Merge remote-tracking branch 'origin/4.13' into 4.14
diff --git a/.gitignore b/.gitignore
index 66ce1c2..b67dc8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,11 +28,12 @@
cloud-*.tar.bz2
*.log
*.pyc
+*.patch
*.egginfo/
*.egg-info/
*.prefs
build.number
-*.log.*.gz
+*.log.*
cloud.log.*.*
unittest
deps/cloud.userlibraries
diff --git a/.java-version b/.java-version
index 6259340..2dbc24b 100644
--- a/.java-version
+++ b/.java-version
@@ -1 +1 @@
-1.8
+11.0
diff --git a/.travis.yml b/.travis.yml
index a7429fe2..18564f9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,13 +14,16 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+
sudo: required
-dist: xenial
-group: edge
+dist: bionic
+group: stable
language: java
+
jdk:
- - openjdk8
+ - openjdk11
+
python:
- "2.7"
@@ -43,8 +46,11 @@
smoke/test_affinity_groups
smoke/test_affinity_groups_projects
smoke/test_async_job
+ smoke/test_backup_recovery_dummy
smoke/test_create_list_domain_account_project
+ smoke/test_create_network
smoke/test_deploy_vgpu_enabled_vm
+ smoke/test_deploy_vm_extra_config_data
smoke/test_deploy_vm_iso
smoke/test_deploy_vm_root_resize
smoke/test_deploy_vm_with_userdata
@@ -98,6 +104,7 @@
smoke/test_ssvm
smoke/test_staticroles
smoke/test_templates
+ smoke/test_update_security_group
smoke/test_usage
smoke/test_usage_events"
@@ -152,6 +159,7 @@
component/test_project_resources"
- TESTS="component/test_project_usage
+ component/test_protocol_number_security_group
component/test_resource_limits"
- TESTS="component/test_regions_accounts
diff --git a/INSTALL.md b/INSTALL.md
index 85da4be..6840626 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -15,15 +15,8 @@
Install tools and dependencies used for development:
- $ yum install git java-1.8.0-openjdk java-1.8.0-openjdk-devel \
- mysql mysql-server mkisofs gcc python MySQL-python openssh-clients wget
-
- # yum -y update
- # yum -y install java-1.8.0-openjdk
- # yum -y install java-1.8.0-openjdk-devel
- # yum -y install mysql-server
- # yum -y install git
- # yum -y install genisoimage
+ # yum -y install git java-11-openjdk java-11-openjdk-devel \
+ mysql mysql-server mkisofs git gcc python MySQL-python openssh-clients wget
Set up Maven (3.6.0):
diff --git a/agent/bindir/cloud-guest-tool.in b/agent/bindir/cloud-guest-tool.in
new file mode 100755
index 0000000..c1a0b00
--- /dev/null
+++ b/agent/bindir/cloud-guest-tool.in
@@ -0,0 +1,129 @@
+#!/usr/bin/env 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.
+
+#
+# Talk to a KVM guest through Libvirt and the Qemu Guest Agent
+# to retrieve information from the guest
+#
+# System VMs have the Qemu Guest Agent installed by default
+# and should properly respond to such commands
+
+#
+# Talk to KVM Instances through the Qemu Guest Agent
+#
+
+import argparse
+import json
+import sys
+import libvirt
+import libvirt_qemu
+
+COMMANDS = ["info", "ping", "fstrim"]
+
+
+class Libvirt:
+ def __init__(self, uri=None, timeout=5):
+ self.timeout = timeout
+ self.conn = libvirt.open(uri)
+ if not self.conn:
+ raise Exception('Failed to open connection to the hypervisor')
+
+ def get_domain(self, name):
+ return self.conn.lookupByName(name)
+
+ def agent_command(self, dom, cmd, flags=0, raw=False):
+ ret = libvirt_qemu.qemuAgentCommand(dom, json.dumps({'execute': cmd}),
+ self.timeout, flags)
+ if raw:
+ return ret
+
+ return json.loads(ret)['return']
+
+class GuestCommand:
+ def __init__(self, domain, timeout):
+ self.domain = domain
+ self.timeout = timeout
+ self.virt = Libvirt(timeout=self.timeout)
+ self.dom = self.virt.get_domain(self.domain)
+
+ def ping(self):
+ result = self.virt.agent_command(self.dom, 'guest-ping')
+
+ res = False
+ code = 1
+ if len(result) == 0:
+ res = True
+ code = 0
+
+ return {'result': res}, code
+
+ def info(self):
+ info = dict()
+ info['filesystem'] = 'guest-get-fsinfo'
+ info['network'] = 'guest-network-get-interfaces'
+
+ result = dict()
+ for key, cmd in info.items():
+ result[key] = self.virt.agent_command(self.dom, cmd)
+
+ return result, 0
+
+ def fstrim(self):
+ result = self.virt.agent_command(self.dom, 'guest-fstrim')
+
+ res = False
+ code = 1
+ if len(result) > 0:
+ res = True
+ code = 0
+
+ return {'result': result}, code
+
+
+def main(args):
+ command = args.command
+
+ try:
+ guestcmd = GuestCommand(args.instance, args.timeout)
+ result = {'error': 'Command not implemented'}
+ code = 255
+
+ if command == 'info':
+ result, code = guestcmd.info()
+ elif command == 'ping':
+ result, code = guestcmd.ping()
+ elif command == 'fstrim':
+ result, code = guestcmd.fstrim()
+
+ print(json.dumps(result))
+ sys.exit(code)
+ except libvirt.libvirtError as exc:
+ print(json.dumps({'error': str(exc)}))
+ sys.exit(255)
+
+if __name__ == '__main__':
+ parser = argparse.ArgumentParser(description='CloudStack Guest Tool')
+ parser.add_argument('instance', type=str,
+ help='Instance Name')
+ parser.add_argument('--command', type=str, required=False,
+ help='Command to execute', default='info',
+ choices=COMMANDS)
+ parser.add_argument('--timeout', type=int, required=False,
+ help='timeout in seconds', default=5)
+ args = parser.parse_args()
+ main(args)
diff --git a/agent/bindir/rolling-maintenance.in b/agent/bindir/rolling-maintenance.in
new file mode 100644
index 0000000..572209c
--- /dev/null
+++ b/agent/bindir/rolling-maintenance.in
@@ -0,0 +1,91 @@
+#!/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 subprocess import *
+import sys
+import logging
+
+LOG_FILE='/var/log/cloudstack/agent/rolling-maintenance.log'
+AVOID_MAINTENANCE_EXIT_STATUS=70
+
+logging.basicConfig(filename=LOG_FILE,
+ filemode='a',
+ format='%(asctime)s,%(msecs)d %(name)s %(levelname)s %(message)s',
+ datefmt='%H:%M:%S',
+ level=logging.INFO)
+logger = logging.getLogger('rolling-maintenance')
+
+
+def execute_script(stage, script, payload, timeout):
+ logger.info("Executing script: %s for stage: %s" % (script, stage))
+
+ try:
+ command = "timeout %s %s " % (str(timeout), script)
+ if payload:
+ logger.info("Adding payload: %s" % payload)
+ command += " " + payload
+ pout = Popen(command, shell=True, stdout=PIPE, stderr=PIPE)
+ exitStatus = pout.wait()
+ stdout, stderr = pout.communicate()
+
+ success = True if exitStatus == 0 or exitStatus == AVOID_MAINTENANCE_EXIT_STATUS else False
+ avoid_maintenance = True if exitStatus == AVOID_MAINTENANCE_EXIT_STATUS else False
+ return {"success": success, "message": stdout.strip(), "avoidmaintenance": avoid_maintenance}
+ except Exception as e:
+ logger.error("Error in stage %s: %s" % (script, e))
+ sys.exit(1)
+
+
+if __name__ == '__main__':
+ try:
+ logger.info(sys.argv)
+ if len(sys.argv) < 2:
+ logger.error("Arguments missing")
+ sys.exit(0)
+
+ args = sys.argv[1]
+ params = args.split(',')
+ if len(params) < 5:
+ logger.error("Wrong number of parameters received, STAGE,SCRIPT,TIMEOUT,RESULTS_FILE,OUTPUT_FILE"
+ "[,PAYLOAD] expected")
+ sys.exit(0)
+
+ stage = params[0]
+ script = params[1]
+ timeout = params[2]
+ results_file_path = params[3]
+ output_file_path = params[4]
+ payload = params[5] if len(params) > 5 else None
+ logger.info("Received parameters: stage: %s, script: %s, timeout: %s, results_file: %s, output_file: %s "
+ "and payload: %s" % (stage, script, timeout, results_file_path, output_file_path, payload))
+
+ results = execute_script(stage, script, payload, timeout)
+
+ # Persist results and output on a file
+ output_file = open(output_file_path, "w+")
+ output_file.write(results['message'])
+ output_file.close()
+
+ results_file = open(results_file_path, "w+")
+ results_file.write("%s,%s,%s" % (stage, str(results['success']), str(results['avoidmaintenance'])))
+ results_file.close()
+
+ msg = "Successful execution of %s" if results['success'] else "Script execution failed: %s"
+ logger.info(results['message'])
+ logger.info(msg % script)
+ except Exception as e:
+ logger.error("Unexpected error on systemd service: %s" % e)
+ sys.exit(1)
diff --git a/agent/conf/agent.properties b/agent/conf/agent.properties
index b45526a..85c85a5 100644
--- a/agent/conf/agent.properties
+++ b/agent/conf/agent.properties
@@ -97,6 +97,31 @@
# migration will finish quickly. Less than 1 means disabled.
#vm.migrate.pauseafter=0
+# Agent hooks is the way to override default agent behavior to extend the functionality without excessive coding
+# for a custom deployment. The first hook promoted is libvirt-vm-xml-transformer which allows provider to modify
+# VM XML specification before send to libvirt. Hooks are implemented in Groovy and must be implemented in the way
+# to keep default CS behaviour is something goes wrong.
+# All hooks are located in a special directory defined in 'agent.hooks.basedir'
+#
+# agent.hooks.basedir=/etc/cloudstack/agent/hooks
+
+# every hook has two major attributes - script name, specified in 'agent.hooks.*.script' and method name
+# specified in 'agent.hooks.*.method'.
+
+# Libvirt XML transformer hook does XML-to-XML transformation which provider can use to add/remove/modify some
+# sort of attributes in Libvirt XML domain specification.
+# agent.hooks.libvirt_vm_xml_transformer.script=libvirt-vm-xml-transformer.groovy
+# agent.hooks.libvirt_vm_xml_transformer.method=transform
+#
+# The hook is called right after libvirt successfuly launched VM
+# agent.hooks.libvirt_vm_on_start.script=libvirt-vm-state-change.groovy
+# agent.hooks.libvirt_vm_on_start.method=onStart
+#
+# The hook is called right after libvirt successfuly stopped VM
+# agent.hooks.libvirt_vm_on_stop.script=libvirt-vm-state-change.groovy
+# agent.hooks.libvirt_vm_on_stop.method=onStop
+#
+
# set the type of bridge used on the hypervisor, this defines what commands the resource
# will use to setup networking. Currently supported NATIVE, OPENVSWITCH
#network.bridge.type=native
@@ -115,6 +140,15 @@
# set the hypervisor type, values are: kvm, lxc
hypervisor.type=kvm
+# This parameter specifies a directory on the host local storage for temporary storing direct download templates
+#direct.download.temporary.download.location=/var/lib/libvirt/images
+
+# set the rolling maintenance hook scripts directory
+#rolling.maintenance.hooks.dir=/etc/cloudstack/agent/hooks.d
+
+# disable the rolling maintenance service execution
+#rolling.maintenance.service.executor.disabled=true
+
# set the hypervisor URI. Usually there is no need for changing this
# For KVM: qemu:///system
# For LXC: lxc:///
@@ -146,6 +180,12 @@
# on,run virsh capabilities for more details.
# guest.cpu.model=
#
+# This param will set the CPU architecture for the domain override what
+# the management server would send
+# In case of arm64 (aarch64), this will change the machine type to 'virt' and
+# adds a SCSI and a USB controller in the domain xml.
+# guest.cpu.arch=x86_64|aarch64
+#
# This param will require CPU features on the <cpu> section
# guest.cpu.features=vmx vme
#
diff --git a/agent/conf/cloudstack-agent.logrotate.in b/agent/conf/cloudstack-agent.logrotate.in
index d9a3dfb..2b3dc87 100644
--- a/agent/conf/cloudstack-agent.logrotate.in
+++ b/agent/conf/cloudstack-agent.logrotate.in
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-/var/log/cloudstack/agent/security_group.log /var/log/cloudstack/agent/resizevolume.log {
+/var/log/cloudstack/agent/security_group.log /var/log/cloudstack/agent/resizevolume.log /var/log/cloudstack/agent/rolling-maintenance.log {
copytruncate
daily
rotate 5
diff --git a/agent/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-agent.in b/agent/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-agent.in
deleted file mode 100755
index d1769cc..0000000
--- a/agent/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-agent.in
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/bash
-
-# chkconfig: 35 99 10
-# description: Cloud Agent
-
-# 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.
-
-# WARNING: if this script is changed, then all other initscripts MUST BE changed to match it as well
-
-. /etc/rc.d/init.d/functions
-
-# set environment variables
-
-SHORTNAME=`basename $0`
-PIDFILE=@PIDDIR@/"$SHORTNAME".pid
-LOCKFILE=@LOCKDIR@/"$SHORTNAME"
-LOGFILE=@AGENTLOG@
-PROGNAME="Cloud Agent"
-CLASS="com.cloud.agent.AgentShell"
-JSVC=`which jsvc 2>/dev/null`;
-
-# exit if we don't find jsvc
-if [ -z "$JSVC" ]; then
- echo no jsvc found in path;
- exit 1;
-fi
-
-unset OPTIONS
-[ -r @SYSCONFDIR@/sysconfig/"$SHORTNAME" ] && source @SYSCONFDIR@/sysconfig/"$SHORTNAME"
-
-# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/jre /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm"
-
-for jdir in $JDK_DIRS; do
- if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
- JAVA_HOME="$jdir"
- fi
-done
-export JAVA_HOME
-
-SCP="@SYSTEMCLASSPATH@"
-DCP="@DEPSCLASSPATH@"
-ACP="@AGENTCLASSPATH@"
-JCP="/usr/share/java/commons-daemon.jar"
-
-# We need to append the JSVC daemon JAR to the classpath
-# AgentShell implements the JSVC daemon methods
-export CLASSPATH="$SCP:$DCP:$ACP:$JCP:@AGENTSYSCONFDIR@:@AGENTLIBDIR@"
-
-start() {
- echo -n $"Starting $PROGNAME: "
- if hostname --fqdn >/dev/null 2>&1 ; then
- $JSVC -cp "$CLASSPATH" -pidfile "$PIDFILE" -errfile SYSLOG $CLASS
- RETVAL=$?
- echo
- else
- failure
- echo
- echo The host name does not resolve properly to an IP address. Cannot start "$PROGNAME". > /dev/stderr
- RETVAL=9
- fi
- [ $RETVAL = 0 ] && touch ${LOCKFILE}
- return $RETVAL
-}
-
-stop() {
- echo -n $"Stopping $PROGNAME: "
- $JSVC -pidfile "$PIDFILE" -stop $CLASS
- RETVAL=$?
- echo
- [ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE}
-}
-
-
-# See how we were called.
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- status)
- status -p ${PIDFILE} $SHORTNAME
- RETVAL=$?
- ;;
- restart)
- stop
- sleep 3
- start
- ;;
- condrestart)
- if status -p ${PIDFILE} $SHORTNAME >&/dev/null; then
- stop
- sleep 3
- start
- fi
- ;;
- *)
- echo $"Usage: $SHORTNAME {start|stop|restart|condrestart|status|help}"
- RETVAL=3
-esac
-
-exit $RETVAL
diff --git a/agent/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-agent.in b/agent/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-agent.in
deleted file mode 100755
index d1769cc..0000000
--- a/agent/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-agent.in
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/bash
-
-# chkconfig: 35 99 10
-# description: Cloud Agent
-
-# 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.
-
-# WARNING: if this script is changed, then all other initscripts MUST BE changed to match it as well
-
-. /etc/rc.d/init.d/functions
-
-# set environment variables
-
-SHORTNAME=`basename $0`
-PIDFILE=@PIDDIR@/"$SHORTNAME".pid
-LOCKFILE=@LOCKDIR@/"$SHORTNAME"
-LOGFILE=@AGENTLOG@
-PROGNAME="Cloud Agent"
-CLASS="com.cloud.agent.AgentShell"
-JSVC=`which jsvc 2>/dev/null`;
-
-# exit if we don't find jsvc
-if [ -z "$JSVC" ]; then
- echo no jsvc found in path;
- exit 1;
-fi
-
-unset OPTIONS
-[ -r @SYSCONFDIR@/sysconfig/"$SHORTNAME" ] && source @SYSCONFDIR@/sysconfig/"$SHORTNAME"
-
-# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/jre /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm"
-
-for jdir in $JDK_DIRS; do
- if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
- JAVA_HOME="$jdir"
- fi
-done
-export JAVA_HOME
-
-SCP="@SYSTEMCLASSPATH@"
-DCP="@DEPSCLASSPATH@"
-ACP="@AGENTCLASSPATH@"
-JCP="/usr/share/java/commons-daemon.jar"
-
-# We need to append the JSVC daemon JAR to the classpath
-# AgentShell implements the JSVC daemon methods
-export CLASSPATH="$SCP:$DCP:$ACP:$JCP:@AGENTSYSCONFDIR@:@AGENTLIBDIR@"
-
-start() {
- echo -n $"Starting $PROGNAME: "
- if hostname --fqdn >/dev/null 2>&1 ; then
- $JSVC -cp "$CLASSPATH" -pidfile "$PIDFILE" -errfile SYSLOG $CLASS
- RETVAL=$?
- echo
- else
- failure
- echo
- echo The host name does not resolve properly to an IP address. Cannot start "$PROGNAME". > /dev/stderr
- RETVAL=9
- fi
- [ $RETVAL = 0 ] && touch ${LOCKFILE}
- return $RETVAL
-}
-
-stop() {
- echo -n $"Stopping $PROGNAME: "
- $JSVC -pidfile "$PIDFILE" -stop $CLASS
- RETVAL=$?
- echo
- [ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE}
-}
-
-
-# See how we were called.
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- status)
- status -p ${PIDFILE} $SHORTNAME
- RETVAL=$?
- ;;
- restart)
- stop
- sleep 3
- start
- ;;
- condrestart)
- if status -p ${PIDFILE} $SHORTNAME >&/dev/null; then
- stop
- sleep 3
- start
- fi
- ;;
- *)
- echo $"Usage: $SHORTNAME {start|stop|restart|condrestart|status|help}"
- RETVAL=3
-esac
-
-exit $RETVAL
diff --git a/agent/distro/opensuse/sles/SYSCONFDIR/init.d/cloud-agent.in b/agent/distro/opensuse/sles/SYSCONFDIR/init.d/cloud-agent.in
deleted file mode 100644
index 3a1d053..0000000
--- a/agent/distro/opensuse/sles/SYSCONFDIR/init.d/cloud-agent.in
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/bin/bash
-### BEGIN INIT INFO
-# Provides: cloudstack-agent
-# Required-Start: $network
-# Required-Stop: $network
-# Default-Start: 3 4 5
-# Default-Stop: 0 1 2 6
-# X-Interactive: true
-# Short-Description: Start/stop apache2 web server
-### END INIT INFO
-
-# 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.
-
-# WARNING: if this script is changed, then all other initscripts MUST BE changed to match it as well
-
-. /lib/lsb/init-functions
-. /etc/rc.status
-
-# set environment variables
-
-SHORTNAME=`basename $0`
-PIDFILE=@PIDDIR@/"$SHORTNAME".pid
-LOCKFILE=@LOCKDIR@/"$SHORTNAME"
-LOGFILE=@AGENTLOG@
-PROGNAME="Cloud Agent"
-CLASS="com.cloud.agent.AgentShell"
-
-unset OPTIONS
-[ -r @SYSCONFDIR@/default/"$SHORTNAME" ] && source @SYSCONFDIR@/default/"$SHORTNAME"
-
-# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm"
-
-for jdir in $JDK_DIRS; do
- if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
- JAVA_HOME="$jdir"
- fi
-done
-export JAVA_HOME
-
-SCP="@SYSTEMCLASSPATH@"
-DCP="@DEPSCLASSPATH@"
-ACP="@AGENTCLASSPATH@"
-JCP="/usr/share/java/commons-daemon.jar"
-
-# We need to append the JSVC daemon JAR to the classpath
-# AgentShell implements the JSVC daemon methods
-export CLASSPATH="$SCP:$DCP:$ACP:$JCP:@AGENTSYSCONFDIR@"
-
-wait_for_network() {
- i=1
- while [ $i -lt 10 ]
- do
- # Under Ubuntu and Debian libvirt by default creates a bridge called virbr0.
- # That's why we want more then 3 lines back from brctl, so that there is a manually created bridge
- if [ "$(brctl show|wc -l)" -gt 2 ]; then
- break
- else
- sleep 1
- let i=$i+1
- continue
- fi
- done
-}
-
-start() {
- log_daemon_msg $"Starting $PROGNAME" "$SHORTNAME"
- if [ -s "$PIDFILE" ] && kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
- log_progress_msg "apparently already running"
- log_end_msg 0
- exit 0
- fi
- if hostname --fqdn >/dev/null 2>&1 ; then
- true
- else
- log_failure_msg "The host name does not resolve properly to an IP address. Cannot start $PROGNAME"
- log_end_msg 1
- exit 1
- fi
-
- wait_for_network
-
- if jsvc -cp "$CLASSPATH" -pidfile "$PIDFILE" -errfile SYSLOG $CLASS
- RETVAL=$?
- then
- rc=0
- sleep 1
- if ! kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
- log_failure_msg "$PROG failed to start"
- rc=1
- fi
- else
- rc=1
- fi
-
- if [ $rc -eq 0 ]; then
- log_end_msg 0
- else
- log_end_msg 1
- rm -f "$PIDFILE"
- fi
-}
-
-stop() {
- SHUTDOWN_WAIT="30"
- count="0"
-
- echo -n $"Stopping $PROGNAME" "$SHORTNAME"
- jsvc -pidfile "$PIDFILE" -stop $CLASS
-
- until [ "$count" -gt "$SHUTDOWN_WAIT" ]
- do
- agentPid=`ps aux|grep [j]svc|grep cloud-agent`
- if [ "$?" -gt "0" ];then
- break
- fi
- sleep 1
- let count="${count}+1"
- done
-
- agentPid=`ps aux|grep [j]svc|grep cloud-agent`
- if [ "$?" -eq "0" ]; then
- agentPid=`ps aux|grep [j]svc|awk '{print $2}'`
- if [ "$agentPid" != "" ]; then
- kill -9 $agentPid
- fi
- fi
-
- log_end_msg $?
- rm -f "$PIDFILE"
-}
-
-
-# See how we were called.
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- status)
- status_of_proc -p "$PIDFILE" "$PROG" "$SHORTNAME"
- RETVAL=$?
- ;;
- restart)
- stop
- sleep 3
- start
- ;;
- *)
- echo $"Usage: $SHORTNAME {start|stop|restart|status|help}"
- RETVAL=3
-esac
-
-exit $RETVAL
-
diff --git a/agent/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in b/agent/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in
deleted file mode 100644
index 271d45d..0000000
--- a/agent/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/bash
-
-# chkconfig: 35 99 10
-# description: Cloud Agent
-
-# 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.
-
-# WARNING: if this script is changed, then all other initscripts MUST BE changed to match it as well
-
-. /etc/rc.d/init.d/functions
-
-# set environment variables
-
-SHORTNAME=`basename $0`
-PIDFILE=@PIDDIR@/"$SHORTNAME".pid
-LOCKFILE=@LOCKDIR@/"$SHORTNAME"
-LOGFILE=@AGENTLOG@
-PROGNAME="Cloud Agent"
-CLASS="com.cloud.agent.AgentShell"
-JSVC=`which jsvc 2>/dev/null`;
-
-# exit if we don't find jsvc
-if [ -z "$JSVC" ]; then
- echo no jsvc found in path;
- exit 1;
-fi
-
-unset OPTIONS
-[ -r @SYSCONFDIR@/sysconfig/"$SHORTNAME" ] && source @SYSCONFDIR@/sysconfig/"$SHORTNAME"
-
-# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/jre /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm /usr/lib/jvm/jre-1.7.0"
-
-jhome=""
-for jdir in $JDK_DIRS; do
- if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
- jhome="$jdir"
- fi
-done
-if [ ! -z $jhome ];then
-export JAVA_HOME="$jhome"
-fi
-
-SCP="@SYSTEMCLASSPATH@"
-DCP="@DEPSCLASSPATH@"
-ACP="@AGENTCLASSPATH@"
-JCP="/usr/share/java/commons-daemon.jar"
-
-# We need to append the JSVC daemon JAR to the classpath
-# AgentShell implements the JSVC daemon methods
-export CLASSPATH="$SCP:$DCP:$ACP:$JCP:@AGENTSYSCONFDIR@:@AGENTLIBDIR@"
-
-start() {
- echo -n $"Starting $PROGNAME: "
- if hostname --fqdn >/dev/null 2>&1 ; then
- $JSVC -cp "$CLASSPATH" -pidfile "$PIDFILE" -errfile SYSLOG $CLASS
- RETVAL=$?
- echo
- else
- failure
- echo
- echo The host name does not resolve properly to an IP address. Cannot start "$PROGNAME". > /dev/stderr
- RETVAL=9
- fi
- [ $RETVAL = 0 ] && touch ${LOCKFILE}
- return $RETVAL
-}
-
-stop() {
- echo -n $"Stopping $PROGNAME: "
- $JSVC -pidfile "$PIDFILE" -stop $CLASS
- RETVAL=$?
- echo
- [ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE}
-}
-
-
-# See how we were called.
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- status)
- status -p ${PIDFILE} $SHORTNAME
- RETVAL=$?
- ;;
- restart)
- stop
- sleep 3
- start
- ;;
- condrestart)
- if status -p ${PIDFILE} $SHORTNAME >&/dev/null; then
- stop
- sleep 3
- start
- fi
- ;;
- *)
- echo $"Usage: $SHORTNAME {start|stop|restart|condrestart|status|help}"
- RETVAL=3
-esac
-
-exit $RETVAL
diff --git a/agent/distro/sles/SYSCONFDIR/init.d/cloud-agent.in b/agent/distro/sles/SYSCONFDIR/init.d/cloud-agent.in
deleted file mode 100644
index 3a1d053..0000000
--- a/agent/distro/sles/SYSCONFDIR/init.d/cloud-agent.in
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/bin/bash
-### BEGIN INIT INFO
-# Provides: cloudstack-agent
-# Required-Start: $network
-# Required-Stop: $network
-# Default-Start: 3 4 5
-# Default-Stop: 0 1 2 6
-# X-Interactive: true
-# Short-Description: Start/stop apache2 web server
-### END INIT INFO
-
-# 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.
-
-# WARNING: if this script is changed, then all other initscripts MUST BE changed to match it as well
-
-. /lib/lsb/init-functions
-. /etc/rc.status
-
-# set environment variables
-
-SHORTNAME=`basename $0`
-PIDFILE=@PIDDIR@/"$SHORTNAME".pid
-LOCKFILE=@LOCKDIR@/"$SHORTNAME"
-LOGFILE=@AGENTLOG@
-PROGNAME="Cloud Agent"
-CLASS="com.cloud.agent.AgentShell"
-
-unset OPTIONS
-[ -r @SYSCONFDIR@/default/"$SHORTNAME" ] && source @SYSCONFDIR@/default/"$SHORTNAME"
-
-# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm"
-
-for jdir in $JDK_DIRS; do
- if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
- JAVA_HOME="$jdir"
- fi
-done
-export JAVA_HOME
-
-SCP="@SYSTEMCLASSPATH@"
-DCP="@DEPSCLASSPATH@"
-ACP="@AGENTCLASSPATH@"
-JCP="/usr/share/java/commons-daemon.jar"
-
-# We need to append the JSVC daemon JAR to the classpath
-# AgentShell implements the JSVC daemon methods
-export CLASSPATH="$SCP:$DCP:$ACP:$JCP:@AGENTSYSCONFDIR@"
-
-wait_for_network() {
- i=1
- while [ $i -lt 10 ]
- do
- # Under Ubuntu and Debian libvirt by default creates a bridge called virbr0.
- # That's why we want more then 3 lines back from brctl, so that there is a manually created bridge
- if [ "$(brctl show|wc -l)" -gt 2 ]; then
- break
- else
- sleep 1
- let i=$i+1
- continue
- fi
- done
-}
-
-start() {
- log_daemon_msg $"Starting $PROGNAME" "$SHORTNAME"
- if [ -s "$PIDFILE" ] && kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
- log_progress_msg "apparently already running"
- log_end_msg 0
- exit 0
- fi
- if hostname --fqdn >/dev/null 2>&1 ; then
- true
- else
- log_failure_msg "The host name does not resolve properly to an IP address. Cannot start $PROGNAME"
- log_end_msg 1
- exit 1
- fi
-
- wait_for_network
-
- if jsvc -cp "$CLASSPATH" -pidfile "$PIDFILE" -errfile SYSLOG $CLASS
- RETVAL=$?
- then
- rc=0
- sleep 1
- if ! kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
- log_failure_msg "$PROG failed to start"
- rc=1
- fi
- else
- rc=1
- fi
-
- if [ $rc -eq 0 ]; then
- log_end_msg 0
- else
- log_end_msg 1
- rm -f "$PIDFILE"
- fi
-}
-
-stop() {
- SHUTDOWN_WAIT="30"
- count="0"
-
- echo -n $"Stopping $PROGNAME" "$SHORTNAME"
- jsvc -pidfile "$PIDFILE" -stop $CLASS
-
- until [ "$count" -gt "$SHUTDOWN_WAIT" ]
- do
- agentPid=`ps aux|grep [j]svc|grep cloud-agent`
- if [ "$?" -gt "0" ];then
- break
- fi
- sleep 1
- let count="${count}+1"
- done
-
- agentPid=`ps aux|grep [j]svc|grep cloud-agent`
- if [ "$?" -eq "0" ]; then
- agentPid=`ps aux|grep [j]svc|awk '{print $2}'`
- if [ "$agentPid" != "" ]; then
- kill -9 $agentPid
- fi
- fi
-
- log_end_msg $?
- rm -f "$PIDFILE"
-}
-
-
-# See how we were called.
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- status)
- status_of_proc -p "$PIDFILE" "$PROG" "$SHORTNAME"
- RETVAL=$?
- ;;
- restart)
- stop
- sleep 3
- start
- ;;
- *)
- echo $"Usage: $SHORTNAME {start|stop|restart|status|help}"
- RETVAL=3
-esac
-
-exit $RETVAL
-
diff --git a/agent/distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in b/agent/distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in
deleted file mode 100755
index c30e526..0000000
--- a/agent/distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in
+++ /dev/null
@@ -1,173 +0,0 @@
-#!/bin/bash
-
-### BEGIN INIT INFO
-# Provides: cloudstack-agent
-# Required-Start: $network $local_fs
-# Required-Stop: $network $local_fs
-# Default-Start: 3 4 5
-# Default-Stop: 0 1 2 6
-# Short-Description: Start/stop Apache CloudStack Agent
-# Description: This scripts Starts/Stops the Apache CloudStack agent
-## The CloudStack Agent is a part of the Apache CloudStack project and is used
-## for managing KVM-based Hypervisors and performing secondary storage tasks inside
-## the Secondary Storage System Virtual Machine.
-## JSVC (Java daemonizing) is used for starting and stopping the agent
-### END INIT INFO
-
-# 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.
-
-. /lib/lsb/init-functions
-
-SHORTNAME="cloud-agent"
-PIDFILE=@PIDDIR@/"$SHORTNAME".pid
-LOCKFILE=@LOCKDIR@/"$SHORTNAME"
-LOGFILE=@AGENTLOG@
-PROGNAME="CloudStack Agent"
-CLASS="com.cloud.agent.AgentShell"
-PROG="jsvc"
-DAEMON="/usr/bin/jsvc"
-SHUTDOWN_WAIT="30"
-
-unset OPTIONS
-[ -r @SYSCONFDIR@/default/"$SHORTNAME" ] && source @SYSCONFDIR@/default/"$SHORTNAME"
-
-# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm"
-
-for jdir in $JDK_DIRS; do
- if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
- JAVA_HOME="$jdir"
- fi
-done
-export JAVA_HOME
-
-SCP="@SYSTEMCLASSPATH@"
-DCP="@DEPSCLASSPATH@"
-ACP="@AGENTCLASSPATH@"
-JCP="/usr/share/java/commons-daemon.jar"
-
-# We need to append the JSVC daemon JAR to the classpath
-# AgentShell implements the JSVC daemon methods
-export CLASSPATH="$SCP:$DCP:$ACP:$JCP:@AGENTSYSCONFDIR@"
-
-wait_for_network() {
- i=1
- while [ $i -lt 10 ]
- do
- # Under Ubuntu and Debian libvirt by default creates a bridge called virbr0.
- # That's why we want more then 3 lines back from brctl, so that there is a manually created bridge
- if [ "$(brctl show|wc -l)" -gt 2 ]; then
- break
- else
- sleep 1
- let i=$i+1
- continue
- fi
- done
-}
-
-start() {
- if [ -s "$PIDFILE" ] && kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
- log_daemon_msg "$PROGNAME apparently already running"
- log_end_msg 0
- exit 0
- fi
-
- log_daemon_msg "Starting $PROGNAME" "$SHORTNAME"
- if hostname --fqdn >/dev/null 2>&1 ; then
- true
- else
- log_failure_msg "The host name does not resolve properly to an IP address. Cannot start $PROGNAME"
- log_end_msg 1
- exit 1
- fi
-
- wait_for_network
-
- if start_daemon -p $PIDFILE $DAEMON -cp "$CLASSPATH" -pidfile "$PIDFILE" -errfile SYSLOG $CLASS
- RETVAL=$?
- then
- rc=0
- sleep 1
- if ! kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
- log_failure_msg "$PROG failed to start"
- rc=1
- fi
- else
- rc=1
- fi
-
- if [ $rc -eq 0 ]; then
- log_end_msg 0
- else
- log_end_msg 1
- rm -f "$PIDFILE"
- fi
-}
-
-stop() {
- count="0"
-
- log_daemon_msg "Stopping $PROGNAME" "$SHORTNAME"
- killproc -p $PIDFILE $DAEMON
-
- until [ "$count" -gt "$SHUTDOWN_WAIT" ]
- do
- agentPid=$(ps aux|grep [j]svc|grep $SHORTNAME)
- if [ "$?" -gt "0" ];then
- break
- fi
- sleep 1
- let count="${count}+1"
- done
-
- agentPid=$(ps aux|grep [j]svc|grep $SHORTNAME)
- if [ "$?" -eq "0" ]; then
- agentPid=$(ps aux|grep [j]svc|awk '{print $2}')
- if [ "$agentPid" != "" ]; then
- log_warning_msg "$PROG still running, forcing kill"
- kill -9 $agentPid
- fi
- fi
-
- log_end_msg $?
- rm -f "$PIDFILE"
-}
-
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- status)
- status_of_proc -p "$PIDFILE" "$PROG" "$SHORTNAME"
- RETVAL=$?
- ;;
- restart | force-reload)
- stop
- sleep 3
- start
- ;;
- *)
- echo "Usage: $0 {start|stop|restart|force-reload|status}"
- RETVAL=3
-esac
-
-exit $RETVAL
diff --git a/agent/pom.xml b/agent/pom.xml
index 24395de..eb2d1e3 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/agent/src/main/java/com/cloud/agent/Agent.java b/agent/src/main/java/com/cloud/agent/Agent.java
index e5fbdd7..7e5e295 100644
--- a/agent/src/main/java/com/cloud/agent/Agent.java
+++ b/agent/src/main/java/com/cloud/agent/Agent.java
@@ -292,8 +292,13 @@
try {
_connection.start();
} catch (final NioConnectionException e) {
- s_logger.warn("NIO Connection Exception " + e);
- s_logger.info("Attempted to connect to the server, but received an unexpected exception, trying again...");
+ _connection.stop();
+ try {
+ _connection.cleanUp();
+ } catch (final IOException ex) {
+ s_logger.warn("Fail to clean up old connection. " + ex);
+ }
+ s_logger.info("Attempted to connect to the server, but received an unexpected exception, trying again...", e);
}
}
_shell.updateConnectedHost();
@@ -516,8 +521,7 @@
try {
_connection.start();
} catch (final NioConnectionException e) {
- s_logger.warn("NIO Connection Exception " + e);
- s_logger.info("Attempted to connect to the server, but received an unexpected exception, trying again...");
+ s_logger.info("Attempted to re-connect to the server, but received an unexpected exception, trying again...", e);
_connection.stop();
try {
_connection.cleanUp();
diff --git a/agent/src/main/java/com/cloud/agent/direct/download/DirectTemplateDownloader.java b/agent/src/main/java/com/cloud/agent/direct/download/DirectTemplateDownloader.java
index a88b452..32b84a3 100644
--- a/agent/src/main/java/com/cloud/agent/direct/download/DirectTemplateDownloader.java
+++ b/agent/src/main/java/com/cloud/agent/direct/download/DirectTemplateDownloader.java
@@ -19,49 +19,15 @@
package com.cloud.agent.direct.download;
+import com.cloud.utils.Pair;
+
public interface DirectTemplateDownloader {
- class DirectTemplateInformation {
- private String installPath;
- private Long size;
- private String checksum;
-
- public DirectTemplateInformation(String installPath, Long size, String checksum) {
- this.installPath = installPath;
- this.size = size;
- this.checksum = checksum;
- }
-
- public String getInstallPath() {
- return installPath;
- }
-
- public Long getSize() {
- return size;
- }
-
- public String getChecksum() {
- return checksum;
- }
- }
-
/**
* Perform template download to pool specified on downloader creation
- * @return true if successful, false if not
+ * @return (true if successful, false if not, download file path)
*/
- boolean downloadTemplate();
-
- /**
- * Perform extraction (if necessary) and installation of previously downloaded template
- * @return true if successful, false if not
- */
- boolean extractAndInstallDownloadedTemplate();
-
- /**
- * Get template information after it is properly installed on pool
- * @return template information
- */
- DirectTemplateInformation getTemplateInformation();
+ Pair<Boolean, String> downloadTemplate();
/**
* Perform checksum validation of previously downloadeed template
diff --git a/agent/src/main/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImpl.java b/agent/src/main/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImpl.java
index 419ab7d..9c150e9 100644
--- a/agent/src/main/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImpl.java
+++ b/agent/src/main/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImpl.java
@@ -19,7 +19,6 @@
package com.cloud.agent.direct.download;
import com.cloud.utils.exception.CloudRuntimeException;
-import com.cloud.utils.script.Script;
import org.apache.cloudstack.utils.security.DigestHelper;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
@@ -28,7 +27,6 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.security.NoSuchAlgorithmException;
-import java.util.UUID;
public abstract class DirectTemplateDownloaderImpl implements DirectTemplateDownloader {
@@ -36,16 +34,19 @@
private String destPoolPath;
private Long templateId;
private String downloadedFilePath;
- private String installPath;
private String checksum;
private boolean redownload = false;
+ protected String temporaryDownloadPath;
+
public static final Logger s_logger = Logger.getLogger(DirectTemplateDownloaderImpl.class.getName());
- protected DirectTemplateDownloaderImpl(final String url, final String destPoolPath, final Long templateId, final String checksum) {
+ protected DirectTemplateDownloaderImpl(final String url, final String destPoolPath, final Long templateId,
+ final String checksum, final String temporaryDownloadPath) {
this.url = url;
this.destPoolPath = destPoolPath;
this.templateId = templateId;
this.checksum = checksum;
+ this.temporaryDownloadPath = temporaryDownloadPath;
}
private static String directDownloadDir = "template";
@@ -53,10 +54,10 @@
/**
* Return direct download temporary path to download template
*/
- protected static String getDirectDownloadTempPath(Long templateId) {
+ protected String getDirectDownloadTempPath(Long templateId) {
String templateIdAsString = String.valueOf(templateId);
- return directDownloadDir + File.separator + templateIdAsString.substring(0,1) +
- File.separator + templateIdAsString;
+ return this.temporaryDownloadPath + File.separator + directDownloadDir + File.separator +
+ templateIdAsString.substring(0,1) + File.separator + templateIdAsString;
}
/**
@@ -113,64 +114,6 @@
return urlParts[urlParts.length - 1];
}
- /**
- * Checks if downloaded template is extractable
- * @return true if it should be extracted, false if not
- */
- private boolean isTemplateExtractable() {
- String type = Script.runSimpleBashScript("file " + downloadedFilePath + " | awk -F' ' '{print $2}'");
- return type.equalsIgnoreCase("bzip2") || type.equalsIgnoreCase("gzip") || type.equalsIgnoreCase("zip");
- }
-
- @Override
- public boolean extractAndInstallDownloadedTemplate() {
- installPath = UUID.randomUUID().toString();
- if (isTemplateExtractable()) {
- extractDownloadedTemplate();
- } else {
- Script.runSimpleBashScript("mv " + downloadedFilePath + " " + getInstallFullPath());
- }
- return true;
- }
-
- /**
- * Return install full path
- */
- private String getInstallFullPath() {
- return destPoolPath + File.separator + installPath;
- }
-
- /**
- * Return extract command to execute given downloaded file
- */
- private String getExtractCommandForDownloadedFile() {
- if (downloadedFilePath.endsWith(".zip")) {
- return "unzip -p " + downloadedFilePath + " | cat > " + getInstallFullPath();
- } else if (downloadedFilePath.endsWith(".bz2")) {
- return "bunzip2 -c " + downloadedFilePath + " > " + getInstallFullPath();
- } else if (downloadedFilePath.endsWith(".gz")) {
- return "gunzip -c " + downloadedFilePath + " > " + getInstallFullPath();
- } else {
- throw new CloudRuntimeException("Unable to extract template " + templateId + " on " + downloadedFilePath);
- }
- }
-
- /**
- * Extract downloaded template into installPath, remove compressed file
- */
- private void extractDownloadedTemplate() {
- String extractCommand = getExtractCommandForDownloadedFile();
- Script.runSimpleBashScript(extractCommand);
- Script.runSimpleBashScript("rm -f " + downloadedFilePath);
- }
-
- @Override
- public DirectTemplateInformation getTemplateInformation() {
- String sizeResult = Script.runSimpleBashScript("ls -als " + getInstallFullPath() + " | awk '{print $1}'");
- long size = Long.parseLong(sizeResult);
- return new DirectTemplateInformation(installPath, size, checksum);
- }
-
@Override
public boolean validateChecksum() {
if (StringUtils.isNotBlank(checksum)) {
diff --git a/agent/src/main/java/com/cloud/agent/direct/download/HttpDirectTemplateDownloader.java b/agent/src/main/java/com/cloud/agent/direct/download/HttpDirectTemplateDownloader.java
index 147ccab..fc23603 100644
--- a/agent/src/main/java/com/cloud/agent/direct/download/HttpDirectTemplateDownloader.java
+++ b/agent/src/main/java/com/cloud/agent/direct/download/HttpDirectTemplateDownloader.java
@@ -19,23 +19,24 @@
package com.cloud.agent.direct.download;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.cloud.utils.Pair;
import com.cloud.utils.exception.CloudRuntimeException;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.io.IOUtils;
import org.apache.log4j.Logger;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
public class HttpDirectTemplateDownloader extends DirectTemplateDownloaderImpl {
protected HttpClient client;
@@ -44,20 +45,25 @@
protected GetMethod request;
protected Map<String, String> reqHeaders = new HashMap<>();
- public HttpDirectTemplateDownloader(String url, Long templateId, String destPoolPath, String checksum, Map<String, String> headers) {
- super(url, destPoolPath, templateId, checksum);
- s_httpClientManager.getParams().setConnectionTimeout(5000);
- s_httpClientManager.getParams().setSoTimeout(5000);
+ public HttpDirectTemplateDownloader(String url, Long templateId, String destPoolPath, String checksum,
+ Map<String, String> headers, Integer connectTimeout, Integer soTimeout, String downloadPath) {
+ super(url, destPoolPath, templateId, checksum, downloadPath);
+ s_httpClientManager.getParams().setConnectionTimeout(connectTimeout == null ? 5000 : connectTimeout);
+ s_httpClientManager.getParams().setSoTimeout(soTimeout == null ? 5000 : soTimeout);
client = new HttpClient(s_httpClientManager);
request = createRequest(url, headers);
String downloadDir = getDirectDownloadTempPath(templateId);
- createTemporaryDirectoryAndFile(downloadDir);
+ File tempFile = createTemporaryDirectoryAndFile(downloadDir);
+ setDownloadedFilePath(tempFile.getAbsolutePath());
}
- protected void createTemporaryDirectoryAndFile(String downloadDir) {
- createFolder(getDestPoolPath() + File.separator + downloadDir);
- File f = new File(getDestPoolPath() + File.separator + downloadDir + File.separator + getFileNameFromUrl());
- setDownloadedFilePath(f.getAbsolutePath());
+ /**
+ * Create download directory (if it does not exist) and set the download file
+ * @return
+ */
+ protected File createTemporaryDirectoryAndFile(String downloadDir) {
+ createFolder(downloadDir);
+ return new File(downloadDir + File.separator + getFileNameFromUrl());
}
protected GetMethod createRequest(String downloadUrl, Map<String, String> headers) {
@@ -73,12 +79,12 @@
}
@Override
- public boolean downloadTemplate() {
+ public Pair<Boolean, String> downloadTemplate() {
try {
int status = client.executeMethod(request);
if (status != HttpStatus.SC_OK) {
s_logger.warn("Not able to download template, status code: " + status);
- return false;
+ return new Pair<>(false, null);
}
return performDownload();
} catch (IOException e) {
@@ -88,7 +94,7 @@
}
}
- protected boolean performDownload() {
+ protected Pair<Boolean, String> performDownload() {
s_logger.info("Downloading template " + getTemplateId() + " from " + getUrl() + " to: " + getDownloadedFilePath());
try (
InputStream in = request.getResponseBodyAsStream();
@@ -97,8 +103,8 @@
IOUtils.copy(in, out);
} catch (IOException e) {
s_logger.error("Error downloading template " + getTemplateId() + " due to: " + e.getMessage());
- return false;
+ return new Pair<>(false, null);
}
- return true;
+ return new Pair<>(true, getDownloadedFilePath());
}
}
\ No newline at end of file
diff --git a/agent/src/main/java/com/cloud/agent/direct/download/HttpsDirectTemplateDownloader.java b/agent/src/main/java/com/cloud/agent/direct/download/HttpsDirectTemplateDownloader.java
index 38f5983..d788310 100644
--- a/agent/src/main/java/com/cloud/agent/direct/download/HttpsDirectTemplateDownloader.java
+++ b/agent/src/main/java/com/cloud/agent/direct/download/HttpsDirectTemplateDownloader.java
@@ -19,6 +19,7 @@
package com.cloud.agent.direct.download;
+import com.cloud.utils.Pair;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.script.Script;
import org.apache.commons.io.IOUtils;
@@ -37,10 +38,10 @@
import javax.net.ssl.SSLContext;
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.FileOutputStream;
import java.security.KeyManagementException;
import java.security.KeyStore;
import java.security.KeyStoreException;
@@ -53,8 +54,9 @@
private CloseableHttpClient httpsClient;
private HttpUriRequest req;
- public HttpsDirectTemplateDownloader(String url, Long templateId, String destPoolPath, String checksum, Map<String, String> headers) {
- super(url, templateId, destPoolPath, checksum, headers);
+ public HttpsDirectTemplateDownloader(String url, Long templateId, String destPoolPath, String checksum, Map<String, String> headers,
+ Integer connectTimeout, Integer soTimeout, Integer connectionRequestTimeout, String temporaryDownloadPath) {
+ super(url, templateId, destPoolPath, checksum, headers, connectTimeout, soTimeout, temporaryDownloadPath);
SSLContext sslcontext = null;
try {
sslcontext = getSSLContext();
@@ -63,9 +65,9 @@
}
SSLConnectionSocketFactory factory = new SSLConnectionSocketFactory(sslcontext, SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
RequestConfig config = RequestConfig.custom()
- .setConnectTimeout(5000)
- .setConnectionRequestTimeout(5000)
- .setSocketTimeout(5000).build();
+ .setConnectTimeout(connectTimeout == null ? 5000 : connectTimeout)
+ .setConnectionRequestTimeout(connectionRequestTimeout == null ? 5000 : connectionRequestTimeout)
+ .setSocketTimeout(soTimeout == null ? 5000 : soTimeout).build();
httpsClient = HttpClients.custom().setSSLSocketFactory(factory).setDefaultRequestConfig(config).build();
createUriRequest(url, headers);
}
@@ -96,7 +98,7 @@
}
@Override
- public boolean downloadTemplate() {
+ public Pair<Boolean, String> downloadTemplate() {
CloseableHttpResponse response;
try {
response = httpsClient.execute(req);
@@ -109,7 +111,7 @@
/**
* Consume response and persist it on getDownloadedFilePath() file
*/
- protected boolean consumeResponse(CloseableHttpResponse response) {
+ protected Pair<Boolean, String> consumeResponse(CloseableHttpResponse response) {
s_logger.info("Downloading template " + getTemplateId() + " from " + getUrl() + " to: " + getDownloadedFilePath());
if (response.getStatusLine().getStatusCode() != 200) {
throw new CloudRuntimeException("Error on HTTPS response");
@@ -121,9 +123,9 @@
IOUtils.copy(in, out);
} catch (Exception e) {
s_logger.error("Error parsing response for template " + getTemplateId() + " due to: " + e.getMessage());
- return false;
+ return new Pair<>(false, null);
}
- return true;
+ return new Pair<>(true, getDownloadedFilePath());
}
}
diff --git a/agent/src/main/java/com/cloud/agent/direct/download/MetalinkDirectTemplateDownloader.java b/agent/src/main/java/com/cloud/agent/direct/download/MetalinkDirectTemplateDownloader.java
index 2fd8ba0..c8e8527 100644
--- a/agent/src/main/java/com/cloud/agent/direct/download/MetalinkDirectTemplateDownloader.java
+++ b/agent/src/main/java/com/cloud/agent/direct/download/MetalinkDirectTemplateDownloader.java
@@ -18,6 +18,7 @@
//
package com.cloud.agent.direct.download;
+import com.cloud.utils.Pair;
import com.cloud.utils.UriUtils;
import com.cloud.utils.exception.CloudRuntimeException;
import org.apache.commons.collections.CollectionUtils;
@@ -37,8 +38,9 @@
private Random random = new Random();
private static final Logger s_logger = Logger.getLogger(MetalinkDirectTemplateDownloader.class.getName());
- public MetalinkDirectTemplateDownloader(String url, String destPoolPath, Long templateId, String checksum, Map<String, String> headers) {
- super(url, templateId, destPoolPath, checksum, headers);
+ public MetalinkDirectTemplateDownloader(String url, String destPoolPath, Long templateId, String checksum,
+ Map<String, String> headers, Integer connectTimeout, Integer soTimeout, String downloadPath) {
+ super(url, templateId, destPoolPath, checksum, headers, connectTimeout, soTimeout, downloadPath);
metalinkUrl = url;
metalinkUrls = UriUtils.getMetalinkUrls(metalinkUrl);
metalinkChecksums = UriUtils.getMetalinkChecksums(metalinkUrl);
@@ -52,27 +54,28 @@
}
@Override
- public boolean downloadTemplate() {
+ public Pair<Boolean, String> downloadTemplate() {
if (StringUtils.isBlank(getUrl())) {
throw new CloudRuntimeException("Download url has not been set, aborting");
}
- String downloadDir = getDirectDownloadTempPath(getTemplateId());
boolean downloaded = false;
int i = 0;
+ String downloadDir = getDirectDownloadTempPath(getTemplateId());
do {
if (!isRedownload()) {
setUrl(metalinkUrls.get(i));
}
s_logger.info("Trying to download template from url: " + getUrl());
try {
- File f = new File(getDestPoolPath() + File.separator + downloadDir + File.separator + getFileNameFromUrl());
+ setDownloadedFilePath(downloadDir + File.separator + getFileNameFromUrl());
+ File f = new File(getDownloadedFilePath());
if (f.exists()) {
f.delete();
f.createNewFile();
}
- setDownloadedFilePath(f.getAbsolutePath());
request = createRequest(getUrl(), reqHeaders);
- downloaded = super.downloadTemplate();
+ Pair<Boolean, String> downloadResult = super.downloadTemplate();
+ downloaded = downloadResult.first();
if (downloaded) {
s_logger.info("Successfully downloaded template from url: " + getUrl());
}
@@ -83,7 +86,7 @@
i++;
}
while (!downloaded && !isRedownload() && i < metalinkUrls.size());
- return downloaded;
+ return new Pair<>(downloaded, getDownloadedFilePath());
}
@Override
diff --git a/agent/src/main/java/com/cloud/agent/direct/download/NfsDirectTemplateDownloader.java b/agent/src/main/java/com/cloud/agent/direct/download/NfsDirectTemplateDownloader.java
index 16901af..9324770 100644
--- a/agent/src/main/java/com/cloud/agent/direct/download/NfsDirectTemplateDownloader.java
+++ b/agent/src/main/java/com/cloud/agent/direct/download/NfsDirectTemplateDownloader.java
@@ -18,6 +18,7 @@
//
package com.cloud.agent.direct.download;
+import com.cloud.utils.Pair;
import com.cloud.utils.UriUtils;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.script.Script;
@@ -51,13 +52,13 @@
}
}
- public NfsDirectTemplateDownloader(String url, String destPool, Long templateId, String checksum) {
- super(url, destPool, templateId, checksum);
+ public NfsDirectTemplateDownloader(String url, String destPool, Long templateId, String checksum, String downloadPath) {
+ super(url, destPool, templateId, checksum, downloadPath);
parseUrl();
}
@Override
- public boolean downloadTemplate() {
+ public Pair<Boolean, String> downloadTemplate() {
String mountSrcUuid = UUID.randomUUID().toString();
String mount = String.format(mountCommand, srcHost + ":" + srcPath, "/mnt/" + mountSrcUuid);
Script.runSimpleBashScript(mount);
@@ -65,6 +66,6 @@
setDownloadedFilePath(downloadDir + File.separator + getFileNameFromUrl());
Script.runSimpleBashScript("cp /mnt/" + mountSrcUuid + srcPath + " " + getDownloadedFilePath());
Script.runSimpleBashScript("umount /mnt/" + mountSrcUuid);
- return true;
+ return new Pair<>(true, getDownloadedFilePath());
}
}
diff --git a/agent/src/main/java/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java b/agent/src/main/java/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
index fb5e327..d150ea7 100644
--- a/agent/src/main/java/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
+++ b/agent/src/main/java/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
@@ -59,7 +59,6 @@
import com.cloud.resource.ServerResource;
import com.cloud.resource.ServerResourceBase;
import com.cloud.utils.NumbersUtil;
-import com.cloud.utils.ReflectUtil;
import com.cloud.utils.net.NetUtils;
import com.cloud.utils.script.Script;
import com.google.gson.Gson;
@@ -317,14 +316,13 @@
private void launchConsoleProxy(final byte[] ksBits, final String ksPassword, final String encryptorPassword) {
final Object resource = this;
s_logger.info("Building class loader for com.cloud.consoleproxy.ConsoleProxy");
- final ClassLoader loader = ReflectUtil.getClassLoaderForName("console-proxy");
if (_consoleProxyMain == null) {
s_logger.info("Running com.cloud.consoleproxy.ConsoleProxy with encryptor password=" + encryptorPassword);
_consoleProxyMain = new Thread(new ManagedContextRunnable() {
@Override
protected void runInContext() {
try {
- Class<?> consoleProxyClazz = loader.loadClass("com.cloud.consoleproxy.ConsoleProxy");
+ Class<?> consoleProxyClazz = Class.forName("com.cloud.consoleproxy.ConsoleProxy");
try {
s_logger.info("Invoke startWithContext()");
Method method = consoleProxyClazz.getMethod("startWithContext", Properties.class, Object.class, byte[].class, String.class, String.class);
@@ -357,7 +355,7 @@
s_logger.info("com.cloud.consoleproxy.ConsoleProxy is already running");
try {
- Class<?> consoleProxyClazz = loader.loadClass("com.cloud.consoleproxy.ConsoleProxy");
+ Class<?> consoleProxyClazz = Class.forName("com.cloud.consoleproxy.ConsoleProxy");
Method methodSetup = consoleProxyClazz.getMethod("setEncryptorPassword", String.class);
methodSetup.invoke(null, encryptorPassword);
} catch (SecurityException e) {
diff --git a/api/pom.xml b/api/pom.xml
index bb10f87..ec72955 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/api/src/main/java/com/cloud/agent/api/to/DataObjectType.java b/api/src/main/java/com/cloud/agent/api/to/DataObjectType.java
index 9addd71..26294cf 100644
--- a/api/src/main/java/com/cloud/agent/api/to/DataObjectType.java
+++ b/api/src/main/java/com/cloud/agent/api/to/DataObjectType.java
@@ -19,5 +19,5 @@
package com.cloud.agent.api.to;
public enum DataObjectType {
- VOLUME, SNAPSHOT, TEMPLATE
+ VOLUME, SNAPSHOT, TEMPLATE, ARCHIVE
}
diff --git a/api/src/main/java/com/cloud/agent/api/to/VirtualMachineTO.java b/api/src/main/java/com/cloud/agent/api/to/VirtualMachineTO.java
index d25ffe3..40f30df 100644
--- a/api/src/main/java/com/cloud/agent/api/to/VirtualMachineTO.java
+++ b/api/src/main/java/com/cloud/agent/api/to/VirtualMachineTO.java
@@ -63,6 +63,8 @@
String vncAddr;
Map<String, String> params;
String uuid;
+ String bootType;
+ String bootMode;
DiskTO[] disks;
NicTO[] nics;
@@ -380,4 +382,15 @@
public void setOvfProperties(Pair<String, List<OVFPropertyTO>> ovfProperties) {
this.ovfProperties = ovfProperties;
}
+ public String getBootType() {
+ return bootType;
+ }
+
+ public void setBootType(String bootType) {
+ this.bootType = bootType;
+ }
+
+ public String getBootMode() { return bootMode; }
+
+ public void setBootMode(String bootMode) { this.bootMode = bootMode; }
}
diff --git a/api/src/main/java/com/cloud/deploy/DataCenterDeployment.java b/api/src/main/java/com/cloud/deploy/DataCenterDeployment.java
index 76faf25..3ee544c 100644
--- a/api/src/main/java/com/cloud/deploy/DataCenterDeployment.java
+++ b/api/src/main/java/com/cloud/deploy/DataCenterDeployment.java
@@ -33,6 +33,7 @@
boolean _recreateDisks;
ReservationContext _context;
List<Long> preferredHostIds = new ArrayList<>();
+ boolean migrationPlan;
public DataCenterDeployment(long dataCenterId) {
this(dataCenterId, null, null, null, null, null);
@@ -107,4 +108,13 @@
return this.preferredHostIds;
}
+ public void setMigrationPlan(boolean migrationPlan) {
+ this.migrationPlan = migrationPlan;
+ }
+
+ @Override
+ public boolean isMigrationPlan() {
+ return migrationPlan;
+ }
+
}
diff --git a/api/src/main/java/com/cloud/deploy/DeploymentPlan.java b/api/src/main/java/com/cloud/deploy/DeploymentPlan.java
index b57fec0..c71bf3e 100644
--- a/api/src/main/java/com/cloud/deploy/DeploymentPlan.java
+++ b/api/src/main/java/com/cloud/deploy/DeploymentPlan.java
@@ -71,4 +71,6 @@
void setPreferredHosts(List<Long> hostIds);
List<Long> getPreferredHosts();
+
+ boolean isMigrationPlan();
}
diff --git a/api/src/main/java/com/cloud/event/EventTypes.java b/api/src/main/java/com/cloud/event/EventTypes.java
index a30518a..ec80890 100644
--- a/api/src/main/java/com/cloud/event/EventTypes.java
+++ b/api/src/main/java/com/cloud/event/EventTypes.java
@@ -19,6 +19,13 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.cloudstack.acl.Role;
+import org.apache.cloudstack.acl.RolePermission;
+import org.apache.cloudstack.annotation.Annotation;
+import org.apache.cloudstack.config.Configuration;
+import org.apache.cloudstack.ha.HAConfig;
+import org.apache.cloudstack.usage.Usage;
+
import com.cloud.dc.DataCenter;
import com.cloud.dc.Pod;
import com.cloud.dc.StorageNetworkIpRange;
@@ -69,12 +76,10 @@
import com.cloud.vm.Nic;
import com.cloud.vm.NicSecondaryIp;
import com.cloud.vm.VirtualMachine;
-import org.apache.cloudstack.acl.Role;
-import org.apache.cloudstack.acl.RolePermission;
-import org.apache.cloudstack.annotation.Annotation;
-import org.apache.cloudstack.config.Configuration;
-import org.apache.cloudstack.ha.HAConfig;
-import org.apache.cloudstack.usage.Usage;
+import org.apache.cloudstack.api.response.ClusterResponse;
+import org.apache.cloudstack.api.response.HostResponse;
+import org.apache.cloudstack.api.response.PodResponse;
+import org.apache.cloudstack.api.response.ZoneResponse;
public class EventTypes {
@@ -96,6 +101,7 @@
public static final String EVENT_VM_MOVE = "VM.MOVE";
public static final String EVENT_VM_RESTORE = "VM.RESTORE";
public static final String EVENT_VM_EXPUNGE = "VM.EXPUNGE";
+ public static final String EVENT_VM_IMPORT = "VM.IMPORT";
// Domain Router
public static final String EVENT_ROUTER_CREATE = "ROUTER.CREATE";
@@ -106,6 +112,7 @@
public static final String EVENT_ROUTER_HA = "ROUTER.HA";
public static final String EVENT_ROUTER_UPGRADE = "ROUTER.UPGRADE";
public static final String EVENT_ROUTER_DIAGNOSTICS = "ROUTER.DIAGNOSTICS";
+ public static final String EVENT_ROUTER_HEALTH_CHECKS = "ROUTER.HEALTH.CHECKS";
// Console proxy
public static final String EVENT_PROXY_CREATE = "PROXY.CREATE";
@@ -236,6 +243,8 @@
public static final String EVENT_VOLUME_DETAIL_ADD = "VOLUME.DETAIL.ADD";
public static final String EVENT_VOLUME_DETAIL_REMOVE = "VOLUME.DETAIL.REMOVE";
public static final String EVENT_VOLUME_UPDATE = "VOLUME.UPDATE";
+ public static final String EVENT_VOLUME_DESTROY = "VOLUME.DESTROY";
+ public static final String EVENT_VOLUME_RECOVER = "VOLUME.RECOVER";
// Domains
public static final String EVENT_DOMAIN_CREATE = "DOMAIN.CREATE";
@@ -322,6 +331,7 @@
public static final String EVENT_SECURITY_GROUP_DELETE = "SG.DELETE";
public static final String EVENT_SECURITY_GROUP_ASSIGN = "SG.ASSIGN";
public static final String EVENT_SECURITY_GROUP_REMOVE = "SG.REMOVE";
+ public static final String EVENT_SECURITY_GROUP_UPDATE = "SG.UPDATE";
// Host
public static final String EVENT_HOST_RECONNECT = "HOST.RECONNECT";
@@ -472,6 +482,18 @@
public static final String EVENT_VM_SNAPSHOT_OFF_PRIMARY = "VMSNAPSHOT.OFF_PRIMARY";
public static final String EVENT_VM_SNAPSHOT_REVERT = "VMSNAPSHOT.REVERTTO";
+ // Backup and Recovery events
+ public static final String EVENT_VM_BACKUP_IMPORT_OFFERING = "BACKUP.IMPORT.OFFERING";
+ public static final String EVENT_VM_BACKUP_OFFERING_ASSIGN = "BACKUP.OFFERING.ASSIGN";
+ public static final String EVENT_VM_BACKUP_OFFERING_REMOVE = "BACKUP.OFFERING.REMOVE";
+ public static final String EVENT_VM_BACKUP_CREATE = "BACKUP.CREATE";
+ public static final String EVENT_VM_BACKUP_RESTORE = "BACKUP.RESTORE";
+ public static final String EVENT_VM_BACKUP_DELETE = "BACKUP.DELETE";
+ public static final String EVENT_VM_BACKUP_RESTORE_VOLUME_TO_VM = "BACKUP.RESTORE.VOLUME.TO.VM";
+ public static final String EVENT_VM_BACKUP_SCHEDULE_CONFIGURE = "BACKUP.SCHEDULE.CONFIGURE";
+ public static final String EVENT_VM_BACKUP_SCHEDULE_DELETE = "BACKUP.SCHEDULE.DELETE";
+ public static final String EVENT_VM_BACKUP_USAGE_METRIC = "BACKUP.USAGE.METRIC";
+
// external network device events
public static final String EVENT_EXTERNAL_NVP_CONTROLLER_ADD = "PHYSICAL.NVPCONTROLLER.ADD";
public static final String EVENT_EXTERNAL_NVP_CONTROLLER_DELETE = "PHYSICAL.NVPCONTROLLER.DELETE";
@@ -574,6 +596,13 @@
// Diagnostics Events
public static final String EVENT_SYSTEM_VM_DIAGNOSTICS = "SYSTEM.VM.DIAGNOSTICS";
+ // Rolling Maintenance
+ public static final String EVENT_START_ROLLING_MAINTENANCE = "SYSTEM.ROLLING.MAINTENANCE";
+ public static final String EVENT_HOST_ROLLING_MAINTENANCE = "HOST.ROLLING.MAINTENANCE";
+ public static final String EVENT_CLUSTER_ROLLING_MAINTENANCE = "CLUSTER.ROLLING.MAINTENANCE";
+ public static final String EVENT_POD_ROLLING_MAINTENANCE = "POD.ROLLING.MAINTENANCE";
+ public static final String EVENT_ZONE_ROLLING_MAINTENANCE = "ZONE.ROLLING.MAINTENANCE";
+
static {
// TODO: need a way to force author adding event types to declare the entity details as well, with out braking
@@ -594,6 +623,7 @@
entityEventDetails.put(EVENT_VM_MOVE, VirtualMachine.class);
entityEventDetails.put(EVENT_VM_RESTORE, VirtualMachine.class);
entityEventDetails.put(EVENT_VM_EXPUNGE, VirtualMachine.class);
+ entityEventDetails.put(EVENT_VM_IMPORT, VirtualMachine.class);
entityEventDetails.put(EVENT_ROUTER_CREATE, VirtualRouter.class);
entityEventDetails.put(EVENT_ROUTER_DESTROY, VirtualRouter.class);
@@ -603,6 +633,7 @@
entityEventDetails.put(EVENT_ROUTER_HA, VirtualRouter.class);
entityEventDetails.put(EVENT_ROUTER_UPGRADE, VirtualRouter.class);
entityEventDetails.put(EVENT_ROUTER_DIAGNOSTICS, VirtualRouter.class);
+ entityEventDetails.put(EVENT_ROUTER_HEALTH_CHECKS, VirtualRouter.class);
entityEventDetails.put(EVENT_PROXY_CREATE, VirtualMachine.class);
entityEventDetails.put(EVENT_PROXY_DESTROY, VirtualMachine.class);
@@ -701,6 +732,8 @@
entityEventDetails.put(EVENT_VOLUME_UPLOAD, Volume.class);
entityEventDetails.put(EVENT_VOLUME_MIGRATE, Volume.class);
entityEventDetails.put(EVENT_VOLUME_RESIZE, Volume.class);
+ entityEventDetails.put(EVENT_VOLUME_DESTROY, Volume.class);
+ entityEventDetails.put(EVENT_VOLUME_RECOVER, Volume.class);
// Domains
entityEventDetails.put(EVENT_DOMAIN_CREATE, Domain.class);
@@ -969,6 +1002,11 @@
entityEventDetails.put(EVENT_TEMPLATE_DIRECT_DOWNLOAD_FAILURE, VirtualMachineTemplate.class);
entityEventDetails.put(EVENT_ISO_DIRECT_DOWNLOAD_FAILURE, "Iso");
entityEventDetails.put(EVENT_SYSTEM_VM_DIAGNOSTICS, VirtualMachine.class);
+
+ entityEventDetails.put(EVENT_ZONE_ROLLING_MAINTENANCE, ZoneResponse.class);
+ entityEventDetails.put(EVENT_POD_ROLLING_MAINTENANCE, PodResponse.class);
+ entityEventDetails.put(EVENT_CLUSTER_ROLLING_MAINTENANCE, ClusterResponse.class);
+ entityEventDetails.put(EVENT_HOST_ROLLING_MAINTENANCE, HostResponse.class);
}
public static String getEntityForEvent(String eventName) {
diff --git a/api/src/main/java/com/cloud/host/Host.java b/api/src/main/java/com/cloud/host/Host.java
index 1ecd48d..e5a3889 100644
--- a/api/src/main/java/com/cloud/host/Host.java
+++ b/api/src/main/java/com/cloud/host/Host.java
@@ -52,6 +52,7 @@
return strs;
}
}
+ public static final String HOST_UEFI_ENABLE = "host.uefi.enable";
/**
* @return name of the machine.
diff --git a/api/src/main/java/com/cloud/host/HostStats.java b/api/src/main/java/com/cloud/host/HostStats.java
index 4eb7b1a..d147944 100644
--- a/api/src/main/java/com/cloud/host/HostStats.java
+++ b/api/src/main/java/com/cloud/host/HostStats.java
@@ -35,6 +35,6 @@
public HostStats getHostStats();
- // public double getAverageLoad();
+ public double getLoadAverage();
// public double getXapiMemoryUsageKBs();
}
diff --git a/api/src/main/java/com/cloud/hypervisor/HypervisorGuru.java b/api/src/main/java/com/cloud/hypervisor/HypervisorGuru.java
index da2c7d0..8a10964 100644
--- a/api/src/main/java/com/cloud/hypervisor/HypervisorGuru.java
+++ b/api/src/main/java/com/cloud/hypervisor/HypervisorGuru.java
@@ -19,13 +19,14 @@
import java.util.List;
import java.util.Map;
-import com.cloud.storage.StoragePool;
+import org.apache.cloudstack.backup.Backup;
import org.apache.cloudstack.framework.config.ConfigKey;
import com.cloud.agent.api.Command;
import com.cloud.agent.api.to.NicTO;
import com.cloud.agent.api.to.VirtualMachineTO;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.storage.StoragePool;
import com.cloud.utils.Pair;
import com.cloud.utils.component.Adapter;
import com.cloud.vm.NicProfile;
@@ -86,6 +87,11 @@
Map<String, String> getClusterSettings(long vmId);
+ VirtualMachine importVirtualMachineFromBackup(long zoneId, long domainId, long accountId, long userId,
+ String vmInternalName, Backup backup) throws Exception;
+
+ boolean attachRestoredVolumeToVirtualMachine(long zoneId, String location, Backup.VolumeInfo volumeInfo,
+ VirtualMachine vm, long poolId, Backup backup) throws Exception;
/**
* Will generate commands to migrate a vm to a pool. For now this will only work for stopped VMs on Vmware.
*
diff --git a/api/src/main/java/com/cloud/network/Network.java b/api/src/main/java/com/cloud/network/Network.java
index 2cabd02..28528f1 100644
--- a/api/src/main/java/com/cloud/network/Network.java
+++ b/api/src/main/java/com/cloud/network/Network.java
@@ -21,6 +21,8 @@
import java.util.ArrayList;
import java.util.List;
+import com.cloud.exception.InvalidParameterValueException;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
@@ -44,6 +46,24 @@
Shared, Isolated, L2
}
+ enum PVlanType {
+ Community, Isolated, Promiscuous;
+
+ static PVlanType fromValue(String type) {
+ if (StringUtils.isBlank(type)) {
+ return null;
+ } else if (type.equalsIgnoreCase("promiscuous") || type.equalsIgnoreCase("p")) {
+ return Promiscuous;
+ } else if (type.equalsIgnoreCase("community") || type.equalsIgnoreCase("c")) {
+ return Community;
+ } else if (type.equalsIgnoreCase("isolated") || type.equalsIgnoreCase("i")) {
+ return Isolated;
+ } else {
+ throw new InvalidParameterValueException("Unexpected Private VLAN type: " + type);
+ }
+ }
+ }
+
String updatingInSequence = "updatingInSequence";
String hideIpAddressUsage = "hideIpAddressUsage";
@@ -416,4 +436,6 @@
boolean isStrechedL2Network();
String getExternalId();
+
+ PVlanType getPvlanType();
}
diff --git a/api/src/main/java/com/cloud/network/NetworkProfile.java b/api/src/main/java/com/cloud/network/NetworkProfile.java
index bf21c93..117f90e 100644
--- a/api/src/main/java/com/cloud/network/NetworkProfile.java
+++ b/api/src/main/java/com/cloud/network/NetworkProfile.java
@@ -314,4 +314,9 @@
return externalId;
}
+ @Override
+ public PVlanType getPvlanType() {
+ return null;
+ }
+
}
diff --git a/api/src/main/java/com/cloud/network/NetworkService.java b/api/src/main/java/com/cloud/network/NetworkService.java
index b228c59..297bcbd 100644
--- a/api/src/main/java/com/cloud/network/NetworkService.java
+++ b/api/src/main/java/com/cloud/network/NetworkService.java
@@ -56,7 +56,7 @@
List<? extends Network> getIsolatedNetworksOwnedByAccountInZone(long zoneId, Account owner);
- IpAddress allocateIP(Account ipOwner, long zoneId, Long networkId, Boolean displayIp) throws ResourceAllocationException, InsufficientAddressCapacityException,
+ IpAddress allocateIP(Account ipOwner, long zoneId, Long networkId, Boolean displayIp, String ipaddress) throws ResourceAllocationException, InsufficientAddressCapacityException,
ConcurrentOperationException;
boolean releaseIpAddress(long ipAddressId) throws InsufficientAddressCapacityException;
@@ -72,7 +72,9 @@
boolean deleteNetwork(long networkId, boolean forced);
- boolean restartNetwork(RestartNetworkCmd cmd, boolean cleanup, boolean makeRedundant) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException;
+ boolean restartNetwork(Long networkId, boolean cleanup, boolean makeRedundant, User user) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException;
+
+ boolean restartNetwork(RestartNetworkCmd cmd) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException;
int getActiveNicsInNetwork(long networkId);
@@ -178,7 +180,7 @@
* @throws ResourceAllocationException
*/
Network createPrivateNetwork(String networkName, String displayText, long physicalNetworkId, String broadcastUri, String startIp, String endIP, String gateway,
- String netmask, long networkOwnerId, Long vpcId, Boolean sourceNat, Long networkOfferingId) throws ResourceAllocationException, ConcurrentOperationException,
+ String netmask, long networkOwnerId, Long vpcId, Boolean sourceNat, Long networkOfferingId, Boolean bypassVlanOverlapCheck) throws ResourceAllocationException, ConcurrentOperationException,
InsufficientCapacityException;
/**
diff --git a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java b/api/src/main/java/com/cloud/network/RouterHealthCheckResult.java
similarity index 60%
copy from agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
copy to api/src/main/java/com/cloud/network/RouterHealthCheckResult.java
index b244d02..eb65ae9 100644
--- a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
+++ b/api/src/main/java/com/cloud/network/RouterHealthCheckResult.java
@@ -1,4 +1,3 @@
-//
// 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
@@ -15,22 +14,21 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-//
-package com.cloud.agent.direct.download;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+package com.cloud.network;
-@RunWith(MockitoJUnitRunner.class)
-public class DirectTemplateDownloaderImplTest {
+import java.util.Date;
- private static final Long templateId = 202l;
+public interface RouterHealthCheckResult {
+ long getRouterId();
- @Test
- public void testGetDirectDownloadTempPath() {
- String path = DirectTemplateDownloaderImpl.getDirectDownloadTempPath(templateId);
- Assert.assertEquals("template/2/202", path);
- }
+ String getCheckName();
+
+ String getCheckType();
+
+ boolean getCheckResult();
+
+ Date getLastUpdateTime();
+
+ String getParsedCheckDetails();
}
diff --git a/api/src/main/java/com/cloud/network/VirtualNetworkApplianceService.java b/api/src/main/java/com/cloud/network/VirtualNetworkApplianceService.java
index 815ae4d..98fb8be 100644
--- a/api/src/main/java/com/cloud/network/VirtualNetworkApplianceService.java
+++ b/api/src/main/java/com/cloud/network/VirtualNetworkApplianceService.java
@@ -31,8 +31,7 @@
/**
* Starts domain router
*
- * @param cmd
- * the command specifying router's id
+ * @param cmd the command specifying router's id
* @return DomainRouter object
*/
VirtualRouter startRouter(long routerId, boolean reprogramNetwork) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException;
@@ -51,10 +50,8 @@
/**
* Stops domain router
*
- * @param id
- * of the router
- * @param forced
- * just do it. caller knows best.
+ * @param id of the router
+ * @param forced just do it. caller knows best.
* @return router if successful, null otherwise
* @throws ResourceUnavailableException
* @throws ConcurrentOperationException
@@ -68,4 +65,13 @@
VirtualRouter findRouter(long routerId);
List<Long> upgradeRouterTemplate(UpgradeRouterTemplateCmd cmd);
+
+ /**
+ * Updates router with latest health checkdata, runs health checks and persists health checks on virtual router if feasible.
+ * Throws relevant exception if feature is disabled or failures occur.
+ *
+ * @param routerId id of the router
+ * @return
+ */
+ boolean performRouterHealthChecks(long routerId);
}
diff --git a/api/src/main/java/com/cloud/network/security/SecurityGroupService.java b/api/src/main/java/com/cloud/network/security/SecurityGroupService.java
index d8b3346..dce7b3d 100644
--- a/api/src/main/java/com/cloud/network/security/SecurityGroupService.java
+++ b/api/src/main/java/com/cloud/network/security/SecurityGroupService.java
@@ -18,16 +18,17 @@
import java.util.List;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.PermissionDeniedException;
+import com.cloud.exception.ResourceInUseException;
+
import org.apache.cloudstack.api.command.user.securitygroup.AuthorizeSecurityGroupEgressCmd;
import org.apache.cloudstack.api.command.user.securitygroup.AuthorizeSecurityGroupIngressCmd;
import org.apache.cloudstack.api.command.user.securitygroup.CreateSecurityGroupCmd;
import org.apache.cloudstack.api.command.user.securitygroup.DeleteSecurityGroupCmd;
import org.apache.cloudstack.api.command.user.securitygroup.RevokeSecurityGroupEgressCmd;
import org.apache.cloudstack.api.command.user.securitygroup.RevokeSecurityGroupIngressCmd;
-
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.exception.PermissionDeniedException;
-import com.cloud.exception.ResourceInUseException;
+import org.apache.cloudstack.api.command.user.securitygroup.UpdateSecurityGroupCmd;
public interface SecurityGroupService {
/**
@@ -43,6 +44,8 @@
boolean deleteSecurityGroup(DeleteSecurityGroupCmd cmd) throws ResourceInUseException;
+ SecurityGroup updateSecurityGroup(UpdateSecurityGroupCmd cmd);
+
public List<? extends SecurityRule> authorizeSecurityGroupIngress(AuthorizeSecurityGroupIngressCmd cmd);
public List<? extends SecurityRule> authorizeSecurityGroupEgress(AuthorizeSecurityGroupEgressCmd cmd);
diff --git a/api/src/main/java/com/cloud/network/vpc/VpcService.java b/api/src/main/java/com/cloud/network/vpc/VpcService.java
index 241e27b..d7c83f9 100644
--- a/api/src/main/java/com/cloud/network/vpc/VpcService.java
+++ b/api/src/main/java/com/cloud/network/vpc/VpcService.java
@@ -21,6 +21,7 @@
import org.apache.cloudstack.api.command.user.vpc.ListPrivateGatewaysCmd;
import org.apache.cloudstack.api.command.user.vpc.ListStaticRoutesCmd;
+import org.apache.cloudstack.api.command.user.vpc.RestartVPCCmd;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientAddressCapacityException;
@@ -29,6 +30,7 @@
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.IpAddress;
+import com.cloud.user.User;
import com.cloud.utils.Pair;
public interface VpcService {
@@ -132,7 +134,9 @@
* @return
* @throws InsufficientCapacityException
*/
- boolean restartVpc(long id, boolean cleanUp, boolean makeredundant) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException;
+ boolean restartVpc(RestartVPCCmd cmd) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException;
+
+ boolean restartVpc(Long networkId, boolean cleanup, boolean makeRedundant, User user) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException;
/**
* Returns a Private gateway found in the VPC by id
@@ -162,7 +166,7 @@
* @throws ResourceAllocationException
*/
public PrivateGateway createVpcPrivateGateway(long vpcId, Long physicalNetworkId, String vlan, String ipAddress, String gateway, String netmask, long gatewayOwnerId,
- Long networkOfferingId, Boolean isSoruceNat, Long aclId) throws ResourceAllocationException, ConcurrentOperationException, InsufficientCapacityException;
+ Long networkOfferingId, Boolean isSoruceNat, Long aclId, Boolean bypassVlanOverlapCheck) throws ResourceAllocationException, ConcurrentOperationException, InsufficientCapacityException;
/**
* Applies VPC private gateway on the backend, so it becomes functional
diff --git a/api/src/main/java/com/cloud/offering/NetworkOffering.java b/api/src/main/java/com/cloud/offering/NetworkOffering.java
index 4545074..8ae90c5 100644
--- a/api/src/main/java/com/cloud/offering/NetworkOffering.java
+++ b/api/src/main/java/com/cloud/offering/NetworkOffering.java
@@ -38,7 +38,7 @@
}
public enum Detail {
- InternalLbProvider, PublicLbProvider, servicepackageuuid, servicepackagedescription, PromiscuousMode, MacAddressChanges, ForgedTransmits, RelatedNetworkOffering, domainid, zoneid
+ InternalLbProvider, PublicLbProvider, servicepackageuuid, servicepackagedescription, PromiscuousMode, MacAddressChanges, ForgedTransmits, RelatedNetworkOffering, domainid, zoneid, pvlanType
}
public final static String SystemPublicNetwork = "System-Public-Network";
diff --git a/api/src/main/java/com/cloud/resource/ResourceState.java b/api/src/main/java/com/cloud/resource/ResourceState.java
index d952afa..9b3bafe 100644
--- a/api/src/main/java/com/cloud/resource/ResourceState.java
+++ b/api/src/main/java/com/cloud/resource/ResourceState.java
@@ -16,23 +16,33 @@
// under the License.
package com.cloud.resource;
+import java.util.Arrays;
import java.util.List;
import java.util.Set;
import com.cloud.utils.fsm.StateMachine;
public enum ResourceState {
- Creating, Enabled, Disabled, PrepareForMaintenance, ErrorInMaintenance, Maintenance, Error;
+ Creating,
+ Enabled,
+ Disabled,
+ ErrorInPrepareForMaintenance,
+ PrepareForMaintenance,
+ ErrorInMaintenance,
+ Maintenance,
+ Error;
public enum Event {
InternalCreated("Resource is created"),
Enable("Admin enables"),
Disable("Admin disables"),
- AdminAskMaintenace("Admin asks to enter maintenance"),
+ AdminAskMaintenance("Admin asks to enter maintenance"),
AdminCancelMaintenance("Admin asks to cancel maintenance"),
InternalEnterMaintenance("Resource enters maintenance"),
UpdatePassword("Admin updates password of host"),
- UnableToMigrate("Management server migrates VM failed"),
+ UnableToMigrate("Migration of VM failed, such as from scheduled HAWork"),
+ UnableToMaintain("Management server has exhausted all legal operations and attempts to put into maintenance has failed"),
+ ErrorsCorrected("Errors were corrected on a resource attempting to enter maintenance but encountered errors"),
Error("An internal error happened"),
DeleteHost("Admin delete a host"),
@@ -84,6 +94,16 @@
return strs;
}
+ public static boolean isMaintenanceState(ResourceState state) {
+ return Arrays.asList(ResourceState.Maintenance, ResourceState.ErrorInMaintenance,
+ ResourceState.PrepareForMaintenance, ResourceState.ErrorInPrepareForMaintenance).contains(state);
+ }
+
+ public static boolean canAttemptMaintenance(ResourceState state) {
+ return !Arrays.asList(ResourceState.Maintenance, ResourceState.PrepareForMaintenance,
+ ResourceState.ErrorInPrepareForMaintenance).contains(state);
+ }
+
protected static final StateMachine<ResourceState, Event> s_fsm = new StateMachine<ResourceState, Event>();
static {
s_fsm.addTransition(null, Event.InternalCreated, ResourceState.Enabled);
@@ -92,22 +112,31 @@
s_fsm.addTransition(ResourceState.Enabled, Event.Enable, ResourceState.Enabled);
s_fsm.addTransition(ResourceState.Enabled, Event.InternalCreated, ResourceState.Enabled);
s_fsm.addTransition(ResourceState.Enabled, Event.Disable, ResourceState.Disabled);
- s_fsm.addTransition(ResourceState.Enabled, Event.AdminAskMaintenace, ResourceState.PrepareForMaintenance);
+ s_fsm.addTransition(ResourceState.Enabled, Event.AdminAskMaintenance, ResourceState.PrepareForMaintenance);
s_fsm.addTransition(ResourceState.Enabled, Event.InternalEnterMaintenance, ResourceState.Maintenance);
s_fsm.addTransition(ResourceState.Disabled, Event.Enable, ResourceState.Enabled);
s_fsm.addTransition(ResourceState.Disabled, Event.Disable, ResourceState.Disabled);
s_fsm.addTransition(ResourceState.Disabled, Event.InternalCreated, ResourceState.Disabled);
s_fsm.addTransition(ResourceState.PrepareForMaintenance, Event.InternalEnterMaintenance, ResourceState.Maintenance);
s_fsm.addTransition(ResourceState.PrepareForMaintenance, Event.AdminCancelMaintenance, ResourceState.Enabled);
- s_fsm.addTransition(ResourceState.PrepareForMaintenance, Event.UnableToMigrate, ResourceState.ErrorInMaintenance);
+ s_fsm.addTransition(ResourceState.PrepareForMaintenance, Event.UnableToMigrate, ResourceState.ErrorInPrepareForMaintenance);
+ s_fsm.addTransition(ResourceState.PrepareForMaintenance, Event.UnableToMaintain, ResourceState.ErrorInMaintenance);
s_fsm.addTransition(ResourceState.PrepareForMaintenance, Event.InternalCreated, ResourceState.PrepareForMaintenance);
s_fsm.addTransition(ResourceState.Maintenance, Event.AdminCancelMaintenance, ResourceState.Enabled);
s_fsm.addTransition(ResourceState.Maintenance, Event.InternalCreated, ResourceState.Maintenance);
s_fsm.addTransition(ResourceState.Maintenance, Event.DeleteHost, ResourceState.Disabled);
+ s_fsm.addTransition(ResourceState.ErrorInPrepareForMaintenance, Event.InternalCreated, ResourceState.ErrorInPrepareForMaintenance);
+ s_fsm.addTransition(ResourceState.ErrorInPrepareForMaintenance, Event.Disable, ResourceState.Disabled);
+ s_fsm.addTransition(ResourceState.ErrorInPrepareForMaintenance, Event.DeleteHost, ResourceState.Disabled);
+ s_fsm.addTransition(ResourceState.ErrorInPrepareForMaintenance, Event.InternalEnterMaintenance, ResourceState.Maintenance);
+ s_fsm.addTransition(ResourceState.ErrorInPrepareForMaintenance, Event.AdminCancelMaintenance, ResourceState.Enabled);
+ s_fsm.addTransition(ResourceState.ErrorInPrepareForMaintenance, Event.UnableToMigrate, ResourceState.ErrorInPrepareForMaintenance);
+ s_fsm.addTransition(ResourceState.ErrorInPrepareForMaintenance, Event.UnableToMaintain, ResourceState.ErrorInMaintenance);
+ s_fsm.addTransition(ResourceState.ErrorInPrepareForMaintenance, Event.ErrorsCorrected, ResourceState.PrepareForMaintenance);
s_fsm.addTransition(ResourceState.ErrorInMaintenance, Event.InternalCreated, ResourceState.ErrorInMaintenance);
+ s_fsm.addTransition(ResourceState.ErrorInMaintenance, Event.AdminAskMaintenance, ResourceState.PrepareForMaintenance);
s_fsm.addTransition(ResourceState.ErrorInMaintenance, Event.Disable, ResourceState.Disabled);
s_fsm.addTransition(ResourceState.ErrorInMaintenance, Event.DeleteHost, ResourceState.Disabled);
- s_fsm.addTransition(ResourceState.ErrorInMaintenance, Event.InternalEnterMaintenance, ResourceState.Maintenance);
s_fsm.addTransition(ResourceState.ErrorInMaintenance, Event.AdminCancelMaintenance, ResourceState.Enabled);
s_fsm.addTransition(ResourceState.Error, Event.InternalCreated, ResourceState.Error);
s_fsm.addTransition(ResourceState.Disabled, Event.DeleteHost, ResourceState.Disabled);
diff --git a/api/src/main/java/com/cloud/resource/RollingMaintenanceManager.java b/api/src/main/java/com/cloud/resource/RollingMaintenanceManager.java
new file mode 100644
index 0000000..2399980
--- /dev/null
+++ b/api/src/main/java/com/cloud/resource/RollingMaintenanceManager.java
@@ -0,0 +1,146 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.resource;
+
+import com.cloud.host.Host;
+import com.cloud.utils.Pair;
+import com.cloud.utils.Ternary;
+import com.cloud.utils.exception.CloudRuntimeException;
+import org.apache.cloudstack.api.command.admin.resource.StartRollingMaintenanceCmd;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.Configurable;
+
+import java.util.Date;
+import java.util.List;
+
+public interface RollingMaintenanceManager extends Configurable {
+
+ ConfigKey<Integer> KvmRollingMaintenanceStageTimeout = new ConfigKey<>("Advanced", Integer.class,
+ "kvm.rolling.maintenance.stage.timeout", "1800",
+ "Wait timeout (in seconds) for a rolling maintenance stage update from hosts",
+ true, ConfigKey.Scope.Global);
+ ConfigKey<Integer> KvmRollingMaintenancePingInterval = new ConfigKey<>("Advanced", Integer.class,
+ "kvm.rolling.maintenance.ping.interval", "10",
+ "Ping interval in seconds between management server and hosts performing stages during rolling maintenance",
+ true, ConfigKey.Scope.Global);
+ ConfigKey<Integer> KvmRollingMaintenanceWaitForMaintenanceTimeout = new ConfigKey<>("Advanced", Integer.class,
+ "kvm.rolling.maintenance.wait.maintenance.timeout", "1800",
+ "Timeout (in seconds) to wait for a host preparing to enter maintenance mode",
+ true, ConfigKey.Scope.Global);
+
+ class HostSkipped {
+ private Host host;
+ private String reason;
+
+ public HostSkipped(Host host, String reason) {
+ this.host = host;
+ this.reason = reason;
+ }
+
+ public Host getHost() {
+ return host;
+ }
+
+ public void setHost(Host host) {
+ this.host = host;
+ }
+
+ public String getReason() {
+ return reason;
+ }
+
+ public void setReason(String reason) {
+ this.reason = reason;
+ }
+ }
+
+ class HostUpdated {
+ private Host host;
+ private Date start;
+ private Date end;
+ private String outputMsg;
+
+ public HostUpdated(Host host, Date start, Date end, String outputMsg) {
+ this.host = host;
+ this.start = start;
+ this.end = end;
+ this.outputMsg = outputMsg;
+ }
+
+ public Host getHost() {
+ return host;
+ }
+
+ public void setHost(Host host) {
+ this.host = host;
+ }
+
+ public Date getStart() {
+ return start;
+ }
+
+ public void setStart(Date start) {
+ this.start = start;
+ }
+
+ public Date getEnd() {
+ return end;
+ }
+
+ public void setEnd(Date end) {
+ this.end = end;
+ }
+
+ public String getOutputMsg() {
+ return outputMsg;
+ }
+
+ public void setOutputMsg(String outputMsg) {
+ this.outputMsg = outputMsg;
+ }
+ }
+
+ enum Stage {
+ PreFlight, PreMaintenance, Maintenance, PostMaintenance;
+
+ public Stage next() {
+ switch (this) {
+ case PreFlight:
+ return PreMaintenance;
+ case PreMaintenance:
+ return Maintenance;
+ case Maintenance:
+ return PostMaintenance;
+ case PostMaintenance:
+ return null;
+ }
+ throw new CloudRuntimeException("Unexpected stage: " + this);
+ }
+ }
+
+ enum ResourceType {
+ Pod, Cluster, Zone, Host
+ }
+
+ /**
+ * Starts rolling maintenance as specified in cmd
+ * @param cmd command
+ * @return tuple: (SUCCESS, DETAILS, (HOSTS_UPDATED, HOSTS_SKIPPED))
+ */
+ Ternary<Boolean, String, Pair<List<HostUpdated>, List<HostSkipped>>> startRollingMaintenance(StartRollingMaintenanceCmd cmd);
+ Pair<ResourceType, List<Long>> getResourceTypeIdPair(StartRollingMaintenanceCmd cmd);
+}
\ No newline at end of file
diff --git a/api/src/main/java/com/cloud/server/ResourceTag.java b/api/src/main/java/com/cloud/server/ResourceTag.java
index 99eb860..fb07762 100644
--- a/api/src/main/java/com/cloud/server/ResourceTag.java
+++ b/api/src/main/java/com/cloud/server/ResourceTag.java
@@ -29,6 +29,7 @@
ISO(true, false),
Volume(true, true),
Snapshot(true, false),
+ Backup(true, false),
Network(true, true),
Nic(false, true),
LoadBalancer(true, true),
diff --git a/api/src/main/java/com/cloud/storage/Storage.java b/api/src/main/java/com/cloud/storage/Storage.java
index 9093dc3..82bc5f6 100644
--- a/api/src/main/java/com/cloud/storage/Storage.java
+++ b/api/src/main/java/com/cloud/storage/Storage.java
@@ -16,11 +16,11 @@
// under the License.
package com.cloud.storage;
-import org.apache.commons.lang.NotImplementedException;
-
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.lang.NotImplementedException;
+
public class Storage {
public static enum ImageFormat {
QCOW2(true, true, false, "qcow2"),
@@ -33,6 +33,7 @@
VMDK(true, true, false, "vmdk"),
VDI(true, true, false, "vdi"),
TAR(false, false, false, "tar"),
+ ZIP(false, false, false, "zip"),
DIR(false, false, false, "dir");
private final boolean supportThinProvisioning;
diff --git a/api/src/main/java/com/cloud/storage/Volume.java b/api/src/main/java/com/cloud/storage/Volume.java
index 0e86ac0..dde9d60 100644
--- a/api/src/main/java/com/cloud/storage/Volume.java
+++ b/api/src/main/java/com/cloud/storage/Volume.java
@@ -124,6 +124,7 @@
s_fsm.addTransition(new StateMachine2.Transition<State, Event>(Ready, Event.AttachRequested, Attaching, null));
s_fsm.addTransition(new StateMachine2.Transition<State, Event>(Attaching, Event.OperationSucceeded, Ready, null));
s_fsm.addTransition(new StateMachine2.Transition<State, Event>(Attaching, Event.OperationFailed, Ready, null));
+ s_fsm.addTransition(new StateMachine2.Transition<State, Event>(Destroy, Event.RecoverRequested, Ready, null));
}
}
@@ -143,6 +144,7 @@
SnapshotRequested,
RevertSnapshotRequested,
DestroyRequested,
+ RecoverRequested,
ExpungingRequested,
ResizeRequested,
AttachRequested,
diff --git a/api/src/main/java/com/cloud/storage/VolumeApiService.java b/api/src/main/java/com/cloud/storage/VolumeApiService.java
index aa6d8a6..5c41301 100644
--- a/api/src/main/java/com/cloud/storage/VolumeApiService.java
+++ b/api/src/main/java/com/cloud/storage/VolumeApiService.java
@@ -148,4 +148,8 @@
* </table>
*/
boolean doesTargetStorageSupportDiskOffering(StoragePool destPool, String diskOfferingTags);
-}
\ No newline at end of file
+
+ Volume destroyVolume(long volumeId, Account caller, boolean expunge, boolean forceExpunge);
+
+ Volume recoverVolume(long volumeId);
+}
diff --git a/api/src/main/java/com/cloud/template/VirtualMachineTemplate.java b/api/src/main/java/com/cloud/template/VirtualMachineTemplate.java
index ad2f636..5177e51 100644
--- a/api/src/main/java/com/cloud/template/VirtualMachineTemplate.java
+++ b/api/src/main/java/com/cloud/template/VirtualMachineTemplate.java
@@ -26,8 +26,6 @@
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.Storage.TemplateType;
-import com.cloud.storage.Volume.Event;
-import com.cloud.storage.Volume.State;
import com.cloud.utils.fsm.StateMachine2;
import com.cloud.utils.fsm.StateObject;
diff --git a/api/src/main/java/com/cloud/vm/UserVmService.java b/api/src/main/java/com/cloud/vm/UserVmService.java
index 99eb827..50786d2 100644
--- a/api/src/main/java/com/cloud/vm/UserVmService.java
+++ b/api/src/main/java/com/cloud/vm/UserVmService.java
@@ -396,7 +396,7 @@
* @throws ResourceUnavailableException
* if the resources required the deploy the VM is not currently available.
*/
- UserVm startVirtualMachine(DeployVMCmd cmd) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException;
+ UserVm startVirtualMachine(DeployVMCmd cmd) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, ResourceAllocationException;
/**
* Creates a vm group.
@@ -513,4 +513,8 @@
void collectVmNetworkStatistics (UserVm userVm);
+ UserVm importVM(final DataCenter zone, final Host host, final VirtualMachineTemplate template, final String instanceName, final String displayName, final Account owner, final String userData, final Account caller, final Boolean isDisplayVm, final String keyboard,
+ final long accountId, final long userId, final ServiceOffering serviceOffering, final String sshPublicKey,
+ final String hostName, final HypervisorType hypervisorType, final Map<String, String> customParameters, final VirtualMachine.PowerState powerState) throws InsufficientCapacityException;
+
}
diff --git a/api/src/main/java/com/cloud/vm/VirtualMachine.java b/api/src/main/java/com/cloud/vm/VirtualMachine.java
index a46edd7..4d6014f 100644
--- a/api/src/main/java/com/cloud/vm/VirtualMachine.java
+++ b/api/src/main/java/com/cloud/vm/VirtualMachine.java
@@ -16,18 +16,21 @@
// under the License.
package com.cloud.vm;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.cloudstack.acl.ControlledEntity;
+import org.apache.cloudstack.api.Displayable;
+import org.apache.cloudstack.backup.Backup;
+import org.apache.cloudstack.kernel.Partition;
+
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.utils.fsm.StateMachine2;
import com.cloud.utils.fsm.StateMachine2.Transition;
import com.cloud.utils.fsm.StateMachine2.Transition.Impact;
import com.cloud.utils.fsm.StateObject;
-import org.apache.cloudstack.acl.ControlledEntity;
-import org.apache.cloudstack.api.Displayable;
-import org.apache.cloudstack.kernel.Partition;
-
-import java.util.Arrays;
-import java.util.Date;
-import java.util.Map;
/**
* VirtualMachine describes the properties held by a virtual machine
@@ -52,7 +55,7 @@
Migrating(true, "VM is being migrated. host id holds to from host"),
Error(false, "VM is in error"),
Unknown(false, "VM state is unknown."),
- Shutdowned(false, "VM is shutdowned from inside");
+ Shutdown(false, "VM state is shutdown from inside");
private final boolean _transitional;
String _description;
@@ -319,6 +322,12 @@
Long getDiskOfferingId();
+ Long getBackupOfferingId();
+
+ String getBackupExternalId();
+
+ List<Backup.VolumeInfo> getBackupVolumeList();
+
Type getType();
HypervisorType getHypervisorType();
diff --git a/api/src/main/java/com/cloud/vm/VirtualMachineProfile.java b/api/src/main/java/com/cloud/vm/VirtualMachineProfile.java
index 977e27e..1abc764 100644
--- a/api/src/main/java/com/cloud/vm/VirtualMachineProfile.java
+++ b/api/src/main/java/com/cloud/vm/VirtualMachineProfile.java
@@ -60,6 +60,9 @@
public static final Param PxeSeverType = new Param("PxeSeverType");
public static final Param HaTag = new Param("HaTag");
public static final Param HaOperation = new Param("HaOperation");
+ public static final Param UefiFlag = new Param("UefiFlag");
+ public static final Param BootMode = new Param("BootMode");
+ public static final Param BootType = new Param("BootType");
private String name;
diff --git a/api/src/main/java/com/cloud/vm/VmDetailConstants.java b/api/src/main/java/com/cloud/vm/VmDetailConstants.java
index 84de8c9..3812aa2 100644
--- a/api/src/main/java/com/cloud/vm/VmDetailConstants.java
+++ b/api/src/main/java/com/cloud/vm/VmDetailConstants.java
@@ -20,6 +20,7 @@
String KEYBOARD = "keyboard";
String CPU_CORE_PER_SOCKET = "cpu.corespersocket";
String ROOT_DISK_SIZE = "rootdisksize";
+ String BOOT_MODE = "boot.mode";
// VMware specific
String NIC_ADAPTER = "nicAdapter";
@@ -54,4 +55,12 @@
String SSH_PUBLIC_KEY = "SSH.PublicKey";
String PASSWORD = "password";
String ENCRYPTED_PASSWORD = "Encrypted.Password";
+
+ // VM import with nic, disk and custom params for custom compute offering
+ String NIC = "nic";
+ String NETWORK = "network";
+ String IP4_ADDRESS = "ip4Address";
+ String IP6_ADDRESS = "ip6Address";
+ String DISK = "disk";
+ String DISK_OFFERING = "diskOffering";
}
diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiCommandJobType.java b/api/src/main/java/org/apache/cloudstack/api/ApiCommandJobType.java
index d35598b..1cac1da 100644
--- a/api/src/main/java/org/apache/cloudstack/api/ApiCommandJobType.java
+++ b/api/src/main/java/org/apache/cloudstack/api/ApiCommandJobType.java
@@ -23,6 +23,7 @@
Volume,
ConsoleProxy,
Snapshot,
+ Backup,
Template,
Iso,
SystemVm,
diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
index 83ec10a..7841aa3 100644
--- a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
@@ -22,6 +22,7 @@
public static final String ACCOUNT_TYPE = "accounttype";
public static final String ACCOUNT_ID = "accountid";
public static final String ACTIVITY = "activity";
+ public static final String ADAPTER_TYPE = "adaptertype";
public static final String ADDRESS = "address";
public static final String ALGORITHM = "algorithm";
public static final String ALLOCATED_ONLY = "allocatedonly";
@@ -32,6 +33,9 @@
public static final String APPLIED = "applied";
public static final String LIST_LB_VMIPS = "lbvmips";
public static final String AVAILABLE = "available";
+ public static final String BACKUP_ID = "backupid";
+ public static final String BACKUP_OFFERING_NAME = "backupofferingname";
+ public static final String BACKUP_OFFERING_ID = "backupofferingid";
public static final String BITS = "bits";
public static final String BOOTABLE = "bootable";
public static final String BIND_DN = "binddn";
@@ -43,6 +47,7 @@
public static final String BYTES_WRITE_RATE_MAX = "byteswriteratemax";
public static final String BYTES_WRITE_RATE_MAX_LENGTH = "byteswriteratemaxlength";
public static final String BYPASS_VLAN_OVERLAP_CHECK = "bypassvlanoverlapcheck";
+ public static final String CAPACITY = "capacity";
public static final String CATEGORY = "category";
public static final String CAN_REVERT = "canrevert";
public static final String CA_CERTIFICATES = "cacertificates";
@@ -50,9 +55,15 @@
public static final String CERTIFICATE_CHAIN = "certchain";
public static final String CERTIFICATE_FINGERPRINT = "fingerprint";
public static final String CERTIFICATE_ID = "certid";
+ public static final String CONTROLLER = "controller";
+ public static final String CONTROLLER_UNIT = "controllerunit";
public static final String COPY_IMAGE_TAGS = "copyimagetags";
public static final String CSR = "csr";
public static final String PRIVATE_KEY = "privatekey";
+ public static final String DATASTORE_HOST = "datastorehost";
+ public static final String DATASTORE_NAME = "datastorename";
+ public static final String DATASTORE_PATH = "datastorepath";
+ public static final String DATASTORE_TYPE = "datastoretype";
public static final String DOMAIN_SUFFIX = "domainsuffix";
public static final String DNS_SEARCH_ORDER = "dnssearchorder";
public static final String CHAIN_INFO = "chaininfo";
@@ -63,14 +74,17 @@
public static final String CLEANUP = "cleanup";
public static final String MAKEREDUNDANT = "makeredundant";
public static final String CLUSTER_ID = "clusterid";
+ public static final String CLUSTER_IDS = "clusterids";
public static final String CLUSTER_NAME = "clustername";
public static final String CLUSTER_TYPE = "clustertype";
public static final String CN = "cn";
public static final String COMMAND = "command";
public static final String CMD_EVENT_TYPE = "cmdeventtype";
public static final String COMPONENT = "component";
+ public static final String CPU_CORE_PER_SOCKET = "cpucorepersocket";
public static final String CPU_NUMBER = "cpunumber";
public static final String CPU_SPEED = "cpuspeed";
+ public static final String CPU_LOAD_AVERAGE = "cpuloadaverage";
public static final String CREATED = "created";
public static final String CTX_ACCOUNT_ID = "ctxaccountid";
public static final String CTX_DETAILS = "ctxDetails";
@@ -90,6 +104,7 @@
public static final String DETAILS = "details";
public static final String DEVICE_ID = "deviceid";
public static final String DIRECT_DOWNLOAD = "directdownload";
+ public static final String DISK = "disk";
public static final String DISK_OFFERING_ID = "diskofferingid";
public static final String NEW_DISK_OFFERING_ID = "newdiskofferingid";
public static final String DISK_KBS_READ = "diskkbsread";
@@ -133,6 +148,7 @@
public static final String EXTRA_DHCP_OPTION_NAME = "extradhcpoptionname";
public static final String EXTRA_DHCP_OPTION_CODE = "extradhcpoptioncode";
public static final String EXTRA_DHCP_OPTION_VALUE = "extradhcpvalue";
+ public static final String EXTERNAL = "external";
public static final String FENCE = "fence";
public static final String FETCH_LATEST = "fetchlatest";
public static final String FIRSTNAME = "firstname";
@@ -158,6 +174,7 @@
public static final String HEALTH = "health";
public static final String HIDE_IP_ADDRESS_USAGE = "hideipaddressusage";
public static final String HOST_ID = "hostid";
+ public static final String HOST_IDS = "hostids";
public static final String HOST_NAME = "hostname";
public static final String HYPERVISOR = "hypervisor";
public static final String INLINE = "inline";
@@ -169,6 +186,7 @@
public static final String PREVIOUS_ACL_RULE_ID = "previousaclruleid";
public static final String NEXT_ACL_RULE_ID = "nextaclruleid";
public static final String MOVE_ACL_CONSISTENCY_HASH = "aclconsistencyhash";
+ public static final String IMAGE_PATH = "imagepath";
public static final String INTERNAL_DNS1 = "internaldns1";
public static final String INTERNAL_DNS2 = "internaldns2";
public static final String INTERVAL_TYPE = "intervaltype";
@@ -180,6 +198,7 @@
public static final String IOPS_WRITE_RATE_MAX = "iopswriteratemax";
public static final String IOPS_WRITE_RATE_MAX_LENGTH = "iopswriteratemaxlength";
public static final String IP_ADDRESS = "ipaddress";
+ public static final String IP_ADDRESSES = "ipaddresses";
public static final String IP6_ADDRESS = "ip6address";
public static final String IP_ADDRESS_ID = "ipaddressid";
public static final String IS_ASYNC = "isasync";
@@ -208,8 +227,8 @@
public static final String LOCK = "lock";
public static final String LUN = "lun";
public static final String LBID = "lbruleid";
- public static final String MAX = "max";
public static final String MAC_ADDRESS = "macaddress";
+ public static final String MAX = "max";
public static final String MAX_SNAPS = "maxsnaps";
public static final String MAX_CPU_NUMBER = "maxcpunumber";
public static final String MAX_MEMORY = "maxmemory";
@@ -223,6 +242,9 @@
public static final String NETWORK_DOMAIN = "networkdomain";
public static final String NETMASK = "netmask";
public static final String NEW_NAME = "newname";
+ public static final String NIC = "nic";
+ public static final String NIC_NETWORK_LIST = "nicnetworklist";
+ public static final String NIC_IP_ADDRESS_LIST = "nicipaddresslist";
public static final String NUM_RETRIES = "numretries";
public static final String OFFER_HA = "offerha";
public static final String IS_SYSTEM_OFFERING = "issystem";
@@ -230,11 +252,13 @@
public static final String OLD_FORMAT = "oldformat";
public static final String OP = "op";
public static final String OS_CATEGORY_ID = "oscategoryid";
+ public static final String OS_ID = "osid";
public static final String OS_TYPE_ID = "ostypeid";
public static final String OS_DISPLAY_NAME = "osdisplayname";
public static final String OS_NAME_FOR_HYPERVISOR = "osnameforhypervisor";
public static final String OUTOFBANDMANAGEMENT_POWERSTATE = "outofbandmanagementpowerstate";
public static final String OUTOFBANDMANAGEMENT_ENABLED = "outofbandmanagementenabled";
+ public static final String OUTPUT = "output";
public static final String OVF_PROPERTIES = "ovfproperties";
public static final String PARAMS = "params";
public static final String PARENT_ID = "parentid";
@@ -246,6 +270,7 @@
public static final String PASSWORD_ENABLED = "passwordenabled";
public static final String SSHKEY_ENABLED = "sshkeyenabled";
public static final String PATH = "path";
+ public static final String PAYLOAD = "payload";
public static final String POD_ID = "podid";
public static final String POD_NAME = "podname";
public static final String POD_IDS = "podids";
@@ -254,6 +279,7 @@
public static final String PORTAL = "portal";
public static final String PORTABLE_IP_ADDRESS = "portableipaddress";
public static final String PORT_FORWARDING_SERVICE_ID = "portforwardingserviceid";
+ public static final String POSITION = "position";
public static final String POST_URL = "postURL";
public static final String POWER_STATE = "powerstate";
public static final String PRIVATE_INTERFACE = "privateinterface";
@@ -336,7 +362,10 @@
public static final String URL = "url";
public static final String USAGE_INTERFACE = "usageinterface";
public static final String USER_DATA = "userdata";
+ public static final String USER_FILTER = "userfilter";
public static final String USER_ID = "userid";
+ public static final String USER_SOURCE = "usersource";
+ public static final String USER_CONFLICT_SOURCE = "conflictingusersource";
public static final String USE_SSL = "ssl";
public static final String USERNAME = "username";
public static final String USER_CONFIGURABLE = "userconfigurable";
@@ -346,6 +375,7 @@
public static final String VALUE = "value";
public static final String VIRTUAL_MACHINE_ID = "virtualmachineid";
public static final String VIRTUAL_MACHINE_IDS = "virtualmachineids";
+ public static final String VIRTUAL_MACHINE_NAME = "virtualmachinename";
public static final String VIRTUAL_MACHINE_ID_IP = "vmidipmap";
public static final String VIRTUAL_MACHINE_COUNT = "virtualmachinecount";
public static final String USAGE_ID = "usageid";
@@ -357,6 +387,7 @@
public static final String REMOVE_VLAN = "removevlan";
public static final String VLAN_ID = "vlanid";
public static final String ISOLATED_PVLAN = "isolatedpvlan";
+ public static final String ISOLATED_PVLAN_TYPE = "isolatedpvlantype";
public static final String ISOLATION_URI = "isolationuri";
public static final String VM_AVAILABLE = "vmavailable";
public static final String VM_LIMIT = "vmlimit";
@@ -364,6 +395,7 @@
public static final String VNET = "vnet";
public static final String IS_VOLATILE = "isvolatile";
public static final String VOLUME_ID = "volumeid";
+ public static final String VOLUMES = "volumes";
public static final String ZONE = "zone";
public static final String ZONE_ID = "zoneid";
public static final String ZONE_NAME = "zonename";
@@ -510,6 +542,7 @@
public static final String REQUIRED = "required";
public static final String RESTART_REQUIRED = "restartrequired";
public static final String ALLOW_USER_CREATE_PROJECTS = "allowusercreateprojects";
+ public static final String ALLOW_USER_DRIVEN_BACKUPS = "allowuserdrivenbackups";
public static final String CONSERVE_MODE = "conservemode";
public static final String TRAFFIC_TYPE_IMPLEMENTOR = "traffictypeimplementor";
public static final String KEYWORD = "keyword";
@@ -528,6 +561,7 @@
public static final String CUSTOM_DISK_OFF_MAX_SIZE = "customdiskofferingmaxsize";
public static final String DEFAULT_ZONE_ID = "defaultzoneid";
public static final String LIVE_MIGRATE = "livemigrate";
+ public static final String MIGRATE_ALLOWED = "migrateallowed";
public static final String MIGRATE_TO = "migrateto";
public static final String GUID = "guid";
public static final String VSWITCH_TYPE_GUEST_TRAFFIC = "guestvswitchtype";
@@ -724,6 +758,7 @@
public static final String VIRTUAL_SIZE = "virtualsize";
public static final String NETSCALER_CONTROLCENTER_ID = "netscalercontrolcenterid";
public static final String NETSCALER_SERVICEPACKAGE_ID = "netscalerservicepackageid";
+ public static final String FETCH_ROUTER_HEALTH_CHECK_RESULTS = "fetchhealthcheckresults";
public static final String ZONE_ID_LIST = "zoneids";
public static final String DESTINATION_ZONE_ID_LIST = "destzoneids";
@@ -742,14 +777,61 @@
public static final String STDERR = "stderr";
public static final String EXITCODE = "exitcode";
public static final String TARGET_ID = "targetid";
+ public static final String FILES = "files";
public static final String VOLUME_IDS = "volumeids";
+ public static final String ROUTER_ID = "routerid";
+ public static final String ROUTER_HEALTH_CHECKS = "healthchecks";
+ public static final String ROUTER_CHECK_NAME = "checkname";
+ public static final String ROUTER_CHECK_TYPE = "checktype";
+ public static final String LAST_UPDATED = "lastupdated";
+ public static final String PERFORM_FRESH_CHECKS = "performfreshchecks";
+ public static final String CACHE_MODE = "cachemode";
+
+ public static final String CONSOLE_END_POINT = "consoleendpoint";
+ public static final String EXTERNAL_LOAD_BALANCER_IP_ADDRESS = "externalloadbalanceripaddress";
+ public static final String DOCKER_REGISTRY_USER_NAME = "dockerregistryusername";
+ public static final String DOCKER_REGISTRY_PASSWORD = "dockerregistrypassword";
+ public static final String DOCKER_REGISTRY_URL = "dockerregistryurl";
+ public static final String DOCKER_REGISTRY_EMAIL = "dockerregistryemail";
+ public static final String ISO_NAME = "isoname";
+ public static final String ISO_STATE = "isostate";
+ public static final String SEMANTIC_VERSION = "semanticversion";
+ public static final String KUBERNETES_VERSION_ID = "kubernetesversionid";
+ public static final String KUBERNETES_VERSION_NAME = "kubernetesversionname";
+ public static final String MASTER_NODES = "masternodes";
+ public static final String MIN_SEMANTIC_VERSION = "minimumsemanticversion";
+ public static final String MIN_KUBERNETES_VERSION_ID = "minimumkubernetesversionid";
+ public static final String NODE_ROOT_DISK_SIZE = "noderootdisksize";
+ public static final String SUPPORTS_HA = "supportsha";
+
+ public static final String BOOT_TYPE ="boottype";
+ public static final String BOOT_MODE ="bootmode";
+
+ public enum BootType {
+ UEFI, BIOS;
+
+ @Override
+ public String toString() {
+ return this.name();
+ }
+ }
+
+ public enum BootMode {
+ LEGACY, SECURE;
+
+ @Override
+ public String toString() {
+ return this.name();
+ }
+ }
+
public enum HostDetails {
all, capacity, events, stats, min;
}
public enum VMDetails {
- all, group, nics, stats, secgrp, tmpl, servoff, diskoff, iso, volume, min, affgrp;
+ all, group, nics, stats, secgrp, tmpl, servoff, diskoff, backoff, iso, volume, min, affgrp;
}
public enum DomainDetails {
diff --git a/api/src/main/java/org/apache/cloudstack/api/BaseBackupListCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseBackupListCmd.java
new file mode 100644
index 0000000..0aa8366
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/BaseBackupListCmd.java
@@ -0,0 +1,49 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.cloudstack.api.response.BackupOfferingResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.backup.BackupOffering;
+import org.apache.cloudstack.context.CallContext;
+
+public abstract class BaseBackupListCmd extends BaseListCmd {
+
+ protected void setupResponseBackupOfferingsList(final List<BackupOffering> offerings, final Integer count) {
+ final ListResponse<BackupOfferingResponse> response = new ListResponse<>();
+ final List<BackupOfferingResponse> responses = new ArrayList<>();
+ for (final BackupOffering offering : offerings) {
+ if (offering == null) {
+ continue;
+ }
+ BackupOfferingResponse backupOfferingResponse = _responseGenerator.createBackupOfferingResponse(offering);
+ responses.add(backupOfferingResponse);
+ }
+ response.setResponses(responses, count);
+ response.setResponseName(getCommandName());
+ setResponseObject(response);
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ return CallContext.current().getCallingAccount().getId();
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/BaseListTaggedResourcesCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseListTaggedResourcesCmd.java
index 5f17742..0bd3356 100644
--- a/api/src/main/java/org/apache/cloudstack/api/BaseListTaggedResourcesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/BaseListTaggedResourcesCmd.java
@@ -16,34 +16,14 @@
// under the License.
package org.apache.cloudstack.api;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
-import com.cloud.exception.InvalidParameterValueException;
-
public abstract class BaseListTaggedResourcesCmd extends BaseListProjectAndAccountResourcesCmd implements IBaseListTaggedResourcesCmd {
@Parameter(name = ApiConstants.TAGS, type = CommandType.MAP, description = "List resources by tags (key/value pairs)")
private Map tags;
@Override
public Map<String, String> getTags() {
- Map<String, String> tagsMap = null;
- if (tags != null && !tags.isEmpty()) {
- tagsMap = new HashMap<String, String>();
- Collection<?> servicesCollection = tags.values();
- Iterator<?> iter = servicesCollection.iterator();
- while (iter.hasNext()) {
- HashMap<String, String> services = (HashMap<String, String>)iter.next();
- String key = services.get("key");
- String value = services.get("value");
- if (value == null) {
- throw new InvalidParameterValueException("No value is passed in for key " + key);
- }
- tagsMap.put(key, value);
- }
- }
- return tagsMap;
+ return TaggedResources.parseKeyValueMap(tags, false);
}
}
diff --git a/api/src/main/java/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java
index d149dff..052d7d1 100644
--- a/api/src/main/java/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java
@@ -21,16 +21,16 @@
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.command.ResponseViewProvider;
import org.apache.cloudstack.api.response.TemplatePermissionsResponse;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
-public abstract class BaseListTemplateOrIsoPermissionsCmd extends BaseCmd {
+public abstract class BaseListTemplateOrIsoPermissionsCmd extends BaseCmd implements ResponseViewProvider {
public Logger logger = getLogger();
protected static final String s_name = "listtemplatepermissionsresponse";
-
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
@@ -76,6 +76,10 @@
return "templateOrIso";
}
+ @Override
+ public void execute() {
+ executeWithView(getResponseView());
+ }
protected void executeWithView(ResponseView view) {
List<String> accountNames = _templateService.listTemplatePermissions(this);
diff --git a/api/src/main/java/org/apache/cloudstack/api/ResponseGenerator.java b/api/src/main/java/org/apache/cloudstack/api/ResponseGenerator.java
index 740ee46..3f0d978 100644
--- a/api/src/main/java/org/apache/cloudstack/api/ResponseGenerator.java
+++ b/api/src/main/java/org/apache/cloudstack/api/ResponseGenerator.java
@@ -22,6 +22,9 @@
import java.util.Map;
import java.util.Set;
+import org.apache.cloudstack.api.response.RouterHealthCheckResultResponse;
+import com.cloud.resource.RollingMaintenanceManager;
+import org.apache.cloudstack.api.response.RollingMaintenanceResponse;
import org.apache.cloudstack.management.ManagementServerHost;
import org.apache.cloudstack.affinity.AffinityGroup;
import org.apache.cloudstack.affinity.AffinityGroupResponse;
@@ -35,6 +38,8 @@
import org.apache.cloudstack.api.response.AutoScalePolicyResponse;
import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse;
import org.apache.cloudstack.api.response.AutoScaleVmProfileResponse;
+import org.apache.cloudstack.api.response.BackupOfferingResponse;
+import org.apache.cloudstack.api.response.BackupScheduleResponse;
import org.apache.cloudstack.api.response.CapacityResponse;
import org.apache.cloudstack.api.response.ClusterResponse;
import org.apache.cloudstack.api.response.ConditionResponse;
@@ -110,6 +115,7 @@
import org.apache.cloudstack.api.response.UsageRecordResponse;
import org.apache.cloudstack.api.response.UserResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
+import org.apache.cloudstack.api.response.BackupResponse;
import org.apache.cloudstack.api.response.VMSnapshotResponse;
import org.apache.cloudstack.api.response.VirtualRouterProviderResponse;
import org.apache.cloudstack.api.response.VlanIpRangeResponse;
@@ -118,6 +124,9 @@
import org.apache.cloudstack.api.response.VpcResponse;
import org.apache.cloudstack.api.response.VpnUsersResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
+import org.apache.cloudstack.backup.BackupOffering;
+import org.apache.cloudstack.backup.Backup;
+import org.apache.cloudstack.backup.BackupSchedule;
import org.apache.cloudstack.config.Configuration;
import org.apache.cloudstack.network.lb.ApplicationLoadBalancerRule;
import org.apache.cloudstack.region.PortableIp;
@@ -146,6 +155,7 @@
import com.cloud.network.PhysicalNetworkServiceProvider;
import com.cloud.network.PhysicalNetworkTrafficType;
import com.cloud.network.RemoteAccessVpn;
+import com.cloud.network.RouterHealthCheckResult;
import com.cloud.network.Site2SiteCustomerGateway;
import com.cloud.network.Site2SiteVpnConnection;
import com.cloud.network.Site2SiteVpnGateway;
@@ -465,5 +475,16 @@
SSHKeyPairResponse createSSHKeyPairResponse(SSHKeyPair sshkeyPair, boolean privatekey);
+ BackupResponse createBackupResponse(Backup backup);
+
+ BackupScheduleResponse createBackupScheduleResponse(BackupSchedule backup);
+
+ BackupOfferingResponse createBackupOfferingResponse(BackupOffering policy);
+
ManagementServerResponse createManagementResponse(ManagementServerHost mgmt);
+
+ List<RouterHealthCheckResultResponse> createHealthCheckResponse(VirtualMachine router, List<RouterHealthCheckResult> healthCheckResults);
+
+ RollingMaintenanceResponse createRollingMaintenanceResponse(Boolean success, String details, List<RollingMaintenanceManager.HostUpdated> hostsUpdated, List<RollingMaintenanceManager.HostSkipped> hostsSkipped);
+
}
diff --git a/api/src/main/java/org/apache/cloudstack/api/TaggedResources.java b/api/src/main/java/org/apache/cloudstack/api/TaggedResources.java
new file mode 100644
index 0000000..26cea9e
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/TaggedResources.java
@@ -0,0 +1,72 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api;
+
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.mapping;
+import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toMap;
+
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+import javax.annotation.Nullable;
+
+import org.apache.commons.collections.MapUtils;
+
+import com.cloud.exception.InvalidParameterValueException;
+
+public abstract class TaggedResources {
+ @Nullable
+ public static Map<String, String> parseKeyValueMap(Map map, boolean allowNullValues) {
+ Map<String, String> result = null;
+ if (MapUtils.isNotEmpty(map)) {
+ Map<Integer, Map<String, String>> typedMap = map;
+ result = typedMap.values()
+ .stream()
+ .collect(toMap(
+ t -> t.get("key"),
+ t -> getValue(t, allowNullValues)
+ ));
+ }
+ return result;
+ }
+
+ @Nullable
+ public static Map<String, List<String>> groupBy(Map map, String keyField, String valueField) {
+ Map<String, List<String>> result = null;
+ if (MapUtils.isNotEmpty(map)) {
+ final Function<Map<String, String>, String> key = entry -> entry.get(keyField);
+ final Function<Map<String, String>, String> value = entry -> entry.get(valueField);
+ Map<Integer, Map<String, String>> typedMap = (Map<Integer, Map<String, String>>) map;
+ result = typedMap.values()
+ .stream()
+ .collect(groupingBy(key, mapping(value, toList())));
+ }
+
+ return result;
+ }
+
+ private static String getValue(Map<String, String> tagEntry, boolean allowNullValues) {
+ String value = tagEntry.get("value");
+ if (value == null && !allowNullValues) {
+ throw new InvalidParameterValueException("No value is passed in for key " + tagEntry.get("key"));
+ }
+ return value;
+ }
+}
diff --git a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java b/api/src/main/java/org/apache/cloudstack/api/command/ResponseViewProvider.java
similarity index 60%
copy from agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
copy to api/src/main/java/org/apache/cloudstack/api/command/ResponseViewProvider.java
index b244d02..c191ee9 100644
--- a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/ResponseViewProvider.java
@@ -1,4 +1,4 @@
-//
+///
// 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
@@ -15,22 +15,12 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-//
-package com.cloud.agent.direct.download;
+///
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+package org.apache.cloudstack.api.command;
-@RunWith(MockitoJUnitRunner.class)
-public class DirectTemplateDownloaderImplTest {
+import org.apache.cloudstack.api.ResponseObject;
- private static final Long templateId = 202l;
-
- @Test
- public void testGetDirectDownloadTempPath() {
- String path = DirectTemplateDownloaderImpl.getDirectDownloadTempPath(templateId);
- Assert.assertEquals("template/2/202", path);
- }
+public interface ResponseViewProvider {
+ ResponseObject.ResponseView getResponseView();
}
diff --git a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/AdminCmd.java
similarity index 60%
copy from agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
copy to api/src/main/java/org/apache/cloudstack/api/command/admin/AdminCmd.java
index b244d02..5238dec 100644
--- a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/AdminCmd.java
@@ -1,4 +1,4 @@
-//
+///
// 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
@@ -15,22 +15,15 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-//
-package com.cloud.agent.direct.download;
+///
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+package org.apache.cloudstack.api.command.admin;
-@RunWith(MockitoJUnitRunner.class)
-public class DirectTemplateDownloaderImplTest {
+import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.command.user.UserCmd;
- private static final Long templateId = 202l;
-
- @Test
- public void testGetDirectDownloadTempPath() {
- String path = DirectTemplateDownloaderImpl.getDirectDownloadTempPath(templateId);
- Assert.assertEquals("template/2/202", path);
+public interface AdminCmd extends UserCmd {
+ default ResponseView getResponseView() {
+ return ResponseView.Full;
}
}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/address/AssociateIPAddrCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/address/AssociateIPAddrCmdByAdmin.java
index e428ac8..56f41b5 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/address/AssociateIPAddrCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/address/AssociateIPAddrCmdByAdmin.java
@@ -19,48 +19,13 @@
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.address.AssociateIPAddrCmd;
import org.apache.cloudstack.api.response.IPAddressResponse;
-import org.apache.cloudstack.context.CallContext;
-
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.ResourceAllocationException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.network.IpAddress;
@APICommand(name = "associateIpAddress", description = "Acquires and associates a public IP to an account.", responseObject = IPAddressResponse.class, responseView = ResponseView.Full,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class AssociateIPAddrCmdByAdmin extends AssociateIPAddrCmd {
+public class AssociateIPAddrCmdByAdmin extends AssociateIPAddrCmd implements AdminCmd {
public static final Logger s_logger = Logger.getLogger(AssociateIPAddrCmdByAdmin.class.getName());
-
-
- @Override
- public void execute() throws ResourceUnavailableException, ResourceAllocationException,
- ConcurrentOperationException, InsufficientCapacityException {
- CallContext.current().setEventDetails("Ip Id: " + getEntityId());
-
- IpAddress result = null;
-
- if (getVpcId() != null) {
- result = _vpcService.associateIPToVpc(getEntityId(), getVpcId());
- } else if (getNetworkId() != null) {
- result = _networkService.associateIPToNetwork(getEntityId(), getNetworkId());
- }
-
- if (result != null) {
- IPAddressResponse ipResponse = _responseGenerator.createIPAddressResponse(ResponseView.Full, result);
- ipResponse.setResponseName(getCommandName());
- setResponseObject(ipResponse);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to assign ip address");
- }
- }
-
-
-
-
}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/address/ListPublicIpAddressesCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/address/ListPublicIpAddressesCmdByAdmin.java
index 22627a2..4bd6aa7 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/address/ListPublicIpAddressesCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/address/ListPublicIpAddressesCmdByAdmin.java
@@ -16,39 +16,14 @@
// under the License.
package org.apache.cloudstack.api.command.admin.address;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.address.ListPublicIpAddressesCmd;
import org.apache.cloudstack.api.response.IPAddressResponse;
-import org.apache.cloudstack.api.response.ListResponse;
import com.cloud.network.IpAddress;
-import com.cloud.utils.Pair;
@APICommand(name = "listPublicIpAddresses", description = "Lists all public ip addresses", responseObject = IPAddressResponse.class, responseView = ResponseView.Full,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, entityType = {IpAddress.class})
-public class ListPublicIpAddressesCmdByAdmin extends ListPublicIpAddressesCmd {
- public static final Logger s_logger = Logger.getLogger(ListPublicIpAddressesCmdByAdmin.class.getName());
-
- @Override
- public void execute(){
- Pair<List<? extends IpAddress>, Integer> result = _mgr.searchForIPAddresses(this);
- ListResponse<IPAddressResponse> response = new ListResponse<IPAddressResponse>();
- List<IPAddressResponse> ipAddrResponses = new ArrayList<IPAddressResponse>();
- for (IpAddress ipAddress : result.first()) {
- IPAddressResponse ipResponse = _responseGenerator.createIPAddressResponse(ResponseView.Full, ipAddress);
- ipResponse.setObjectName("publicipaddress");
- ipAddrResponses.add(ipResponse);
- }
-
- response.setResponses(ipAddrResponses, result.second());
- response.setResponseName(getCommandName());
- setResponseObject(response);
- }
-
-}
+public class ListPublicIpAddressesCmdByAdmin extends ListPublicIpAddressesCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/affinitygroup/UpdateVMAffinityGroupCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/affinitygroup/UpdateVMAffinityGroupCmdByAdmin.java
index b0a6cae..7bf9b64 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/affinitygroup/UpdateVMAffinityGroupCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/affinitygroup/UpdateVMAffinityGroupCmdByAdmin.java
@@ -16,23 +16,14 @@
// under the License.
package org.apache.cloudstack.api.command.admin.affinitygroup;
-import java.util.ArrayList;
-import java.util.EnumSet;
-
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiConstants.VMDetails;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.affinitygroup.UpdateVMAffinityGroupCmd;
import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.cloudstack.context.CallContext;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.uservm.UserVm;
import com.cloud.vm.VirtualMachine;
@@ -41,27 +32,6 @@
entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false,
responseHasSensitiveInfo = true)
-public class UpdateVMAffinityGroupCmdByAdmin extends UpdateVMAffinityGroupCmd {
+public class UpdateVMAffinityGroupCmdByAdmin extends UpdateVMAffinityGroupCmd implements AdminCmd {
public static final Logger s_logger = Logger.getLogger(UpdateVMAffinityGroupCmdByAdmin.class.getName());
-
-
- @Override
- public void execute() throws ResourceUnavailableException,
- InsufficientCapacityException, ServerApiException {
- CallContext.current().setEventDetails("Vm Id: "+getId());
- UserVm result = _affinityGroupService.updateVMAffinityGroups(getId(), getAffinityGroupIdList());
- ArrayList<VMDetails> dc = new ArrayList<VMDetails>();
- dc.add(VMDetails.valueOf("affgrp"));
- EnumSet<VMDetails> details = EnumSet.copyOf(dc);
-
- if (result != null){
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Full, "virtualmachine", details, result).get(0);
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update vm's affinity groups");
- }
- }
-
-
}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/DeleteBackupOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/DeleteBackupOfferingCmd.java
new file mode 100644
index 0000000..a405fd6
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/DeleteBackupOfferingCmd.java
@@ -0,0 +1,92 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.command.admin.backup;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.BackupOfferingResponse;
+import org.apache.cloudstack.api.response.SuccessResponse;
+import org.apache.cloudstack.backup.BackupManager;
+import org.apache.cloudstack.context.CallContext;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.NetworkRuleConflictException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
+
+@APICommand(name = DeleteBackupOfferingCmd.APINAME,
+ description = "Deletes a backup offering",
+ responseObject = SuccessResponse.class, since = "4.14.0",
+ authorized = {RoleType.Admin})
+public class DeleteBackupOfferingCmd extends BaseCmd {
+ public static final String APINAME = "deleteBackupOffering";
+
+ @Inject
+ private BackupManager backupManager;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ ////////////////////////////////////////////////////
+
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = BackupOfferingResponse.class,
+ required = true,
+ description = "ID of the backup offering")
+ private Long id;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public Long getId() {
+ return id;
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ @Override
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException {
+ if (backupManager.deleteBackupOffering(getId())) {
+ SuccessResponse response = new SuccessResponse(getCommandName());
+ setResponseObject(response);
+ } else {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Unable to remove backup offering: " + getId());
+ }
+ }
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ return CallContext.current().getCallingAccount().getId();
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ImportBackupOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ImportBackupOfferingCmd.java
new file mode 100644
index 0000000..f682f4c
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ImportBackupOfferingCmd.java
@@ -0,0 +1,145 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.command.admin.backup;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.BackupOfferingResponse;
+import org.apache.cloudstack.api.response.ZoneResponse;
+import org.apache.cloudstack.backup.BackupManager;
+import org.apache.cloudstack.backup.BackupOffering;
+import org.apache.cloudstack.context.CallContext;
+
+import com.cloud.event.EventTypes;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.NetworkRuleConflictException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+@APICommand(name = ImportBackupOfferingCmd.APINAME,
+ description = "Imports a backup offering using a backup provider",
+ responseObject = BackupOfferingResponse.class, since = "4.14.0",
+ authorized = {RoleType.Admin})
+public class ImportBackupOfferingCmd extends BaseAsyncCmd {
+ public static final String APINAME = "importBackupOffering";
+
+ @Inject
+ private BackupManager backupManager;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ ////////////////////////////////////////////////////
+
+ @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true,
+ description = "the name of the backup offering")
+ private String name;
+
+ @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, required = true,
+ description = "the description of the backup offering")
+ private String description;
+
+ @Parameter(name = ApiConstants.EXTERNAL_ID,
+ type = CommandType.STRING,
+ required = true,
+ description = "The backup offering ID (from backup provider side)")
+ private String externalId;
+
+ @Parameter(name = ApiConstants.ZONE_ID, type = BaseCmd.CommandType.UUID, entityType = ZoneResponse.class,
+ description = "The zone ID", required = true)
+ private Long zoneId;
+
+ @Parameter(name = ApiConstants.ALLOW_USER_DRIVEN_BACKUPS, type = CommandType.BOOLEAN,
+ description = "Whether users are allowed to create adhoc backups and backup schedules", required = true)
+ private Boolean userDrivenBackups;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public String getName() {
+ return name;
+ }
+
+ public String getExternalId() {
+ return externalId;
+ }
+
+ public Long getZoneId() {
+ return zoneId;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public Boolean getUserDrivenBackups() {
+ return userDrivenBackups == null ? false : userDrivenBackups;
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ @Override
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException {
+ try {
+ BackupOffering policy = backupManager.importBackupOffering(this);
+ if (policy != null) {
+ BackupOfferingResponse response = _responseGenerator.createBackupOfferingResponse(policy);
+ response.setResponseName(getCommandName());
+ setResponseObject(response);
+ } else {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to add a backup offering");
+ }
+ } catch (InvalidParameterValueException e) {
+ throw new ServerApiException(ApiErrorCode.PARAM_ERROR, e.getMessage());
+ } catch (CloudRuntimeException e) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
+ }
+ }
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + RESPONSE_SUFFIX;
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ return CallContext.current().getCallingAccount().getId();
+ }
+
+ @Override
+ public String getEventType() {
+ return EventTypes.EVENT_VM_BACKUP_IMPORT_OFFERING;
+ }
+
+ @Override
+ public String getEventDescription() {
+ return "Importing backup offering: " + name + " (external ID: " + externalId + ") on zone ID " + zoneId ;
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProviderOfferingsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProviderOfferingsCmd.java
new file mode 100644
index 0000000..2e5657d
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProviderOfferingsCmd.java
@@ -0,0 +1,94 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.command.admin.backup;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseBackupListCmd;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.BackupOfferingResponse;
+import org.apache.cloudstack.api.response.ZoneResponse;
+import org.apache.cloudstack.backup.BackupManager;
+import org.apache.cloudstack.backup.BackupOffering;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+@APICommand(name = ListBackupProviderOfferingsCmd.APINAME,
+ description = "Lists external backup offerings of the provider",
+ responseObject = BackupOfferingResponse.class, since = "4.14.0",
+ authorized = {RoleType.Admin})
+public class ListBackupProviderOfferingsCmd extends BaseBackupListCmd {
+ public static final String APINAME = "listBackupProviderOfferings";
+
+ @Inject
+ private BackupManager backupManager;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+
+ @Parameter(name = ApiConstants.ZONE_ID, type = BaseCmd.CommandType.UUID, entityType = ZoneResponse.class,
+ required = true, description = "The zone ID")
+ private Long zoneId;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public Long getZoneId() {
+ return zoneId;
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ private void validateParameters() {
+ if (getZoneId() == null) {
+ throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Please provide a valid zone ID ");
+ }
+ }
+
+ @Override
+ public void execute() throws ResourceUnavailableException, ServerApiException, ConcurrentOperationException {
+ validateParameters();
+ try {
+ final List<BackupOffering> backupOfferings = backupManager.listBackupProviderOfferings(getZoneId());
+ setupResponseBackupOfferingsList(backupOfferings, backupOfferings.size());
+ } catch (InvalidParameterValueException e) {
+ throw new ServerApiException(ApiErrorCode.PARAM_ERROR, e.getMessage());
+ } catch (CloudRuntimeException e) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
+ }
+ }
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + RESPONSE_SUFFIX;
+ }
+}
\ No newline at end of file
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProvidersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProvidersCmd.java
new file mode 100644
index 0000000..2b4b735
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProvidersCmd.java
@@ -0,0 +1,98 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.command.admin.backup;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.response.BackupProviderResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.backup.BackupManager;
+import org.apache.cloudstack.backup.BackupProvider;
+
+import com.cloud.user.Account;
+
+@APICommand(name = ListBackupProvidersCmd.APINAME,
+ description = "Lists Backup and Recovery providers",
+ responseObject = BackupProviderResponse.class, since = "4.14.0",
+ authorized = {RoleType.Admin})
+public class ListBackupProvidersCmd extends BaseCmd {
+ public static final String APINAME = "listBackupProviders";
+
+ @Inject
+ private BackupManager backupManager;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+
+ @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "List Backup and Recovery provider by name")
+ private String name;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ return Account.ACCOUNT_ID_SYSTEM;
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ private void setupResponse(final List<BackupProvider> providers) {
+ final ListResponse<BackupProviderResponse> response = new ListResponse<>();
+ final List<BackupProviderResponse> responses = new ArrayList<>();
+ for (final BackupProvider provider : providers) {
+ if (provider == null || (getName() != null && !provider.getName().equals(getName()))) {
+ continue;
+ }
+ final BackupProviderResponse backupProviderResponse = new BackupProviderResponse();
+ backupProviderResponse.setName(provider.getName());
+ backupProviderResponse.setDescription(provider.getDescription());
+ backupProviderResponse.setObjectName("providers");
+ responses.add(backupProviderResponse);
+ }
+ response.setResponses(responses);
+ response.setResponseName(getCommandName());
+ setResponseObject(response);
+ }
+
+ @Override
+ public void execute() {
+ List<BackupProvider> providers = backupManager.listBackupProviders();
+ setupResponse(providers);
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/diagnostics/GetDiagnosticsDataCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/diagnostics/GetDiagnosticsDataCmd.java
new file mode 100644
index 0000000..dc058ff
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/diagnostics/GetDiagnosticsDataCmd.java
@@ -0,0 +1,157 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.command.admin.diagnostics;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiArgValidator;
+import org.apache.cloudstack.api.ApiCommandJobType;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.SystemVmResponse;
+import org.apache.cloudstack.api.response.diagnostics.GetDiagnosticsDataResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.diagnostics.DiagnosticsService;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.validator.routines.UrlValidator;
+
+import com.cloud.event.EventTypes;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.user.Account;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.VirtualMachine;
+
+@APICommand(name = GetDiagnosticsDataCmd.APINAME,
+ responseObject = GetDiagnosticsDataResponse.class,
+ entityType = {VirtualMachine.class},
+ responseHasSensitiveInfo = false,
+ requestHasSensitiveInfo = false,
+ description = "Get diagnostics and files from system VMs",
+ since = "4.14.0.0",
+ authorized = {RoleType.Admin})
+public class GetDiagnosticsDataCmd extends BaseAsyncCmd {
+ public static final String APINAME = "getDiagnosticsData";
+
+ @Inject
+ private DiagnosticsService diagnosticsService;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+ @Parameter(name = ApiConstants.TARGET_ID,
+ type = BaseCmd.CommandType.UUID,
+ entityType = SystemVmResponse.class,
+ required = true,
+ validations = {ApiArgValidator.PositiveNumber},
+ description = "The ID of the system VM instance to retrieve diagnostics data files from")
+ private Long id;
+
+ @Parameter(name = ApiConstants.FILES,
+ type = BaseCmd.CommandType.LIST,
+ collectionType = BaseCmd.CommandType.STRING,
+ description = "A comma separated list of diagnostics data files to be retrieved. Defaults are taken from global settings if none has been provided.")
+ private List<String> filesList;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public Long getId() {
+ return id;
+ }
+
+ public List<String> getFilesList() {
+ return filesList;
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////////// Implementation //////////////////
+ /////////////////////////////////////////////////////
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ Account account = CallContext.current().getCallingAccount();
+ if (account != null) {
+ return account.getId();
+ }
+ return Account.ACCOUNT_ID_SYSTEM;
+ }
+
+ @Override
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException {
+ try {
+ String downloadUrl = diagnosticsService.getDiagnosticsDataCommand(this);
+ UrlValidator urlValidator = new UrlValidator();
+ if (StringUtils.isEmpty(downloadUrl)) {
+ throw new CloudRuntimeException("Failed to retrieve diagnostics files");
+ }
+ GetDiagnosticsDataResponse response = new GetDiagnosticsDataResponse();
+ if (urlValidator.isValid(downloadUrl)){
+ response.setUrl(downloadUrl);
+ response.setObjectName("diagnostics");
+ response.setResponseName(getCommandName());
+ this.setResponseObject(response);
+ } else {
+ throw new CloudRuntimeException("failed to generate valid download url: " + downloadUrl);
+ }
+ } catch (ServerApiException e) {
+ throw new CloudRuntimeException("Internal exception caught while retrieving diagnostics files: ", e);
+ }
+ }
+
+ @Override
+ public String getEventType() {
+ VirtualMachine.Type vmType = _entityMgr.findById(VirtualMachine.class, getId()).getType();
+ String eventType = "";
+ switch (vmType) {
+ case ConsoleProxy:
+ eventType = EventTypes.EVENT_PROXY_DIAGNOSTICS;
+ break;
+ case SecondaryStorageVm:
+ eventType = EventTypes.EVENT_SSVM_DIAGNOSTICS;
+ break;
+ case DomainRouter:
+ eventType = EventTypes.EVENT_ROUTER_DIAGNOSTICS;
+ break;
+ }
+ return eventType;
+ }
+
+ @Override
+ public String getEventDescription() {
+ return "Getting diagnostics data files from system vm: " + this._uuidMgr.getUuid(VirtualMachine.class, getId());
+ }
+
+ @Override
+ public ApiCommandJobType getInstanceType() {
+ return ApiCommandJobType.SystemVm;
+ }
+
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java
index 9c1ae22..5e4cda3 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java
@@ -28,6 +28,7 @@
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.ListResponse;
@@ -36,7 +37,7 @@
@APICommand(name = "listDomains", description = "Lists domains and provides detailed information for listed domains", responseObject = DomainResponse.class, responseView = ResponseView.Restricted, entityType = {Domain.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class ListDomainsCmd extends BaseListCmd {
+public class ListDomainsCmd extends BaseListCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(ListDomainsCmd.class.getName());
private static final String s_name = "listdomainsresponse";
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmdByAdmin.java
index bbe75de..02a2b45 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmdByAdmin.java
@@ -18,11 +18,11 @@
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.response.DomainResponse;
import com.cloud.domain.Domain;
@APICommand(name = "listDomains", description = "Lists domains and provides detailed information for listed domains", responseObject = DomainResponse.class, responseView = ResponseView.Full, entityType = {Domain.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class ListDomainsCmdByAdmin extends ListDomainsCmd {
-}
+public class ListDomainsCmdByAdmin extends ListDomainsCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java
index e49aabc..7083f0d 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java
@@ -16,8 +16,6 @@
// under the License.
package org.apache.cloudstack.api.command.admin.host;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiCommandJobType;
import org.apache.cloudstack.api.ApiConstants;
@@ -27,10 +25,12 @@
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.HostResponse;
import org.apache.cloudstack.context.CallContext;
+import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.host.Host;
import com.cloud.user.Account;
+import com.cloud.utils.exception.CloudRuntimeException;
@APICommand(name = "prepareHostForMaintenance", description = "Prepares a host for maintenance.", responseObject = HostResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
@@ -97,15 +97,23 @@
return getId();
}
+ public void setId(Long id) {
+ this.id = id;
+ }
+
@Override
public void execute() {
- Host result = _resourceService.maintain(this);
- if (result != null) {
- HostResponse response = _responseGenerator.createHostResponse(result);
- response.setResponseName("host");
- this.setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to prepare host for maintenance");
+ try {
+ Host result = _resourceService.maintain(this);
+ if (result != null) {
+ HostResponse response = _responseGenerator.createHostResponse(result);
+ response.setResponseName("host");
+ this.setResponseObject(response);
+ } else {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to prepare host for maintenance");
+ }
+ } catch (CloudRuntimeException exception) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to prepare host for maintenance due to: " + exception.getMessage());
}
}
}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
index ba2054c..fd41585 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
@@ -16,6 +16,7 @@
// under the License.
package org.apache.cloudstack.api.command.admin.internallb;
+import org.apache.commons.lang.BooleanUtils;
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
@@ -73,6 +74,11 @@
@Parameter(name = ApiConstants.FOR_VPC, type = CommandType.BOOLEAN, description = "if true is passed for this parameter, list only VPC Internal LB VMs")
private Boolean forVpc;
+
+ @Parameter(name = ApiConstants.FETCH_ROUTER_HEALTH_CHECK_RESULTS, type = CommandType.BOOLEAN, since = "4.14",
+ description = "if true is passed for this parameter, also fetch last executed health check results for the VM. Default is false")
+ private Boolean fetchHealthCheckResults;
+
/////////////////////////////////////////////////////
/////////////////// Accessors ///////////////////////
/////////////////////////////////////////////////////
@@ -117,6 +123,10 @@
return Role.INTERNAL_LB_VM.toString();
}
+ public boolean shouldFetchHealthCheckResults() {
+ return BooleanUtils.isTrue(fetchHealthCheckResults);
+ }
+
/////////////////////////////////////////////////////
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/AttachIsoCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/AttachIsoCmdByAdmin.java
index 2a58508..e39107b 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/AttachIsoCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/AttachIsoCmdByAdmin.java
@@ -16,39 +16,12 @@
// under the License.
package org.apache.cloudstack.api.command.admin.iso;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.iso.AttachIsoCmd;
-import org.apache.cloudstack.api.command.user.vm.DeployVMCmd;
import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.cloudstack.context.CallContext;
-
-import com.cloud.uservm.UserVm;
@APICommand(name = "attachIso", description = "Attaches an ISO to a virtual machine.", responseObject = UserVmResponse.class, responseView = ResponseView.Full,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class AttachIsoCmdByAdmin extends AttachIsoCmd {
- public static final Logger s_logger = Logger.getLogger(AttachIsoCmdByAdmin.class.getName());
-
- @Override
- public void execute(){
- CallContext.current().setEventDetails("Vm Id: " +getVirtualMachineId()+ " ISO Id: "+getId());
- boolean result = _templateService.attachIso(id, virtualMachineId);
- if (result) {
- UserVm userVm = _responseGenerator.findUserVmById(virtualMachineId);
- if (userVm != null) {
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Full, "virtualmachine", userVm).get(0);
- response.setResponseName(DeployVMCmd.getResultObjectName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to attach iso");
- }
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to attach iso");
- }
- }
-}
+public class AttachIsoCmdByAdmin extends AttachIsoCmd implements AdminCmd { }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/DetachIsoCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/DetachIsoCmdByAdmin.java
index 2486680..5eeba2b 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/DetachIsoCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/DetachIsoCmdByAdmin.java
@@ -16,33 +16,12 @@
// under the License.
package org.apache.cloudstack.api.command.admin.iso;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.iso.DetachIsoCmd;
-import org.apache.cloudstack.api.command.user.vm.DeployVMCmd;
import org.apache.cloudstack.api.response.UserVmResponse;
-import com.cloud.uservm.UserVm;
-
@APICommand(name = "detachIso", description = "Detaches any ISO file (if any) currently attached to a virtual machine.", responseObject = UserVmResponse.class, responseView = ResponseView.Full,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class DetachIsoCmdByAdmin extends DetachIsoCmd {
- public static final Logger s_logger = Logger.getLogger(DetachIsoCmdByAdmin.class.getName());
-
- @Override
- public void execute(){
- boolean result = _templateService.detachIso(virtualMachineId);
- if (result) {
- UserVm userVm = _entityMgr.findById(UserVm.class, virtualMachineId);
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Full, "virtualmachine", userVm).get(0);
- response.setResponseName(DeployVMCmd.getResultObjectName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to detach iso");
- }
- }
-}
+public class DetachIsoCmdByAdmin extends DetachIsoCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/ListIsoPermissionsCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/ListIsoPermissionsCmdByAdmin.java
index 0b3c9ef..46bd4f3 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/ListIsoPermissionsCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/ListIsoPermissionsCmdByAdmin.java
@@ -18,16 +18,14 @@
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.iso.ListIsoPermissionsCmd;
import org.apache.cloudstack.api.response.TemplatePermissionsResponse;
-@APICommand(name = "listIsoPermissions", description = "List iso visibility and all accounts that have permissions to view this iso.", responseObject = TemplatePermissionsResponse.class, responseView = ResponseView.Full,
+@APICommand(name = "listIsoPermissions",
+ description = "List iso visibility and all accounts that have permissions to view this iso.",
+ responseObject = TemplatePermissionsResponse.class,
+ responseView = ResponseView.Full,
requestHasSensitiveInfo = false,
responseHasSensitiveInfo = false)
-public class ListIsoPermissionsCmdByAdmin extends ListIsoPermissionsCmd {
-
- @Override
- public void execute() {
- executeWithView(ResponseView.Full);
- }
-}
+public class ListIsoPermissionsCmdByAdmin extends ListIsoPermissionsCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/ListIsosCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/ListIsosCmdByAdmin.java
index 621fe01..4b6d4c0 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/ListIsosCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/ListIsosCmdByAdmin.java
@@ -18,10 +18,11 @@
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.iso.ListIsosCmd;
import org.apache.cloudstack.api.response.TemplateResponse;
@APICommand(name = "listIsos", description = "Lists all available ISO files.", responseObject = TemplateResponse.class, responseView = ResponseView.Full,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class ListIsosCmdByAdmin extends ListIsosCmd {
+public class ListIsosCmdByAdmin extends ListIsosCmd implements AdminCmd {
}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/RegisterIsoCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/RegisterIsoCmdByAdmin.java
index daae959..754c945 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/RegisterIsoCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/RegisterIsoCmdByAdmin.java
@@ -16,39 +16,11 @@
// under the License.
package org.apache.cloudstack.api.command.admin.iso;
-import java.util.List;
-
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.command.user.iso.RegisterIsoCmd;
-import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.TemplateResponse;
-import com.cloud.exception.ResourceAllocationException;
-import com.cloud.template.VirtualMachineTemplate;
-
@APICommand(name = "registerIso", responseObject = TemplateResponse.class, description = "Registers an existing ISO into the CloudStack Cloud.", responseView = ResponseView.Full,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class RegisterIsoCmdByAdmin extends RegisterIsoCmd {
- public static final Logger s_logger = Logger.getLogger(RegisterIsoCmdByAdmin.class.getName());
-
-
- @Override
- public void execute() throws ResourceAllocationException{
- VirtualMachineTemplate template = _templateService.registerIso(this);
- if (template != null) {
- ListResponse<TemplateResponse> response = new ListResponse<TemplateResponse>();
- List<TemplateResponse> templateResponses = _responseGenerator.createIsoResponses(ResponseView.Full, template, zoneId, false);
- response.setResponses(templateResponses);
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to register iso");
- }
-
- }
-}
+public class RegisterIsoCmdByAdmin extends RegisterIsoCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/UpdateIsoCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/UpdateIsoCmdByAdmin.java
index d3ec820..58a57f0 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/UpdateIsoCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/iso/UpdateIsoCmdByAdmin.java
@@ -16,31 +16,11 @@
// under the License.
package org.apache.cloudstack.api.command.admin.iso;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.command.user.iso.UpdateIsoCmd;
import org.apache.cloudstack.api.response.TemplateResponse;
-import com.cloud.template.VirtualMachineTemplate;
-
@APICommand(name = "updateIso", description = "Updates an ISO file.", responseObject = TemplateResponse.class, responseView = ResponseView.Full,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class UpdateIsoCmdByAdmin extends UpdateIsoCmd {
- public static final Logger s_logger = Logger.getLogger(UpdateIsoCmdByAdmin.class.getName());
-
- @Override
- public void execute(){
- VirtualMachineTemplate result = _templateService.updateTemplate(this);
- if (result != null) {
- TemplateResponse response = _responseGenerator.createTemplateUpdateResponse(ResponseView.Full, result);
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update iso");
- }
- }
-}
+public class UpdateIsoCmdByAdmin extends UpdateIsoCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/loadbalancer/ListLoadBalancerRuleInstancesCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/loadbalancer/ListLoadBalancerRuleInstancesCmdByAdmin.java
index 1bece18..b11988b 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/loadbalancer/ListLoadBalancerRuleInstancesCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/loadbalancer/ListLoadBalancerRuleInstancesCmdByAdmin.java
@@ -16,79 +16,14 @@
// under the License.
package org.apache.cloudstack.api.command.admin.loadbalancer;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.cloud.vm.VirtualMachine;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.response.LoadBalancerRuleVmMapResponse;
-import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.command.user.loadbalancer.ListLoadBalancerRuleInstancesCmd;
-import org.apache.cloudstack.api.response.ListResponse;
-import org.apache.cloudstack.api.response.UserVmResponse;
-
-import com.cloud.uservm.UserVm;
-import com.cloud.utils.Pair;
@APICommand(name = "listLoadBalancerRuleInstances", description = "List all virtual machine instances that are assigned to a load balancer rule.", responseObject = LoadBalancerRuleVmMapResponse.class, responseView = ResponseView.Full,
requestHasSensitiveInfo = false,
responseHasSensitiveInfo = true)
-public class ListLoadBalancerRuleInstancesCmdByAdmin extends ListLoadBalancerRuleInstancesCmd {
- public static final Logger s_logger = Logger.getLogger (ListLoadBalancerRuleInstancesCmdByAdmin.class.getName());
-
-
-
- @Override
- public void execute(){
- Pair<List<? extends UserVm>, List<String>> vmServiceMap = _lbService.listLoadBalancerInstances(this);
- List<? extends UserVm> result = vmServiceMap.first();
- List<String> serviceStates = vmServiceMap.second();
-
-
- if (!isListLbVmip()) {
- // list lb instances
- ListResponse<UserVmResponse> response = new ListResponse<UserVmResponse>();
- List<UserVmResponse> vmResponses = new ArrayList<UserVmResponse>();
- if (result != null) {
- vmResponses = _responseGenerator.createUserVmResponse(ResponseView.Restricted, "loadbalancerruleinstance", result.toArray(new UserVm[result.size()]));
-
-
- for (int i = 0; i < result.size(); i++) {
- vmResponses.get(i).setServiceState(serviceStates.get(i));
- }
- }
- response.setResponses(vmResponses);
- response.setResponseName(getCommandName());
- setResponseObject(response);
-
- } else {
- ListResponse<LoadBalancerRuleVmMapResponse> lbRes = new ListResponse<LoadBalancerRuleVmMapResponse>();
-
- List<UserVmResponse> vmResponses = new ArrayList<UserVmResponse>();
- List<LoadBalancerRuleVmMapResponse> listlbVmRes = new ArrayList<LoadBalancerRuleVmMapResponse>();
-
- if (result != null) {
- vmResponses = _responseGenerator.createUserVmResponse(ResponseView.Full, "loadbalancerruleinstance", result.toArray(new UserVm[result.size()]));
-
- List<String> ipaddr = null;
-
- for (int i=0;i<result.size(); i++) {
- LoadBalancerRuleVmMapResponse lbRuleVmIpResponse = new LoadBalancerRuleVmMapResponse();
- vmResponses.get(i).setServiceState(serviceStates.get(i));
- lbRuleVmIpResponse.setUserVmResponse(vmResponses.get(i));
- //get vm id from the uuid
- VirtualMachine lbvm = _entityMgr.findByUuid(VirtualMachine.class, vmResponses.get(i).getId());
- lbRuleVmIpResponse.setIpAddr(_lbService.listLbVmIpAddress(getId(), lbvm.getId()));
- lbRuleVmIpResponse.setObjectName("lbrulevmidip");
- listlbVmRes.add(lbRuleVmIpResponse);
- }
- }
-
- lbRes.setResponseName(getCommandName());
- lbRes.setResponses(listlbVmRes);
- setResponseObject(lbRes);
- }
- }
-}
+public class ListLoadBalancerRuleInstancesCmdByAdmin extends ListLoadBalancerRuleInstancesCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkCmdByAdmin.java
index 7a60940..1f32f62 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkCmdByAdmin.java
@@ -20,21 +20,17 @@
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.network.CreateNetworkCmd;
import org.apache.cloudstack.api.response.NetworkResponse;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.ResourceAllocationException;
import com.cloud.network.Network;
@APICommand(name = "createNetwork", description = "Creates a network", responseObject = NetworkResponse.class, responseView = ResponseView.Full, entityType = {Network.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class CreateNetworkCmdByAdmin extends CreateNetworkCmd {
+public class CreateNetworkCmdByAdmin extends CreateNetworkCmd implements AdminCmd {
public static final Logger s_logger = Logger.getLogger(CreateNetworkCmdByAdmin.class.getName());
@Parameter(name=ApiConstants.VLAN, type=CommandType.STRING, description="the ID or VID of the network")
@@ -67,21 +63,4 @@
}
return false;
}
-
- /////////////////////////////////////////////////////
- /////////////// API Implementation///////////////////
- /////////////////////////////////////////////////////
-
- @Override
- // an exception thrown by createNetwork() will be caught by the dispatcher.
- public void execute() throws InsufficientCapacityException, ConcurrentOperationException, ResourceAllocationException{
- Network result = _networkService.createGuestNetwork(this);
- if (result != null) {
- NetworkResponse response = _responseGenerator.createNetworkResponse(ResponseView.Full, result);
- response.setResponseName(getCommandName());
- setResponseObject(response);
- }else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create network");
- }
- }
}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworksCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworksCmdByAdmin.java
index 244352f..a234ff0 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworksCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworksCmdByAdmin.java
@@ -16,36 +16,14 @@
// under the License.
package org.apache.cloudstack.api.command.admin.network;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.network.ListNetworksCmd;
-import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.NetworkResponse;
import com.cloud.network.Network;
-import com.cloud.utils.Pair;
@APICommand(name = "listNetworks", description = "Lists all available networks.", responseObject = NetworkResponse.class, responseView = ResponseView.Full, entityType = {Network.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class ListNetworksCmdByAdmin extends ListNetworksCmd {
- public static final Logger s_logger = Logger.getLogger(ListNetworksCmdByAdmin.class.getName());
-
- @Override
- public void execute(){
- Pair<List<? extends Network>, Integer> networks = _networkService.searchForNetworks(this);
- ListResponse<NetworkResponse> response = new ListResponse<NetworkResponse>();
- List<NetworkResponse> networkResponses = new ArrayList<NetworkResponse>();
- for (Network network : networks.first()) {
- NetworkResponse networkResponse = _responseGenerator.createNetworkResponse(ResponseView.Full, network);
- networkResponses.add(networkResponse);
- }
- response.setResponses(networkResponses, networks.second());
- response.setResponseName(getCommandName());
- setResponseObject(response);
- }
-}
+public class ListNetworksCmdByAdmin extends ListNetworksCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkCmdByAdmin.java
index 487ed14..b3088a4 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkCmdByAdmin.java
@@ -18,24 +18,17 @@
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.network.UpdateNetworkCmd;
import org.apache.cloudstack.api.response.NetworkResponse;
-import org.apache.log4j.Logger;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.Network;
@APICommand(name = "updateNetwork", description = "Updates a network", responseObject = NetworkResponse.class, responseView = ResponseView.Full, entityType = {Network.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class UpdateNetworkCmdByAdmin extends UpdateNetworkCmd {
- public static final Logger s_logger = Logger.getLogger(UpdateNetworkCmdByAdmin.class.getName());
-
+public class UpdateNetworkCmdByAdmin extends UpdateNetworkCmd implements AdminCmd {
@Parameter(name= ApiConstants.HIDE_IP_ADDRESS_USAGE, type=CommandType.BOOLEAN, description="when true ip address usage for the network will not be exported by the listUsageRecords API")
private Boolean hideIpAddressUsage;
@@ -45,22 +38,4 @@
}
return hideIpAddressUsage;
}
-
- @Override
- public void execute() throws InsufficientCapacityException, ConcurrentOperationException{
- Network network = _networkService.getNetwork(id);
- if (network == null) {
- throw new InvalidParameterValueException("Couldn't find network by id");
- }
-
- Network result = _networkService.updateGuestNetwork(this);
- if (result != null) {
- NetworkResponse response = _responseGenerator.createNetworkResponse(ResponseView.Full, result);
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update network");
- }
- }
-
}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java
index 3ff8f69..f0ca5fb 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java
@@ -144,6 +144,13 @@
description = "Hypervisor snapshot reserve space as a percent of a volume (for managed storage using Xen or VMware)")
private Integer hypervisorSnapshotReserve;
+ @Parameter(name = ApiConstants.CACHE_MODE,
+ type = CommandType.STRING,
+ required = false,
+ description = "the cache mode to use for this disk offering. none, writeback or writethrough",
+ since = "4.14")
+ private String cacheMode;
+
/////////////////////////////////////////////////////
/////////////////// Accessors ///////////////////////
/////////////////////////////////////////////////////
@@ -262,6 +269,10 @@
return hypervisorSnapshotReserve;
}
+ public String getCacheMode() {
+ return cacheMode;
+ }
+
/////////////////////////////////////////////////////
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
index c30b437..5015f7c 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
@@ -178,6 +178,13 @@
since = "4.4")
private Integer hypervisorSnapshotReserve;
+ @Parameter(name = ApiConstants.CACHE_MODE,
+ type = CommandType.STRING,
+ required = false,
+ description = "the cache mode to use for this disk offering. none, writeback or writethrough",
+ since = "4.14")
+ private String cacheMode;
+
// Introduce 4 new optional paramaters to work custom compute offerings
@Parameter(name = ApiConstants.CUSTOMIZED,
type = CommandType.BOOLEAN,
@@ -377,6 +384,10 @@
return hypervisorSnapshotReserve;
}
+ public String getCacheMode() {
+ return cacheMode;
+ }
+
/**
* If customized parameter is true, then cpuNumber, memory and cpuSpeed must be null
* Check if the optional params min/max CPU/Memory have been specified
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/StartRollingMaintenanceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/StartRollingMaintenanceCmd.java
new file mode 100644
index 0000000..b5a9128
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/StartRollingMaintenanceCmd.java
@@ -0,0 +1,178 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.command.admin.resource;
+
+import com.cloud.event.EventTypes;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.NetworkRuleConflictException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.resource.RollingMaintenanceManager;
+import com.cloud.utils.Pair;
+import com.cloud.utils.Ternary;
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.ClusterResponse;
+import org.apache.cloudstack.api.response.HostResponse;
+import org.apache.cloudstack.api.response.PodResponse;
+import org.apache.cloudstack.api.response.RollingMaintenanceResponse;
+import org.apache.cloudstack.api.response.ZoneResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.log4j.Logger;
+
+import javax.inject.Inject;
+import java.util.List;
+
+@APICommand(name = StartRollingMaintenanceCmd.APINAME, description = "Start rolling maintenance",
+ responseObject = RollingMaintenanceResponse.class,
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
+ authorized = {RoleType.Admin})
+public class StartRollingMaintenanceCmd extends BaseAsyncCmd {
+
+ @Inject
+ RollingMaintenanceManager manager;
+
+ public static final Logger s_logger = Logger.getLogger(StartRollingMaintenanceCmd.class.getName());
+
+ public static final String APINAME = "startRollingMaintenance";
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+ @Parameter(name = ApiConstants.POD_IDS, type = CommandType.LIST, collectionType = CommandType.UUID,
+ entityType = PodResponse.class, description = "the IDs of the pods to start maintenance on")
+ private List<Long> podIds;
+
+ @Parameter(name = ApiConstants.CLUSTER_IDS, type = CommandType.LIST, collectionType = CommandType.UUID,
+ entityType = ClusterResponse.class, description = "the IDs of the clusters to start maintenance on")
+ private List<Long> clusterIds;
+
+ @Parameter(name = ApiConstants.ZONE_ID_LIST, type = CommandType.LIST, collectionType = CommandType.UUID,
+ entityType = ZoneResponse.class, description = "the IDs of the zones to start maintenance on")
+ private List<Long> zoneIds;
+
+ @Parameter(name = ApiConstants.HOST_IDS, type = CommandType.LIST, collectionType = CommandType.UUID,
+ entityType = HostResponse.class, description = "the IDs of the hosts to start maintenance on")
+ private List<Long> hostIds;
+
+ @Parameter(name = ApiConstants.FORCED, type = CommandType.BOOLEAN,
+ description = "if rolling mechanism should continue in case of an error")
+ private Boolean forced;
+
+ @Parameter(name = ApiConstants.PAYLOAD, type = CommandType.STRING,
+ description = "the command to execute while hosts are on maintenance")
+ private String payload;
+
+ @Parameter(name = ApiConstants.TIMEOUT, type = CommandType.INTEGER,
+ description = "optional operation timeout (in seconds) that overrides the global timeout setting")
+ private Integer timeout;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public List<Long> getPodIds() {
+ return podIds;
+ }
+
+ public List<Long> getClusterIds() {
+ return clusterIds;
+ }
+
+ public List<Long> getZoneIds() {
+ return zoneIds;
+ }
+
+ public List<Long> getHostIds() {
+ return hostIds;
+ }
+
+ public Boolean getForced() {
+ return forced != null && forced;
+ }
+
+ public String getPayload() {
+ return payload;
+ }
+
+ public Integer getTimeout() {
+ return timeout;
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ @Override
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException {
+ Ternary<Boolean, String, Pair<List<RollingMaintenanceManager.HostUpdated>, List<RollingMaintenanceManager.HostSkipped>>>
+ result = manager.startRollingMaintenance(this);
+ Boolean success = result.first();
+ String details = result.second();
+ Pair<List<RollingMaintenanceManager.HostUpdated>, List<RollingMaintenanceManager.HostSkipped>> pair = result.third();
+ List<RollingMaintenanceManager.HostUpdated> hostsUpdated = pair.first();
+ List<RollingMaintenanceManager.HostSkipped> hostsSkipped = pair.second();
+
+ RollingMaintenanceResponse response = _responseGenerator.createRollingMaintenanceResponse(success, details, hostsUpdated, hostsSkipped);
+ response.setResponseName(getCommandName());
+ this.setResponseObject(response);
+ }
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ return CallContext.current().getCallingAccountId();
+ }
+
+ @Override
+ public String getEventType() {
+ Pair<RollingMaintenanceManager.ResourceType, List<Long>> pair = manager.getResourceTypeIdPair(this);
+ RollingMaintenanceManager.ResourceType type = pair.first();
+ String eventType = "";
+ switch (type) {
+ case Zone:
+ eventType = EventTypes.EVENT_ZONE_ROLLING_MAINTENANCE;
+ break;
+ case Pod:
+ eventType = EventTypes.EVENT_POD_ROLLING_MAINTENANCE;
+ break;
+ case Cluster:
+ eventType = EventTypes.EVENT_CLUSTER_ROLLING_MAINTENANCE;
+ break;
+ case Host:
+ eventType = EventTypes.EVENT_HOST_ROLLING_MAINTENANCE;
+ }
+ return eventType;
+ }
+
+ @Override
+ public String getEventDescription() {
+ Pair<RollingMaintenanceManager.ResourceType, List<Long>> pair = manager.getResourceTypeIdPair(this);
+ return "Starting rolling maintenance on entity: " + pair.first() + " with IDs: " + pair.second();
+ }
+}
\ No newline at end of file
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/GetRouterHealthCheckResultsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/GetRouterHealthCheckResultsCmd.java
new file mode 100644
index 0000000..5efc6de
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/GetRouterHealthCheckResultsCmd.java
@@ -0,0 +1,117 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.command.admin.router;
+
+import java.util.List;
+
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.DomainRouterResponse;
+import org.apache.cloudstack.api.response.RouterHealthCheckResultResponse;
+import org.apache.cloudstack.api.response.RouterHealthCheckResultsListResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.commons.lang.BooleanUtils;
+import org.apache.log4j.Logger;
+
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.network.router.VirtualRouter;
+import com.cloud.user.Account;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.VirtualMachine;
+
+@APICommand(name = GetRouterHealthCheckResultsCmd.APINAME,
+ responseObject = RouterHealthCheckResultsListResponse.class,
+ description = "Starts a router.",
+ entityType = {VirtualMachine.class},
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = false,
+ since = "4.14.0")
+public class GetRouterHealthCheckResultsCmd extends BaseCmd {
+ public static final Logger s_logger = Logger.getLogger(GetRouterHealthCheckResultsCmd.class.getName());
+ public static final String APINAME = "getRouterHealthCheckResults";
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+
+ @Parameter(name = ApiConstants.ROUTER_ID, type = CommandType.UUID, entityType = DomainRouterResponse.class,
+ required = true, description = "the ID of the router")
+ private Long routerId;
+
+ @Parameter(name = ApiConstants.PERFORM_FRESH_CHECKS, type = CommandType.BOOLEAN, description = "if true is passed for this parameter, " +
+ "health checks are performed on the fly. Else last performed checks data is fetched")
+ private Boolean performFreshChecks;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public Long getRouterId() {
+ return routerId;
+ }
+
+ public boolean shouldPerformFreshChecks() {
+ return BooleanUtils.isTrue(performFreshChecks);
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ VirtualRouter router = _entityMgr.findById(VirtualRouter.class, getRouterId());
+ if (router != null) {
+ return router.getAccountId();
+ }
+
+ return Account.ACCOUNT_ID_SYSTEM;
+ }
+
+ @Override
+ public void execute() throws ResourceUnavailableException, InvalidParameterValueException, ServerApiException {
+ CallContext.current().setEventDetails("Router Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getRouterId()));
+ VirtualRouter router = _routerService.findRouter(getRouterId());
+ if (router == null || router.getRole() != VirtualRouter.Role.VIRTUAL_ROUTER) {
+ throw new InvalidParameterValueException("Can't find router by routerId");
+ }
+
+ try {
+ List<RouterHealthCheckResultResponse> healthChecks = _queryService.listRouterHealthChecks(this);
+ RouterHealthCheckResultsListResponse routerResponse = new RouterHealthCheckResultsListResponse();
+ routerResponse.setRouterId(router.getUuid());
+ routerResponse.setHealthChecks(healthChecks);
+ routerResponse.setObjectName("routerhealthchecks");
+ routerResponse.setResponseName(getCommandName());
+ setResponseObject(routerResponse);
+ } catch (CloudRuntimeException ex){
+ ex.printStackTrace();
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to execute command due to exception: " + ex.getLocalizedMessage());
+ }
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java
index 121fc5b..4fabcf5 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java
@@ -16,6 +16,7 @@
// under the License.
package org.apache.cloudstack.api.command.admin.router;
+import org.apache.commons.lang.BooleanUtils;
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
@@ -80,6 +81,10 @@
@Parameter(name = ApiConstants.VERSION, type = CommandType.STRING, description = "list virtual router elements by version")
private String version;
+ @Parameter(name = ApiConstants.FETCH_ROUTER_HEALTH_CHECK_RESULTS, type = CommandType.BOOLEAN, since = "4.14",
+ description = "if true is passed for this parameter, also fetch last executed health check results for the router. Default is false")
+ private Boolean fetchHealthCheckResults;
+
/////////////////////////////////////////////////////
/////////////////// Accessors ///////////////////////
/////////////////////////////////////////////////////
@@ -132,6 +137,11 @@
return Role.VIRTUAL_ROUTER.toString();
}
+ public boolean shouldFetchHealthCheckResults() {
+ return BooleanUtils.isTrue(fetchHealthCheckResults);
+ }
+
+
/////////////////////////////////////////////////////
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/template/CopyTemplateCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/CopyTemplateCmdByAdmin.java
index e0c798c..75061ab 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/template/CopyTemplateCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/CopyTemplateCmdByAdmin.java
@@ -16,58 +16,12 @@
// under the License.
package org.apache.cloudstack.api.command.admin.template;
-import java.util.List;
-
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.command.user.template.CopyTemplateCmd;
import org.apache.cloudstack.api.response.TemplateResponse;
-import org.apache.cloudstack.context.CallContext;
-
-import com.cloud.exception.ResourceAllocationException;
-import com.cloud.exception.StorageUnavailableException;
-import com.cloud.template.VirtualMachineTemplate;
@APICommand(name = "copyTemplate", description = "Copies a template from one zone to another.", responseObject = TemplateResponse.class, responseView = ResponseView.Full,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class CopyTemplateCmdByAdmin extends CopyTemplateCmd {
- public static final Logger s_logger = Logger.getLogger(CopyTemplateCmdByAdmin.class.getName());
-
- @Override
- public void execute() throws ResourceAllocationException{
- try {
- if (destZoneId == null && (destZoneIds == null || destZoneIds.size() == 0))
- throw new ServerApiException(ApiErrorCode.PARAM_ERROR,
- "Either destzoneid or destzoneids parameters have to be specified.");
-
- if (destZoneId != null && destZoneIds != null && destZoneIds.size() != 0)
- throw new ServerApiException(ApiErrorCode.PARAM_ERROR,
- "Both destzoneid and destzoneids cannot be specified at the same time.");
-
- CallContext.current().setEventDetails(getEventDescription());
- VirtualMachineTemplate template = _templateService.copyTemplate(this);
-
- if (template != null){
- List<TemplateResponse> listResponse = _responseGenerator.createTemplateResponses(ResponseView.Full, template,
- getDestinationZoneIds(), false);
- TemplateResponse response = new TemplateResponse();
- if (listResponse != null && !listResponse.isEmpty()) {
- response = listResponse.get(0);
- }
-
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to copy template");
- }
- } catch (StorageUnavailableException ex) {
- s_logger.warn("Exception: ", ex);
- throw new ServerApiException(ApiErrorCode.RESOURCE_UNAVAILABLE_ERROR, ex.getMessage());
- }
- }
-}
+public class CopyTemplateCmdByAdmin extends CopyTemplateCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/template/CreateTemplateCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/CreateTemplateCmdByAdmin.java
index 865bc15..1260949 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/template/CreateTemplateCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/CreateTemplateCmdByAdmin.java
@@ -16,50 +16,13 @@
// under the License.
package org.apache.cloudstack.api.command.admin.template;
-import java.util.List;
-
-import com.cloud.storage.Snapshot;
-import com.cloud.storage.Volume;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.template.CreateTemplateCmd;
import org.apache.cloudstack.api.response.TemplateResponse;
-import org.apache.cloudstack.context.CallContext;
-
-import com.cloud.template.VirtualMachineTemplate;
@APICommand(name = "createTemplate", responseObject = TemplateResponse.class, description = "Creates a template of a virtual machine. " + "The virtual machine must be in a STOPPED state. "
+ "A template created from this command is automatically designated as a private template visible to the account that created it.", responseView = ResponseView.Full,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class CreateTemplateCmdByAdmin extends CreateTemplateCmd {
- public static final Logger s_logger = Logger.getLogger(CreateTemplateCmdByAdmin.class.getName());
-
- @Override
- public void execute() {
- CallContext.current().setEventDetails("Template Id: " + getEntityUuid()+((getSnapshotId() == null) ? " from volume Id: " + this._uuidMgr.getUuid(Volume.class, getVolumeId()) : " from snapshot Id: " + this._uuidMgr.getUuid(Snapshot.class, getSnapshotId())));
- VirtualMachineTemplate template = null;
- template = _templateService.createPrivateTemplate(this);
-
- if (template != null){
- List<TemplateResponse> templateResponses;
- if (isBareMetal()) {
- templateResponses = _responseGenerator.createTemplateResponses(ResponseView.Full, template.getId(), vmId);
- } else {
- templateResponses = _responseGenerator.createTemplateResponses(ResponseView.Full, template.getId(), snapshotId, volumeId, false);
- }
- TemplateResponse response = new TemplateResponse();
- if (templateResponses != null && !templateResponses.isEmpty()) {
- response = templateResponses.get(0);
- }
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create private template");
- }
-
- }
-}
+public class CreateTemplateCmdByAdmin extends CreateTemplateCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/template/ListTemplatePermissionsCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/ListTemplatePermissionsCmdByAdmin.java
index 08e2ee8..ae0e220 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/template/ListTemplatePermissionsCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/ListTemplatePermissionsCmdByAdmin.java
@@ -18,17 +18,11 @@
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.template.ListTemplatePermissionsCmd;
import org.apache.cloudstack.api.response.TemplatePermissionsResponse;
@APICommand(name = "listTemplatePermissions", description = "List template visibility and all accounts that have permissions to view this template.", responseObject = TemplatePermissionsResponse.class, responseView = ResponseView.Full,
requestHasSensitiveInfo = false,
responseHasSensitiveInfo = false)
-public class ListTemplatePermissionsCmdByAdmin extends ListTemplatePermissionsCmd {
-
- @Override
- public void execute() {
- executeWithView(ResponseView.Full);
- }
-
-}
+public class ListTemplatePermissionsCmdByAdmin extends ListTemplatePermissionsCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/template/ListTemplatesCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/ListTemplatesCmdByAdmin.java
index 1469fe2..2f57783 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/template/ListTemplatesCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/ListTemplatesCmdByAdmin.java
@@ -18,6 +18,7 @@
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.template.ListTemplatesCmd;
import org.apache.cloudstack.api.response.TemplateResponse;
@@ -25,6 +26,6 @@
@APICommand(name = "listTemplates", description = "List all public, private, and privileged templates.", responseObject = TemplateResponse.class, entityType = {VirtualMachineTemplate.class}, responseView = ResponseView.Full,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class ListTemplatesCmdByAdmin extends ListTemplatesCmd {
+public class ListTemplatesCmdByAdmin extends ListTemplatesCmd implements AdminCmd {
}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/template/RegisterTemplateCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/RegisterTemplateCmdByAdmin.java
index ba4772b..2859375 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/template/RegisterTemplateCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/RegisterTemplateCmdByAdmin.java
@@ -16,46 +16,11 @@
// under the License.
package org.apache.cloudstack.api.command.admin.template;
-import java.net.URISyntaxException;
-import java.util.List;
-
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.command.user.template.RegisterTemplateCmd;
-import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.TemplateResponse;
-import com.cloud.exception.ResourceAllocationException;
-import com.cloud.template.VirtualMachineTemplate;
-
@APICommand(name = "registerTemplate", description = "Registers an existing template into the CloudStack cloud.", responseObject = TemplateResponse.class, responseView = ResponseView.Full,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class RegisterTemplateCmdByAdmin extends RegisterTemplateCmd {
- public static final Logger s_logger = Logger.getLogger(RegisterTemplateCmdByAdmin.class.getName());
-
- @Override
- public void execute() throws ResourceAllocationException{
- try {
- validateParameters();
-
- VirtualMachineTemplate template = _templateService.registerTemplate(this);
- if (template != null){
- ListResponse<TemplateResponse> response = new ListResponse<TemplateResponse>();
- List<TemplateResponse> templateResponses = _responseGenerator.createTemplateResponses(ResponseView.Full, template,
- zoneIds, false);
- response.setResponses(templateResponses);
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to register template");
- }
- } catch (URISyntaxException ex1) {
- s_logger.info(ex1);
- throw new ServerApiException(ApiErrorCode.PARAM_ERROR, ex1.getMessage());
- }
- }
-}
+public class RegisterTemplateCmdByAdmin extends RegisterTemplateCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/template/UpdateTemplateCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/UpdateTemplateCmdByAdmin.java
index 94f8ff2..09591c8 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/template/UpdateTemplateCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/UpdateTemplateCmdByAdmin.java
@@ -16,33 +16,12 @@
// under the License.
package org.apache.cloudstack.api.command.admin.template;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.template.UpdateTemplateCmd;
import org.apache.cloudstack.api.response.TemplateResponse;
-import com.cloud.template.VirtualMachineTemplate;
-
@APICommand(name = "updateTemplate", description = "Updates attributes of a template.", responseObject = TemplateResponse.class, responseView = ResponseView.Full,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class UpdateTemplateCmdByAdmin extends UpdateTemplateCmd {
- public static final Logger s_logger = Logger.getLogger(UpdateTemplateCmdByAdmin.class.getName());
-
- @Override
- public void execute(){
- VirtualMachineTemplate result = _templateService.updateTemplate(this);
- if (result != null) {
- TemplateResponse response = _responseGenerator.createTemplateUpdateResponse(ResponseView.Full, result);
- response.setObjectName("template");
- response.setTemplateType(result.getTemplateType().toString());//Template can be either USER or ROUTING type
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update template");
- }
- }
-}
+public class UpdateTemplateCmdByAdmin extends UpdateTemplateCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AddNicToVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AddNicToVMCmdByAdmin.java
index da0a087..7a8c409 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AddNicToVMCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AddNicToVMCmdByAdmin.java
@@ -16,43 +16,15 @@
// under the License.
package org.apache.cloudstack.api.command.admin.vm;
-import java.util.ArrayList;
-import java.util.EnumSet;
-
-import com.cloud.network.Network;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiConstants.VMDetails;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.vm.AddNicToVMCmd;
import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.cloudstack.context.CallContext;
-import com.cloud.uservm.UserVm;
import com.cloud.vm.VirtualMachine;
@APICommand(name = "addNicToVirtualMachine", description = "Adds VM to specified network by creating a NIC", responseObject = UserVmResponse.class, responseView = ResponseView.Full, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class AddNicToVMCmdByAdmin extends AddNicToVMCmd {
- public static final Logger s_logger = Logger.getLogger(AddNicToVMCmdByAdmin.class);
-
- @Override
- public void execute(){
- CallContext.current().setEventDetails("Vm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getVmId()) + " Network Id: " + this._uuidMgr.getUuid(Network.class, getNetworkId()));
- UserVm result = _userVmService.addNicToVirtualMachine(this);
- ArrayList<VMDetails> dc = new ArrayList<VMDetails>();
- dc.add(VMDetails.valueOf("nics"));
- EnumSet<VMDetails> details = EnumSet.copyOf(dc);
- if (result != null){
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Full, "virtualmachine", details, result).get(0);
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to add NIC to vm. Refer to server logs for details.");
- }
- }
-}
+public class AddNicToVMCmdByAdmin extends AddNicToVMCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/DeployVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/DeployVMCmdByAdmin.java
index b94fc0c..acdc0e0 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/DeployVMCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/DeployVMCmdByAdmin.java
@@ -23,26 +23,20 @@
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.vm.DeployVMCmd;
import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.cloudstack.context.CallContext;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.InsufficientServerCapacityException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.uservm.UserVm;
import com.cloud.vm.VirtualMachine;
@APICommand(name = "deployVirtualMachine", description = "Creates and automatically starts a virtual machine based on a service offering, disk offering, and template.", responseObject = UserVmResponse.class, responseView = ResponseView.Full, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class DeployVMCmdByAdmin extends DeployVMCmd {
+public class DeployVMCmdByAdmin extends DeployVMCmd implements AdminCmd {
public static final Logger s_logger = Logger.getLogger(DeployVMCmdByAdmin.class.getName());
+
@Parameter(name = ApiConstants.POD_ID, type = CommandType.UUID, entityType = PodResponse.class, description = "destination Pod ID to deploy the VM to - parameter available for root admin only", since = "4.13")
private Long podId;
@@ -56,43 +50,4 @@
public Long getClusterId() {
return clusterId;
}
-
- @Override
- public void execute(){
- UserVm result;
-
- if (getStartVm()) {
- try {
- CallContext.current().setEventDetails("Vm Id: " + getEntityUuid());
- result = _userVmService.startVirtualMachine(this);
- } catch (ResourceUnavailableException ex) {
- s_logger.warn("Exception: ", ex);
- throw new ServerApiException(ApiErrorCode.RESOURCE_UNAVAILABLE_ERROR, ex.getMessage());
- } catch (ConcurrentOperationException ex) {
- s_logger.warn("Exception: ", ex);
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, ex.getMessage());
- } catch (InsufficientCapacityException ex) {
- StringBuilder message = new StringBuilder(ex.getMessage());
- if (ex instanceof InsufficientServerCapacityException) {
- if(((InsufficientServerCapacityException)ex).isAffinityApplied()){
- message.append(", Please check the affinity groups provided, there may not be sufficient capacity to follow them");
- }
- }
- s_logger.info(ex);
- s_logger.info(message.toString(), ex);
- throw new ServerApiException(ApiErrorCode.INSUFFICIENT_CAPACITY_ERROR, message.toString());
- }
- } else {
- result = _userVmService.getUserVm(getEntityId());
- }
-
- if (result != null) {
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Full, "virtualmachine", result).get(0);
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to deploy vm");
- }
- }
-
}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/DestroyVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/DestroyVMCmdByAdmin.java
index bb59a17..08a1364 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/DestroyVMCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/DestroyVMCmdByAdmin.java
@@ -16,45 +16,15 @@
// under the License.
package org.apache.cloudstack.api.command.admin.vm;
-import java.util.List;
-
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.vm.DestroyVMCmd;
import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.cloudstack.context.CallContext;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.uservm.UserVm;
import com.cloud.vm.VirtualMachine;
@APICommand(name = "destroyVirtualMachine", description = "Destroys a virtual machine. Once destroyed, only the administrator can recover it.", responseObject = UserVmResponse.class, responseView = ResponseView.Full, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false,
responseHasSensitiveInfo = true)
-public class DestroyVMCmdByAdmin extends DestroyVMCmd {
- public static final Logger s_logger = Logger.getLogger(DestroyVMCmdByAdmin.class.getName());
-
-
- @Override
- public void execute() throws ResourceUnavailableException, ConcurrentOperationException{
- CallContext.current().setEventDetails("Vm Id: "+this._uuidMgr.getUuid(VirtualMachine.class, getId()));
- UserVm result = _userVmService.destroyVm(this);
-
- UserVmResponse response = new UserVmResponse();
- if (result != null) {
- List<UserVmResponse> responses = _responseGenerator.createUserVmResponse(ResponseView.Full, "virtualmachine", result);
- if (responses != null && !responses.isEmpty()) {
- response = responses.get(0);
- }
- response.setResponseName("virtualmachine");
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to destroy vm");
- }
- }
-}
+public class DestroyVMCmdByAdmin extends DestroyVMCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ImportUnmanagedInstanceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ImportUnmanagedInstanceCmd.java
new file mode 100644
index 0000000..4b367f8
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ImportUnmanagedInstanceCmd.java
@@ -0,0 +1,300 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.command.admin.vm;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.ClusterResponse;
+import org.apache.cloudstack.api.response.DomainResponse;
+import org.apache.cloudstack.api.response.ProjectResponse;
+import org.apache.cloudstack.api.response.ServiceOfferingResponse;
+import org.apache.cloudstack.api.response.TemplateResponse;
+import org.apache.cloudstack.api.response.UserVmResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.vm.VmImportService;
+import org.apache.commons.collections.MapUtils;
+import org.apache.log4j.Logger;
+
+import com.cloud.event.EventTypes;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.NetworkRuleConflictException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.network.Network;
+import com.cloud.offering.DiskOffering;
+import com.cloud.user.Account;
+import com.cloud.utils.net.NetUtils;
+import com.cloud.vm.VmDetailConstants;
+import com.google.common.base.Strings;
+
+@APICommand(name = ImportUnmanagedInstanceCmd.API_NAME,
+ description = "Import unmanaged virtual machine from a given cluster.",
+ responseObject = UserVmResponse.class,
+ responseView = ResponseObject.ResponseView.Full,
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = true,
+ authorized = {RoleType.Admin},
+ since = "4.14.0")
+public class ImportUnmanagedInstanceCmd extends BaseAsyncCmd {
+ public static final Logger LOGGER = Logger.getLogger(ImportUnmanagedInstanceCmd.class);
+ public static final String API_NAME = "importUnmanagedInstance";
+
+ @Inject
+ public VmImportService vmImportService;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+
+ @Parameter(name = ApiConstants.CLUSTER_ID,
+ type = CommandType.UUID,
+ entityType = ClusterResponse.class,
+ required = true,
+ description = "the cluster ID")
+ private Long clusterId;
+
+ @Parameter(name = ApiConstants.NAME,
+ type = CommandType.STRING,
+ required = true,
+ description = "the hypervisor name of the instance")
+ private String name;
+
+ @Parameter(name = ApiConstants.DISPLAY_NAME,
+ type = CommandType.STRING,
+ description = "the display name of the instance")
+ private String displayName;
+
+ @Parameter(name = ApiConstants.HOST_NAME,
+ type = CommandType.STRING,
+ description = "the host name of the instance")
+ private String hostName;
+
+ @Parameter(name = ApiConstants.ACCOUNT,
+ type = CommandType.STRING,
+ description = "an optional account for the virtual machine. Must be used with domainId.")
+ private String accountName;
+
+ @Parameter(name = ApiConstants.DOMAIN_ID,
+ type = CommandType.UUID,
+ entityType = DomainResponse.class,
+ description = "import instance to the domain specified")
+ private Long domainId;
+
+ @Parameter(name = ApiConstants.PROJECT_ID,
+ type = CommandType.UUID,
+ entityType = ProjectResponse.class,
+ description = "import instance for the project")
+ private Long projectId;
+
+ @Parameter(name = ApiConstants.TEMPLATE_ID,
+ type = CommandType.UUID,
+ entityType = TemplateResponse.class,
+ description = "the ID of the template for the virtual machine")
+ private Long templateId;
+
+ @Parameter(name = ApiConstants.SERVICE_OFFERING_ID,
+ type = CommandType.UUID,
+ entityType = ServiceOfferingResponse.class,
+ required = true,
+ description = "the ID of the service offering for the virtual machine")
+ private Long serviceOfferingId;
+
+ @Parameter(name = ApiConstants.NIC_NETWORK_LIST,
+ type = CommandType.MAP,
+ description = "VM nic to network id mapping using keys nic and network")
+ private Map nicNetworkList;
+
+ @Parameter(name = ApiConstants.NIC_IP_ADDRESS_LIST,
+ type = CommandType.MAP,
+ description = "VM nic to ip address mapping using keys nic, ip4Address")
+ private Map nicIpAddressList;
+
+ @Parameter(name = ApiConstants.DATADISK_OFFERING_LIST,
+ type = CommandType.MAP,
+ description = "datadisk template to disk-offering mapping using keys disk and diskOffering")
+ private Map dataDiskToDiskOfferingList;
+
+ @Parameter(name = ApiConstants.DETAILS,
+ type = CommandType.MAP,
+ description = "used to specify the custom parameters.")
+ private Map<String, String> details;
+
+ @Parameter(name = ApiConstants.MIGRATE_ALLOWED,
+ type = CommandType.BOOLEAN,
+ description = "vm and its volumes are allowed to migrate to different host/pool when offerings passed are incompatible with current host/pool")
+ private Boolean migrateAllowed;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public Long getClusterId() {
+ return clusterId;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getDisplayName() {
+ return displayName;
+ }
+
+ public String getHostName() {
+ return hostName;
+ }
+
+ public String getAccountName() {
+ return accountName;
+ }
+
+ public Long getDomainId() {
+ return domainId;
+ }
+
+ public Long getTemplateId() {
+ return templateId;
+ }
+
+ public Long getProjectId() {
+ return projectId;
+ }
+
+ public Long getServiceOfferingId() {
+ return serviceOfferingId;
+ }
+
+ public Map<String, Long> getNicNetworkList() {
+ Map<String, Long> nicNetworkMap = new HashMap<>();
+ if (MapUtils.isNotEmpty(nicNetworkList)) {
+ for (Map<String, String> entry : (Collection<Map<String, String>>)nicNetworkList.values()) {
+ String nic = entry.get(VmDetailConstants.NIC);
+ String networkUuid = entry.get(VmDetailConstants.NETWORK);
+ if (Strings.isNullOrEmpty(nic) || Strings.isNullOrEmpty(networkUuid) || _entityMgr.findByUuid(Network.class, networkUuid) == null) {
+ throw new InvalidParameterValueException(String.format("Network ID: %s for NIC ID: %s is invalid", networkUuid, nic));
+ }
+ nicNetworkMap.put(nic, _entityMgr.findByUuid(Network.class, networkUuid).getId());
+ }
+ }
+ return nicNetworkMap;
+ }
+
+ public Map<String, Network.IpAddresses> getNicIpAddressList() {
+ Map<String, Network.IpAddresses> nicIpAddressMap = new HashMap<>();
+ if (MapUtils.isNotEmpty(nicIpAddressList)) {
+ for (Map<String, String> entry : (Collection<Map<String, String>>)nicIpAddressList.values()) {
+ String nic = entry.get(VmDetailConstants.NIC);
+ String ipAddress = Strings.emptyToNull(entry.get(VmDetailConstants.IP4_ADDRESS));
+ if (Strings.isNullOrEmpty(nic)) {
+ throw new InvalidParameterValueException(String.format("NIC ID: '%s' is invalid for IP address mapping", nic));
+ }
+ if (Strings.isNullOrEmpty(ipAddress)) {
+ throw new InvalidParameterValueException(String.format("IP address '%s' for NIC ID: %s is invalid", ipAddress, nic));
+ }
+ if (!Strings.isNullOrEmpty(ipAddress) && !ipAddress.equals("auto") && !NetUtils.isValidIp4(ipAddress)) {
+ throw new InvalidParameterValueException(String.format("IP address '%s' for NIC ID: %s is invalid", ipAddress, nic));
+ }
+ Network.IpAddresses ipAddresses = new Network.IpAddresses(ipAddress, null);
+ nicIpAddressMap.put(nic, ipAddresses);
+ }
+ }
+ return nicIpAddressMap;
+ }
+
+ public Map<String, Long> getDataDiskToDiskOfferingList() {
+ Map<String, Long> dataDiskToDiskOfferingMap = new HashMap<>();
+ if (MapUtils.isNotEmpty(dataDiskToDiskOfferingList)) {
+ for (Map<String, String> entry : (Collection<Map<String, String>>)dataDiskToDiskOfferingList.values()) {
+ String nic = entry.get(VmDetailConstants.DISK);
+ String offeringUuid = entry.get(VmDetailConstants.DISK_OFFERING);
+ if (Strings.isNullOrEmpty(nic) || Strings.isNullOrEmpty(offeringUuid) || _entityMgr.findByUuid(DiskOffering.class, offeringUuid) == null) {
+ throw new InvalidParameterValueException(String.format("Disk offering ID: %s for disk ID: %s is invalid", offeringUuid, nic));
+ }
+ dataDiskToDiskOfferingMap.put(nic, _entityMgr.findByUuid(DiskOffering.class, offeringUuid).getId());
+ }
+ }
+ return dataDiskToDiskOfferingMap;
+ }
+
+ public Map<String, String> getDetails() {
+ if (MapUtils.isEmpty(details)) {
+ return new HashMap<String, String>();
+ }
+
+ Collection<String> paramsCollection = details.values();
+ Map<String, String> params = (Map<String, String>) (paramsCollection.toArray())[0];
+ return params;
+ }
+
+ public Boolean getMigrateAllowed() {
+ return migrateAllowed == Boolean.TRUE;
+ }
+
+ @Override
+ public String getEventType() {
+ return EventTypes.EVENT_VM_IMPORT;
+ }
+
+ @Override
+ public String getEventDescription() {
+ return "Importing unmanaged VM";
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ @Override
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException {
+ UserVmResponse response = vmImportService.importUnmanagedInstance(this);
+ response.setResponseName(getCommandName());
+ setResponseObject(response);
+ }
+
+ @Override
+ public String getCommandName() {
+ return API_NAME.toLowerCase() + BaseAsyncCmd.RESPONSE_SUFFIX;
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ Long accountId = _accountService.finalyzeAccountId(accountName, domainId, projectId, true);
+ if (accountId == null) {
+ Account account = CallContext.current().getCallingAccount();
+ if (account != null) {
+ accountId = account.getId();
+ } else {
+ accountId = Account.ACCOUNT_ID_SYSTEM;
+ }
+ }
+ return accountId;
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ListUnmanagedInstancesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ListUnmanagedInstancesCmd.java
new file mode 100644
index 0000000..a991ef4
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ListUnmanagedInstancesCmd.java
@@ -0,0 +1,113 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.command.admin.vm;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.BaseListCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.ClusterResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.UnmanagedInstanceResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.vm.UnmanagedInstanceTO;
+import org.apache.cloudstack.vm.VmImportService;
+import org.apache.log4j.Logger;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.NetworkRuleConflictException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.user.Account;
+
+@APICommand(name = ListUnmanagedInstancesCmd.API_NAME,
+ description = "Lists unmanaged virtual machines for a given cluster.",
+ responseObject = UnmanagedInstanceResponse.class,
+ responseView = ResponseObject.ResponseView.Full,
+ entityType = {UnmanagedInstanceTO.class},
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = true,
+ authorized = {RoleType.Admin},
+ since = "4.14.0")
+public class ListUnmanagedInstancesCmd extends BaseListCmd {
+ public static final Logger LOGGER = Logger.getLogger(ListUnmanagedInstancesCmd.class.getName());
+ public static final String API_NAME = "listUnmanagedInstances";
+
+ @Inject
+ public VmImportService vmImportService;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+
+ @Parameter(name = ApiConstants.CLUSTER_ID,
+ type = CommandType.UUID,
+ entityType = ClusterResponse.class,
+ required = true,
+ description = "the cluster ID")
+ private Long clusterId;
+
+ @Parameter(name = ApiConstants.NAME,
+ type = CommandType.STRING,
+ description = "the hypervisor name of the instance")
+ private String name;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public Long getClusterId() {
+ return clusterId;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ @Override
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException {
+ ListResponse<UnmanagedInstanceResponse> response = vmImportService.listUnmanagedInstances(this);
+ response.setResponseName(getCommandName());
+ setResponseObject(response);
+ }
+
+ @Override
+ public String getCommandName() {
+ return API_NAME.toLowerCase() + BaseAsyncCmd.RESPONSE_SUFFIX;
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ Account account = CallContext.current().getCallingAccount();
+ if (account != null) {
+ return account.getId();
+ }
+ return Account.ACCOUNT_ID_SYSTEM;
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ListVMsCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ListVMsCmdByAdmin.java
index f41e196..fbcedaa 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ListVMsCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ListVMsCmdByAdmin.java
@@ -22,6 +22,7 @@
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.vm.ListVMsCmd;
import org.apache.cloudstack.api.response.HostResponse;
import org.apache.cloudstack.api.response.PodResponse;
@@ -32,7 +33,7 @@
@APICommand(name = "listVirtualMachines", description = "List the virtual machines owned by the account.", responseObject = UserVmResponse.class, responseView = ResponseView.Full, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class ListVMsCmdByAdmin extends ListVMsCmd {
+public class ListVMsCmdByAdmin extends ListVMsCmd implements AdminCmd {
public static final Logger s_logger = Logger.getLogger(ListVMsCmdByAdmin.class.getName());
/////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RebootVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RebootVMCmdByAdmin.java
index c32f9ac..5f6a7ab 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RebootVMCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RebootVMCmdByAdmin.java
@@ -16,38 +16,14 @@
// under the License.
package org.apache.cloudstack.api.command.admin.vm;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.vm.RebootVMCmd;
import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.cloudstack.context.CallContext;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.uservm.UserVm;
import com.cloud.vm.VirtualMachine;
@APICommand(name = "rebootVirtualMachine", description = "Reboots a virtual machine.", responseObject = UserVmResponse.class, responseView = ResponseView.Full, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class RebootVMCmdByAdmin extends RebootVMCmd {
- public static final Logger s_logger = Logger.getLogger(RebootVMCmdByAdmin.class.getName());
-
- @Override
- public void execute() throws ResourceUnavailableException, InsufficientCapacityException{
- CallContext.current().setEventDetails("Vm Id: "+this._uuidMgr.getUuid(VirtualMachine.class, getId()));
- UserVm result;
- result = _userVmService.rebootVirtualMachine(this);
-
- if (result !=null){
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Full, "virtualmachine", result).get(0);
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to reboot vm instance");
- }
- }
-}
+public class RebootVMCmdByAdmin extends RebootVMCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RemoveNicFromVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RemoveNicFromVMCmdByAdmin.java
index 08c56df..89726af 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RemoveNicFromVMCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RemoveNicFromVMCmdByAdmin.java
@@ -16,42 +16,14 @@
// under the License.
package org.apache.cloudstack.api.command.admin.vm;
-import java.util.ArrayList;
-import java.util.EnumSet;
-
-import com.cloud.vm.Nic;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiConstants.VMDetails;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.vm.RemoveNicFromVMCmd;
import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.cloudstack.context.CallContext;
-import com.cloud.uservm.UserVm;
import com.cloud.vm.VirtualMachine;
@APICommand(name = "removeNicFromVirtualMachine", description = "Removes VM from specified network by deleting a NIC", responseObject = UserVmResponse.class, responseView = ResponseView.Full, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class RemoveNicFromVMCmdByAdmin extends RemoveNicFromVMCmd {
- public static final Logger s_logger = Logger.getLogger(RemoveNicFromVMCmdByAdmin.class);
-
- @Override
- public void execute(){
- CallContext.current().setEventDetails("Vm Id: "+this._uuidMgr.getUuid(VirtualMachine.class, getVmId()) + " Nic Id: " + this._uuidMgr.getUuid(Nic.class, getNicId()));
- UserVm result = _userVmService.removeNicFromVirtualMachine(this);
- ArrayList<VMDetails> dc = new ArrayList<VMDetails>();
- dc.add(VMDetails.valueOf("nics"));
- EnumSet<VMDetails> details = EnumSet.copyOf(dc);
- if (result != null){
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Full, "virtualmachine", details, result).get(0);
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to remove NIC from vm, see error log for details");
- }
- }
-}
+public class RemoveNicFromVMCmdByAdmin extends RemoveNicFromVMCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ResetVMPasswordCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ResetVMPasswordCmdByAdmin.java
index a53e61a..d7ab0c6 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ResetVMPasswordCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ResetVMPasswordCmdByAdmin.java
@@ -16,41 +16,16 @@
// under the License.
package org.apache.cloudstack.api.command.admin.vm;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.vm.ResetVMPasswordCmd;
import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.cloudstack.context.CallContext;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.uservm.UserVm;
import com.cloud.vm.VirtualMachine;
@APICommand(name = "resetPasswordForVirtualMachine", responseObject=UserVmResponse.class, description="Resets the password for virtual machine. " +
"The virtual machine must be in a \"Stopped\" state and the template must already " +
"support this feature for this command to take effect. [async]", responseView = ResponseView.Full, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class ResetVMPasswordCmdByAdmin extends ResetVMPasswordCmd {
- public static final Logger s_logger = Logger.getLogger(ResetVMPasswordCmdByAdmin.class.getName());
-
-
-
- @Override
- public void execute() throws ResourceUnavailableException, InsufficientCapacityException{
- password = _mgr.generateRandomPassword();
- CallContext.current().setEventDetails("Vm Id: "+getId());
- UserVm result = _userVmService.resetVMPassword(this, password);
- if (result != null){
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Full, "virtualmachine", result).get(0);
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to reset vm password");
- }
- }
-}
+public class ResetVMPasswordCmdByAdmin extends ResetVMPasswordCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ResetVMSSHKeyCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ResetVMSSHKeyCmdByAdmin.java
index 35c47ed..ed9cc11 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ResetVMSSHKeyCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ResetVMSSHKeyCmdByAdmin.java
@@ -17,43 +17,15 @@
package org.apache.cloudstack.api.command.admin.vm;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.vm.ResetVMSSHKeyCmd;
import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.cloudstack.context.CallContext;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.uservm.UserVm;
import com.cloud.vm.VirtualMachine;
@APICommand(name = "resetSSHKeyForVirtualMachine", responseObject = UserVmResponse.class, description = "Resets the SSH Key for virtual machine. " +
"The virtual machine must be in a \"Stopped\" state. [async]", responseView = ResponseView.Full, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class ResetVMSSHKeyCmdByAdmin extends ResetVMSSHKeyCmd {
-
- public static final Logger s_logger = Logger.getLogger(ResetVMSSHKeyCmdByAdmin.class.getName());
-
-
- @Override
- public void execute() throws ResourceUnavailableException,
- InsufficientCapacityException {
-
- CallContext.current().setEventDetails("Vm Id: " + getId());
- UserVm result = _userVmService.resetVMSSHKey(this);
-
- if (result != null) {
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Full, "virtualmachine", result).get(0);
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to reset vm SSHKey");
- }
- }
-
-}
+public class ResetVMSSHKeyCmdByAdmin extends ResetVMSSHKeyCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RestoreVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RestoreVMCmdByAdmin.java
index f607faf..b3ee398 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RestoreVMCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RestoreVMCmdByAdmin.java
@@ -16,42 +16,15 @@
// under the License.
package org.apache.cloudstack.api.command.admin.vm;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.vm.RestoreVMCmd;
import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.cloudstack.context.CallContext;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.ResourceAllocationException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.uservm.UserVm;
import com.cloud.vm.VirtualMachine;
@APICommand(name = "restoreVirtualMachine", description = "Restore a VM to original template/ISO or new template/ISO", responseObject = UserVmResponse.class, since = "3.0.0", responseView = ResponseView.Full, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false,
responseHasSensitiveInfo = true)
-public class RestoreVMCmdByAdmin extends RestoreVMCmd {
- public static final Logger s_logger = Logger.getLogger(RestoreVMCmdByAdmin.class);
-
- @Override
- public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
- ResourceAllocationException {
- UserVm result;
- CallContext.current().setEventDetails("Vm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getVmId()));
- result = _userVmService.restoreVM(this);
- if (result != null) {
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Full, "virtualmachine", result).get(0);
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to restore vm " + getVmId());
- }
- }
-
-}
+public class RestoreVMCmdByAdmin extends RestoreVMCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ScaleVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ScaleVMCmdByAdmin.java
index f434fdf..869b45b 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ScaleVMCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ScaleVMCmdByAdmin.java
@@ -16,56 +16,15 @@
// under the License.
package org.apache.cloudstack.api.command.admin.vm;
-import java.util.List;
-
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.vm.ScaleVMCmd;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.cloudstack.api.response.UserVmResponse;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.ManagementServerException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.exception.VirtualMachineMigrationException;
-import com.cloud.uservm.UserVm;
import com.cloud.vm.VirtualMachine;
@APICommand(name = "scaleVirtualMachine", description = "Scales the virtual machine to a new service offering.", responseObject = SuccessResponse.class, responseView = ResponseView.Full, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class ScaleVMCmdByAdmin extends ScaleVMCmd {
- public static final Logger s_logger = Logger.getLogger(ScaleVMCmdByAdmin.class.getName());
-
- @Override
- public void execute(){
- UserVm result;
- try {
- result = _userVmService.upgradeVirtualMachine(this);
- } catch (ResourceUnavailableException ex) {
- s_logger.warn("Exception: ", ex);
- throw new ServerApiException(ApiErrorCode.RESOURCE_UNAVAILABLE_ERROR, ex.getMessage());
- } catch (ConcurrentOperationException ex) {
- s_logger.warn("Exception: ", ex);
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, ex.getMessage());
- } catch (ManagementServerException ex) {
- s_logger.warn("Exception: ", ex);
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, ex.getMessage());
- } catch (VirtualMachineMigrationException ex) {
- s_logger.warn("Exception: ", ex);
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, ex.getMessage());
- }
- if (result != null){
- List<UserVmResponse> responseList = _responseGenerator.createUserVmResponse(ResponseView.Full, "virtualmachine", result);
- UserVmResponse response = responseList.get(0);
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to scale vm");
- }
- }
-}
\ No newline at end of file
+public class ScaleVMCmdByAdmin extends ScaleVMCmd implements AdminCmd {}
\ No newline at end of file
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/StartVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/StartVMCmdByAdmin.java
index 1230547..f87622c 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/StartVMCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/StartVMCmdByAdmin.java
@@ -16,67 +16,14 @@
// under the License.
package org.apache.cloudstack.api.command.admin.vm;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.vm.StartVMCmd;
import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.cloudstack.context.CallContext;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.InsufficientServerCapacityException;
-import com.cloud.exception.ResourceAllocationException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.exception.StorageUnavailableException;
-import com.cloud.uservm.UserVm;
-import com.cloud.utils.exception.ExecutionException;
import com.cloud.vm.VirtualMachine;
@APICommand(name = "startVirtualMachine", responseObject = UserVmResponse.class, description = "Starts a virtual machine.", responseView = ResponseView.Full, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class StartVMCmdByAdmin extends StartVMCmd {
- public static final Logger s_logger = Logger.getLogger(StartVMCmdByAdmin.class.getName());
-
-
- @Override
- public void execute() throws ResourceUnavailableException, ResourceAllocationException {
- try {
- CallContext.current().setEventDetails("Vm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId()));
-
- UserVm result ;
- result = _userVmService.startVirtualMachine(this);
-
- if (result != null) {
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Full, "virtualmachine", result).get(0);
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to start a vm");
- }
- } catch (ConcurrentOperationException ex) {
- s_logger.warn("Exception: ", ex);
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, ex.getMessage());
- } catch (StorageUnavailableException ex) {
- s_logger.warn("Exception: ", ex);
- throw new ServerApiException(ApiErrorCode.RESOURCE_UNAVAILABLE_ERROR, ex.getMessage());
- } catch (ExecutionException ex) {
- s_logger.warn("Exception: ", ex);
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, ex.getMessage());
- } catch (InsufficientCapacityException ex) {
- StringBuilder message = new StringBuilder(ex.getMessage());
- if (ex instanceof InsufficientServerCapacityException) {
- if (((InsufficientServerCapacityException) ex).isAffinityApplied()) {
- message.append(", Please check the affinity groups provided, there may not be sufficient capacity to follow them");
- }
- }
- s_logger.info(ex);
- s_logger.info(message.toString(), ex);
- throw new ServerApiException(ApiErrorCode.INSUFFICIENT_CAPACITY_ERROR, message.toString());
- }
- }
-
-}
+public class StartVMCmdByAdmin extends StartVMCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/StopVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/StopVMCmdByAdmin.java
index ca85dfa..2f7cc21 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/StopVMCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/StopVMCmdByAdmin.java
@@ -16,40 +16,14 @@
// under the License.
package org.apache.cloudstack.api.command.admin.vm;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.vm.StopVMCmd;
import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.cloudstack.context.CallContext;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.uservm.UserVm;
import com.cloud.vm.VirtualMachine;
@APICommand(name = "stopVirtualMachine", responseObject = UserVmResponse.class, description = "Stops a virtual machine.", responseView = ResponseView.Full, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class StopVMCmdByAdmin extends StopVMCmd {
- public static final Logger s_logger = Logger.getLogger(StopVMCmdByAdmin.class.getName());
-
-
-
- @Override
- public void execute() throws ServerApiException, ConcurrentOperationException {
- CallContext.current().setEventDetails("Vm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId()));
- UserVm result;
-
- result = _userVmService.stopVirtualMachine(getId(), isForced());
-
- if (result != null) {
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Full, "virtualmachine", result).get(0);
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to stop vm");
- }
- }
-}
+public class StopVMCmdByAdmin extends StopVMCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UpdateDefaultNicForVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UpdateDefaultNicForVMCmdByAdmin.java
index d666ae4..1c4dde9 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UpdateDefaultNicForVMCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UpdateDefaultNicForVMCmdByAdmin.java
@@ -16,43 +16,14 @@
// under the License.
package org.apache.cloudstack.api.command.admin.vm;
-import java.util.ArrayList;
-import java.util.EnumSet;
-
-import com.cloud.vm.Nic;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiConstants.VMDetails;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.vm.UpdateDefaultNicForVMCmd;
import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.cloudstack.context.CallContext;
-import com.cloud.uservm.UserVm;
import com.cloud.vm.VirtualMachine;
@APICommand(name = "updateDefaultNicForVirtualMachine", description = "Changes the default NIC on a VM", responseObject = UserVmResponse.class, responseView = ResponseView.Full, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class UpdateDefaultNicForVMCmdByAdmin extends UpdateDefaultNicForVMCmd {
- public static final Logger s_logger = Logger.getLogger(UpdateDefaultNicForVMCmdByAdmin.class);
-
-
- @Override
- public void execute(){
- CallContext.current().setEventDetails("Vm Id: "+this._uuidMgr.getUuid(VirtualMachine.class, getVmId()) + " Nic Id: " + this._uuidMgr.getUuid(Nic.class, getNicId()));
- UserVm result = _userVmService.updateDefaultNicForVirtualMachine(this);
- ArrayList<VMDetails> dc = new ArrayList<VMDetails>();
- dc.add(VMDetails.valueOf("nics"));
- EnumSet<VMDetails> details = EnumSet.copyOf(dc);
- if (result != null){
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Full, "virtualmachine", details, result).get(0);
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to set default nic for VM. Refer to server logs for details.");
- }
- }
-}
+public class UpdateDefaultNicForVMCmdByAdmin extends UpdateDefaultNicForVMCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UpdateVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UpdateVMCmdByAdmin.java
index 5d2b2b7..cb4bb04 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UpdateVMCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UpdateVMCmdByAdmin.java
@@ -16,19 +16,12 @@
// under the License.
package org.apache.cloudstack.api.command.admin.vm;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.vm.UpdateVMCmd;
import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.cloudstack.context.CallContext;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.uservm.UserVm;
import com.cloud.vm.VirtualMachine;
@@ -36,20 +29,4 @@
"new properties to take effect. UpdateVirtualMachine does not first check whether the VM is stopped. " +
"Therefore, stop the VM manually before issuing this call.", responseObject = UserVmResponse.class, responseView = ResponseView.Full, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class UpdateVMCmdByAdmin extends UpdateVMCmd {
- public static final Logger s_logger = Logger.getLogger(UpdateVMCmdByAdmin.class.getName());
-
- @Override
- public void execute() throws ResourceUnavailableException,
- InsufficientCapacityException, ServerApiException {
- CallContext.current().setEventDetails("Vm Id: "+this._uuidMgr.getUuid(VirtualMachine.class, getId()));
- UserVm result = _userVmService.updateVirtualMachine(this);
- if (result != null){
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Full, "virtualmachine", result).get(0);
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update vm");
- }
- }
-}
+public class UpdateVMCmdByAdmin extends UpdateVMCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UpgradeVMCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UpgradeVMCmdByAdmin.java
index 6e3261a..7291fe9 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UpgradeVMCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UpgradeVMCmdByAdmin.java
@@ -16,46 +16,16 @@
// under the License.
package org.apache.cloudstack.api.command.admin.vm;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.vm.UpgradeVMCmd;
import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.cloudstack.context.CallContext;
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.exception.ResourceAllocationException;
-import com.cloud.offering.ServiceOffering;
-import com.cloud.uservm.UserVm;
import com.cloud.vm.VirtualMachine;
@APICommand(name = "changeServiceForVirtualMachine", responseObject=UserVmResponse.class, description="Changes the service offering for a virtual machine. " +
"The virtual machine must be in a \"Stopped\" state for " +
"this command to take effect.", responseView = ResponseView.Full, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class UpgradeVMCmdByAdmin extends UpgradeVMCmd {
- public static final Logger s_logger = Logger.getLogger(UpgradeVMCmdByAdmin.class.getName());
-
-
- @Override
- public void execute() throws ResourceAllocationException{
- CallContext.current().setEventDetails("Vm Id: "+this._uuidMgr.getUuid(VirtualMachine.class, getId()));
-
- ServiceOffering serviceOffering = _entityMgr.findById(ServiceOffering.class, serviceOfferingId);
- if (serviceOffering == null) {
- throw new InvalidParameterValueException("Unable to find service offering: " + serviceOfferingId);
- }
-
- UserVm result = _userVmService.upgradeVirtualMachine(this);
- if (result != null){
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Full, "virtualmachine", result).get(0);
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to upgrade vm");
- }
- }
-}
+public class UpgradeVMCmdByAdmin extends UpgradeVMCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vmsnapshot/RevertToVMSnapshotCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vmsnapshot/RevertToVMSnapshotCmdByAdmin.java
index 47cb99b..8f28662 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vmsnapshot/RevertToVMSnapshotCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vmsnapshot/RevertToVMSnapshotCmdByAdmin.java
@@ -16,44 +16,12 @@
// under the License.
package org.apache.cloudstack.api.command.admin.vmsnapshot;
-import java.util.logging.Logger;
-
-import com.cloud.vm.snapshot.VMSnapshot;
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.vmsnapshot.RevertToVMSnapshotCmd;
import org.apache.cloudstack.api.response.UserVmResponse;
-import org.apache.cloudstack.context.CallContext;
-
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.ResourceAllocationException;
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.uservm.UserVm;
@APICommand(name = "revertToVMSnapshot", description = "Revert VM from a vmsnapshot.", responseObject = UserVmResponse.class, since = "4.2.0", responseView = ResponseView.Full,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class RevertToVMSnapshotCmdByAdmin extends RevertToVMSnapshotCmd {
- public static final Logger s_logger = Logger
- .getLogger(RevertToVMSnapshotCmdByAdmin.class.getName());
-
-
- @Override
- public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ResourceAllocationException, ConcurrentOperationException {
- CallContext.current().setEventDetails(
- "vmsnapshot id: " + this._uuidMgr.getUuid(VMSnapshot.class, getVmSnapShotId()));
- UserVm result = _vmSnapshotService.revertToSnapshot(getVmSnapShotId());
- if (result != null) {
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Full,
- "virtualmachine", result).get(0);
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR,"Failed to revert VM snapshot");
- }
- }
-
-
-}
+public class RevertToVMSnapshotCmdByAdmin extends RevertToVMSnapshotCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/AttachVolumeCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/AttachVolumeCmdByAdmin.java
index f70b410..6f31df7 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/AttachVolumeCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/AttachVolumeCmdByAdmin.java
@@ -16,34 +16,14 @@
// under the License.
package org.apache.cloudstack.api.command.admin.volume;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd;
import org.apache.cloudstack.api.response.VolumeResponse;
-import org.apache.cloudstack.context.CallContext;
-import com.cloud.storage.Volume;
import com.cloud.vm.VirtualMachine;
@APICommand(name = "attachVolume", description = "Attaches a disk volume to a virtual machine.", responseObject = VolumeResponse.class, responseView = ResponseView.Full, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class AttachVolumeCmdByAdmin extends AttachVolumeCmd {
- public static final Logger s_logger = Logger.getLogger(AttachVolumeCmdByAdmin.class.getName());
-
- @Override
- public void execute(){
- CallContext.current().setEventDetails("Volume Id: "+this._uuidMgr.getUuid(Volume.class, getId())+" VmId: "+this._uuidMgr.getUuid(VirtualMachine.class, getVirtualMachineId()));
- Volume result = _volumeService.attachVolumeToVM(this);
- if (result != null) {
- VolumeResponse response = _responseGenerator.createVolumeResponse(ResponseView.Full, result);
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to attach volume");
- }
- }
-}
+public class AttachVolumeCmdByAdmin extends AttachVolumeCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/CreateVolumeCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/CreateVolumeCmdByAdmin.java
index 1dc4721..c0dfe42 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/CreateVolumeCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/CreateVolumeCmdByAdmin.java
@@ -16,49 +16,16 @@
// under the License.
package org.apache.cloudstack.api.command.admin.volume;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.volume.CreateVolumeCmd;
import org.apache.cloudstack.api.response.VolumeResponse;
-import org.apache.cloudstack.context.CallContext;
-import com.cloud.storage.Snapshot;
import com.cloud.storage.Volume;
import com.cloud.vm.VirtualMachine;
@APICommand(name = "createVolume", responseObject = VolumeResponse.class, description = "Creates a disk volume from a disk offering. This disk volume must still be attached to a virtual machine to make use of it.", responseView = ResponseView.Full, entityType = {
Volume.class, VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class CreateVolumeCmdByAdmin extends CreateVolumeCmd {
- public static final Logger s_logger = Logger.getLogger(CreateVolumeCmdByAdmin.class.getName());
-
- @Override
- public void execute(){
- CallContext.current().setEventDetails("Volume Id: "+ getEntityUuid() + ((getSnapshotId() == null) ? "" : " from snapshot: " + this._uuidMgr.getUuid(Snapshot.class, getSnapshotId())));
- Volume volume = _volumeService.createVolume(this);
- if (volume != null) {
- VolumeResponse response = _responseGenerator.createVolumeResponse(ResponseView.Full, volume);
- //FIXME - have to be moved to ApiResponseHelper
- if (getSnapshotId() != null) {
- Snapshot snap = _entityMgr.findById(Snapshot.class, getSnapshotId());
- if (snap != null) {
- response.setSnapshotId(snap.getUuid()); // if the volume was
- // created from a
- // snapshot,
- // snapshotId will
- // be set so we pass
- // it back in the
- // response
- }
- }
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create a volume");
- }
- }
-}
+public class CreateVolumeCmdByAdmin extends CreateVolumeCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/DestroyVolumeCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/DestroyVolumeCmdByAdmin.java
new file mode 100644
index 0000000..44ce32f
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/DestroyVolumeCmdByAdmin.java
@@ -0,0 +1,54 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.command.admin.volume;
+
+import org.apache.log4j.Logger;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
+import org.apache.cloudstack.api.command.user.volume.DestroyVolumeCmd;
+import org.apache.cloudstack.api.response.VolumeResponse;
+import org.apache.cloudstack.context.CallContext;
+
+import com.cloud.storage.Volume;
+
+@APICommand(name = "destroyVolume", description = "Destroys a Volume.", responseObject = VolumeResponse.class, responseView = ResponseView.Full, entityType = {Volume.class},
+ since = "4.14.0",
+ authorized = {RoleType.Admin},
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = true)
+public class DestroyVolumeCmdByAdmin extends DestroyVolumeCmd implements AdminCmd {
+
+ public static final Logger s_logger = Logger.getLogger(DestroyVolumeCmdByAdmin.class.getName());
+
+ @Override
+ public void execute() {
+ CallContext.current().setEventDetails("Volume Id: " + getId());
+ Volume result = _volumeService.destroyVolume(getId(), CallContext.current().getCallingAccount(), getExpunge(), false);
+ if (result != null) {
+ VolumeResponse response = _responseGenerator.createVolumeResponse(ResponseView.Full, result);
+ response.setResponseName(getCommandName());
+ setResponseObject(response);
+ } else {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to destroy volume");
+ }
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/DetachVolumeCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/DetachVolumeCmdByAdmin.java
index f9d9cbd..36a183b 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/DetachVolumeCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/DetachVolumeCmdByAdmin.java
@@ -16,35 +16,14 @@
// under the License.
package org.apache.cloudstack.api.command.admin.volume;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.volume.DetachVolumeCmd;
import org.apache.cloudstack.api.response.VolumeResponse;
-import org.apache.cloudstack.context.CallContext;
-import com.cloud.storage.Volume;
import com.cloud.vm.VirtualMachine;
@APICommand(name = "detachVolume", description = "Detaches a disk volume from a virtual machine.", responseObject = VolumeResponse.class, responseView = ResponseView.Full, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class DetachVolumeCmdByAdmin extends DetachVolumeCmd {
- public static final Logger s_logger = Logger.getLogger(DetachVolumeCmdByAdmin.class.getName());
-
-
- @Override
- public void execute(){
- CallContext.current().setEventDetails(getEventDescription());
- Volume result = _volumeService.detachVolumeFromVM(this);
- if (result != null){
- VolumeResponse response = _responseGenerator.createVolumeResponse(ResponseView.Full, result);
- response.setResponseName("volume");
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to detach volume");
- }
- }
-}
+public class DetachVolumeCmdByAdmin extends DetachVolumeCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/ListVolumesCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/ListVolumesCmdByAdmin.java
index add2271..371db31 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/ListVolumesCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/ListVolumesCmdByAdmin.java
@@ -18,6 +18,7 @@
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.volume.ListVolumesCmd;
import org.apache.cloudstack.api.response.VolumeResponse;
@@ -25,6 +26,4 @@
@APICommand(name = "listVolumes", description = "Lists all volumes.", responseObject = VolumeResponse.class, responseView = ResponseView.Full, entityType = {
Volume.class}, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class ListVolumesCmdByAdmin extends ListVolumesCmd {
-
-}
+public class ListVolumesCmdByAdmin extends ListVolumesCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/MigrateVolumeCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/MigrateVolumeCmdByAdmin.java
index 1a18b95..135c8fc 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/MigrateVolumeCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/MigrateVolumeCmdByAdmin.java
@@ -17,9 +17,8 @@
package org.apache.cloudstack.api.command.admin.volume;
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.volume.MigrateVolumeCmd;
import org.apache.cloudstack.api.response.VolumeResponse;
@@ -27,18 +26,4 @@
@APICommand(name = "migrateVolume", description = "Migrate volume", responseObject = VolumeResponse.class, since = "3.0.0", responseView = ResponseView.Full, entityType = {
Volume.class}, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class MigrateVolumeCmdByAdmin extends MigrateVolumeCmd {
-
- @Override
- public void execute() {
- Volume result = _volumeService.migrateVolume(this);
- if (result != null) {
- VolumeResponse response = _responseGenerator.createVolumeResponse(ResponseView.Full, result);
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to migrate volume");
- }
- }
-
-}
+public class MigrateVolumeCmdByAdmin extends MigrateVolumeCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/RecoverVolumeCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/RecoverVolumeCmdByAdmin.java
new file mode 100644
index 0000000..f51aeec
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/RecoverVolumeCmdByAdmin.java
@@ -0,0 +1,53 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.command.admin.volume;
+
+import org.apache.log4j.Logger;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
+import org.apache.cloudstack.api.command.user.volume.RecoverVolumeCmd;
+import org.apache.cloudstack.api.response.VolumeResponse;
+import org.apache.cloudstack.context.CallContext;
+
+import com.cloud.storage.Volume;
+
+@APICommand(name = "recoverVolume", description = "Recovers a Destroy volume.", responseObject = VolumeResponse.class, responseView = ResponseView.Full, entityType = {Volume.class},
+ since = "4.14.0",
+ authorized = {RoleType.Admin},
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = true)
+public class RecoverVolumeCmdByAdmin extends RecoverVolumeCmd implements AdminCmd {
+ public static final Logger s_logger = Logger.getLogger(RecoverVolumeCmdByAdmin.class.getName());
+
+ @Override
+ public void execute() {
+ CallContext.current().setEventDetails("Volume Id: " + getId());
+ Volume result = _volumeService.recoverVolume(getId());
+ if (result != null) {
+ VolumeResponse response = _responseGenerator.createVolumeResponse(ResponseView.Full, result);
+ response.setResponseName(getCommandName());
+ setResponseObject(response);
+ } else {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to recover volume");
+ }
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/ResizeVolumeCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/ResizeVolumeCmdByAdmin.java
index 689e779..73c0984 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/ResizeVolumeCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/ResizeVolumeCmdByAdmin.java
@@ -17,40 +17,14 @@
package org.apache.cloudstack.api.command.admin.volume;
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.volume.ResizeVolumeCmd;
import org.apache.cloudstack.api.response.VolumeResponse;
-import org.apache.cloudstack.context.CallContext;
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.exception.ResourceAllocationException;
import com.cloud.storage.Volume;
@APICommand(name = "resizeVolume", description = "Resizes a volume", responseObject = VolumeResponse.class, responseView = ResponseView.Full, entityType = {Volume.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class ResizeVolumeCmdByAdmin extends ResizeVolumeCmd {
-
- @Override
- public void execute() throws ResourceAllocationException{
- Volume volume = null;
- try {
- CallContext.current().setEventDetails("Volume Id: " + this._uuidMgr.getUuid(Volume.class, getEntityId()) + " to size " + getSize() + "G");
- volume = _volumeService.resizeVolume(this);
- } catch (InvalidParameterValueException ex) {
- s_logger.info(ex.getMessage());
- throw new ServerApiException(ApiErrorCode.UNSUPPORTED_ACTION_ERROR, ex.getMessage());
- }
-
- if (volume != null) {
- VolumeResponse response = _responseGenerator.createVolumeResponse(ResponseView.Full, volume);
- //FIXME - have to be moved to ApiResponseHelper
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to resize volume");
- }
- }
-}
+public class ResizeVolumeCmdByAdmin extends ResizeVolumeCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/UpdateVolumeCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/UpdateVolumeCmdByAdmin.java
index b683435..5e0f06a 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/UpdateVolumeCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/UpdateVolumeCmdByAdmin.java
@@ -17,30 +17,13 @@
package org.apache.cloudstack.api.command.admin.volume;
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.volume.UpdateVolumeCmd;
import org.apache.cloudstack.api.response.VolumeResponse;
-import org.apache.cloudstack.context.CallContext;
import com.cloud.storage.Volume;
@APICommand(name = "updateVolume", description = "Updates the volume.", responseObject = VolumeResponse.class, responseView = ResponseView.Full, entityType = {Volume.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class UpdateVolumeCmdByAdmin extends UpdateVolumeCmd {
-
- @Override
- public void execute(){
- CallContext.current().setEventDetails("Volume Id: "+this._uuidMgr.getUuid(Volume.class, getId()));
- Volume result = _volumeService.updateVolume(getId(), getPath(), getState(), getStorageId(), getDisplayVolume(),
- getCustomId(), getEntityOwnerId(), getChainInfo());
- if (result != null) {
- VolumeResponse response = _responseGenerator.createVolumeResponse(ResponseView.Full, result);
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update volume");
- }
- }
-}
+public class UpdateVolumeCmdByAdmin extends UpdateVolumeCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/UploadVolumeCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/UploadVolumeCmdByAdmin.java
index f26e465..6140db57 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/UploadVolumeCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/volume/UploadVolumeCmdByAdmin.java
@@ -16,43 +16,14 @@
// under the License.
package org.apache.cloudstack.api.command.admin.volume;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.volume.UploadVolumeCmd;
import org.apache.cloudstack.api.response.VolumeResponse;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.NetworkRuleConflictException;
-import com.cloud.exception.ResourceAllocationException;
-import com.cloud.exception.ResourceUnavailableException;
import com.cloud.storage.Volume;
@APICommand(name = "uploadVolume", description = "Uploads a data disk.", responseObject = VolumeResponse.class, responseView = ResponseView.Full, entityType = {Volume.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class UploadVolumeCmdByAdmin extends UploadVolumeCmd {
- public static final Logger s_logger = Logger.getLogger(UploadVolumeCmdByAdmin.class.getName());
-
-
- @Override
- public void execute() throws ResourceUnavailableException,
- InsufficientCapacityException, ServerApiException,
- ConcurrentOperationException, ResourceAllocationException,
- NetworkRuleConflictException {
-
- Volume volume = _volumeService.uploadVolume(this);
- if (volume != null){
- VolumeResponse response = _responseGenerator.createVolumeResponse(ResponseView.Full, volume);
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to upload volume");
- }
- }
-
-
-}
+public class UploadVolumeCmdByAdmin extends UploadVolumeCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java
index d2a7ffb..fab1b59 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java
@@ -92,6 +92,9 @@
@Parameter(name = ApiConstants.ACL_ID, type = CommandType.UUID, entityType = NetworkACLResponse.class, required = false, description = "the ID of the network ACL")
private Long aclId;
+ @Parameter(name=ApiConstants.BYPASS_VLAN_OVERLAP_CHECK, type=CommandType.BOOLEAN, description="when true bypasses VLAN id/range overlap check during private gateway creation")
+ private Boolean bypassVlanOverlapCheck;
+
/////////////////////////////////////////////////////
/////////////////// Accessors ///////////////////////
/////////////////////////////////////////////////////
@@ -135,6 +138,13 @@
return aclId;
}
+ public Boolean getBypassVlanOverlapCheck() {
+ if (bypassVlanOverlapCheck != null) {
+ return bypassVlanOverlapCheck;
+ }
+ return false;
+ }
+
/////////////////////////////////////////////////////
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@@ -149,7 +159,7 @@
try {
result =
_vpcService.createVpcPrivateGateway(getVpcId(), getPhysicalNetworkId(), getBroadcastUri(), getStartIp(), getGateway(), getNetmask(), getEntityOwnerId(),
- getNetworkOfferingId(), getIsSourceNat(), getAclId());
+ getNetworkOfferingId(), getIsSourceNat(), getAclId(), getBypassVlanOverlapCheck());
} catch (InsufficientCapacityException ex) {
s_logger.info(ex);
s_logger.trace(ex);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java
index a84a3aa5..bd00876 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java
@@ -16,54 +16,14 @@
// under the License.
package org.apache.cloudstack.api.command.admin.vpc;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.vpc.CreateVPCCmd;
import org.apache.cloudstack.api.response.VpcResponse;
-import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.vpc.Vpc;
@APICommand(name = "createVPC", description = "Creates a VPC", responseObject = VpcResponse.class, responseView = ResponseView.Full, entityType = {Vpc.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class CreateVPCCmdByAdmin extends CreateVPCCmd {
- public static final Logger s_logger = Logger.getLogger(CreateVPCCmdByAdmin.class.getName());
-
- @Override
- public void execute() {
- Vpc vpc = null;
- try {
- if (isStart()) {
- _vpcService.startVpc(getEntityId(), true);
- } else {
- s_logger.debug("Not starting VPC as " + ApiConstants.START + "=false was passed to the API");
- }
- vpc = _entityMgr.findById(Vpc.class, getEntityId());
- } catch (ResourceUnavailableException ex) {
- s_logger.warn("Exception: ", ex);
- throw new ServerApiException(ApiErrorCode.RESOURCE_UNAVAILABLE_ERROR, ex.getMessage());
- } catch (ConcurrentOperationException ex) {
- s_logger.warn("Exception: ", ex);
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, ex.getMessage());
- } catch (InsufficientCapacityException ex) {
- s_logger.info(ex);
- s_logger.trace(ex);
- throw new ServerApiException(ApiErrorCode.INSUFFICIENT_CAPACITY_ERROR, ex.getMessage());
- }
-
- if (vpc != null) {
- VpcResponse response = _responseGenerator.createVpcResponse(ResponseView.Full, vpc);
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create VPC");
- }
- }
-}
+public class CreateVPCCmdByAdmin extends CreateVPCCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/ListVPCsCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/ListVPCsCmdByAdmin.java
index 20d77a7..efd2f9e 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/ListVPCsCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/ListVPCsCmdByAdmin.java
@@ -16,41 +16,15 @@
// under the License.
package org.apache.cloudstack.api.command.admin.vpc;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.vpc.ListVPCsCmd;
-import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.VpcResponse;
-import org.apache.log4j.Logger;
import com.cloud.network.vpc.Vpc;
-import com.cloud.utils.Pair;
@APICommand(name = "listVPCs", description = "Lists VPCs", responseObject = VpcResponse.class, responseView = ResponseView.Full, entityType = {Vpc.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class ListVPCsCmdByAdmin extends ListVPCsCmd {
- public static final Logger s_logger = Logger.getLogger(ListVPCsCmdByAdmin.class.getName());
-
- @Override
- public void execute() {
- Pair<List<? extends Vpc>, Integer> vpcs =
- _vpcService.listVpcs(getId(), getVpcName(), getDisplayText(), getSupportedServices(), getCidr(), getVpcOffId(), getState(), getAccountName(), getDomainId(),
- getKeyword(), getStartIndex(), getPageSizeVal(), getZoneId(), isRecursive(), listAll(), getRestartRequired(), getTags(),
- getProjectId(), getDisplay());
- ListResponse<VpcResponse> response = new ListResponse<VpcResponse>();
- List<VpcResponse> vpcResponses = new ArrayList<VpcResponse>();
- for (Vpc vpc : vpcs.first()) {
- VpcResponse offeringResponse = _responseGenerator.createVpcResponse(ResponseView.Full, vpc);
- vpcResponses.add(offeringResponse);
- }
-
- response.setResponses(vpcResponses, vpcs.second());
- response.setResponseName(getCommandName());
- setResponseObject(response);
- }
-
-}
+public class ListVPCsCmdByAdmin extends ListVPCsCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCCmdByAdmin.java
index d7761de..5fb2461 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCCmdByAdmin.java
@@ -16,12 +16,9 @@
// under the License.
package org.apache.cloudstack.api.command.admin.vpc;
-import org.apache.log4j.Logger;
-
import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.vpc.UpdateVPCCmd;
import org.apache.cloudstack.api.response.VpcResponse;
@@ -29,20 +26,4 @@
@APICommand(name = "updateVPC", description = "Updates a VPC", responseObject = VpcResponse.class, responseView = ResponseView.Full, entityType = {Vpc.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class UpdateVPCCmdByAdmin extends UpdateVPCCmd {
- public static final Logger s_logger = Logger.getLogger(UpdateVPCCmdByAdmin.class.getName());
-
- @Override
- public void execute(){
- Vpc result = _vpcService.updateVpc(getId(), getVpcName(), getDisplayText(), getCustomId(), isDisplayVpc());
- if (result != null) {
- VpcResponse response = _responseGenerator.createVpcResponse(ResponseView.Full, result);
- response.setResponseName(getCommandName());
- setResponseObject(response);
- } else {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update VPC");
- }
- }
-
-
-}
+public class UpdateVPCCmdByAdmin extends UpdateVPCCmd implements AdminCmd {}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListZonesCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListZonesCmdByAdmin.java
index d0a7707..a8896df 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListZonesCmdByAdmin.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListZonesCmdByAdmin.java
@@ -18,10 +18,11 @@
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.command.user.zone.ListZonesCmd;
import org.apache.cloudstack.api.response.ZoneResponse;
@APICommand(name = "listZones", description = "Lists zones", responseObject = ZoneResponse.class, responseView = ResponseView.Full,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class ListZonesCmdByAdmin extends ListZonesCmd {
+public class ListZonesCmdByAdmin extends ListZonesCmd implements AdminCmd {
}
diff --git a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java b/api/src/main/java/org/apache/cloudstack/api/command/user/UserCmd.java
similarity index 60%
copy from agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
copy to api/src/main/java/org/apache/cloudstack/api/command/user/UserCmd.java
index b244d02..f78f0c0 100644
--- a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/UserCmd.java
@@ -1,4 +1,4 @@
-//
+///
// 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
@@ -15,22 +15,15 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-//
-package com.cloud.agent.direct.download;
+///
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+package org.apache.cloudstack.api.command.user;
-@RunWith(MockitoJUnitRunner.class)
-public class DirectTemplateDownloaderImplTest {
+import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.command.ResponseViewProvider;
- private static final Long templateId = 202l;
-
- @Test
- public void testGetDirectDownloadTempPath() {
- String path = DirectTemplateDownloaderImpl.getDirectDownloadTempPath(templateId);
- Assert.assertEquals("template/2/202", path);
+public interface UserCmd extends ResponseViewProvider {
+ default ResponseView getResponseView() {
+ return ResponseView.Restricted;
}
}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java
index 0d33352..29f86c8 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java
@@ -28,6 +28,7 @@
import org.apache.cloudstack.api.BaseListDomainResourcesCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.AccountResponse;
import org.apache.cloudstack.api.response.ListResponse;
@@ -36,7 +37,7 @@
@APICommand(name = "listAccounts", description = "Lists accounts and provides detailed account information for listed accounts", responseObject = AccountResponse.class, responseView = ResponseView.Restricted, entityType = {Account.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class ListAccountsCmd extends BaseListDomainResourcesCmd {
+public class ListAccountsCmd extends BaseListDomainResourcesCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(ListAccountsCmd.class.getName());
private static final String s_name = "listaccountsresponse";
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
index fea7f20..5beba26 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
@@ -31,6 +31,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.IPAddressResponse;
import org.apache.cloudstack.api.response.NetworkResponse;
@@ -63,7 +64,7 @@
responseView = ResponseView.Restricted,
requestHasSensitiveInfo = false,
responseHasSensitiveInfo = false)
-public class AssociateIPAddrCmd extends BaseAsyncCreateCmd {
+public class AssociateIPAddrCmd extends BaseAsyncCreateCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(AssociateIPAddrCmd.class.getName());
private static final String s_name = "associateipaddressresponse";
@@ -124,6 +125,9 @@
authorized = {RoleType.Admin})
private Boolean display;
+ @Parameter(name=ApiConstants.IP_ADDRESS, type=CommandType.STRING, description="IP Address to be associated")
+ private String ipAddress;
+
/////////////////////////////////////////////////////
/////////////////// Accessors ///////////////////////
/////////////////////////////////////////////////////
@@ -177,6 +181,10 @@
return regionId;
}
+ public String getIpAddress() {
+ return ipAddress;
+ }
+
public Long getNetworkId() {
if (vpcId != null) {
return null;
@@ -305,7 +313,7 @@
IpAddress ip = null;
if (!isPortable()) {
- ip = _networkService.allocateIP(_accountService.getAccount(getEntityOwnerId()), getZoneId(), getNetworkId(), getDisplayIp());
+ ip = _networkService.allocateIP(_accountService.getAccount(getEntityOwnerId()), getZoneId(), getNetworkId(), getDisplayIp(), ipAddress);
} else {
ip = _networkService.allocatePortableIP(_accountService.getAccount(getEntityOwnerId()), 1, getZoneId(), getNetworkId(), getVpcId());
}
@@ -339,7 +347,7 @@
}
if (result != null) {
- IPAddressResponse ipResponse = _responseGenerator.createIPAddressResponse(ResponseView.Restricted, result);
+ IPAddressResponse ipResponse = _responseGenerator.createIPAddressResponse(getResponseView(), result);
ipResponse.setResponseName(getCommandName());
setResponseObject(ipResponse);
} else {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
index d25d167..a9b3bf8 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
@@ -28,6 +28,7 @@
import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.IPAddressResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.NetworkResponse;
@@ -41,7 +42,7 @@
@APICommand(name = "listPublicIpAddresses", description = "Lists all public IP addresses", responseObject = IPAddressResponse.class, responseView = ResponseView.Restricted,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, entityType = { IpAddress.class })
-public class ListPublicIpAddressesCmd extends BaseListTaggedResourcesCmd {
+public class ListPublicIpAddressesCmd extends BaseListTaggedResourcesCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(ListPublicIpAddressesCmd.class.getName());
private static final String s_name = "listpublicipaddressesresponse";
@@ -194,7 +195,7 @@
ListResponse<IPAddressResponse> response = new ListResponse<IPAddressResponse>();
List<IPAddressResponse> ipAddrResponses = new ArrayList<IPAddressResponse>();
for (IpAddress ipAddress : result.first()) {
- IPAddressResponse ipResponse = _responseGenerator.createIPAddressResponse(ResponseView.Restricted, ipAddress);
+ IPAddressResponse ipResponse = _responseGenerator.createIPAddressResponse(getResponseView(), ipAddress);
ipResponse.setObjectName("publicipaddress");
ipAddrResponses.add(ipResponse);
}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java
index 7085000..c798b18 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java
@@ -34,6 +34,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
@@ -53,7 +54,7 @@
entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false,
responseHasSensitiveInfo = true)
-public class UpdateVMAffinityGroupCmd extends BaseAsyncCmd {
+public class UpdateVMAffinityGroupCmd extends BaseAsyncCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(UpdateVMAffinityGroupCmd.class.getName());
private static final String s_name = "updatevirtualmachineresponse";
@@ -148,8 +149,8 @@
dc.add(VMDetails.valueOf("affgrp"));
EnumSet<VMDetails> details = EnumSet.copyOf(dc);
- if (result != null){
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Restricted, "virtualmachine", details, result).get(0);
+ if (result != null) {
+ UserVmResponse response = _responseGenerator.createUserVmResponse(getResponseView(), "virtualmachine", details, result).get(0);
response.setResponseName(getCommandName());
setResponseObject(response);
} else {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/AssignVirtualMachineToBackupOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/AssignVirtualMachineToBackupOfferingCmd.java
new file mode 100644
index 0000000..b5c0986
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/AssignVirtualMachineToBackupOfferingCmd.java
@@ -0,0 +1,122 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.command.user.backup;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.BackupOfferingResponse;
+import org.apache.cloudstack.api.response.BackupResponse;
+import org.apache.cloudstack.api.response.SuccessResponse;
+import org.apache.cloudstack.api.response.UserVmResponse;
+import org.apache.cloudstack.backup.BackupManager;
+import org.apache.cloudstack.context.CallContext;
+
+import com.cloud.event.EventTypes;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.NetworkRuleConflictException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
+
+@APICommand(name = AssignVirtualMachineToBackupOfferingCmd.APINAME,
+ description = "Assigns a VM to a backup offering",
+ responseObject = BackupResponse.class, since = "4.14.0",
+ authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
+public class AssignVirtualMachineToBackupOfferingCmd extends BaseAsyncCmd {
+ public static final String APINAME = "assignVirtualMachineToBackupOffering";
+
+ @Inject
+ private BackupManager backupManager;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+
+ @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
+ type = CommandType.UUID,
+ entityType = UserVmResponse.class,
+ required = true,
+ description = "ID of the virtual machine")
+ private Long vmId;
+
+ @Parameter(name = ApiConstants.BACKUP_OFFERING_ID,
+ type = CommandType.UUID,
+ entityType = BackupOfferingResponse.class,
+ required = true,
+ description = "ID of the backup offering")
+ private Long offeringId;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public Long getVmId() {
+ return vmId;
+ }
+
+ public Long getOfferingId() {
+ return offeringId;
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ @Override
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException {
+ try {
+ boolean result = backupManager.assignVMToBackupOffering(getVmId(), getOfferingId());
+ if (result) {
+ SuccessResponse response = new SuccessResponse(getCommandName());
+ this.setResponseObject(response);
+ } else {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to add VM to backup offering");
+ }
+ } catch (Exception e) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
+ }
+ }
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ return CallContext.current().getCallingAccount().getId();
+ }
+
+ @Override
+ public String getEventType() {
+ return EventTypes.EVENT_VM_BACKUP_OFFERING_ASSIGN;
+ }
+
+ @Override
+ public String getEventDescription() {
+ return "Assigning VM to backup offering ID: " + offeringId;
+ }
+}
\ No newline at end of file
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupCmd.java
new file mode 100644
index 0000000..db7a276
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupCmd.java
@@ -0,0 +1,126 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.command.user.backup;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiCommandJobType;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCreateCmd;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.SuccessResponse;
+import org.apache.cloudstack.api.response.UserVmResponse;
+import org.apache.cloudstack.backup.BackupManager;
+import org.apache.cloudstack.context.CallContext;
+
+import com.cloud.event.EventTypes;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.NetworkRuleConflictException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+@APICommand(name = CreateBackupCmd.APINAME,
+ description = "Create VM backup",
+ responseObject = SuccessResponse.class, since = "4.14.0",
+ authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
+public class CreateBackupCmd extends BaseAsyncCreateCmd {
+ public static final String APINAME = "createBackup";
+
+ @Inject
+ private BackupManager backupManager;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+
+ @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
+ type = CommandType.UUID,
+ entityType = UserVmResponse.class,
+ required = true,
+ description = "ID of the VM")
+ private Long vmId;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public Long getVmId() {
+ return vmId;
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ @Override
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException {
+ try {
+ boolean result = backupManager.createBackup(getVmId());
+ if (result) {
+ SuccessResponse response = new SuccessResponse(getCommandName());
+ response.setResponseName(getCommandName());
+ setResponseObject(response);
+ } else {
+ throw new CloudRuntimeException("Error while creating backup of VM");
+ }
+ } catch (Exception e) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
+ }
+ }
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
+ }
+
+ @Override
+ public ApiCommandJobType getInstanceType() {
+ return ApiCommandJobType.Backup;
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ return CallContext.current().getCallingAccount().getId();
+ }
+
+ @Override
+ public String getEventType() {
+ return EventTypes.EVENT_VM_BACKUP_CREATE;
+ }
+
+ @Override
+ public String getEventDescription() {
+ return "Creating backup for VM " + vmId;
+ }
+
+ @Override
+ public void create() throws ResourceAllocationException {
+ }
+
+ @Override
+ public Long getEntityId() {
+ return vmId;
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupScheduleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupScheduleCmd.java
new file mode 100644
index 0000000..e10386d
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupScheduleCmd.java
@@ -0,0 +1,128 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.command.user.backup;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.BackupResponse;
+import org.apache.cloudstack.api.response.BackupScheduleResponse;
+import org.apache.cloudstack.api.response.UserVmResponse;
+import org.apache.cloudstack.backup.BackupManager;
+import org.apache.cloudstack.backup.BackupSchedule;
+import org.apache.cloudstack.context.CallContext;
+
+import com.cloud.utils.DateUtil;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+@APICommand(name = CreateBackupScheduleCmd.APINAME,
+ description = "Creates a user-defined VM backup schedule",
+ responseObject = BackupResponse.class, since = "4.14.0",
+ authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
+public class CreateBackupScheduleCmd extends BaseCmd {
+ public static final String APINAME = "createBackupSchedule";
+
+ @Inject
+ private BackupManager backupManager;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+
+ @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
+ type = CommandType.UUID,
+ entityType = UserVmResponse.class,
+ required = true,
+ description = "ID of the VM for which schedule is to be defined")
+ private Long vmId;
+
+ @Parameter(name = ApiConstants.INTERVAL_TYPE,
+ type = CommandType.STRING,
+ required = true,
+ description = "valid values are HOURLY, DAILY, WEEKLY, and MONTHLY")
+ private String intervalType;
+
+ @Parameter(name = ApiConstants.SCHEDULE,
+ type = CommandType.STRING,
+ required = true,
+ description = "custom backup schedule, the format is:"
+ + "for HOURLY MM*, for DAILY MM:HH*, for WEEKLY MM:HH:DD (1-7)*, for MONTHLY MM:HH:DD (1-28)")
+ private String schedule;
+
+ @Parameter(name = ApiConstants.TIMEZONE,
+ type = CommandType.STRING,
+ required = true,
+ description = "Specifies a timezone for this command. For more information on the timezone parameter, see TimeZone Format.")
+ private String timezone;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public Long getVmId() {
+ return vmId;
+ }
+
+ public DateUtil.IntervalType getIntervalType() {
+ return DateUtil.IntervalType.getIntervalType(intervalType);
+ }
+
+ public String getSchedule() {
+ return schedule;
+ }
+
+ public String getTimezone() {
+ return timezone;
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ @Override
+ public void execute() throws ServerApiException {
+ try {
+ BackupSchedule schedule = backupManager.configureBackupSchedule(this);
+ if (schedule != null) {
+ BackupScheduleResponse response = _responseGenerator.createBackupScheduleResponse(schedule);
+ response.setResponseName(getCommandName());
+ setResponseObject(response);
+ } else {
+ throw new CloudRuntimeException("Error while creating backup schedule of VM");
+ }
+ } catch (Exception e) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
+ }
+ }
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ return CallContext.current().getCallingAccount().getId();
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupCmd.java
new file mode 100644
index 0000000..32344d8
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupCmd.java
@@ -0,0 +1,111 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.command.user.backup;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.BackupResponse;
+import org.apache.cloudstack.api.response.SuccessResponse;
+import org.apache.cloudstack.backup.BackupManager;
+import org.apache.cloudstack.context.CallContext;
+
+import com.cloud.event.EventTypes;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.NetworkRuleConflictException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+@APICommand(name = DeleteBackupCmd.APINAME,
+ description = "Delete VM backup",
+ responseObject = SuccessResponse.class, since = "4.14.0",
+ authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
+public class DeleteBackupCmd extends BaseAsyncCmd {
+ public static final String APINAME = "deleteBackup";
+
+ @Inject
+ private BackupManager backupManager;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = BackupResponse.class,
+ required = true,
+ description = "id of the VM backup")
+ private Long backupId;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public Long getId() {
+ return backupId;
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ @Override
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException {
+ try {
+ boolean result = backupManager.deleteBackup(backupId);
+ if (result) {
+ SuccessResponse response = new SuccessResponse(getCommandName());
+ response.setResponseName(getCommandName());
+ setResponseObject(response);
+ } else {
+ throw new CloudRuntimeException("Error while deleting backup of VM");
+ }
+ } catch (Exception e) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
+ }
+ }
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ return CallContext.current().getCallingAccount().getId();
+ }
+
+ @Override
+ public String getEventType() {
+ return EventTypes.EVENT_VM_BACKUP_DELETE;
+ }
+
+ @Override
+ public String getEventDescription() {
+ return "Deleting backup ID " + backupId;
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupScheduleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupScheduleCmd.java
new file mode 100644
index 0000000..1c7b65c
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupScheduleCmd.java
@@ -0,0 +1,99 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.command.user.backup;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.SuccessResponse;
+import org.apache.cloudstack.api.response.UserVmResponse;
+import org.apache.cloudstack.backup.BackupManager;
+import org.apache.cloudstack.context.CallContext;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.NetworkRuleConflictException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+@APICommand(name = DeleteBackupScheduleCmd.APINAME,
+ description = "Deletes the backup schedule of a VM",
+ responseObject = SuccessResponse.class, since = "4.14.0",
+ authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
+public class DeleteBackupScheduleCmd extends BaseCmd {
+ public static final String APINAME = "deleteBackupSchedule";
+
+ @Inject
+ private BackupManager backupManager;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+
+ @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
+ type = CommandType.UUID,
+ entityType = UserVmResponse.class,
+ required = true,
+ description = "ID of the VM")
+ private Long vmId;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public Long getVmId() {
+ return vmId;
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ @Override
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException {
+ try {
+ boolean result = backupManager.deleteBackupSchedule(getVmId());
+ if (result) {
+ SuccessResponse response = new SuccessResponse(getCommandName());
+ response.setResponseName(getCommandName());
+ setResponseObject(response);
+ } else {
+ throw new CloudRuntimeException("Failed to delete VM backup schedule");
+ }
+ } catch (Exception e) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
+ }
+ }
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ return CallContext.current().getCallingAccount().getId();
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupOfferingsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupOfferingsCmd.java
new file mode 100644
index 0000000..e745a6b
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupOfferingsCmd.java
@@ -0,0 +1,96 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.command.user.backup;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseBackupListCmd;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.BackupOfferingResponse;
+import org.apache.cloudstack.api.response.ZoneResponse;
+import org.apache.cloudstack.backup.BackupManager;
+import org.apache.cloudstack.backup.BackupOffering;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.utils.Pair;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+@APICommand(name = ListBackupOfferingsCmd.APINAME,
+ description = "Lists backup offerings",
+ responseObject = BackupOfferingResponse.class, since = "4.14.0",
+ authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
+public class ListBackupOfferingsCmd extends BaseBackupListCmd {
+ public static final String APINAME = "listBackupOfferings";
+
+ @Inject
+ private BackupManager backupManager;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+
+ @Parameter(name = ApiConstants.ID, type = BaseCmd.CommandType.UUID, entityType = BackupOfferingResponse.class,
+ description = "The backup offering ID")
+ private Long offeringId;
+
+ @Parameter(name = ApiConstants.ZONE_ID, type = BaseCmd.CommandType.UUID, entityType = ZoneResponse.class,
+ description = "The zone ID")
+ private Long zoneId;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public Long getZoneId() {
+ return zoneId;
+ }
+
+ public Long getOfferingId() {
+ return offeringId;
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ @Override
+ public void execute() throws ResourceUnavailableException, ServerApiException, ConcurrentOperationException {
+ try {
+ Pair<List<BackupOffering>, Integer> result = backupManager.listBackupOfferings(this);
+ setupResponseBackupOfferingsList(result.first(), result.second());
+ } catch (InvalidParameterValueException e) {
+ throw new ServerApiException(ApiErrorCode.PARAM_ERROR, e.getMessage());
+ } catch (CloudRuntimeException e) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
+ }
+ }
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + RESPONSE_SUFFIX;
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupScheduleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupScheduleCmd.java
new file mode 100644
index 0000000..4068dc2
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupScheduleCmd.java
@@ -0,0 +1,100 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.command.user.backup;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.BackupScheduleResponse;
+import org.apache.cloudstack.api.response.UserVmResponse;
+import org.apache.cloudstack.backup.BackupManager;
+import org.apache.cloudstack.backup.BackupSchedule;
+import org.apache.cloudstack.context.CallContext;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.NetworkRuleConflictException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+@APICommand(name = ListBackupScheduleCmd.APINAME,
+ description = "List backup schedule of a VM",
+ responseObject = BackupScheduleResponse.class, since = "4.14.0",
+ authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
+public class ListBackupScheduleCmd extends BaseCmd {
+ public static final String APINAME = "listBackupSchedule";
+
+ @Inject
+ private BackupManager backupManager;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+
+ @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
+ type = CommandType.UUID,
+ entityType = UserVmResponse.class,
+ required = true,
+ description = "ID of the VM")
+ private Long vmId;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public Long getVmId() {
+ return vmId;
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ @Override
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException {
+ try{
+ BackupSchedule schedule = backupManager.listBackupSchedule(getVmId());
+ if (schedule != null) {
+ BackupScheduleResponse response = _responseGenerator.createBackupScheduleResponse(schedule);
+ response.setResponseName(getCommandName());
+ setResponseObject(response);
+ } else {
+ throw new CloudRuntimeException("No backup schedule exists for the VM");
+ }
+ } catch (Exception e) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
+ }
+ }
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ return CallContext.current().getCallingAccount().getId();
+ }
+}
\ No newline at end of file
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupsCmd.java
new file mode 100644
index 0000000..1e1e731
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupsCmd.java
@@ -0,0 +1,135 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.command.user.backup;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.BackupResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.UserVmResponse;
+import org.apache.cloudstack.api.response.ZoneResponse;
+import org.apache.cloudstack.backup.Backup;
+import org.apache.cloudstack.backup.BackupManager;
+import org.apache.cloudstack.context.CallContext;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.NetworkRuleConflictException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.utils.Pair;
+
+@APICommand(name = ListBackupsCmd.APINAME,
+ description = "Lists VM backups",
+ responseObject = BackupResponse.class, since = "4.14.0",
+ authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
+public class ListBackupsCmd extends BaseListProjectAndAccountResourcesCmd {
+ public static final String APINAME = "listBackups";
+
+ @Inject
+ private BackupManager backupManager;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = BackupResponse.class,
+ description = "id of the backup")
+ private Long id;
+
+ @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
+ type = CommandType.UUID,
+ entityType = UserVmResponse.class,
+ description = "id of the VM")
+ private Long vmId;
+
+ @Parameter(name = ApiConstants.ZONE_ID,
+ type = CommandType.UUID,
+ entityType = ZoneResponse.class,
+ description = "list backups by zone id")
+ private Long zoneId;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public Long getId() {
+ return id;
+ }
+
+ public Long getVmId() {
+ return vmId;
+ }
+
+ public Long getZoneId() {
+ return zoneId;
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ protected void setupResponseBackupList(final List<Backup> backups, final Integer count) {
+ final List<BackupResponse> responses = new ArrayList<>();
+ for (Backup backup : backups) {
+ if (backup == null) {
+ continue;
+ }
+ BackupResponse backupResponse = _responseGenerator.createBackupResponse(backup);
+ responses.add(backupResponse);
+ }
+ final ListResponse<BackupResponse> response = new ListResponse<>();
+ response.setResponses(responses, count);
+ response.setResponseName(getCommandName());
+ setResponseObject(response);
+ }
+
+ @Override
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException {
+ try{
+ Pair<List<Backup>, Integer> result = backupManager.listBackups(this);
+ setupResponseBackupList(result.first(), result.second());
+ } catch (Exception e) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
+ }
+ }
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ return CallContext.current().getCallingAccount().getId();
+ }
+
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RemoveVirtualMachineFromBackupOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RemoveVirtualMachineFromBackupOfferingCmd.java
new file mode 100644
index 0000000..28f03f8
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RemoveVirtualMachineFromBackupOfferingCmd.java
@@ -0,0 +1,118 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.command.user.backup;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.SuccessResponse;
+import org.apache.cloudstack.api.response.UserVmResponse;
+import org.apache.cloudstack.backup.BackupManager;
+import org.apache.cloudstack.context.CallContext;
+
+import com.cloud.event.EventTypes;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.NetworkRuleConflictException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
+
+@APICommand(name = RemoveVirtualMachineFromBackupOfferingCmd.APINAME,
+ description = "Removes a VM from any existing backup offering",
+ responseObject = SuccessResponse.class, since = "4.14.0",
+ authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
+public class RemoveVirtualMachineFromBackupOfferingCmd extends BaseAsyncCmd {
+ public static final String APINAME = "removeVirtualMachineFromBackupOffering";
+
+ @Inject
+ private BackupManager backupManager;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+
+ @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
+ type = CommandType.UUID,
+ entityType = UserVmResponse.class,
+ required = true,
+ description = "ID of the virtual machine")
+ private Long vmId;
+
+ @Parameter(name = ApiConstants.FORCED,
+ type = CommandType.BOOLEAN,
+ description = "Whether to force remove VM from the backup offering that may also delete VM backups.")
+ private Boolean forced;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public Long getVmId() {
+ return vmId;
+ }
+
+ public boolean getForced() {
+ return forced == null ? false : forced;
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ @Override
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException {
+ try {
+ boolean result = backupManager.removeVMFromBackupOffering(getVmId(), getForced());
+ if (result) {
+ SuccessResponse response = new SuccessResponse(getCommandName());
+ this.setResponseObject(response);
+ } else {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to remove VM from backup offering");
+ }
+ } catch (Exception e) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
+ }
+ }
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ return CallContext.current().getCallingAccount().getId();
+ }
+
+ @Override
+ public String getEventType() {
+ return EventTypes.EVENT_VM_BACKUP_OFFERING_REMOVE;
+ }
+
+ @Override
+ public String getEventDescription() {
+ return "Removing VM ID" + vmId + " from backup offering";
+ }
+}
\ No newline at end of file
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreBackupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreBackupCmd.java
new file mode 100644
index 0000000..62fa9a1
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreBackupCmd.java
@@ -0,0 +1,111 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.command.user.backup;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.SuccessResponse;
+import org.apache.cloudstack.api.response.BackupResponse;
+import org.apache.cloudstack.backup.BackupManager;
+import org.apache.cloudstack.context.CallContext;
+
+import com.cloud.event.EventTypes;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.NetworkRuleConflictException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+@APICommand(name = RestoreBackupCmd.APINAME,
+ description = "Restores an existing stopped or deleted VM using a VM backup",
+ responseObject = SuccessResponse.class, since = "4.14.0",
+ authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
+public class RestoreBackupCmd extends BaseAsyncCmd {
+ public static final String APINAME = "restoreBackup";
+
+ @Inject
+ private BackupManager backupManager;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = BackupResponse.class,
+ required = true,
+ description = "ID of the backup")
+ private Long backupId;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public Long getBackupId() {
+ return backupId;
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ @Override
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException {
+ try {
+ boolean result = backupManager.restoreBackup(backupId);
+ if (result) {
+ SuccessResponse response = new SuccessResponse(getCommandName());
+ response.setResponseName(getCommandName());
+ setResponseObject(response);
+ } else {
+ throw new CloudRuntimeException("Error while restoring VM from backup");
+ }
+ } catch (Exception e) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
+ }
+ }
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ return CallContext.current().getCallingAccount().getId();
+ }
+
+ @Override
+ public String getEventType() {
+ return EventTypes.EVENT_VM_BACKUP_RESTORE;
+ }
+
+ @Override
+ public String getEventDescription() {
+ return "Restoring VM from backup: " + backupId;
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreVolumeFromBackupAndAttachToVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreVolumeFromBackupAndAttachToVMCmd.java
new file mode 100644
index 0000000..b5966a7
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreVolumeFromBackupAndAttachToVMCmd.java
@@ -0,0 +1,133 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.command.user.backup;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.SuccessResponse;
+import org.apache.cloudstack.api.response.UserVmResponse;
+import org.apache.cloudstack.api.response.BackupResponse;
+import org.apache.cloudstack.backup.BackupManager;
+import org.apache.cloudstack.context.CallContext;
+
+import com.cloud.event.EventTypes;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.NetworkRuleConflictException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+@APICommand(name = RestoreVolumeFromBackupAndAttachToVMCmd.APINAME,
+ description = "Restore and attach a backed up volume to VM",
+ responseObject = SuccessResponse.class, since = "4.14.0",
+ authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
+public class RestoreVolumeFromBackupAndAttachToVMCmd extends BaseAsyncCmd {
+ public static final String APINAME = "restoreVolumeFromBackupAndAttachToVM";
+
+ @Inject
+ private BackupManager backupManager;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+
+ @Parameter(name = ApiConstants.BACKUP_ID,
+ type = CommandType.UUID,
+ entityType = BackupResponse.class,
+ required = true,
+ description = "ID of the VM backup")
+ private Long backupId;
+
+ @Parameter(name = ApiConstants.VOLUME_ID,
+ type = CommandType.STRING,
+ required = true,
+ description = "ID of the volume backed up")
+ private String volumeUuid;
+
+ @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
+ type = CommandType.UUID,
+ entityType = UserVmResponse.class,
+ required = true,
+ description = "id of the VM where to attach the restored volume")
+ private Long vmId;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public String getVolumeUuid() {
+ return volumeUuid;
+ }
+
+ public Long getVmId() {
+ return vmId;
+ }
+
+ public Long getBackupId() {
+ return backupId;
+ }
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ return CallContext.current().getCallingAccount().getId();
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ @Override
+ public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException {
+ try {
+ boolean result = backupManager.restoreBackupVolumeAndAttachToVM(volumeUuid, backupId, vmId);
+ if (result) {
+ SuccessResponse response = new SuccessResponse(getCommandName());
+ response.setResponseName(getCommandName());
+ setResponseObject(response);
+ } else {
+ throw new CloudRuntimeException("Error restoring volume and attaching to VM");
+ }
+ } catch (Exception e) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
+ }
+ }
+
+ @Override
+ public String getEventType() {
+ return EventTypes.EVENT_VM_BACKUP_RESTORE_VOLUME_TO_VM;
+ }
+
+ @Override
+ public String getEventDescription() {
+ return "Restoring volume "+ volumeUuid + " from backup " + backupId + " and attaching it to VM " + vmId;
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/UpdateBackupScheduleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/UpdateBackupScheduleCmd.java
new file mode 100644
index 0000000..5a02cf9
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/UpdateBackupScheduleCmd.java
@@ -0,0 +1,30 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.command.user.backup;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.response.BackupResponse;
+
+@APICommand(name = UpdateBackupScheduleCmd.APINAME,
+ description = "Updates a user-defined VM backup schedule",
+ responseObject = BackupResponse.class, since = "4.14.0",
+ authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
+public class UpdateBackupScheduleCmd extends CreateBackupScheduleCmd {
+ public static final String APINAME = "updateBackupSchedule";
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
index 40d1a71..566be64 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
@@ -59,7 +59,10 @@
response.setKVMSnapshotEnabled((Boolean)capabilities.get("KVMSnapshotEnabled"));
response.setAllowUserViewDestroyedVM((Boolean)capabilities.get("allowUserViewDestroyedVM"));
response.setAllowUserExpungeRecoverVM((Boolean)capabilities.get("allowUserExpungeRecoverVM"));
+ response.setAllowUserExpungeRecoverVolume((Boolean)capabilities.get("allowUserExpungeRecoverVolume"));
response.setAllowUserViewAllDomainAccounts((Boolean)capabilities.get("allowUserViewAllDomainAccounts"));
+ response.setKubernetesServiceEnabled((Boolean)capabilities.get("kubernetesServiceEnabled"));
+ response.setKubernetesClusterExperimentalFeaturesEnabled((Boolean)capabilities.get("kubernetesClusterExperimentalFeaturesEnabled"));
if (capabilities.containsKey("apiLimitInterval")) {
response.setApiLimitInterval((Integer)capabilities.get("apiLimitInterval"));
}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java
index c1d67e5..2458400 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java
@@ -25,6 +25,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.command.user.vm.DeployVMCmd;
import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
@@ -36,7 +37,7 @@
@APICommand(name = "attachIso", description = "Attaches an ISO to a virtual machine.", responseObject = UserVmResponse.class, responseView = ResponseView.Restricted,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class AttachIsoCmd extends BaseAsyncCmd {
+public class AttachIsoCmd extends BaseAsyncCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(AttachIsoCmd.class.getName());
private static final String s_name = "attachisoresponse";
@@ -101,7 +102,7 @@
if (result) {
UserVm userVm = _responseGenerator.findUserVmById(virtualMachineId);
if (userVm != null) {
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Restricted, "virtualmachine", userVm).get(0);
+ UserVmResponse response = _responseGenerator.createUserVmResponse(getResponseView(), "virtualmachine", userVm).get(0);
response.setResponseName(DeployVMCmd.getResultObjectName());
setResponseObject(response);
} else {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java
index 103e922..b38a24f 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java
@@ -61,6 +61,10 @@
return id;
}
+ public void setId(Long id) {
+ this.id = id;
+ }
+
public Long getZoneId() {
return zoneId;
}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java
index 9ee8ef5..ae86e2f 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java
@@ -25,6 +25,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.command.user.vm.DeployVMCmd;
import org.apache.cloudstack.api.response.UserVmResponse;
@@ -34,7 +35,7 @@
@APICommand(name = "detachIso", description = "Detaches any ISO file (if any) currently attached to a virtual machine.", responseObject = UserVmResponse.class, responseView = ResponseView.Restricted,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class DetachIsoCmd extends BaseAsyncCmd {
+public class DetachIsoCmd extends BaseAsyncCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(DetachIsoCmd.class.getName());
private static final String s_name = "detachisoresponse";
@@ -89,7 +90,7 @@
boolean result = _templateService.detachIso(virtualMachineId);
if (result) {
UserVm userVm = _entityMgr.findById(UserVm.class, virtualMachineId);
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Restricted, "virtualmachine", userVm).get(0);
+ UserVmResponse response = _responseGenerator.createUserVmResponse(getResponseView(), "virtualmachine", userVm).get(0);
response.setResponseName(DeployVMCmd.getResultObjectName());
setResponseObject(response);
} else {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java
index 9a3db43..fbbe088 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java
@@ -21,6 +21,7 @@
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.BaseListTemplateOrIsoPermissionsCmd;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.TemplatePermissionsResponse;
import com.cloud.storage.Storage.ImageFormat;
@@ -29,7 +30,7 @@
@APICommand(name = "listIsoPermissions", description = "List ISO visibility and all accounts that have permissions to view this ISO.", responseObject = TemplatePermissionsResponse.class, responseView = ResponseView.Restricted,
requestHasSensitiveInfo = false,
responseHasSensitiveInfo = false)
-public class ListIsoPermissionsCmd extends BaseListTemplateOrIsoPermissionsCmd {
+public class ListIsoPermissionsCmd extends BaseListTemplateOrIsoPermissionsCmd implements UserCmd {
protected String getResponseName() {
return "listisopermissionsresponse";
}
@@ -48,9 +49,4 @@
protected boolean templateIsCorrectType(VirtualMachineTemplate template) {
return template.getFormat().equals(ImageFormat.ISO);
}
-
- @Override
- public void execute() {
- executeWithView(ResponseView.Restricted);
- }
}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java
index d45c8cd..b741ae7 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java
@@ -24,6 +24,7 @@
import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
@@ -34,7 +35,7 @@
@APICommand(name = "listIsos", description = "Lists all available ISO files.", responseObject = TemplateResponse.class, responseView = ResponseView.Restricted,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class ListIsosCmd extends BaseListTaggedResourcesCmd {
+public class ListIsosCmd extends BaseListTaggedResourcesCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(ListIsosCmd.class.getName());
private static final String s_name = "listisosresponse";
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java
index f3e884c..1c1a767 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java
@@ -25,6 +25,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.GuestOSResponse;
import org.apache.cloudstack.api.response.ListResponse;
@@ -39,7 +40,7 @@
@APICommand(name = "registerIso", responseObject = TemplateResponse.class, description = "Registers an existing ISO into the CloudStack Cloud.", responseView = ResponseView.Restricted,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class RegisterIsoCmd extends BaseCmd {
+public class RegisterIsoCmd extends BaseCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(RegisterIsoCmd.class.getName());
private static final String s_name = "registerisoresponse";
@@ -126,10 +127,18 @@
return bootable;
}
+ public void setBootable(Boolean bootable) {
+ this.bootable = bootable;
+ }
+
public String getDisplayText() {
return displayText;
}
+ public void setDisplayText(String displayText) {
+ this.displayText = displayText;
+ }
+
public Boolean isFeatured() {
return featured;
}
@@ -138,6 +147,10 @@
return publicIso;
}
+ public void setPublic(Boolean publicIso) {
+ this.publicIso = publicIso;
+ }
+
public Boolean isExtractable() {
return extractable;
}
@@ -146,6 +159,10 @@
return isoName;
}
+ public void setIsoName(String isoName) {
+ this.isoName = isoName;
+ }
+
public Long getOsTypeId() {
return osTypeId;
}
@@ -154,22 +171,42 @@
return url;
}
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
public Long getZoneId() {
return zoneId;
}
+ public void setZoneId(Long zoneId) {
+ this.zoneId = zoneId;
+ }
+
public Long getDomainId() {
return domainId;
}
+ public void setDomainId(Long domainId) {
+ this.domainId = domainId;
+ }
+
public String getAccountName() {
return accountName;
}
+ public void setAccountName(String accountName) {
+ this.accountName = accountName;
+ }
+
public String getChecksum() {
return checksum;
}
+ public void setChecksum(String checksum) {
+ this.checksum = checksum;
+ }
+
public String getImageStoreUuid() {
return imageStoreUuid;
}
@@ -210,7 +247,7 @@
VirtualMachineTemplate template = _templateService.registerIso(this);
if (template != null) {
ListResponse<TemplateResponse> response = new ListResponse<TemplateResponse>();
- List<TemplateResponse> templateResponses = _responseGenerator.createIsoResponses(ResponseView.Restricted, template, zoneId, false);
+ List<TemplateResponse> templateResponses = _responseGenerator.createIsoResponses(getResponseView(), template, zoneId, false);
response.setResponses(templateResponses);
response.setResponseName(getCommandName());
setResponseObject(response);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java
index 0d3c962..36e9b53 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java
@@ -23,6 +23,7 @@
import org.apache.cloudstack.api.BaseUpdateTemplateOrIsoCmd;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.TemplateResponse;
import com.cloud.template.VirtualMachineTemplate;
@@ -30,7 +31,7 @@
@APICommand(name = "updateIso", description = "Updates an ISO file.", responseObject = TemplateResponse.class, responseView = ResponseView.Restricted,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class UpdateIsoCmd extends BaseUpdateTemplateOrIsoCmd {
+public class UpdateIsoCmd extends BaseUpdateTemplateOrIsoCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(UpdateIsoCmd.class.getName());
private static final String s_name = "updateisoresponse";
@@ -71,7 +72,7 @@
public void execute() {
VirtualMachineTemplate result = _templateService.updateTemplate(this);
if (result != null) {
- TemplateResponse response = _responseGenerator.createTemplateUpdateResponse(ResponseView.Restricted, result);
+ TemplateResponse response = _responseGenerator.createTemplateUpdateResponse(getResponseView(), result);
response.setResponseName(getCommandName());
setResponseObject(response);
} else {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java
index e3cde0b..77aaa6b 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java
@@ -20,6 +20,8 @@
import java.util.List;
import com.cloud.vm.VirtualMachine;
+
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.LoadBalancerRuleVmMapResponse;
import org.apache.log4j.Logger;
@@ -38,7 +40,7 @@
@APICommand(name = "listLoadBalancerRuleInstances", description = "List all virtual machine instances that are assigned to a load balancer rule.", responseObject = LoadBalancerRuleVmMapResponse.class, responseView = ResponseView.Restricted,
requestHasSensitiveInfo = false,
responseHasSensitiveInfo = true)
-public class ListLoadBalancerRuleInstancesCmd extends BaseListCmd {
+public class ListLoadBalancerRuleInstancesCmd extends BaseListCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(ListLoadBalancerRuleInstancesCmd.class.getName());
private static final String s_name = "listloadbalancerruleinstancesresponse";
@@ -121,7 +123,7 @@
List<LoadBalancerRuleVmMapResponse> listlbVmRes = new ArrayList<LoadBalancerRuleVmMapResponse>();
if (result != null) {
- vmResponses = _responseGenerator.createUserVmResponse(ResponseView.Full, "loadbalancerruleinstance", result.toArray(new UserVm[result.size()]));
+ vmResponses = _responseGenerator.createUserVmResponse(getResponseView(), "loadbalancerruleinstance", result.toArray(new UserVm[result.size()]));
List<String> ipaddr = null;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java
index befef99..5dff7c9 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java
@@ -26,6 +26,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.NetworkACLResponse;
import org.apache.cloudstack.api.response.NetworkOfferingResponse;
@@ -47,7 +48,7 @@
@APICommand(name = "createNetwork", description = "Creates a network", responseObject = NetworkResponse.class, responseView = ResponseView.Restricted, entityType = {Network.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class CreateNetworkCmd extends BaseCmd {
+public class CreateNetworkCmd extends BaseCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(CreateNetworkCmd.class.getName());
private static final String s_name = "createnetworkresponse";
@@ -96,6 +97,10 @@
@Parameter(name = ApiConstants.ISOLATED_PVLAN, type = CommandType.STRING, description = "the isolated private VLAN for this network")
private String isolatedPvlan;
+ @Parameter(name = ApiConstants.ISOLATED_PVLAN_TYPE, type = CommandType.STRING,
+ description = "the isolated private VLAN type for this network")
+ private String isolatedPvlanType;
+
@Parameter(name = ApiConstants.NETWORK_DOMAIN, type = CommandType.STRING, description = "network domain")
private String networkDomain;
@@ -216,6 +221,10 @@
return externalId;
}
+ public String getIsolatedPvlanType() {
+ return isolatedPvlanType;
+ }
+
@Override
public boolean isDisplay() {
if(displayNetwork == null)
@@ -310,7 +319,7 @@
void execute() throws InsufficientCapacityException, ConcurrentOperationException, ResourceAllocationException {
Network result = _networkService.createGuestNetwork(this);
if (result != null) {
- NetworkResponse response = _responseGenerator.createNetworkResponse(ResponseView.Restricted, result);
+ NetworkResponse response = _responseGenerator.createNetworkResponse(getResponseView(), result);
response.setResponseName(getCommandName());
setResponseObject(response);
} else {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
index a61c597..b737212 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
@@ -27,6 +27,7 @@
import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.NetworkResponse;
import org.apache.cloudstack.api.response.PhysicalNetworkResponse;
@@ -38,7 +39,7 @@
@APICommand(name = "listNetworks", description = "Lists all available networks.", responseObject = NetworkResponse.class, responseView = ResponseView.Restricted, entityType = {Network.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class ListNetworksCmd extends BaseListTaggedResourcesCmd {
+public class ListNetworksCmd extends BaseListTaggedResourcesCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(ListNetworksCmd.class.getName());
private static final String s_name = "listnetworksresponse";
@@ -164,7 +165,7 @@
ListResponse<NetworkResponse> response = new ListResponse<NetworkResponse>();
List<NetworkResponse> networkResponses = new ArrayList<NetworkResponse>();
for (Network network : networks.first()) {
- NetworkResponse networkResponse = _responseGenerator.createNetworkResponse(ResponseView.Restricted, network);
+ NetworkResponse networkResponse = _responseGenerator.createNetworkResponse(getResponseView(), network);
networkResponses.add(networkResponse);
}
response.setResponses(networkResponses, networks.second());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java
index 645ae5a..d422966 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java
@@ -96,7 +96,7 @@
@Override
public void execute() throws ResourceUnavailableException, ResourceAllocationException, ConcurrentOperationException, InsufficientCapacityException {
- boolean result = _networkService.restartNetwork(this, getCleanup(), getMakeRedundant());
+ boolean result = _networkService.restartNetwork(this);
if (result) {
SuccessResponse response = new SuccessResponse(getCommandName());
setResponseObject(response);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java
index 3e93e5e..2ffa52b 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java
@@ -27,6 +27,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.NetworkOfferingResponse;
import org.apache.cloudstack.api.response.NetworkResponse;
import org.apache.log4j.Logger;
@@ -40,7 +41,7 @@
@APICommand(name = "updateNetwork", description = "Updates a network", responseObject = NetworkResponse.class, responseView = ResponseView.Restricted, entityType = {Network.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class UpdateNetworkCmd extends BaseAsyncCustomIdCmd {
+public class UpdateNetworkCmd extends BaseAsyncCustomIdCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(UpdateNetworkCmd.class.getName());
private static final String s_name = "updatenetworkresponse";
@@ -162,7 +163,7 @@
Network result = _networkService.updateGuestNetwork(this);
if (result != null) {
- NetworkResponse response = _responseGenerator.createNetworkResponse(ResponseView.Restricted, result);
+ NetworkResponse response = _responseGenerator.createNetworkResponse(getResponseView(), result);
response.setResponseName(getCommandName());
setResponseObject(response);
} else {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java
index 3b17c34..db77916 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java
@@ -17,10 +17,7 @@
package org.apache.cloudstack.api.command.user.project;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -31,6 +28,7 @@
import org.apache.cloudstack.api.ApiConstants.DomainDetails;
import org.apache.cloudstack.api.BaseListAccountResourcesCmd;
import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.TaggedResources;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.ProjectResponse;
@@ -97,22 +95,7 @@
}
public Map<String, String> getTags() {
- Map<String, String> tagsMap = null;
- if (tags != null && !tags.isEmpty()) {
- tagsMap = new HashMap<String, String>();
- Collection<?> servicesCollection = tags.values();
- Iterator<?> iter = servicesCollection.iterator();
- while (iter.hasNext()) {
- HashMap<String, String> services = (HashMap<String, String>)iter.next();
- String key = services.get("key");
- String value = services.get("value");
- if (value == null) {
- throw new InvalidParameterValueException("No value is passed in for key " + key);
- }
- tagsMap.put(key, value);
- }
- }
- return tagsMap;
+ return TaggedResources.parseKeyValueMap(tags, false);
}
public EnumSet<DomainDetails> getDetails() throws InvalidParameterValueException {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
index a807386..fb66e31 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java
@@ -58,7 +58,7 @@
// ////////////// API parameters /////////////////////
// ///////////////////////////////////////////////////
- @Parameter(name = ApiConstants.PROTOCOL, type = CommandType.STRING, description = "TCP is default. UDP is the other supported protocol")
+ @Parameter(name = ApiConstants.PROTOCOL, type = CommandType.STRING, description = "the protocol for the ACL rule. Valid values are TCP/UDP/ICMP/ALL or valid protocol number (see /etc/protocols). ALL is default.")
private String protocol;
@Parameter(name = ApiConstants.START_PORT, type = CommandType.INTEGER, description = "start port for this ingress rule")
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/UpdateSecurityGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/UpdateSecurityGroupCmd.java
new file mode 100644
index 0000000..154ae71
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/UpdateSecurityGroupCmd.java
@@ -0,0 +1,105 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.command.user.securitygroup;
+
+import org.apache.log4j.Logger;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.acl.SecurityChecker.AccessType;
+import org.apache.cloudstack.api.ACL;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCustomIdCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.SecurityGroupResponse;
+
+import com.cloud.network.security.SecurityGroup;
+import com.cloud.user.Account;
+
+@APICommand(name = UpdateSecurityGroupCmd.APINAME, description = "Updates a security group", responseObject = SecurityGroupResponse.class, entityType = {SecurityGroup.class},
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
+ since = "4.14.0.0",
+ authorized = {RoleType.Admin})
+public class UpdateSecurityGroupCmd extends BaseCustomIdCmd {
+ public static final String APINAME = "updateSecurityGroup";
+ public static final Logger s_logger = Logger.getLogger(UpdateSecurityGroupCmd.class.getName());
+ private static final String s_name = "updatesecuritygroupresponse";
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+
+ @ACL(accessType = AccessType.OperateEntry)
+ @Parameter(name = ApiConstants.ID, type = CommandType.UUID, required=true, description="The ID of the security group.", entityType=SecurityGroupResponse.class)
+ private Long id;
+
+ @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "The new name of the security group.")
+ private String name;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public Long getId() {
+ return id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ @Override
+ public String getCommandName() {
+ return s_name;
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ SecurityGroup securityGroup = _entityMgr.findById(SecurityGroup.class, getId());
+ if (securityGroup != null) {
+ return securityGroup.getAccountId();
+ }
+
+ return Account.ACCOUNT_ID_SYSTEM; // no account info given, parent this command to SYSTEM so ERROR events are tracked
+ }
+
+ @Override
+ public void execute() {
+ SecurityGroup result = _securityGroupService.updateSecurityGroup(this);
+ if (result != null) {
+ SecurityGroupResponse response = _responseGenerator.createSecurityGroupResponse(result);
+ response.setResponseName(getCommandName());
+ setResponseObject(response);
+ } else {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update security group");
+ }
+ }
+
+ @Override
+ public void checkUuid() {
+ if (getCustomId() != null) {
+ _uuidMgr.checkUuid(getCustomId(), SecurityGroup.class);
+ }
+ }
+
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java
index 6aecc05..cde31cd 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java
@@ -17,9 +17,6 @@
package org.apache.cloudstack.api.command.user.tag;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -31,6 +28,7 @@
import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.TaggedResources;
import org.apache.cloudstack.api.response.SuccessResponse;
import com.cloud.event.EventTypes;
@@ -74,19 +72,7 @@
}
public Map<String, String> getTags() {
- Map<String, String> tagsMap = null;
- if (!tag.isEmpty()) {
- tagsMap = new HashMap<String, String>();
- Collection<?> servicesCollection = tag.values();
- Iterator<?> iter = servicesCollection.iterator();
- while (iter.hasNext()) {
- HashMap<String, String> services = (HashMap<String, String>)iter.next();
- String key = services.get("key");
- String value = services.get("value");
- tagsMap.put(key, value);
- }
- }
- return tagsMap;
+ return TaggedResources.parseKeyValueMap(tag, true);
}
public List<String> getResourceIds() {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java
index db45f75..5490097 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java
@@ -30,6 +30,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.context.CallContext;
@@ -42,7 +43,7 @@
@APICommand(name = "copyTemplate", description = "Copies a template from one zone to another.", responseObject = TemplateResponse.class, responseView = ResponseView.Restricted,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class CopyTemplateCmd extends BaseAsyncCmd {
+public class CopyTemplateCmd extends BaseAsyncCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(CopyTemplateCmd.class.getName());
private static final String s_name = "copytemplateresponse";
@@ -178,7 +179,7 @@
VirtualMachineTemplate template = _templateService.copyTemplate(this);
if (template != null){
- List<TemplateResponse> listResponse = _responseGenerator.createTemplateResponses(ResponseView.Restricted,
+ List<TemplateResponse> listResponse = _responseGenerator.createTemplateResponses(getResponseView(),
template, getDestinationZoneIds(), false);
TemplateResponse response = new TemplateResponse();
if (listResponse != null && !listResponse.isEmpty()) {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java
index aa8ecee..d598531 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java
@@ -21,6 +21,7 @@
import java.util.Map;
import org.apache.cloudstack.acl.SecurityChecker;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.GuestOSResponse;
import org.apache.cloudstack.api.response.SnapshotResponse;
import org.apache.cloudstack.api.response.TemplateResponse;
@@ -53,7 +54,7 @@
@APICommand(name = "createTemplate", responseObject = TemplateResponse.class, description = "Creates a template of a virtual machine. " + "The virtual machine must be in a STOPPED state. "
+ "A template created from this command is automatically designated as a private template visible to the account that created it.", responseView = ResponseView.Restricted,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class CreateTemplateCmd extends BaseAsyncCreateCmd {
+public class CreateTemplateCmd extends BaseAsyncCreateCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(CreateTemplateCmd.class.getName());
private static final String s_name = "createtemplateresponse";
@@ -301,15 +302,14 @@
public void execute() {
CallContext.current().setEventDetails(
"Template Id: " + getEntityUuid() + ((getSnapshotId() == null) ? " from volume Id: " + this._uuidMgr.getUuid(Volume.class, getVolumeId()) : " from snapshot Id: " + this._uuidMgr.getUuid(Snapshot.class, getSnapshotId())));
- VirtualMachineTemplate template = null;
- template = _templateService.createPrivateTemplate(this);
+ VirtualMachineTemplate template = _templateService.createPrivateTemplate(this);
if (template != null) {
List<TemplateResponse> templateResponses;
if (isBareMetal()) {
- templateResponses = _responseGenerator.createTemplateResponses(ResponseView.Restricted, template.getId(), vmId);
+ templateResponses = _responseGenerator.createTemplateResponses(getResponseView(), template.getId(), vmId);
} else {
- templateResponses = _responseGenerator.createTemplateResponses(ResponseView.Restricted, template.getId(), snapshotId, volumeId, false);
+ templateResponses = _responseGenerator.createTemplateResponses(getResponseView(), template.getId(), snapshotId, volumeId, false);
}
TemplateResponse response = new TemplateResponse();
if (templateResponses != null && !templateResponses.isEmpty()) {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java
index 48f8fff..970c6b3 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java
@@ -21,6 +21,7 @@
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.BaseListTemplateOrIsoPermissionsCmd;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.TemplatePermissionsResponse;
import com.cloud.storage.Storage.ImageFormat;
@@ -29,7 +30,7 @@
@APICommand(name = "listTemplatePermissions", description = "List template visibility and all accounts that have permissions to view this template.", responseObject = TemplatePermissionsResponse.class, responseView = ResponseView.Restricted,
requestHasSensitiveInfo = false,
responseHasSensitiveInfo = false)
-public class ListTemplatePermissionsCmd extends BaseListTemplateOrIsoPermissionsCmd {
+public class ListTemplatePermissionsCmd extends BaseListTemplateOrIsoPermissionsCmd implements UserCmd {
protected String getResponseName() {
return "listtemplatepermissionsresponse";
}
@@ -49,9 +50,4 @@
return !template.getFormat().equals(ImageFormat.ISO);
}
- @Override
- public void execute() {
- executeWithView(ResponseView.Restricted);
- }
-
}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
index 481cfd1..5630d7f 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
@@ -25,6 +25,7 @@
import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
@@ -36,7 +37,7 @@
@APICommand(name = "listTemplates", description = "List all public, private, and privileged templates.", responseObject = TemplateResponse.class, entityType = {VirtualMachineTemplate.class}, responseView = ResponseView.Restricted,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class ListTemplatesCmd extends BaseListTaggedResourcesCmd {
+public class ListTemplatesCmd extends BaseListTaggedResourcesCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(ListTemplatesCmd.class.getName());
private static final String s_name = "listtemplatesresponse";
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
index 333b363..7e0002d 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
@@ -31,6 +31,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.GuestOSResponse;
import org.apache.cloudstack.api.response.ListResponse;
@@ -45,7 +46,7 @@
@APICommand(name = "registerTemplate", description = "Registers an existing template into the CloudStack cloud. ", responseObject = TemplateResponse.class, responseView = ResponseView.Restricted,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class RegisterTemplateCmd extends BaseCmd {
+public class RegisterTemplateCmd extends BaseCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(RegisterTemplateCmd.class.getName());
private static final String s_name = "registertemplateresponse";
@@ -304,7 +305,7 @@
VirtualMachineTemplate template = _templateService.registerTemplate(this);
if (template != null) {
ListResponse<TemplateResponse> response = new ListResponse<TemplateResponse>();
- List<TemplateResponse> templateResponses = _responseGenerator.createTemplateResponses(ResponseView.Restricted,
+ List<TemplateResponse> templateResponses = _responseGenerator.createTemplateResponses(getResponseView(),
template, getZoneIds(), false);
response.setResponses(templateResponses);
response.setResponseName(getCommandName());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java
index 0a01e48..ee60ad5 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java
@@ -23,6 +23,7 @@
import org.apache.cloudstack.api.BaseUpdateTemplateOrIsoCmd;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.TemplateResponse;
import com.cloud.template.VirtualMachineTemplate;
@@ -30,7 +31,7 @@
@APICommand(name = "updateTemplate", description = "Updates attributes of a template.", responseObject = TemplateResponse.class, responseView = ResponseView.Restricted,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class UpdateTemplateCmd extends BaseUpdateTemplateOrIsoCmd {
+public class UpdateTemplateCmd extends BaseUpdateTemplateOrIsoCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(UpdateTemplateCmd.class.getName());
private static final String s_name = "updatetemplateresponse";
@@ -70,7 +71,7 @@
public void execute() {
VirtualMachineTemplate result = _templateService.updateTemplate(this);
if (result != null) {
- TemplateResponse response = _responseGenerator.createTemplateUpdateResponse(ResponseView.Restricted, result);
+ TemplateResponse response = _responseGenerator.createTemplateUpdateResponse(getResponseView(), result);
response.setObjectName("template");
response.setTemplateType(result.getTemplateType().toString());//Template can be either USER or ROUTING type
response.setResponseName(getCommandName());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/AddNicToVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/AddNicToVMCmd.java
index a5a3f6e..454ca6d 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/AddNicToVMCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/AddNicToVMCmd.java
@@ -35,6 +35,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.NetworkResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
@@ -49,7 +50,7 @@
@APICommand(name = "addNicToVirtualMachine", description = "Adds VM to specified network by creating a NIC", responseObject = UserVmResponse.class, responseView = ResponseView.Restricted, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class AddNicToVMCmd extends BaseAsyncCmd {
+public class AddNicToVMCmd extends BaseAsyncCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(AddNicToVMCmd.class);
private static final String s_name = "addnictovirtualmachineresponse";
@@ -164,7 +165,7 @@
dc.add(VMDetails.valueOf("nics"));
EnumSet<VMDetails> details = EnumSet.copyOf(dc);
if (result != null){
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Restricted, "virtualmachine", details, result).get(0);
+ UserVmResponse response = _responseGenerator.createUserVmResponse(getResponseView(), "virtualmachine", details, result).get(0);
response.setResponseName(getCommandName());
setResponseObject(response);
} else {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
index ec1dc81..db315cc 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
@@ -17,6 +17,7 @@
package org.apache.cloudstack.api.command.user.vm;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
@@ -24,7 +25,10 @@
import java.util.List;
import java.util.Map;
-import com.cloud.agent.api.LogLevel;
+import javax.annotation.Nonnull;
+
+import com.cloud.utils.StringUtils;
+
import org.apache.cloudstack.acl.RoleType;
import org.apache.cloudstack.affinity.AffinityGroupResponse;
import org.apache.cloudstack.api.ACL;
@@ -36,6 +40,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.DiskOfferingResponse;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.HostResponse;
@@ -50,6 +55,7 @@
import org.apache.commons.collections.MapUtils;
import org.apache.log4j.Logger;
+import com.cloud.agent.api.LogLevel;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
@@ -69,7 +75,7 @@
@APICommand(name = "deployVirtualMachine", description = "Creates and automatically starts a virtual machine based on a service offering, disk offering, and template.", responseObject = UserVmResponse.class, responseView = ResponseView.Restricted, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd implements SecurityGroupAction {
+public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd implements SecurityGroupAction, UserCmd {
public static final Logger s_logger = Logger.getLogger(DeployVMCmd.class.getName());
private static final String s_name = "deployvirtualmachineresponse";
@@ -107,6 +113,12 @@
@Parameter(name = ApiConstants.NETWORK_IDS, type = CommandType.LIST, collectionType = CommandType.UUID, entityType = NetworkResponse.class, description = "list of network ids used by virtual machine. Can't be specified with ipToNetworkList parameter")
private List<Long> networkIds;
+ @Parameter(name = ApiConstants.BOOT_TYPE, type = CommandType.STRING, required = false, description = "Guest VM Boot option either custom[UEFI] or default boot [BIOS]")
+ private String bootType;
+
+ @Parameter(name = ApiConstants.BOOT_MODE, type = CommandType.STRING, required = false, description = "Boot Mode [Legacy] or [Secure] Applicable when Boot Type Selected is UEFI, otherwise Legacy By default for BIOS")
+ private String bootMode;
+
//DataDisk information
@ACL
@Parameter(name = ApiConstants.DISK_OFFERING_ID, type = CommandType.UUID, entityType = DiskOfferingResponse.class, description = "the ID of the disk offering for the virtual machine. If the template is of ISO format,"
@@ -186,7 +198,7 @@
@Parameter(name = ApiConstants.DISPLAY_VM, type = CommandType.BOOLEAN, since = "4.2", description = "an optional field, whether to the display the vm to the end user or not.", authorized = {RoleType.Admin})
private Boolean displayVm;
- @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, since = "4.3", description = "used to specify the custom parameters.")
+ @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, since = "4.3", description = "used to specify the custom parameters. 'extraconfig' is not allowed to be passed in details")
private Map details;
@Parameter(name = ApiConstants.DEPLOYMENT_PLANNER, type = CommandType.STRING, description = "Deployment planner to use for vm allocation. Available to ROOT admin only", since = "4.4", authorized = { RoleType.Admin })
@@ -241,6 +253,22 @@
return domainId;
}
+ private ApiConstants.BootType getBootType() {
+
+ if (StringUtils.isNotBlank(bootType)) {
+ try {
+ String type = bootType.trim().toUpperCase();
+ return ApiConstants.BootType.valueOf(type);
+ } catch (IllegalArgumentException e) {
+ String errMesg = "Invalid bootType " + bootType + "Specified for vm " + getName()
+ + " Valid values are: " + Arrays.toString(ApiConstants.BootType.values());
+ s_logger.warn(errMesg);
+ throw new InvalidParameterValueException(errMesg);
+ }
+ }
+ return null;
+ }
+
public Map<String, String> getDetails() {
Map<String, String> customparameterMap = new HashMap<String, String>();
if (details != null && details.size() != 0) {
@@ -253,12 +281,35 @@
}
}
}
+ if(getBootType() != null){ // export to get
+ if(getBootType() == ApiConstants.BootType.UEFI) {
+ customparameterMap.put(getBootType().toString(), getBootMode().toString());
+ }
+ }
+
if (rootdisksize != null && !customparameterMap.containsKey("rootdisksize")) {
customparameterMap.put("rootdisksize", rootdisksize.toString());
}
return customparameterMap;
}
+
+ public ApiConstants.BootMode getBootMode() {
+ if (StringUtils.isNotBlank(bootMode)) {
+ try {
+ String mode = bootMode.trim().toUpperCase();
+ return ApiConstants.BootMode.valueOf(mode);
+ } catch (IllegalArgumentException e) {
+ String errMesg = "Invalid bootMode " + bootMode + "Specified for vm " + getName()
+ + " Valid values are: "+ Arrays.toString(ApiConstants.BootMode.values());
+ s_logger.warn(errMesg);
+ throw new InvalidParameterValueException(errMesg);
+ }
+ }
+ return null;
+ }
+
+
public Map<String, String> getVmOVFProperties() {
Map<String, String> map = new HashMap<>();
if (MapUtils.isNotEmpty(vmOvfProperties)) {
@@ -360,32 +411,8 @@
Iterator iter = ipsCollection.iterator();
while (iter.hasNext()) {
HashMap<String, String> ips = (HashMap<String, String>)iter.next();
- Long networkId;
- Network network = _networkService.getNetwork(ips.get("networkid"));
- if (network != null) {
- networkId = network.getId();
- } else {
- try {
- networkId = Long.parseLong(ips.get("networkid"));
- } catch (NumberFormatException e) {
- throw new InvalidParameterValueException("Unable to translate and find entity with networkId: " + ips.get("networkid"));
- }
- }
- String requestedIp = ips.get("ip");
- String requestedIpv6 = ips.get("ipv6");
- String requestedMac = ips.get("mac");
- if (requestedIpv6 != null) {
- requestedIpv6 = NetUtils.standardizeIp6Address(requestedIpv6);
- }
- if (requestedMac != null) {
- if(!NetUtils.isValidMac(requestedMac)) {
- throw new InvalidParameterValueException("Mac address is not valid: " + requestedMac);
- } else if(!NetUtils.isUnicastMac(requestedMac)) {
- throw new InvalidParameterValueException("Mac address is not unicast: " + requestedMac);
- }
- requestedMac = NetUtils.standardizeMacAddress(requestedMac);
- }
- IpAddresses addrs = new IpAddresses(requestedIp, requestedIpv6, requestedMac);
+ Long networkId = getNetworkIdFomIpMap(ips);
+ IpAddresses addrs = getIpAddressesFromIpMap(ips);
ipToNetworkMap.put(networkId, addrs);
}
}
@@ -393,6 +420,42 @@
return ipToNetworkMap;
}
+ @Nonnull
+ private IpAddresses getIpAddressesFromIpMap(HashMap<String, String> ips) {
+ String requestedIp = ips.get("ip");
+ String requestedIpv6 = ips.get("ipv6");
+ String requestedMac = ips.get("mac");
+ if (requestedIpv6 != null) {
+ requestedIpv6 = NetUtils.standardizeIp6Address(requestedIpv6);
+ }
+ if (requestedMac != null) {
+ if(!NetUtils.isValidMac(requestedMac)) {
+ throw new InvalidParameterValueException("Mac address is not valid: " + requestedMac);
+ } else if(!NetUtils.isUnicastMac(requestedMac)) {
+ throw new InvalidParameterValueException("Mac address is not unicast: " + requestedMac);
+ }
+ requestedMac = NetUtils.standardizeMacAddress(requestedMac);
+ }
+ return new IpAddresses(requestedIp, requestedIpv6, requestedMac);
+ }
+
+ @Nonnull
+ private Long getNetworkIdFomIpMap(HashMap<String, String> ips) {
+ Long networkId;
+ final String networkid = ips.get("networkid");
+ Network network = _networkService.getNetwork(networkid);
+ if (network != null) {
+ networkId = network.getId();
+ } else {
+ try {
+ networkId = Long.parseLong(networkid);
+ } catch (NumberFormatException e) {
+ throw new InvalidParameterValueException("Unable to translate and find entity with networkId: " + networkid);
+ }
+ }
+ return networkId;
+ }
+
public String getIpAddress() {
return ipAddress;
}
@@ -573,6 +636,9 @@
} catch (ResourceUnavailableException ex) {
s_logger.warn("Exception: ", ex);
throw new ServerApiException(ApiErrorCode.RESOURCE_UNAVAILABLE_ERROR, ex.getMessage());
+ } catch (ResourceAllocationException ex) {
+ s_logger.warn("Exception: ", ex);
+ throw new ServerApiException(ApiErrorCode.RESOURCE_ALLOCATION_ERROR, ex.getMessage());
} catch (ConcurrentOperationException ex) {
s_logger.warn("Exception: ", ex);
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, ex.getMessage());
@@ -592,7 +658,7 @@
}
if (result != null) {
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Restricted, "virtualmachine", result).get(0);
+ UserVmResponse response = _responseGenerator.createUserVmResponse(getResponseView(), "virtualmachine", result).get(0);
response.setResponseName(getCommandName());
setResponseObject(response);
} else {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java
index 7b359b7..30ab5b5 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java
@@ -30,6 +30,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.context.CallContext;
@@ -44,7 +45,7 @@
@APICommand(name = "destroyVirtualMachine", description = "Destroys a virtual machine.", responseObject = UserVmResponse.class, responseView = ResponseView.Restricted, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false,
responseHasSensitiveInfo = true)
-public class DestroyVMCmd extends BaseAsyncCmd {
+public class DestroyVMCmd extends BaseAsyncCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(DestroyVMCmd.class.getName());
private static final String s_name = "destroyvirtualmachineresponse";
@@ -137,7 +138,7 @@
UserVmResponse response = new UserVmResponse();
if (result != null) {
- List<UserVmResponse> responses = _responseGenerator.createUserVmResponse(ResponseView.Restricted, "virtualmachine", result);
+ List<UserVmResponse> responses = _responseGenerator.createUserVmResponse(getResponseView(), "virtualmachine", result);
if (responses != null && !responses.isEmpty()) {
response = responses.get(0);
}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
index ff6acde..d468578 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java
@@ -20,6 +20,7 @@
import java.util.EnumSet;
import java.util.List;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.UserResponse;
import org.apache.log4j.Logger;
@@ -51,7 +52,7 @@
@APICommand(name = "listVirtualMachines", description = "List the virtual machines owned by the account.", responseObject = UserVmResponse.class, responseView = ResponseView.Restricted, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class ListVMsCmd extends BaseListTaggedResourcesCmd {
+public class ListVMsCmd extends BaseListTaggedResourcesCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(ListVMsCmd.class.getName());
private static final String s_name = "listvirtualmachinesresponse";
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java
index b524257..6011bdb 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java
@@ -28,6 +28,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
@@ -40,7 +41,7 @@
@APICommand(name = "rebootVirtualMachine", description = "Reboots a virtual machine.", responseObject = UserVmResponse.class, responseView = ResponseView.Restricted, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class RebootVMCmd extends BaseAsyncCmd {
+public class RebootVMCmd extends BaseAsyncCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(RebootVMCmd.class.getName());
private static final String s_name = "rebootvirtualmachineresponse";
@@ -105,7 +106,7 @@
UserVm result;
result = _userVmService.rebootVirtualMachine(this);
if (result !=null){
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Restricted, "virtualmachine", result).get(0);
+ UserVmResponse response = _responseGenerator.createUserVmResponse(getResponseView(), "virtualmachine", result).get(0);
response.setResponseName(getCommandName());
setResponseObject(response);
} else {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RemoveNicFromVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RemoveNicFromVMCmd.java
index 677b482..5fd016c 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RemoveNicFromVMCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RemoveNicFromVMCmd.java
@@ -32,6 +32,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.NicResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
@@ -43,7 +44,7 @@
@APICommand(name = "removeNicFromVirtualMachine", description = "Removes VM from specified network by deleting a NIC", responseObject = UserVmResponse.class, responseView = ResponseView.Restricted, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class RemoveNicFromVMCmd extends BaseAsyncCmd {
+public class RemoveNicFromVMCmd extends BaseAsyncCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(RemoveNicFromVMCmd.class);
private static final String s_name = "removenicfromvirtualmachineresponse";
@@ -110,7 +111,7 @@
dc.add(VMDetails.valueOf("nics"));
EnumSet<VMDetails> details = EnumSet.copyOf(dc);
if (result != null){
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Restricted, "virtualmachine", details, result).get(0);
+ UserVmResponse response = _responseGenerator.createUserVmResponse(getResponseView(), "virtualmachine", details, result).get(0);
response.setResponseName(getCommandName());
setResponseObject(response);
} else {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java
index 365f3ed..e9a2503 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java
@@ -28,6 +28,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
@@ -42,7 +43,7 @@
"The virtual machine must be in a \"Stopped\" state and the template must already " +
"support this feature for this command to take effect. [async]", responseView = ResponseView.Restricted, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class ResetVMPasswordCmd extends BaseAsyncCmd {
+public class ResetVMPasswordCmd extends BaseAsyncCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(ResetVMPasswordCmd.class.getName());
private static final String s_name = "resetpasswordforvirtualmachineresponse";
@@ -121,7 +122,7 @@
CallContext.current().setEventDetails("Vm Id: " + getId());
UserVm result = _userVmService.resetVMPassword(this, password);
if (result != null){
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Restricted, "virtualmachine", result).get(0);
+ UserVmResponse response = _responseGenerator.createUserVmResponse(getResponseView(), "virtualmachine", result).get(0);
response.setResponseName(getCommandName());
setResponseObject(response);
} else {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java
index db2c7ff..ce481d8 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ResetVMSSHKeyCmd.java
@@ -29,6 +29,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
@@ -44,7 +45,7 @@
@APICommand(name = "resetSSHKeyForVirtualMachine", responseObject = UserVmResponse.class, description = "Resets the SSH Key for virtual machine. " +
"The virtual machine must be in a \"Stopped\" state. [async]", responseView = ResponseView.Restricted, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class ResetVMSSHKeyCmd extends BaseAsyncCmd {
+public class ResetVMSSHKeyCmd extends BaseAsyncCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(ResetVMSSHKeyCmd.class.getName());
@@ -143,7 +144,7 @@
UserVm result = _userVmService.resetVMSSHKey(this);
if (result != null) {
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Restricted, "virtualmachine", result).get(0);
+ UserVmResponse response = _responseGenerator.createUserVmResponse(getResponseView(), "virtualmachine", result).get(0);
response.setResponseName(getCommandName());
setResponseObject(response);
} else {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java
index b2b4d03..2439a26 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java
@@ -27,6 +27,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
@@ -43,7 +44,7 @@
@APICommand(name = "restoreVirtualMachine", description = "Restore a VM to original template/ISO or new template/ISO", responseObject = UserVmResponse.class, since = "3.0.0", responseView = ResponseView.Restricted, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false,
responseHasSensitiveInfo = true)
-public class RestoreVMCmd extends BaseAsyncCmd {
+public class RestoreVMCmd extends BaseAsyncCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(RestoreVMCmd.class);
private static final String s_name = "restorevmresponse";
@@ -75,7 +76,7 @@
CallContext.current().setEventDetails("Vm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getVmId()));
result = _userVmService.restoreVM(this);
if (result != null) {
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Restricted, "virtualmachine", result).get(0);
+ UserVmResponse response = _responseGenerator.createUserVmResponse(getResponseView(), "virtualmachine", result).get(0);
response.setResponseName(getCommandName());
setResponseObject(response);
} else {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
index 631cef2..f7caf56 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
@@ -35,6 +35,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.ServiceOfferingResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
@@ -51,7 +52,7 @@
@APICommand(name = "scaleVirtualMachine", description = "Scales the virtual machine to a new service offering.", responseObject = SuccessResponse.class, responseView = ResponseView.Restricted, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class ScaleVMCmd extends BaseAsyncCmd {
+public class ScaleVMCmd extends BaseAsyncCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(ScaleVMCmd.class.getName());
private static final String s_name = "scalevirtualmachineresponse";
@@ -152,7 +153,7 @@
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, ex.getMessage());
}
if (result != null){
- List<UserVmResponse> responseList = _responseGenerator.createUserVmResponse(ResponseView.Restricted, "virtualmachine", result);
+ List<UserVmResponse> responseList = _responseGenerator.createUserVmResponse(getResponseView(), "virtualmachine", result);
UserVmResponse response = responseList.get(0);
response.setResponseName(getCommandName());
setResponseObject(response);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java
index 5b3db85..2a7f6d0 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java
@@ -31,6 +31,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.HostResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
@@ -49,7 +50,7 @@
@APICommand(name = "startVirtualMachine", responseObject = UserVmResponse.class, description = "Starts a virtual machine.", responseView = ResponseView.Restricted, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class StartVMCmd extends BaseAsyncCmd {
+public class StartVMCmd extends BaseAsyncCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(StartVMCmd.class.getName());
private static final String s_name = "startvirtualmachineresponse";
@@ -153,7 +154,7 @@
}
@Override
- public void execute() throws ResourceUnavailableException, ResourceAllocationException {
+ public void execute() {
try {
CallContext.current().setEventDetails("Vm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId()));
@@ -161,7 +162,7 @@
result = _userVmService.startVirtualMachine(this);
if (result != null) {
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Restricted, "virtualmachine", result).get(0);
+ UserVmResponse response = _responseGenerator.createUserVmResponse(getResponseView(), "virtualmachine", result).get(0);
response.setResponseName(getCommandName());
setResponseObject(response);
} else {
@@ -176,6 +177,12 @@
} catch (ExecutionException ex) {
s_logger.warn("Exception: ", ex);
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, ex.getMessage());
+ } catch (ResourceUnavailableException ex) {
+ s_logger.warn("Exception: ", ex);
+ throw new ServerApiException(ApiErrorCode.RESOURCE_UNAVAILABLE_ERROR, ex.getMessage());
+ } catch (ResourceAllocationException ex) {
+ s_logger.warn("Exception: ", ex);
+ throw new ServerApiException(ApiErrorCode.RESOURCE_ALLOCATION_ERROR, ex.getMessage());
} catch (InsufficientCapacityException ex) {
StringBuilder message = new StringBuilder(ex.getMessage());
if (ex instanceof InsufficientServerCapacityException) {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java
index bab8552..8e1c3cb 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java
@@ -28,6 +28,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
@@ -39,7 +40,7 @@
@APICommand(name = "stopVirtualMachine", responseObject = UserVmResponse.class, description = "Stops a virtual machine.", responseView = ResponseView.Restricted, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class StopVMCmd extends BaseAsyncCmd {
+public class StopVMCmd extends BaseAsyncCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(StopVMCmd.class.getName());
private static final String s_name = "stopvirtualmachineresponse";
@@ -121,7 +122,7 @@
result = _userVmService.stopVirtualMachine(getId(), isForced());
if (result != null) {
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Restricted, "virtualmachine", result).get(0);
+ UserVmResponse response = _responseGenerator.createUserVmResponse(getResponseView(), "virtualmachine", result).get(0);
response.setResponseName(getCommandName());
setResponseObject(response);
} else {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateDefaultNicForVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateDefaultNicForVMCmd.java
index 7262e23..ff533f8 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateDefaultNicForVMCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateDefaultNicForVMCmd.java
@@ -32,6 +32,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.NicResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
@@ -43,7 +44,7 @@
@APICommand(name = "updateDefaultNicForVirtualMachine", description = "Changes the default NIC on a VM", responseObject = UserVmResponse.class, responseView = ResponseView.Restricted, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class UpdateDefaultNicForVMCmd extends BaseAsyncCmd {
+public class UpdateDefaultNicForVMCmd extends BaseAsyncCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(UpdateDefaultNicForVMCmd.class);
private static final String s_name = "updatedefaultnicforvirtualmachineresponse";
@@ -111,7 +112,7 @@
dc.add(VMDetails.valueOf("nics"));
EnumSet<VMDetails> details = EnumSet.copyOf(dc);
if (result != null){
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Restricted, "virtualmachine", details, result).get(0);
+ UserVmResponse response = _responseGenerator.createUserVmResponse(getResponseView(), "virtualmachine", details, result).get(0);
response.setResponseName(getCommandName());
setResponseObject(response);
} else {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
index b040f79..3afee8a 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
@@ -33,6 +33,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.GuestOSResponse;
import org.apache.cloudstack.api.response.SecurityGroupResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
@@ -49,7 +50,7 @@
"new properties to take effect. UpdateVirtualMachine does not first check whether the VM is stopped. " +
"Therefore, stop the VM manually before issuing this call.", responseObject = UserVmResponse.class, responseView = ResponseView.Restricted, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class UpdateVMCmd extends BaseCustomIdCmd implements SecurityGroupAction {
+public class UpdateVMCmd extends BaseCustomIdCmd implements SecurityGroupAction, UserCmd {
public static final Logger s_logger = Logger.getLogger(UpdateVMCmd.class.getName());
private static final String s_name = "updatevirtualmachineresponse";
@@ -97,7 +98,7 @@
@Parameter(name = ApiConstants.INSTANCE_NAME, type = CommandType.STRING, description = "instance name of the user vm", since = "4.4", authorized = {RoleType.Admin})
private String instanceName;
- @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, description = "Details in key/value pairs.")
+ @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, description = "Details in key/value pairs. 'extraconfig' is not allowed to be passed in details.")
protected Map<String, String> details;
@ACL
@@ -259,7 +260,7 @@
CallContext.current().setEventDetails("Vm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId()));
UserVm result = _userVmService.updateVirtualMachine(this);
if (result != null){
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Restricted, "virtualmachine", result).get(0);
+ UserVmResponse response = _responseGenerator.createUserVmResponse(getResponseView(), "virtualmachine", result).get(0);
response.setResponseName(getCommandName());
setResponseObject(response);
} else {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
index 216833b..8dc8f44 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
@@ -32,6 +32,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.ServiceOfferingResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.context.CallContext;
@@ -47,7 +48,7 @@
"The virtual machine must be in a \"Stopped\" state for " +
"this command to take effect.", responseView = ResponseView.Restricted, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class UpgradeVMCmd extends BaseCmd {
+public class UpgradeVMCmd extends BaseCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(UpgradeVMCmd.class.getName());
private static final String s_name = "changeserviceforvirtualmachineresponse";
@@ -129,7 +130,7 @@
UserVm result = _userVmService.upgradeVirtualMachine(this);
if (result != null){
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Restricted, "virtualmachine", result).get(0);
+ UserVmResponse response = _responseGenerator.createUserVmResponse(getResponseView(), "virtualmachine", result).get(0);
response.setResponseName(getCommandName());
setResponseObject(response);
} else {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToVMSnapshotCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToVMSnapshotCmd.java
index 8c3510b..9076ac2 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToVMSnapshotCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToVMSnapshotCmd.java
@@ -27,6 +27,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.VMSnapshotResponse;
import org.apache.cloudstack.context.CallContext;
@@ -42,7 +43,7 @@
@APICommand(name = "revertToVMSnapshot", description = "Revert VM from a vmsnapshot.", responseObject = UserVmResponse.class, since = "4.2.0", responseView = ResponseView.Restricted,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class RevertToVMSnapshotCmd extends BaseAsyncCmd {
+public class RevertToVMSnapshotCmd extends BaseAsyncCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(RevertToVMSnapshotCmd.class.getName());
private static final String s_name = "reverttovmsnapshotresponse";
@@ -77,7 +78,7 @@
CallContext.current().setEventDetails("vmsnapshot id: " + this._uuidMgr.getUuid(VMSnapshot.class, getVmSnapShotId()));
UserVm result = _vmSnapshotService.revertToSnapshot(getVmSnapShotId());
if (result != null) {
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Restricted,
+ UserVmResponse response = _responseGenerator.createUserVmResponse(getResponseView(),
"virtualmachine", result).get(0);
response.setResponseName(getCommandName());
setResponseObject(response);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java
index d53059e..a8a3a75 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java
@@ -16,17 +16,16 @@
// under the License.
package org.apache.cloudstack.api.command.user.volume;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.TaggedResources;
import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
import com.cloud.server.ResourceTag;
@@ -58,19 +57,7 @@
/////////////////////////////////////////////////////
public Map getDetails() {
- Map<String, String> detailsMap = null;
- if (!details.isEmpty()) {
- detailsMap = new HashMap<String, String>();
- Collection<?> servicesCollection = details.values();
- Iterator<?> iter = servicesCollection.iterator();
- while (iter.hasNext()) {
- HashMap<String, String> services = (HashMap<String, String>)iter.next();
- String key = services.get("key");
- String value = services.get("value");
- detailsMap.put(key, value);
- }
- }
- return detailsMap;
+ return TaggedResources.parseKeyValueMap(details, true);
}
public ResourceTag.ResourceObjectType getResourceType() {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java
index 7e2b155..18770b2 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java
@@ -28,6 +28,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.context.CallContext;
@@ -39,7 +40,7 @@
@APICommand(name = "attachVolume", description = "Attaches a disk volume to a virtual machine.", responseObject = VolumeResponse.class, responseView = ResponseView.Restricted, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class AttachVolumeCmd extends BaseAsyncCmd {
+public class AttachVolumeCmd extends BaseAsyncCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(AttachVolumeCmd.class.getName());
private static final String s_name = "attachvolumeresponse";
@@ -119,7 +120,7 @@
CallContext.current().setEventDetails("Volume Id: " + this._uuidMgr.getUuid(Volume.class, getId()) + " VmId: " + this._uuidMgr.getUuid(VirtualMachine.class, getVirtualMachineId()));
Volume result = _volumeService.attachVolumeToVM(this);
if (result != null) {
- VolumeResponse response = _responseGenerator.createVolumeResponse(ResponseView.Restricted, result);
+ VolumeResponse response = _responseGenerator.createVolumeResponse(getResponseView(), result);
response.setResponseName(getCommandName());
setResponseObject(response);
} else {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java
index 6528109..a54bda1 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java
@@ -28,6 +28,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.DiskOfferingResponse;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.ProjectResponse;
@@ -46,7 +47,7 @@
@APICommand(name = "createVolume", responseObject = VolumeResponse.class, description = "Creates a disk volume from a disk offering. This disk volume must still be attached to a virtual machine to make use of it.", responseView = ResponseView.Restricted, entityType = {
Volume.class, VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class CreateVolumeCmd extends BaseAsyncCreateCustomIdCmd {
+public class CreateVolumeCmd extends BaseAsyncCreateCustomIdCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(CreateVolumeCmd.class.getName());
private static final String s_name = "createvolumeresponse";
@@ -223,7 +224,7 @@
CallContext.current().setEventDetails("Volume Id: " + getEntityUuid() + ((getSnapshotId() == null) ? "" : " from snapshot: " + this._uuidMgr.getUuid(Snapshot.class, getSnapshotId())));
Volume volume = _volumeService.createVolume(this);
if (volume != null) {
- VolumeResponse response = _responseGenerator.createVolumeResponse(ResponseView.Restricted, volume);
+ VolumeResponse response = _responseGenerator.createVolumeResponse(getResponseView(), volume);
//FIXME - have to be moved to ApiResponseHelper
if (getSnapshotId() != null) {
Snapshot snap = _entityMgr.findById(Snapshot.class, getSnapshotId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java
index 070ec5f..678299c 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java
@@ -82,8 +82,8 @@
@Override
public void execute() throws ConcurrentOperationException {
CallContext.current().setEventDetails("Volume Id: " + this._uuidMgr.getUuid(Volume.class, getId()));
- boolean result = _volumeService.deleteVolume(id, CallContext.current().getCallingAccount());
- if (result) {
+ Volume result = _volumeService.destroyVolume(id, CallContext.current().getCallingAccount(), true, false);
+ if (result != null) {
SuccessResponse response = new SuccessResponse(getCommandName());
setResponseObject(response);
} else {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/DestroyVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/DestroyVolumeCmd.java
new file mode 100644
index 0000000..ed84578
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/DestroyVolumeCmd.java
@@ -0,0 +1,130 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.command.user.volume;
+
+import org.apache.log4j.Logger;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.acl.SecurityChecker.AccessType;
+import org.apache.cloudstack.api.ACL;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiCommandJobType;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.VolumeResponse;
+import org.apache.cloudstack.context.CallContext;
+
+import com.cloud.event.EventTypes;
+import com.cloud.storage.Volume;
+import com.cloud.user.Account;
+
+@APICommand(name = "destroyVolume", description = "Destroys a Volume.", responseObject = VolumeResponse.class, responseView = ResponseView.Restricted, entityType = {Volume.class},
+ since = "4.14.0",
+ authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User},
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = true)
+public class DestroyVolumeCmd extends BaseAsyncCmd {
+ public static final Logger s_logger = Logger.getLogger(DestroyVolumeCmd.class.getName());
+
+ private static final String s_name = "destroyvolumeresponse";
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+
+ @ACL(accessType = AccessType.OperateEntry)
+ @Parameter(name=ApiConstants.ID, type=CommandType.UUID, entityType=VolumeResponse.class,
+ required=true, description="The ID of the volume")
+ private Long id;
+
+ @Parameter(name = ApiConstants.EXPUNGE,
+ type = CommandType.BOOLEAN,
+ description = "If true is passed, the volume is expunged immediately. False by default.",
+ since = "4.6.0")
+ private Boolean expunge;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public Long getId() {
+ return id;
+ }
+
+ public boolean getExpunge() {
+ if (expunge == null) {
+ return false;
+ }
+ return expunge;
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ @Override
+ public String getCommandName() {
+ return s_name;
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ Volume volume = _entityMgr.findById(Volume.class, getId());
+ if (volume != null) {
+ return volume.getAccountId();
+ }
+
+ return Account.ACCOUNT_ID_SYSTEM; // no account info given, parent this command to SYSTEM so ERROR events are tracked
+ }
+
+ @Override
+ public String getEventType() {
+ return EventTypes.EVENT_VOLUME_DESTROY;
+ }
+
+ @Override
+ public String getEventDescription() {
+ return "destroying volume: " + getId();
+ }
+
+ @Override
+ public ApiCommandJobType getInstanceType() {
+ return ApiCommandJobType.Volume;
+ }
+
+ @Override
+ public Long getInstanceId() {
+ return getId();
+ }
+
+ @Override
+ public void execute() {
+ CallContext.current().setEventDetails("Volume Id: " + getId());
+ Volume result = _volumeService.destroyVolume(getId(), CallContext.current().getCallingAccount(), getExpunge(), false);
+ if (result != null) {
+ VolumeResponse response = _responseGenerator.createVolumeResponse(ResponseView.Restricted, result);
+ response.setResponseName(getCommandName());
+ setResponseObject(response);
+ } else {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to destroy volume");
+ }
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java
index 55d30e3..1e38ca2 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java
@@ -28,6 +28,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.context.CallContext;
@@ -40,7 +41,7 @@
@APICommand(name = "detachVolume", description = "Detaches a disk volume from a virtual machine.", responseObject = VolumeResponse.class, responseView = ResponseView.Restricted, entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class DetachVolumeCmd extends BaseAsyncCmd {
+public class DetachVolumeCmd extends BaseAsyncCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(DetachVolumeCmd.class.getName());
private static final String s_name = "detachvolumeresponse";
@@ -143,7 +144,7 @@
CallContext.current().setEventDetails(getEventDescription());
Volume result = _volumeService.detachVolumeFromVM(this);
if (result != null){
- VolumeResponse response = _responseGenerator.createVolumeResponse(ResponseView.Restricted, result);
+ VolumeResponse response = _responseGenerator.createVolumeResponse(getResponseView(), result);
response.setResponseName("volume");
setResponseObject(response);
} else {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java
index c858f49..0b3e6dd 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java
@@ -24,7 +24,9 @@
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.BaseCmd.CommandType;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.ClusterResponse;
import org.apache.cloudstack.api.response.DiskOfferingResponse;
import org.apache.cloudstack.api.response.HostResponse;
@@ -40,7 +42,7 @@
@APICommand(name = "listVolumes", description = "Lists all volumes.", responseObject = VolumeResponse.class, responseView = ResponseView.Restricted, entityType = {
Volume.class}, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class ListVolumesCmd extends BaseListTaggedResourcesCmd {
+public class ListVolumesCmd extends BaseListTaggedResourcesCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(ListVolumesCmd.class.getName());
private static final String s_name = "listvolumesresponse";
@@ -87,6 +89,9 @@
RoleType.Admin})
private Boolean display;
+ @Parameter(name = ApiConstants.STATE, type = CommandType.STRING, description = "state of the volume. Possible values are: Ready, Allocated, Destroy, Expunging, Expunged.")
+ private String state;
+
/////////////////////////////////////////////////////
/////////////////// Accessors ///////////////////////
/////////////////////////////////////////////////////
@@ -138,6 +143,10 @@
}
return super.getDisplay();
}
+
+ public String getState() {
+ return state;
+ }
/////////////////////////////////////////////////////
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java
index f5d5e8c..44dd4bf 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java
@@ -24,6 +24,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.StoragePoolResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
@@ -33,7 +34,7 @@
@APICommand(name = "migrateVolume", description = "Migrate volume", responseObject = VolumeResponse.class, since = "3.0.0", responseView = ResponseView.Restricted, entityType = {
Volume.class}, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class MigrateVolumeCmd extends BaseAsyncCmd {
+public class MigrateVolumeCmd extends BaseAsyncCmd implements UserCmd {
private static final String s_name = "migratevolumeresponse";
/////////////////////////////////////////////////////
@@ -112,7 +113,7 @@
result = _volumeService.migrateVolume(this);
if (result != null) {
- VolumeResponse response = _responseGenerator.createVolumeResponse(ResponseView.Restricted, result);
+ VolumeResponse response = _responseGenerator.createVolumeResponse(getResponseView(), result);
response.setResponseName(getCommandName());
setResponseObject(response);
} else {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/RecoverVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/RecoverVolumeCmd.java
new file mode 100644
index 0000000..f5bb1dd
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/RecoverVolumeCmd.java
@@ -0,0 +1,91 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.command.user.volume;
+
+import org.apache.log4j.Logger;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.VolumeResponse;
+import org.apache.cloudstack.context.CallContext;
+
+import com.cloud.storage.Volume;
+import com.cloud.user.Account;
+
+@APICommand(name = "recoverVolume", description = "Recovers a Destroy volume.", responseObject = VolumeResponse.class, responseView = ResponseView.Restricted, entityType = {Volume.class},
+ since = "4.14.0",
+ authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User},
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = true)
+public class RecoverVolumeCmd extends BaseCmd {
+ public static final Logger s_logger = Logger.getLogger(RecoverVolumeCmd.class.getName());
+
+ private static final String s_name = "recovervolumeresponse";
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+
+ @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = VolumeResponse.class, required = true, description = "The ID of the volume")
+ private Long id;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public Long getId() {
+ return id;
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ @Override
+ public String getCommandName() {
+ return s_name;
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ Volume volume = _entityMgr.findById(Volume.class, getId());
+ if (volume != null) {
+ return volume.getAccountId();
+ }
+
+ return Account.ACCOUNT_ID_SYSTEM; // no account info given, parent this command to SYSTEM so ERROR events are tracked
+ }
+
+ @Override
+ public void execute() {
+ CallContext.current().setEventDetails("Volume Id: " + getId());
+ Volume result = _volumeService.recoverVolume(getId());
+ if (result != null) {
+ VolumeResponse response = _responseGenerator.createVolumeResponse(ResponseView.Full, result);
+ response.setResponseName(getCommandName());
+ setResponseObject(response);
+ } else {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to recover volume");
+ }
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
index 21127a7..304bb25 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
@@ -27,6 +27,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.DiskOfferingResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.context.CallContext;
@@ -42,7 +43,7 @@
@APICommand(name = "resizeVolume", description = "Resizes a volume", responseObject = VolumeResponse.class, responseView = ResponseView.Restricted, entityType = {Volume.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class ResizeVolumeCmd extends BaseAsyncCmd {
+public class ResizeVolumeCmd extends BaseAsyncCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(ResizeVolumeCmd.class.getName());
private static final String s_name = "resizevolumeresponse";
@@ -178,7 +179,7 @@
}
if (volume != null) {
- VolumeResponse response = _responseGenerator.createVolumeResponse(ResponseView.Restricted, volume);
+ VolumeResponse response = _responseGenerator.createVolumeResponse(getResponseView(), volume);
//FIXME - have to be moved to ApiResponseHelper
response.setResponseName(getCommandName());
setResponseObject(response);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java
index b4f8642..71fb576 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/UpdateVolumeCmd.java
@@ -29,6 +29,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.StoragePoolResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.context.CallContext;
@@ -39,7 +40,7 @@
@APICommand(name = "updateVolume", description = "Updates the volume.", responseObject = VolumeResponse.class, responseView = ResponseView.Restricted, entityType = {Volume.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class UpdateVolumeCmd extends BaseAsyncCustomIdCmd {
+public class UpdateVolumeCmd extends BaseAsyncCustomIdCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(UpdateVolumeCmd.class.getName());
private static final String s_name = "updatevolumeresponse";
@@ -158,7 +159,7 @@
Volume result = _volumeService.updateVolume(getId(), getPath(), getState(), getStorageId(), getDisplayVolume(),
getCustomId(), getEntityOwnerId(), getChainInfo());
if (result != null) {
- VolumeResponse response = _responseGenerator.createVolumeResponse(ResponseView.Restricted, result);
+ VolumeResponse response = _responseGenerator.createVolumeResponse(getResponseView(), result);
response.setResponseName(getCommandName());
setResponseObject(response);
} else {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java
index 2802c00..236a4c8 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java
@@ -26,6 +26,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.DiskOfferingResponse;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.ProjectResponse;
@@ -43,7 +44,7 @@
@APICommand(name = "uploadVolume", description = "Uploads a data disk.", responseObject = VolumeResponse.class, responseView = ResponseView.Restricted, entityType = {Volume.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class UploadVolumeCmd extends BaseAsyncCmd {
+public class UploadVolumeCmd extends BaseAsyncCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(UploadVolumeCmd.class.getName());
private static final String s_name = "uploadvolumeresponse";
@@ -145,7 +146,7 @@
Volume volume = _volumeService.uploadVolume(this);
if (volume != null){
- VolumeResponse response = _responseGenerator.createVolumeResponse(ResponseView.Restricted, volume);
+ VolumeResponse response = _responseGenerator.createVolumeResponse(getResponseView(), volume);
response.setResponseName(getCommandName());
setResponseObject(response);
} else {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
index e5e5017..8f6568f 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
@@ -26,6 +26,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.VpcOfferingResponse;
@@ -42,7 +43,7 @@
@APICommand(name = "createVPC", description = "Creates a VPC", responseObject = VpcResponse.class, responseView = ResponseView.Restricted, entityType = {Vpc.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class CreateVPCCmd extends BaseAsyncCreateCmd {
+public class CreateVPCCmd extends BaseAsyncCreateCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(CreateVPCCmd.class.getName());
private static final String s_name = "createvpcresponse";
@@ -175,7 +176,7 @@
}
if (vpc != null) {
- VpcResponse response = _responseGenerator.createVpcResponse(ResponseView.Restricted, vpc);
+ VpcResponse response = _responseGenerator.createVpcResponse(getResponseView(), vpc);
response.setResponseName(getCommandName());
setResponseObject(response);
} else {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.java
index 9531b81..adcbf8b 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.java
@@ -25,6 +25,7 @@
import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.VpcOfferingResponse;
import org.apache.cloudstack.api.response.VpcResponse;
@@ -37,7 +38,7 @@
@APICommand(name = "listVPCs", description = "Lists VPCs", responseObject = VpcResponse.class, responseView = ResponseView.Restricted, entityType = {Vpc.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class ListVPCsCmd extends BaseListTaggedResourcesCmd {
+public class ListVPCsCmd extends BaseListTaggedResourcesCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(ListVPCsCmd.class.getName());
private static final String s_name = "listvpcsresponse";
@@ -136,7 +137,7 @@
ListResponse<VpcResponse> response = new ListResponse<VpcResponse>();
List<VpcResponse> vpcResponses = new ArrayList<VpcResponse>();
for (Vpc vpc : vpcs.first()) {
- VpcResponse offeringResponse = _responseGenerator.createVpcResponse(ResponseView.Restricted, vpc);
+ VpcResponse offeringResponse = _responseGenerator.createVpcResponse(getResponseView(), vpc);
vpcResponses.add(offeringResponse);
}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java
index edfd93e..8ed2ab2 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java
@@ -91,7 +91,7 @@
@Override
public void execute() {
try {
- final boolean result = _vpcService.restartVpc(getId(), getCleanup(), getMakeredundant());
+ final boolean result = _vpcService.restartVpc(this);
if (result) {
final SuccessResponse response = new SuccessResponse(getCommandName());
setResponseObject(response);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java
index 1309334..92f02ca 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java
@@ -29,6 +29,7 @@
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.VpcResponse;
import com.cloud.event.EventTypes;
@@ -37,7 +38,7 @@
@APICommand(name = "updateVPC", description = "Updates a VPC", responseObject = VpcResponse.class, responseView = ResponseView.Restricted, entityType = {Vpc.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class UpdateVPCCmd extends BaseAsyncCustomIdCmd {
+public class UpdateVPCCmd extends BaseAsyncCustomIdCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(UpdateVPCCmd.class.getName());
private static final String s_name = "updatevpcresponse";
@@ -99,7 +100,7 @@
public void execute() {
Vpc result = _vpcService.updateVpc(getId(), getVpcName(), getDisplayText(), getCustomId(), isDisplayVpc());
if (result != null) {
- VpcResponse response = _responseGenerator.createVpcResponse(ResponseView.Restricted, result);
+ VpcResponse response = _responseGenerator.createVpcResponse(getResponseView(), result);
response.setResponseName(getCommandName());
setResponseObject(response);
} else {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/zone/ListZonesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/zone/ListZonesCmd.java
index 34a5440..f7e3155 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/zone/ListZonesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/zone/ListZonesCmd.java
@@ -16,9 +16,6 @@
// under the License.
package org.apache.cloudstack.api.command.user.zone;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import org.apache.log4j.Logger;
@@ -28,15 +25,15 @@
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.TaggedResources;
+import org.apache.cloudstack.api.command.user.UserCmd;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
-import com.cloud.exception.InvalidParameterValueException;
-
@APICommand(name = "listZones", description = "Lists zones", responseObject = ZoneResponse.class, responseView = ResponseView.Restricted,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
-public class ListZonesCmd extends BaseListCmd {
+public class ListZonesCmd extends BaseListCmd implements UserCmd {
public static final Logger s_logger = Logger.getLogger(ListZonesCmd.class.getName());
private static final String s_name = "listzonesresponse";
@@ -97,22 +94,7 @@
}
public Map<String, String> getTags() {
- Map<String, String> tagsMap = null;
- if (tags != null && !tags.isEmpty()) {
- tagsMap = new HashMap<String, String>();
- Collection<?> servicesCollection = tags.values();
- Iterator<?> iter = servicesCollection.iterator();
- while (iter.hasNext()) {
- HashMap<String, String> services = (HashMap<String, String>)iter.next();
- String key = services.get("key");
- String value = services.get("value");
- if (value == null) {
- throw new InvalidParameterValueException("No value is passed in for key " + key);
- }
- tagsMap.put(key, value);
- }
- }
- return tagsMap;
+ return TaggedResources.parseKeyValueMap(tags, false);
}
/////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/BackupOfferingResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/BackupOfferingResponse.java
new file mode 100644
index 0000000..480ebcf
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/response/BackupOfferingResponse.java
@@ -0,0 +1,95 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.response;
+
+import java.util.Date;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.EntityReference;
+import org.apache.cloudstack.backup.BackupOffering;
+
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
+@EntityReference(value = BackupOffering.class)
+public class BackupOfferingResponse extends BaseResponse {
+
+ @SerializedName(ApiConstants.ID)
+ @Param(description = "ID of the backup offering")
+ private String id;
+
+ @SerializedName(ApiConstants.NAME)
+ @Param(description = "name for the backup offering")
+ private String name;
+
+ @SerializedName(ApiConstants.DESCRIPTION)
+ @Param(description = "description for the backup offering")
+ private String description;
+
+ @SerializedName(ApiConstants.EXTERNAL_ID)
+ @Param(description = "external ID on the provider side")
+ private String externalId;
+
+ @SerializedName(ApiConstants.ALLOW_USER_DRIVEN_BACKUPS)
+ @Param(description = "whether offering allows user driven ad-hoc/scheduled backups")
+ private Boolean userDrivenBackups;
+
+ @SerializedName(ApiConstants.ZONE_ID)
+ @Param(description = "zone ID")
+ private String zoneId;
+
+ @SerializedName(ApiConstants.ZONE_NAME)
+ @Param(description = "zone name")
+ private String zoneName;
+
+ @SerializedName(ApiConstants.CREATED)
+ @Param(description = "the date this backup offering was created")
+ private Date created;
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public void setExternalId(String externalId) {
+ this.externalId = externalId;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public void setUserDrivenBackups(Boolean userDrivenBackups) {
+ this.userDrivenBackups = userDrivenBackups;
+ }
+
+ public void setZoneId(String zoneId) {
+ this.zoneId = zoneId;
+ }
+
+ public void setZoneName(String zoneName) {
+ this.zoneName = zoneName;
+ }
+
+ public void setCreated(Date created) {
+ this.created = created;
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/BackupProviderResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/BackupProviderResponse.java
new file mode 100644
index 0000000..5227d85
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/response/BackupProviderResponse.java
@@ -0,0 +1,53 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.response;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.EntityReference;
+import org.apache.cloudstack.backup.BackupProvider;
+
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
+@EntityReference(BackupProvider.class)
+public class BackupProviderResponse extends BaseResponse {
+ @SerializedName(ApiConstants.NAME)
+ @Param(description = "the CA service provider name")
+ private String name;
+
+ @SerializedName(ApiConstants.DESCRIPTION)
+ @Param(description = "the description of the CA service provider")
+ private String description;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/BackupResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/BackupResponse.java
new file mode 100644
index 0000000..d0c8e58
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/response/BackupResponse.java
@@ -0,0 +1,246 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.response;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.EntityReference;
+import org.apache.cloudstack.backup.Backup;
+
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
+@EntityReference(value = Backup.class)
+public class BackupResponse extends BaseResponse {
+
+ @SerializedName(ApiConstants.ID)
+ @Param(description = "ID of the VM backup")
+ private String id;
+
+ @SerializedName(ApiConstants.VIRTUAL_MACHINE_ID)
+ @Param(description = "ID of the VM")
+ private String vmId;
+
+ @SerializedName(ApiConstants.VIRTUAL_MACHINE_NAME)
+ @Param(description = "name of the VM")
+ private String vmName;
+
+ @SerializedName(ApiConstants.EXTERNAL_ID)
+ @Param(description = "external backup id")
+ private String externalId;
+
+ @SerializedName(ApiConstants.TYPE)
+ @Param(description = "backup type")
+ private String type;
+
+ @SerializedName(ApiConstants.CREATED)
+ @Param(description = "backup date")
+ private String date;
+
+ @SerializedName(ApiConstants.SIZE)
+ @Param(description = "backup size in bytes")
+ private Long size;
+
+ @SerializedName(ApiConstants.VIRTUAL_SIZE)
+ @Param(description = "backup protected (virtual) size in bytes")
+ private Long protectedSize;
+
+ @SerializedName(ApiConstants.STATUS)
+ @Param(description = "backup status")
+ private Backup.Status status;
+
+ @SerializedName(ApiConstants.VOLUMES)
+ @Param(description = "backed up volumes")
+ private String volumes;
+
+ @SerializedName(ApiConstants.BACKUP_OFFERING_ID)
+ @Param(description = "backup offering id")
+ private String backupOfferingId;
+
+ @SerializedName(ApiConstants.BACKUP_OFFERING_NAME)
+ @Param(description = "backup offering name")
+ private String backupOfferingName;
+
+ @SerializedName(ApiConstants.ACCOUNT_ID)
+ @Param(description = "account id")
+ private String accountId;
+
+ @SerializedName(ApiConstants.ACCOUNT)
+ @Param(description = "account name")
+ private String account;
+
+ @SerializedName(ApiConstants.DOMAIN_ID)
+ @Param(description = "domain id")
+ private String domainId;
+
+ @SerializedName(ApiConstants.DOMAIN)
+ @Param(description = "domain name")
+ private String domain;
+
+ @SerializedName(ApiConstants.ZONE_ID)
+ @Param(description = "zone id")
+ private String zoneId;
+
+ @SerializedName(ApiConstants.ZONE)
+ @Param(description = "zone name")
+ private String zone;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getVmId() {
+ return vmId;
+ }
+
+ public void setVmId(String vmId) {
+ this.vmId = vmId;
+ }
+
+ public String getVmName() {
+ return vmName;
+ }
+
+ public void setVmName(String vmName) {
+ this.vmName = vmName;
+ }
+
+ public String getExternalId() {
+ return externalId;
+ }
+
+ public void setExternalId(String externalId) {
+ this.externalId = externalId;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getDate() {
+ return date;
+ }
+
+ public void setDate(String date) {
+ this.date = date;
+ }
+
+ public Long getSize() {
+ return size;
+ }
+
+ public void setSize(Long size) {
+ this.size = size;
+ }
+
+ public Long getProtectedSize() {
+ return protectedSize;
+ }
+
+ public void setProtectedSize(Long protectedSize) {
+ this.protectedSize = protectedSize;
+ }
+
+ public Backup.Status getStatus() {
+ return status;
+ }
+
+ public void setStatus(Backup.Status status) {
+ this.status = status;
+ }
+
+ public String getVolumes() {
+ return volumes;
+ }
+
+ public void setVolumes(String volumes) {
+ this.volumes = volumes;
+ }
+
+ public String getBackupOfferingId() {
+ return backupOfferingId;
+ }
+
+ public void setBackupOfferingId(String backupOfferingId) {
+ this.backupOfferingId = backupOfferingId;
+ }
+
+ public String getBackupOffering() {
+ return backupOfferingName;
+ }
+
+ public void setBackupOffering(String backupOfferingName) {
+ this.backupOfferingName = backupOfferingName;
+ }
+
+ public String getAccountId() {
+ return accountId;
+ }
+
+ public void setAccountId(String accountId) {
+ this.accountId = accountId;
+ }
+
+ public String getAccount() {
+ return account;
+ }
+
+ public void setAccount(String account) {
+ this.account = account;
+ }
+
+ public String getDomainId() {
+ return domainId;
+ }
+
+ public void setDomainId(String domainId) {
+ this.domainId = domainId;
+ }
+
+ public String getDomain() {
+ return domain;
+ }
+
+ public void setDomain(String domain) {
+ this.domain = domain;
+ }
+
+ public String getZoneId() {
+ return zoneId;
+ }
+
+ public void setZoneId(String zoneId) {
+ this.zoneId = zoneId;
+ }
+
+ public String getZone() {
+ return zone;
+ }
+
+ public void setZone(String zone) {
+ this.zone = zone;
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/BackupRestorePointResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/BackupRestorePointResponse.java
new file mode 100644
index 0000000..afb3e9f
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/response/BackupRestorePointResponse.java
@@ -0,0 +1,66 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.response;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.EntityReference;
+import org.apache.cloudstack.backup.Backup;
+
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
+@EntityReference(value = Backup.RestorePoint.class)
+public class BackupRestorePointResponse extends BaseResponse {
+
+ @SerializedName(ApiConstants.ID)
+ @Param(description = "external id of the restore point")
+ private String id;
+
+ @SerializedName(ApiConstants.CREATED)
+ @Param(description = "created time")
+ private String created;
+
+ @SerializedName(ApiConstants.TYPE)
+ @Param(description = "restore point type")
+ private String type;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getCreated() {
+ return created;
+ }
+
+ public void setCreated(String created) {
+ this.created = created;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/BackupScheduleResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/BackupScheduleResponse.java
new file mode 100644
index 0000000..ba44f1e
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/response/BackupScheduleResponse.java
@@ -0,0 +1,91 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.response;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.EntityReference;
+import org.apache.cloudstack.backup.BackupSchedule;
+
+import com.cloud.serializer.Param;
+import com.cloud.utils.DateUtil;
+import com.google.gson.annotations.SerializedName;
+
+@EntityReference(value = BackupSchedule.class)
+public class BackupScheduleResponse extends BaseResponse {
+
+ @SerializedName(ApiConstants.VIRTUAL_MACHINE_NAME)
+ @Param(description = "name of the VM")
+ private String vmName;
+
+ @SerializedName(ApiConstants.VIRTUAL_MACHINE_ID)
+ @Param(description = "ID of the VM")
+ private String vmId;
+
+ @SerializedName("schedule")
+ @Param(description = "time the backup is scheduled to be taken.")
+ private String schedule;
+
+ @SerializedName("intervaltype")
+ @Param(description = "the interval type of the backup schedule")
+ private DateUtil.IntervalType intervalType;
+
+ @SerializedName("timezone")
+ @Param(description = "the time zone of the backup schedule")
+ private String timezone;
+
+ public String getVmName() {
+ return vmName;
+ }
+
+ public void setVmName(String vmName) {
+ this.vmName = vmName;
+ }
+
+ public String getVmId() {
+ return vmId;
+ }
+
+ public void setVmId(String vmId) {
+ this.vmId = vmId;
+ }
+
+ public String getSchedule() {
+ return schedule;
+ }
+
+ public void setSchedule(String schedule) {
+ this.schedule = schedule;
+ }
+
+ public DateUtil.IntervalType getIntervalType() {
+ return intervalType;
+ }
+
+ public void setIntervalType(DateUtil.IntervalType intervalType) {
+ this.intervalType = intervalType;
+ }
+
+ public String getTimezone() {
+ return timezone;
+ }
+
+ public void setTimezone(String timezone) {
+ this.timezone = timezone;
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/CapabilitiesResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/CapabilitiesResponse.java
index 153d7df..26b3fd5 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/CapabilitiesResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/CapabilitiesResponse.java
@@ -84,10 +84,22 @@
@Param(description = "true if the user can recover and expunge virtualmachines, false otherwise", since = "4.6.0")
private boolean allowUserExpungeRecoverVM;
+ @SerializedName("allowuserexpungerecovervolume")
+ @Param(description = "true if the user can recover and expunge volumes, false otherwise", since = "4.14.0")
+ private boolean allowUserExpungeRecoverVolume;
+
@SerializedName("allowuserviewalldomainaccounts")
@Param(description = "true if users can see all accounts within the same domain, false otherwise")
private boolean allowUserViewAllDomainAccounts;
+ @SerializedName("kubernetesserviceenabled")
+ @Param(description = "true if Kubernetes Service plugin is enabled, false otherwise")
+ private boolean kubernetesServiceEnabled;
+
+ @SerializedName("kubernetesclusterexperimentalfeaturesenabled")
+ @Param(description = "true if experimental features for Kubernetes cluster such as Docker private registry are enabled, false otherwise")
+ private boolean kubernetesClusterExperimentalFeaturesEnabled;
+
public void setSecurityGroupsEnabled(boolean securityGroupsEnabled) {
this.securityGroupsEnabled = securityGroupsEnabled;
}
@@ -148,7 +160,19 @@
this.allowUserExpungeRecoverVM = allowUserExpungeRecoverVM;
}
+ public void setAllowUserExpungeRecoverVolume(boolean allowUserExpungeRecoverVolume) {
+ this.allowUserExpungeRecoverVolume = allowUserExpungeRecoverVolume;
+ }
+
public void setAllowUserViewAllDomainAccounts(boolean allowUserViewAllDomainAccounts) {
this.allowUserViewAllDomainAccounts = allowUserViewAllDomainAccounts;
}
-}
\ No newline at end of file
+
+ public void setKubernetesServiceEnabled(boolean kubernetesServiceEnabled) {
+ this.kubernetesServiceEnabled = kubernetesServiceEnabled;
+ }
+
+ public void setKubernetesClusterExperimentalFeaturesEnabled(boolean kubernetesClusterExperimentalFeaturesEnabled) {
+ this.kubernetesClusterExperimentalFeaturesEnabled = kubernetesClusterExperimentalFeaturesEnabled;
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/DomainRouterResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/DomainRouterResponse.java
index 131e3e1..5bd57b4 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/DomainRouterResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/DomainRouterResponse.java
@@ -18,10 +18,9 @@
import java.util.Date;
import java.util.LinkedHashSet;
+import java.util.List;
import java.util.Set;
-import com.google.gson.annotations.SerializedName;
-
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
@@ -29,6 +28,7 @@
import com.cloud.serializer.Param;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachine.State;
+import com.google.gson.annotations.SerializedName;
@EntityReference(value = VirtualMachine.class)
@SuppressWarnings("unused")
@@ -217,6 +217,14 @@
@Param(description = "true if the router template requires upgrader")
private boolean requiresUpgrade;
+ @SerializedName("healthchecksfailed")
+ @Param(description = "true if any health checks had failed")
+ private boolean healthChecksFailed;
+
+ @SerializedName("healthcheckresults")
+ @Param(description = "Last executed health check result for the router", responseObject = RouterHealthCheckResultResponse.class, since = "4.14")
+ List<RouterHealthCheckResultResponse> healthCheckResults;
+
public DomainRouterResponse() {
nics = new LinkedHashSet<NicResponse>();
}
@@ -258,6 +266,10 @@
this.gateway = gateway;
}
+ public String getName() {
+ return name;
+ }
+
public void setName(String name) {
this.name = name;
}
@@ -278,6 +290,14 @@
return hypervisor;
}
+ public List<RouterHealthCheckResultResponse> getHealthCheckResults() {
+ return healthCheckResults;
+ }
+
+ public boolean getHealthChecksFailed() {
+ return healthChecksFailed;
+ }
+
public void setHypervisor(String hypervisor) {
this.hypervisor = hypervisor;
}
@@ -446,4 +466,12 @@
public void setRequiresUpgrade(boolean requiresUpgrade) {
this.requiresUpgrade = requiresUpgrade;
}
+
+ public void setHealthChecksFailed(boolean healthChecksFailed) {
+ this.healthChecksFailed = healthChecksFailed;
+ }
+
+ public void setHealthCheckResults(List<RouterHealthCheckResultResponse> healthCheckResults) {
+ this.healthCheckResults = healthCheckResults;
+ }
}
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java
index 199a8c9..7b47f8a 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java
@@ -115,9 +115,9 @@
@Param(description = "the amount of the host's CPU after applying the cpu.overprovisioning.factor ")
private String cpuWithOverprovisioning;
- @SerializedName("averageload")
+ @SerializedName(ApiConstants.CPU_LOAD_AVERAGE)
@Param(description = "the cpu average load on the host")
- private Long averageLoad;
+ private Double cpuloadaverage;
@SerializedName("networkkbsread")
@Param(description = "the incoming network traffic on the host")
@@ -244,6 +244,10 @@
@Param(description = "the admin that annotated this host", since = "4.11")
private String username;
+ @SerializedName("ueficapability")
+ @Param(description = "true if the host has capability to support UEFI boot")
+ private Boolean uefiCapabilty;
+
@Override
public String getObjectId() {
return this.getId();
@@ -333,8 +337,8 @@
this.cpuUsed = cpuUsed;
}
- public void setAverageLoad(Long averageLoad) {
- this.averageLoad = averageLoad;
+ public void setCpuAverageLoad(Double averageLoad) {
+ this.cpuloadaverage = averageLoad;
}
public void setNetworkKbsRead(Long networkKbsRead) {
@@ -499,6 +503,14 @@
detailsCopy.remove("username");
detailsCopy.remove("password");
+ if(detailsCopy.containsKey(Host.HOST_UEFI_ENABLE)) {
+ this.setUefiCapabilty(Boolean.parseBoolean((String) detailsCopy.get(Host.HOST_UEFI_ENABLE)));
+ detailsCopy.remove(Host.HOST_UEFI_ENABLE);
+ } else {
+ this.setUefiCapabilty(new Boolean(false)); // in case of existing host which is not scanned for UEFI capability
+ }
+
+
this.details = detailsCopy;
}
@@ -577,8 +589,8 @@
return cpuUsed;
}
- public Long getAverageLoad() {
- return averageLoad;
+ public Double getAverageLoad() {
+ return cpuloadaverage;
}
public Long getNetworkKbsRead() {
@@ -668,4 +680,8 @@
public Boolean getHaHost() {
return haHost;
}
+
+ public void setUefiCapabilty(Boolean hostCapability) {
+ this.uefiCapabilty = hostCapability;
+ }
}
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/NicResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NicResponse.java
index 5c3fd7a..72a2bbc 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/NicResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/NicResponse.java
@@ -16,14 +16,15 @@
// under the License.
package org.apache.cloudstack.api.response;
-import com.cloud.serializer.Param;
-import com.cloud.vm.Nic;
-import com.google.gson.annotations.SerializedName;
+import java.util.List;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.EntityReference;
-import java.util.List;
+import com.cloud.serializer.Param;
+import com.cloud.vm.Nic;
+import com.google.gson.annotations.SerializedName;
@SuppressWarnings("unused")
@EntityReference(value = Nic.class)
@@ -113,6 +114,26 @@
@Param(description = "Id of the NSX Logical Switch Port (if NSX based), null otherwise", since="4.6.0")
private String nsxLogicalSwitchPort;
+ @SerializedName(ApiConstants.VLAN_ID)
+ @Param(description = "ID of the VLAN/VNI if available", since="4.14.0")
+ private Integer vlanId;
+
+ @SerializedName(ApiConstants.ISOLATED_PVLAN)
+ @Param(description = "the isolated private VLAN if available", since="4.14.0")
+ private Integer isolatedPvlanId;
+
+ @SerializedName(ApiConstants.ISOLATED_PVLAN_TYPE)
+ @Param(description = "the isolated private VLAN type if available", since="4.14.0")
+ private String isolatedPvlanType;
+
+ @SerializedName(ApiConstants.ADAPTER_TYPE)
+ @Param(description = "Type of adapter if available", since="4.14.0")
+ private String adapterType;
+
+ @SerializedName(ApiConstants.IP_ADDRESSES)
+ @Param(description = "IP addresses associated with NIC found for unmanaged VM", since="4.14.0")
+ private List<String> ipAddresses;
+
public void setVmId(String vmId) {
this.vmId = vmId;
}
@@ -303,4 +324,44 @@
public String getNsxLogicalSwitchPort() {
return nsxLogicalSwitchPort;
}
+
+ public Integer getVlanId() {
+ return vlanId;
+ }
+
+ public void setVlanId(Integer vlanId) {
+ this.vlanId = vlanId;
+ }
+
+ public Integer getIsolatedPvlanId() {
+ return isolatedPvlanId;
+ }
+
+ public void setIsolatedPvlanId(Integer isolatedPvlanId) {
+ this.isolatedPvlanId = isolatedPvlanId;
+ }
+
+ public String getIsolatedPvlanType() {
+ return isolatedPvlanType;
+ }
+
+ public void setIsolatedPvlanType(String isolatedPvlanType) {
+ this.isolatedPvlanType = isolatedPvlanType;
+ }
+
+ public String getAdapterType() {
+ return adapterType;
+ }
+
+ public void setAdapterType(String adapterType) {
+ this.adapterType = adapterType;
+ }
+
+ public List<String> getIpAddresses() {
+ return ipAddresses;
+ }
+
+ public void setIpAddresses(List<String> ipAddresses) {
+ this.ipAddresses = ipAddresses;
+ }
}
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/RollingMaintenanceHostSkippedResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/RollingMaintenanceHostSkippedResponse.java
new file mode 100644
index 0000000..8d30454
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/response/RollingMaintenanceHostSkippedResponse.java
@@ -0,0 +1,61 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.response;
+
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+
+public class RollingMaintenanceHostSkippedResponse extends BaseResponse {
+
+ @SerializedName(ApiConstants.HOST_ID)
+ @Param(description = "the ID of the skipped host")
+ private String hostId;
+
+ @SerializedName(ApiConstants.HOST_NAME)
+ @Param(description = "the name of the skipped host")
+ private String hostName;
+
+ @SerializedName(ApiConstants.ACL_REASON)
+ @Param(description = "the reason to skip the host")
+ private String reason;
+
+ public String getHostId() {
+ return hostId;
+ }
+
+ public void setHostId(String hostId) {
+ this.hostId = hostId;
+ }
+
+ public String getHostName() {
+ return hostName;
+ }
+
+ public void setHostName(String hostName) {
+ this.hostName = hostName;
+ }
+
+ public String getReason() {
+ return reason;
+ }
+
+ public void setReason(String reason) {
+ this.reason = reason;
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/RollingMaintenanceHostUpdatedResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/RollingMaintenanceHostUpdatedResponse.java
new file mode 100644
index 0000000..821257d
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/response/RollingMaintenanceHostUpdatedResponse.java
@@ -0,0 +1,85 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.response;
+
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+
+public class RollingMaintenanceHostUpdatedResponse extends BaseResponse {
+
+ @SerializedName(ApiConstants.HOST_ID)
+ @Param(description = "the ID of the updated host")
+ private String hostId;
+
+ @SerializedName(ApiConstants.HOST_NAME)
+ @Param(description = "the name of the updated host")
+ private String hostName;
+
+ @SerializedName(ApiConstants.START_DATE)
+ @Param(description = "start date of the update on the host")
+ private String startDate;
+
+ @SerializedName(ApiConstants.END_DATE)
+ @Param(description = "end date of the update on the host")
+ private String endDate;
+
+ @SerializedName(ApiConstants.OUTPUT)
+ @Param(description = "output of the maintenance script on the host")
+ private String output;
+
+ public String getHostId() {
+ return hostId;
+ }
+
+ public void setHostId(String hostId) {
+ this.hostId = hostId;
+ }
+
+ public String getHostName() {
+ return hostName;
+ }
+
+ public void setHostName(String hostName) {
+ this.hostName = hostName;
+ }
+
+ public String getStartDate() {
+ return startDate;
+ }
+
+ public void setStartDate(String startDate) {
+ this.startDate = startDate;
+ }
+
+ public String getEndDate() {
+ return endDate;
+ }
+
+ public void setEndDate(String endDate) {
+ this.endDate = endDate;
+ }
+
+ public String getOutput() {
+ return output;
+ }
+
+ public void setOutput(String output) {
+ this.output = output;
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/RollingMaintenanceResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/RollingMaintenanceResponse.java
new file mode 100644
index 0000000..bfd4d9f
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/response/RollingMaintenanceResponse.java
@@ -0,0 +1,79 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.response;
+
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+import org.apache.cloudstack.api.BaseResponse;
+
+import java.util.List;
+
+public class RollingMaintenanceResponse extends BaseResponse {
+
+ @SerializedName("success")
+ @Param(description = "indicates if the rolling maintenance operation was successful")
+ private Boolean success;
+
+ @SerializedName("details")
+ @Param(description = "in case of failure, details are displayed")
+ private String details;
+
+ @SerializedName("hostsupdated")
+ @Param(description = "the hosts updated", responseObject = RollingMaintenanceHostUpdatedResponse.class)
+ private List<RollingMaintenanceHostUpdatedResponse> updatedHosts;
+
+ @SerializedName("hostsskipped")
+ @Param(description = "the hosts skipped", responseObject = RollingMaintenanceHostSkippedResponse.class)
+ private List<RollingMaintenanceHostSkippedResponse> skippedHosts;
+
+ public RollingMaintenanceResponse(Boolean success, String details) {
+ this.success = success;
+ this.details = details;
+ }
+
+ public Boolean getSuccess() {
+ return success;
+ }
+
+ public void setSuccess(Boolean success) {
+ this.success = success;
+ }
+
+ public String getDetails() {
+ return details;
+ }
+
+ public void setDetails(String details) {
+ this.details = details;
+ }
+
+ public List<RollingMaintenanceHostUpdatedResponse> getUpdatedHosts() {
+ return updatedHosts;
+ }
+
+ public void setUpdatedHosts(List<RollingMaintenanceHostUpdatedResponse> updatedHosts) {
+ this.updatedHosts = updatedHosts;
+ }
+
+ public List<RollingMaintenanceHostSkippedResponse> getSkippedHosts() {
+ return skippedHosts;
+ }
+
+ public void setSkippedHosts(List<RollingMaintenanceHostSkippedResponse> skippedHosts) {
+ this.skippedHosts = skippedHosts;
+ }
+}
\ No newline at end of file
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/RouterHealthCheckResultResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/RouterHealthCheckResultResponse.java
new file mode 100644
index 0000000..f98cf0a
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/response/RouterHealthCheckResultResponse.java
@@ -0,0 +1,88 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.response;
+
+import java.util.Date;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
+public class RouterHealthCheckResultResponse extends BaseResponse {
+ @SerializedName(ApiConstants.ROUTER_CHECK_NAME)
+ @Param(description = "the name of the health check on the router")
+ private String checkName;
+
+ @SerializedName(ApiConstants.ROUTER_CHECK_TYPE)
+ @Param(description = "the type of the health check - basic or advanced")
+ private String checkType;
+
+ @SerializedName(ApiConstants.RESULT)
+ @Param(description = "result of the health check")
+ private boolean result;
+
+ @SerializedName(ApiConstants.LAST_UPDATED)
+ @Param(description = "the date this VPC was created")
+ private Date lastUpdated;
+
+ @SerializedName(ApiConstants.DETAILS)
+ @Param(description = "detailed response generated on running health check")
+ private String details;
+
+ public String getCheckName() {
+ return checkName;
+ }
+
+ public String getCheckType() {
+ return checkType;
+ }
+
+ public boolean getResult() {
+ return result;
+ }
+
+ public Date getLastUpdated() {
+ return lastUpdated;
+ }
+
+ public String getDetails() {
+ return details;
+ }
+
+ public void setCheckName(String checkName) {
+ this.checkName = checkName;
+ }
+
+ public void setCheckType(String checkType) {
+ this.checkType = checkType;
+ }
+
+ public void setResult(boolean result) {
+ this.result = result;
+ }
+
+ public void setLastUpdated(Date lastUpdated) {
+ this.lastUpdated = lastUpdated;
+ }
+
+ public void setDetails(String details) {
+ this.details = details;
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/RouterHealthCheckResultsListResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/RouterHealthCheckResultsListResponse.java
new file mode 100644
index 0000000..e56f70d
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/response/RouterHealthCheckResultsListResponse.java
@@ -0,0 +1,52 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.response;
+
+import java.util.List;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
+public class RouterHealthCheckResultsListResponse extends BaseResponse {
+ @SerializedName(ApiConstants.ROUTER_ID)
+ @Param(description = "the id of the router")
+ private String routerId;
+
+ @SerializedName(ApiConstants.ROUTER_HEALTH_CHECKS)
+ @Param(description = "the id of the router")
+ private List<RouterHealthCheckResultResponse> healthChecks;
+
+ public String getRouterId() {
+ return routerId;
+ }
+
+ public List<RouterHealthCheckResultResponse> getHealthChecks() {
+ return healthChecks;
+ }
+
+ public void setRouterId(String routerId) {
+ this.routerId = routerId;
+ }
+
+ public void setHealthChecks(List<RouterHealthCheckResultResponse> healthChecks) {
+ this.healthChecks = healthChecks;
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/ServiceOfferingResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
index 41c8645..9d5e9ee 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
@@ -192,6 +192,10 @@
@Param(description = "is true if the offering is customized", since = "4.3.0")
private Boolean isCustomized;
+ @SerializedName("cacheMode")
+ @Param(description = "the cache mode to use for this disk offering. none, writeback or writethrough", since = "4.14")
+ private String cacheMode;
+
public ServiceOfferingResponse() {
}
@@ -448,4 +452,7 @@
}
+ public void setCacheMode(String cacheMode) {
+ this.cacheMode = cacheMode;
+ }
}
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/UnmanagedInstanceDiskResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/UnmanagedInstanceDiskResponse.java
new file mode 100644
index 0000000..083c83f
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/response/UnmanagedInstanceDiskResponse.java
@@ -0,0 +1,159 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.response;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
+public class UnmanagedInstanceDiskResponse extends BaseResponse {
+
+ @SerializedName(ApiConstants.ID)
+ @Param(description = "the ID of the disk")
+ private String diskId;
+
+ @SerializedName(ApiConstants.LABEL)
+ @Param(description = "the label of the disk")
+ private String label;
+
+ @SerializedName(ApiConstants.CAPACITY)
+ @Param(description = "the capacity of the disk in bytes")
+ private Long capacity;
+
+ @SerializedName(ApiConstants.IMAGE_PATH)
+ @Param(description = "the file path of the disk image")
+ private String imagePath;
+
+ @SerializedName(ApiConstants.CONTROLLER)
+ @Param(description = "the controller of the disk")
+ private String controller;
+
+ @SerializedName(ApiConstants.CONTROLLER_UNIT)
+ @Param(description = "the controller unit of the disk")
+ private Integer controllerUnit;
+
+ @SerializedName(ApiConstants.POSITION)
+ @Param(description = "the position of the disk")
+ private Integer position;
+
+ @SerializedName(ApiConstants.DATASTORE_NAME)
+ @Param(description = "the controller of the disk")
+ private String datastoreName;
+
+ @SerializedName(ApiConstants.DATASTORE_HOST)
+ @Param(description = "the controller of the disk")
+ private String datastoreHost;
+
+ @SerializedName(ApiConstants.DATASTORE_PATH)
+ @Param(description = "the controller of the disk")
+ private String datastorePath;
+
+ @SerializedName(ApiConstants.DATASTORE_TYPE)
+ @Param(description = "the controller of the disk")
+ private String datastoreType;
+
+ public String getDiskId() {
+ return diskId;
+ }
+
+ public void setDiskId(String diskId) {
+ this.diskId = diskId;
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ public void setLabel(String label) {
+ this.label = label;
+ }
+
+ public Long getCapacity() {
+ return capacity;
+ }
+
+ public void setCapacity(Long capacity) {
+ this.capacity = capacity;
+ }
+
+ public String getImagePath() {
+ return imagePath;
+ }
+
+ public void setImagePath(String imagePath) {
+ this.imagePath = imagePath;
+ }
+
+ public String getController() {
+ return controller;
+ }
+
+ public void setController(String controller) {
+ this.controller = controller;
+ }
+
+ public Integer getControllerUnit() {
+ return controllerUnit;
+ }
+
+ public void setControllerUnit(Integer controllerUnit) {
+ this.controllerUnit = controllerUnit;
+ }
+
+ public Integer getPosition() {
+ return position;
+ }
+
+ public void setPosition(Integer position) {
+ this.position = position;
+ }
+
+ public String getDatastoreName() {
+ return datastoreName;
+ }
+
+ public void setDatastoreName(String datastoreName) {
+ this.datastoreName = datastoreName;
+ }
+
+ public String getDatastoreHost() {
+ return datastoreHost;
+ }
+
+ public void setDatastoreHost(String datastoreHost) {
+ this.datastoreHost = datastoreHost;
+ }
+
+ public String getDatastorePath() {
+ return datastorePath;
+ }
+
+ public void setDatastorePath(String datastorePath) {
+ this.datastorePath = datastorePath;
+ }
+
+ public String getDatastoreType() {
+ return datastoreType;
+ }
+
+ public void setDatastoreType(String datastoreType) {
+ this.datastoreType = datastoreType;
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/UnmanagedInstanceResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/UnmanagedInstanceResponse.java
new file mode 100644
index 0000000..5167f17
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/response/UnmanagedInstanceResponse.java
@@ -0,0 +1,190 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.response;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.EntityReference;
+import org.apache.cloudstack.vm.UnmanagedInstanceTO;
+
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
+@EntityReference(value = UnmanagedInstanceTO.class)
+public class UnmanagedInstanceResponse extends BaseResponse {
+
+ @SerializedName(ApiConstants.NAME)
+ @Param(description = "the name of the virtual machine")
+ private String name;
+
+ @SerializedName(ApiConstants.CLUSTER_ID)
+ @Param(description = "the ID of the cluster to which virtual machine belongs")
+ private String clusterId;
+
+ @SerializedName(ApiConstants.HOST_ID)
+ @Param(description = "the ID of the host to which virtual machine belongs")
+ private String hostId;
+
+ @SerializedName(ApiConstants.POWER_STATE)
+ @Param(description = "the power state of the virtual machine")
+ private String powerState;
+
+ @SerializedName(ApiConstants.CPU_NUMBER)
+ @Param(description = "the CPU cores of the virtual machine")
+ private Integer cpuCores;
+
+ @SerializedName(ApiConstants.CPU_CORE_PER_SOCKET)
+ @Param(description = "the CPU cores per socket for the virtual machine. VMware specific")
+ private Integer cpuCoresPerSocket;
+
+ @SerializedName(ApiConstants.CPU_SPEED)
+ @Param(description = "the CPU speed of the virtual machine")
+ private Integer cpuSpeed;
+
+ @SerializedName(ApiConstants.MEMORY)
+ @Param(description = "the memory of the virtual machine in MB")
+ private Integer memory;
+
+ @SerializedName(ApiConstants.OS_ID)
+ @Param(description = "the operating system ID of the virtual machine")
+ private String operatingSystemId;
+
+ @SerializedName(ApiConstants.OS_DISPLAY_NAME)
+ @Param(description = "the operating system of the virtual machine")
+ private String operatingSystem;
+
+ @SerializedName(ApiConstants.DISK)
+ @Param(description = "the list of disks associated with the virtual machine", responseObject = UnmanagedInstanceDiskResponse.class)
+ private Set<UnmanagedInstanceDiskResponse> disks;
+
+ @SerializedName(ApiConstants.NIC)
+ @Param(description = "the list of nics associated with the virtual machine", responseObject = NicResponse.class)
+ private Set<NicResponse> nics;
+
+ public UnmanagedInstanceResponse() {
+ disks = new LinkedHashSet<UnmanagedInstanceDiskResponse>();
+ nics = new LinkedHashSet<NicResponse>();
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getClusterId() {
+ return clusterId;
+ }
+
+ public void setClusterId(String clusterId) {
+ this.clusterId = clusterId;
+ }
+
+ public String getHostId() {
+ return hostId;
+ }
+
+ public void setHostId(String hostId) {
+ this.hostId = hostId;
+ }
+
+ public String getPowerState() {
+ return powerState;
+ }
+
+ public void setPowerState(String powerState) {
+ this.powerState = powerState;
+ }
+
+ public Integer getCpuCores() {
+ return cpuCores;
+ }
+
+ public void setCpuCores(Integer cpuCores) {
+ this.cpuCores = cpuCores;
+ }
+
+ public Integer getCpuCoresPerSocket() {
+ return cpuCoresPerSocket;
+ }
+
+ public void setCpuCoresPerSocket(Integer cpuCoresPerSocket) {
+ this.cpuCoresPerSocket = cpuCoresPerSocket;
+ }
+
+ public Integer getCpuSpeed() {
+ return cpuSpeed;
+ }
+
+ public void setCpuSpeed(Integer cpuSpeed) {
+ this.cpuSpeed = cpuSpeed;
+ }
+
+ public Integer getMemory() {
+ return memory;
+ }
+
+ public void setMemory(Integer memory) {
+ this.memory = memory;
+ }
+
+ public String getOperatingSystemId() {
+ return operatingSystemId;
+ }
+
+ public void setOperatingSystemId(String operatingSystemId) {
+ this.operatingSystemId = operatingSystemId;
+ }
+
+ public String getOperatingSystem() {
+ return operatingSystem;
+ }
+
+ public void setOperatingSystem(String operatingSystem) {
+ this.operatingSystem = operatingSystem;
+ }
+
+ public Set<UnmanagedInstanceDiskResponse> getDisks() {
+ return disks;
+ }
+
+ public void setDisks(Set<UnmanagedInstanceDiskResponse> disks) {
+ this.disks = disks;
+ }
+
+ public void addDisk(UnmanagedInstanceDiskResponse disk) {
+ this.disks.add(disk);
+ }
+
+ public Set<NicResponse> getNics() {
+ return nics;
+ }
+
+ public void setNics(Set<NicResponse> nics) {
+ this.nics = nics;
+ }
+
+ public void addNic(NicResponse nic) {
+ this.nics.add(nic);
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java
index 8a2f1a1..b8b0189 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java
@@ -156,6 +156,14 @@
@Param(description = "the name of the disk offering of the virtual machine", since = "4.4")
private String diskOfferingName;
+ @SerializedName(ApiConstants.BACKUP_OFFERING_ID)
+ @Param(description = "the ID of the backup offering of the virtual machine", since = "4.14")
+ private String backupOfferingId;
+
+ @SerializedName(ApiConstants.BACKUP_OFFERING_NAME)
+ @Param(description = "the name of the backup offering of the virtual machine", since = "4.14")
+ private String backupOfferingName;
+
@SerializedName("forvirtualnetwork")
@Param(description = "the virtual network for the service offering")
private Boolean forVirtualNetwork;
@@ -290,6 +298,14 @@
@Param(description = "OS type id of the vm", since = "4.4")
private String osTypeId;
+ @SerializedName(ApiConstants.BOOT_MODE)
+ @Param(description = "Guest vm Boot Mode")
+ private String bootMode;
+
+ @SerializedName(ApiConstants.BOOT_TYPE)
+ @Param(description = "Guest vm Boot Type")
+ private String bootType;
+
public UserVmResponse() {
securityGroupList = new LinkedHashSet<SecurityGroupResponse>();
nics = new LinkedHashSet<NicResponse>();
@@ -439,6 +455,14 @@
return diskOfferingName;
}
+ public String getBackupOfferingId() {
+ return backupOfferingId;
+ }
+
+ public String getBackupOfferingName() {
+ return backupOfferingName;
+ }
+
public Boolean getForVirtualNetwork() {
return forVirtualNetwork;
}
@@ -697,6 +721,14 @@
this.diskOfferingName = diskOfferingName;
}
+ public void setBackupOfferingId(String backupOfferingId) {
+ this.backupOfferingId = backupOfferingId;
+ }
+
+ public void setBackupOfferingName(String backupOfferingName) {
+ this.backupOfferingName = backupOfferingName;
+ }
+
public void setCpuNumber(Integer cpuNumber) {
this.cpuNumber = cpuNumber;
}
@@ -849,4 +881,13 @@
public String getOsTypeId() {
return osTypeId;
}
+
+ public String getBootType() { return bootType; }
+
+ public void setBootType(String bootType) { this.bootType = bootType; }
+
+ public String getBootMode() { return bootMode; }
+
+ public void setBootMode(String bootMode) { this.bootMode = bootMode; }
+
}
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/diagnostics/GetDiagnosticsDataResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/diagnostics/GetDiagnosticsDataResponse.java
new file mode 100644
index 0000000..4d6e674
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/api/response/diagnostics/GetDiagnosticsDataResponse.java
@@ -0,0 +1,40 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.response.diagnostics;
+
+import com.cloud.serializer.Param;
+import com.cloud.vm.VirtualMachine;
+import com.google.gson.annotations.SerializedName;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.EntityReference;
+
+@EntityReference(value = VirtualMachine.class)
+public class GetDiagnosticsDataResponse extends BaseResponse {
+ @SerializedName(ApiConstants.URL)
+ @Param(description = "Storage URL to download retrieve diagnostics data files")
+ private String url;
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/backup/Backup.java b/api/src/main/java/org/apache/cloudstack/backup/Backup.java
new file mode 100644
index 0000000..e6aa238
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/backup/Backup.java
@@ -0,0 +1,142 @@
+//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
+//the License. You may obtain a copy of the License at
+//
+//http://www.apache.org/licenses/LICENSE-2.0
+//
+//Unless required by applicable law or agreed to in writing,
+//software distributed under the License is distributed on an
+//"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+//KIND, either express or implied. See the License for the
+//specific language governing permissions and limitations
+//under the License.
+
+package org.apache.cloudstack.backup;
+
+import org.apache.cloudstack.acl.ControlledEntity;
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
+import com.cloud.storage.Volume;
+import com.cloud.utils.StringUtils;
+
+public interface Backup extends ControlledEntity, InternalIdentity, Identity {
+
+ enum Status {
+ Allocated, Queued, BackingUp, BackedUp, Error, Failed, Restoring, Removed, Expunged
+ }
+
+ class Metric {
+ private Long backupSize = 0L;
+ private Long dataSize = 0L;
+
+ public Metric(final Long backupSize, final Long dataSize) {
+ this.backupSize = backupSize;
+ this.dataSize = dataSize;
+ }
+
+ public Long getBackupSize() {
+ return backupSize;
+ }
+
+ public Long getDataSize() {
+ return dataSize;
+ }
+
+ public void setBackupSize(Long backupSize) {
+ this.backupSize = backupSize;
+ }
+
+ public void setDataSize(Long dataSize) {
+ this.dataSize = dataSize;
+ }
+ }
+
+ class RestorePoint {
+ private String id;
+ private String created;
+ private String type;
+
+ public RestorePoint(String id, String created, String type) {
+ this.id = id;
+ this.created = created;
+ this.type = type;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getCreated() {
+ return created;
+ }
+
+ public void setCreated(String created) {
+ this.created = created;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+ }
+
+ class VolumeInfo {
+ private String uuid;
+ private Volume.Type type;
+ private Long size;
+ private String path;
+
+ public VolumeInfo(String uuid, String path, Volume.Type type, Long size) {
+ this.uuid = uuid;
+ this.type = type;
+ this.size = size;
+ this.path = path;
+ }
+
+ public String getUuid() {
+ return uuid;
+ }
+
+ public Volume.Type getType() {
+ return type;
+ }
+
+ public void setType(Volume.Type type) {
+ this.type = type;
+ }
+
+ public String getPath() {
+ return path;
+ }
+
+ public Long getSize() {
+ return size;
+ }
+
+ @Override
+ public String toString() {
+ return StringUtils.join(":", uuid, path, type, size);
+ }
+ }
+
+ long getVmId();
+ String getExternalId();
+ String getType();
+ String getDate();
+ Backup.Status getStatus();
+ Long getSize();
+ Long getProtectedSize();
+ long getZoneId();
+}
diff --git a/api/src/main/java/org/apache/cloudstack/backup/BackupManager.java b/api/src/main/java/org/apache/cloudstack/backup/BackupManager.java
new file mode 100644
index 0000000..7c9d3b6
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/backup/BackupManager.java
@@ -0,0 +1,140 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.backup;
+
+import java.util.List;
+
+import org.apache.cloudstack.api.command.admin.backup.ImportBackupOfferingCmd;
+import org.apache.cloudstack.api.command.user.backup.CreateBackupScheduleCmd;
+import org.apache.cloudstack.api.command.user.backup.ListBackupOfferingsCmd;
+import org.apache.cloudstack.api.command.user.backup.ListBackupsCmd;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.Configurable;
+
+import com.cloud.utils.Pair;
+import com.cloud.utils.component.Manager;
+import com.cloud.utils.component.PluggableService;
+
+/**
+ * Backup and Recover Manager Interface
+ */
+public interface BackupManager extends BackupService, Configurable, PluggableService, Manager {
+
+ ConfigKey<Boolean> BackupFrameworkEnabled = new ConfigKey<>("Advanced", Boolean.class,
+ "backup.framework.enabled",
+ "false",
+ "Is backup and recovery framework enabled.", true, ConfigKey.Scope.Zone);
+
+ ConfigKey<String> BackupProviderPlugin = new ConfigKey<>("Advanced", String.class,
+ "backup.framework.provider.plugin",
+ "dummy",
+ "The backup and recovery provider plugin.", true, ConfigKey.Scope.Zone);
+
+ ConfigKey<Long> BackupSyncPollingInterval = new ConfigKey<>("Advanced", Long.class,
+ "backup.framework.sync.interval",
+ "300",
+ "The backup and recovery background sync task polling interval in seconds.", true);
+
+ /**
+ * List backup provider offerings
+ * @param zoneId zone id
+ */
+ List<BackupOffering> listBackupProviderOfferings(final Long zoneId);
+
+ /**
+ * Add a new Backup and Recovery policy to CloudStack by mapping an existing external backup offering to a name and description
+ * @param cmd import backup offering cmd
+ */
+ BackupOffering importBackupOffering(final ImportBackupOfferingCmd cmd);
+
+ /**
+ * List backup offerings
+ * @param ListBackupOfferingsCmd API cmd
+ */
+ Pair<List<BackupOffering>, Integer> listBackupOfferings(final ListBackupOfferingsCmd cmd);
+
+ /**
+ * Deletes a backup offering
+ */
+ boolean deleteBackupOffering(final Long policyId);
+
+ /**
+ * Assigns a VM to a backup offering
+ * @param vmId
+ * @param offeringId
+ * @return
+ */
+ boolean assignVMToBackupOffering(final Long vmId, final Long offeringId);
+
+ /**
+ * Removes a VM from a backup offering
+ * @param vmId
+ * @param forced
+ * @return
+ */
+ boolean removeVMFromBackupOffering(final Long vmId, final boolean forced);
+
+ /**
+ * Creates or Updates a VM backup schedule
+ * @param cmd
+ * @return
+ */
+ BackupSchedule configureBackupSchedule(CreateBackupScheduleCmd cmd);
+
+ /**
+ * Lists VM backup schedule for a VM
+ * @param vmId
+ * @return
+ */
+ BackupSchedule listBackupSchedule(Long vmId);
+
+ /**
+ * Deletes VM backup schedule for a VM
+ * @param vmId
+ * @return
+ */
+ boolean deleteBackupSchedule(Long vmId);
+
+ /**
+ * Creates backup of a VM
+ * @param vmId Virtual Machine ID
+ * @return returns operation success
+ */
+ boolean createBackup(final Long vmId);
+
+ /**
+ * List existing backups for a VM
+ */
+ Pair<List<Backup>, Integer> listBackups(final ListBackupsCmd cmd);
+
+ /**
+ * Restore a full VM from backup
+ */
+ boolean restoreBackup(final Long backupId);
+
+ /**
+ * Restore a backed up volume and attach it to a VM
+ */
+ boolean restoreBackupVolumeAndAttachToVM(final String backedUpVolumeUuid, final Long backupId, final Long vmId) throws Exception;
+
+ /**
+ * Deletes a backup
+ * @return returns operation success
+ */
+ boolean deleteBackup(final Long backupId);
+}
diff --git a/api/src/main/java/org/apache/cloudstack/backup/BackupOffering.java b/api/src/main/java/org/apache/cloudstack/backup/BackupOffering.java
new file mode 100644
index 0000000..156c9cd
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/backup/BackupOffering.java
@@ -0,0 +1,32 @@
+//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
+//the License. You may obtain a copy of the License at
+//
+//http://www.apache.org/licenses/LICENSE-2.0
+//
+//Unless required by applicable law or agreed to in writing,
+//software distributed under the License is distributed on an
+//"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+//KIND, either express or implied. See the License for the
+//specific language governing permissions and limitations
+//under the License.
+package org.apache.cloudstack.backup;
+
+import java.util.Date;
+
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
+public interface BackupOffering extends InternalIdentity, Identity {
+ String getExternalId();
+ String getName();
+ String getDescription();
+ long getZoneId();
+ boolean isUserDrivenBackupAllowed();
+ String getProvider();
+ Date getCreated();
+}
diff --git a/api/src/main/java/org/apache/cloudstack/backup/BackupProvider.java b/api/src/main/java/org/apache/cloudstack/backup/BackupProvider.java
new file mode 100644
index 0000000..ff05a38
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/backup/BackupProvider.java
@@ -0,0 +1,111 @@
+//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
+//the License. You may obtain a copy of the License at
+//
+//http://www.apache.org/licenses/LICENSE-2.0
+//
+//Unless required by applicable law or agreed to in writing,
+//software distributed under the License is distributed on an
+//"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+//KIND, either express or implied. See the License for the
+//specific language governing permissions and limitations
+//under the License.
+package org.apache.cloudstack.backup;
+
+import java.util.List;
+import java.util.Map;
+
+import com.cloud.utils.Pair;
+import com.cloud.vm.VirtualMachine;
+
+public interface BackupProvider {
+
+ /**
+ * Returns the unique name of the provider
+ * @return returns provider name
+ */
+ String getName();
+
+ /**
+ * Returns description about the backup and recovery provider plugin
+ * @return returns description
+ */
+ String getDescription();
+
+ /**
+ * Returns the list of existing backup policies on the provider
+ * @return backup policies list
+ */
+ List<BackupOffering> listBackupOfferings(Long zoneId);
+
+ /**
+ * True if a backup offering exists on the backup provider
+ */
+ boolean isValidProviderOffering(Long zoneId, String uuid);
+
+ /**
+ * Assign a VM to a backup offering or policy
+ * @param vm
+ * @param backup
+ * @param policy
+ * @return
+ */
+ boolean assignVMToBackupOffering(VirtualMachine vm, BackupOffering backupOffering);
+
+ /**
+ * Removes a VM from a backup offering or policy
+ * @param vm
+ * @return
+ */
+ boolean removeVMFromBackupOffering(VirtualMachine vm);
+
+ /**
+ * Whether the provide will delete backups on removal of VM from the offfering
+ * @return boolean result
+ */
+ boolean willDeleteBackupsOnOfferingRemoval();
+
+ /**
+ * Starts and creates an adhoc backup process
+ * for a previously registered VM backup
+ * @param backup
+ * @return
+ */
+ boolean takeBackup(VirtualMachine vm);
+
+ /**
+ * Delete an existing backup
+ * @param backup
+ * @return
+ */
+ boolean deleteBackup(Backup backup);
+
+ /**
+ * Restore VM from backup
+ */
+ boolean restoreVMFromBackup(VirtualMachine vm, Backup backup);
+
+ /**
+ * Restore a volume from a backup
+ */
+ Pair<Boolean, String> restoreBackedUpVolume(Backup backup, String volumeUuid, String hostIp, String dataStoreUuid);
+
+ /**
+ * Returns backup metrics for a list of VMs in a zone
+ * @param zoneId
+ * @param vms
+ * @return
+ */
+ Map<VirtualMachine, Backup.Metric> getBackupMetrics(Long zoneId, List<VirtualMachine> vms);
+
+ /**
+ * This method should reconcile and create backup entries for any backups created out-of-band
+ * @param vm
+ * @param metric
+ */
+ void syncBackups(VirtualMachine vm, Backup.Metric metric);
+}
diff --git a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java b/api/src/main/java/org/apache/cloudstack/backup/BackupSchedule.java
similarity index 60%
copy from agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
copy to api/src/main/java/org/apache/cloudstack/backup/BackupSchedule.java
index b244d02..d81dd73 100644
--- a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
+++ b/api/src/main/java/org/apache/cloudstack/backup/BackupSchedule.java
@@ -1,4 +1,3 @@
-//
// 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
@@ -15,22 +14,20 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-//
-package com.cloud.agent.direct.download;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+package org.apache.cloudstack.backup;
-@RunWith(MockitoJUnitRunner.class)
-public class DirectTemplateDownloaderImplTest {
+import java.util.Date;
- private static final Long templateId = 202l;
+import org.apache.cloudstack.api.InternalIdentity;
- @Test
- public void testGetDirectDownloadTempPath() {
- String path = DirectTemplateDownloaderImpl.getDirectDownloadTempPath(templateId);
- Assert.assertEquals("template/2/202", path);
- }
+import com.cloud.utils.DateUtil;
+
+public interface BackupSchedule extends InternalIdentity {
+ Long getVmId();
+ DateUtil.IntervalType getScheduleType();
+ String getSchedule();
+ String getTimezone();
+ Date getScheduledTimestamp();
+ Long getAsyncJobId();
}
diff --git a/api/src/main/java/org/apache/cloudstack/backup/BackupService.java b/api/src/main/java/org/apache/cloudstack/backup/BackupService.java
new file mode 100644
index 0000000..d4beb62
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/backup/BackupService.java
@@ -0,0 +1,37 @@
+//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
+//the License. You may obtain a copy of the License at
+//
+//http://www.apache.org/licenses/LICENSE-2.0
+//
+//Unless required by applicable law or agreed to in writing,
+//software distributed under the License is distributed on an
+//"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+//KIND, either express or implied. See the License for the
+//specific language governing permissions and limitations
+//under the License.
+package org.apache.cloudstack.backup;
+
+import java.util.List;
+
+/**
+ * Backup and Recovery Services
+ */
+public interface BackupService {
+ /**
+ * Lists backup and recovery provider plugins
+ * @return list of providers
+ */
+ List<BackupProvider> listBackupProviders();
+
+ /**
+ * Find backup provider by zone ID
+ * @param zoneId zone id
+ * @return backup provider
+ */
+ BackupProvider getBackupProvider(final Long zoneId);
+}
diff --git a/api/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsService.java b/api/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsService.java
index a9177af..fb1d03b 100644
--- a/api/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsService.java
+++ b/api/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsService.java
@@ -18,12 +18,16 @@
//
package org.apache.cloudstack.diagnostics;
-import org.apache.cloudstack.api.command.admin.diagnostics.RunDiagnosticsCmd;
-
import java.util.Map;
+import org.apache.cloudstack.api.command.admin.diagnostics.GetDiagnosticsDataCmd;
+import org.apache.cloudstack.api.command.admin.diagnostics.RunDiagnosticsCmd;
+
public interface DiagnosticsService {
+ String DIAGNOSTICS_DIRECTORY = "diagnostics";
+
Map<String, String> runDiagnosticsCommand(RunDiagnosticsCmd cmd);
+ String getDiagnosticsDataCommand(GetDiagnosticsDataCmd getDiagnosticsDataCmd);
}
\ No newline at end of file
diff --git a/api/src/main/java/org/apache/cloudstack/direct/download/DirectDownloadManager.java b/api/src/main/java/org/apache/cloudstack/direct/download/DirectDownloadManager.java
index d627ffa..f7dfae1 100644
--- a/api/src/main/java/org/apache/cloudstack/direct/download/DirectDownloadManager.java
+++ b/api/src/main/java/org/apache/cloudstack/direct/download/DirectDownloadManager.java
@@ -17,13 +17,18 @@
package org.apache.cloudstack.direct.download;
-import com.cloud.utils.component.PluggableService;
import org.apache.cloudstack.framework.agent.direct.download.DirectDownloadService;
import org.apache.cloudstack.framework.config.ConfigKey;
import org.apache.cloudstack.framework.config.Configurable;
+import com.cloud.utils.component.PluggableService;
+
public interface DirectDownloadManager extends DirectDownloadService, PluggableService, Configurable {
+ static final int DEFAULT_DIRECT_DOWNLOAD_CONNECT_TIMEOUT = 5000;
+ static final int DEFAULT_DIRECT_DOWNLOAD_SOCKET_TIMEOUT = 5000;
+ static final int DEFAULT_DIRECT_DOWNLOAD_CONNECTION_REQUEST_TIMEOUT = 5000;
+
ConfigKey<Long> DirectDownloadCertificateUploadInterval = new ConfigKey<>("Advanced", Long.class,
"direct.download.certificate.background.task.interval",
"0",
@@ -32,6 +37,24 @@
"Only certificates which have not been revoked from hosts are uploaded",
false);
+ static final ConfigKey<Integer> DirectDownloadConnectTimeout = new ConfigKey<Integer>("Advanced", Integer.class,
+ "direct.download.connect.timeout",
+ String.valueOf(DEFAULT_DIRECT_DOWNLOAD_CONNECT_TIMEOUT),
+ "Connection establishment timeout in milliseconds for direct download",
+ true);
+
+ static final ConfigKey<Integer> DirectDownloadSocketTimeout = new ConfigKey<Integer>("Advanced", Integer.class,
+ "direct.download.socket.timeout",
+ String.valueOf(DEFAULT_DIRECT_DOWNLOAD_SOCKET_TIMEOUT),
+ "Socket timeout (SO_TIMEOUT) in milliseconds for direct download",
+ true);
+
+ static final ConfigKey<Integer> DirectDownloadConnectionRequestTimeout = new ConfigKey<Integer>("Hidden", Integer.class,
+ "direct.download.connection.request.timeout",
+ String.valueOf(DEFAULT_DIRECT_DOWNLOAD_CONNECTION_REQUEST_TIMEOUT),
+ "Requesting a connection from connection manager timeout in milliseconds for direct download",
+ true);
+
/**
* Revoke direct download certificate with alias 'alias' from hosts of hypervisor type 'hypervisor'
*/
diff --git a/api/src/main/java/org/apache/cloudstack/query/QueryService.java b/api/src/main/java/org/apache/cloudstack/query/QueryService.java
index 68dc31f..0a400ed 100644
--- a/api/src/main/java/org/apache/cloudstack/query/QueryService.java
+++ b/api/src/main/java/org/apache/cloudstack/query/QueryService.java
@@ -24,6 +24,7 @@
import org.apache.cloudstack.api.command.admin.host.ListHostsCmd;
import org.apache.cloudstack.api.command.admin.internallb.ListInternalLBVMsCmd;
import org.apache.cloudstack.api.command.admin.management.ListMgmtsCmd;
+import org.apache.cloudstack.api.command.admin.router.GetRouterHealthCheckResultsCmd;
import org.apache.cloudstack.api.command.admin.router.ListRoutersCmd;
import org.apache.cloudstack.api.command.admin.storage.ListImageStoresCmd;
import org.apache.cloudstack.api.command.admin.storage.ListSecondaryStagingStoresCmd;
@@ -68,6 +69,7 @@
import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.ResourceDetailResponse;
import org.apache.cloudstack.api.response.ResourceTagResponse;
+import org.apache.cloudstack.api.response.RouterHealthCheckResultResponse;
import org.apache.cloudstack.api.response.SecurityGroupResponse;
import org.apache.cloudstack.api.response.ServiceOfferingResponse;
import org.apache.cloudstack.api.response.StoragePoolResponse;
@@ -111,6 +113,8 @@
ListResponse<UserResponse> searchForUsers(ListUsersCmd cmd) throws PermissionDeniedException;
+ ListResponse<UserResponse> searchForUsers(Long domainId, boolean recursive) throws PermissionDeniedException;
+
ListResponse<EventResponse> searchForEvents(ListEventsCmd cmd);
ListResponse<ResourceTagResponse> listTags(ListTagsCmd cmd);
@@ -170,4 +174,6 @@
ListResponse<ManagementServerResponse> listManagementServers(ListMgmtsCmd cmd);
ListResponse<TemplateOVFPropertyResponse> listTemplateOVFProperties(ListTemplateOVFProperties cmd);
+
+ List<RouterHealthCheckResultResponse> listRouterHealthChecks(GetRouterHealthCheckResultsCmd cmd);
}
diff --git a/api/src/main/java/org/apache/cloudstack/usage/UsageTypes.java b/api/src/main/java/org/apache/cloudstack/usage/UsageTypes.java
index d0b7006..48cff30 100644
--- a/api/src/main/java/org/apache/cloudstack/usage/UsageTypes.java
+++ b/api/src/main/java/org/apache/cloudstack/usage/UsageTypes.java
@@ -44,6 +44,7 @@
public static final int VM_SNAPSHOT = 25;
public static final int VOLUME_SECONDARY = 26;
public static final int VM_SNAPSHOT_ON_PRIMARY = 27;
+ public static final int BACKUP = 28;
public static List<UsageTypeResponse> listUsageTypes() {
List<UsageTypeResponse> responseList = new ArrayList<UsageTypeResponse>();
@@ -68,6 +69,7 @@
responseList.add(new UsageTypeResponse(VM_SNAPSHOT, "VM Snapshot storage usage"));
responseList.add(new UsageTypeResponse(VOLUME_SECONDARY, "Volume on secondary storage usage"));
responseList.add(new UsageTypeResponse(VM_SNAPSHOT_ON_PRIMARY, "VM Snapshot on primary storage usage"));
+ responseList.add(new UsageTypeResponse(BACKUP, "Backup storage usage"));
return responseList;
}
}
diff --git a/api/src/main/java/org/apache/cloudstack/vm/UnmanagedInstanceTO.java b/api/src/main/java/org/apache/cloudstack/vm/UnmanagedInstanceTO.java
new file mode 100644
index 0000000..860ecdc
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/vm/UnmanagedInstanceTO.java
@@ -0,0 +1,353 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.vm;
+
+import java.util.List;
+
+public class UnmanagedInstanceTO {
+
+ public enum PowerState {
+ PowerUnknown,
+ PowerOn,
+ PowerOff
+ }
+
+ private String name;
+
+ private PowerState powerState;
+
+ private Integer cpuCores;
+
+ private Integer cpuCoresPerSocket;
+
+ private Integer memory;
+
+ private Integer cpuSpeed;
+
+ private String operatingSystemId;
+
+ private String operatingSystem;
+
+ private List<Disk> disks;
+
+ private List<Nic> nics;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public PowerState getPowerState() {
+ return powerState;
+ }
+
+ public void setPowerState(PowerState powerState) {
+ this.powerState = powerState;
+ }
+
+ public Integer getCpuCores() {
+ return cpuCores;
+ }
+
+ public void setCpuCores(Integer cpuCores) {
+ this.cpuCores = cpuCores;
+ }
+
+ public Integer getCpuCoresPerSocket() {
+ return cpuCoresPerSocket;
+ }
+
+ public void setCpuCoresPerSocket(Integer cpuCoresPerSocket) {
+ this.cpuCoresPerSocket = cpuCoresPerSocket;
+ }
+
+ public Integer getMemory() {
+ return memory;
+ }
+
+ public void setMemory(Integer memory) {
+ this.memory = memory;
+ }
+
+ public Integer getCpuSpeed() {
+ return cpuSpeed;
+ }
+
+ public void setCpuSpeed(Integer cpuSpeed) {
+ this.cpuSpeed = cpuSpeed;
+ }
+
+ public String getOperatingSystemId() {
+ return operatingSystemId;
+ }
+
+ public void setOperatingSystemId(String operatingSystemId) {
+ this.operatingSystemId = operatingSystemId;
+ }
+
+ public String getOperatingSystem() {
+ return operatingSystem;
+ }
+
+ public void setOperatingSystem(String operatingSystem) {
+ this.operatingSystem = operatingSystem;
+ }
+
+ public List<Disk> getDisks() {
+ return disks;
+ }
+
+ public void setDisks(List<Disk> disks) {
+ this.disks = disks;
+ }
+
+ public List<Nic> getNics() {
+ return nics;
+ }
+
+ public void setNics(List<Nic> nics) {
+ this.nics = nics;
+ }
+
+ public static class Disk {
+ private String diskId;
+
+ private String label;
+
+ private Long capacity;
+
+ private String fileBaseName;
+
+ private String imagePath;
+
+ private String controller;
+
+ private Integer controllerUnit;
+
+ private Integer position;
+
+ private String chainInfo;
+
+ private String datastoreName;
+
+ private String datastoreHost;
+
+ private String datastorePath;
+
+ private String datastoreType;
+
+ public String getDiskId() {
+ return diskId;
+ }
+
+ public void setDiskId(String diskId) {
+ this.diskId = diskId;
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ public void setLabel(String label) {
+ this.label = label;
+ }
+
+ public Long getCapacity() {
+ return capacity;
+ }
+
+ public void setCapacity(Long capacity) {
+ this.capacity = capacity;
+ }
+
+ public String getFileBaseName() {
+ return fileBaseName;
+ }
+
+ public void setFileBaseName(String fileBaseName) {
+ this.fileBaseName = fileBaseName;
+ }
+
+ public String getImagePath() {
+ return imagePath;
+ }
+
+ public void setImagePath(String imagePath) {
+ this.imagePath = imagePath;
+ }
+
+ public String getController() {
+ return controller;
+ }
+
+ public void setController(String controller) {
+ this.controller = controller;
+ }
+
+ public Integer getControllerUnit() {
+ return controllerUnit;
+ }
+
+ public void setControllerUnit(Integer controllerUnit) {
+ this.controllerUnit = controllerUnit;
+ }
+
+ public Integer getPosition() {
+ return position;
+ }
+
+ public void setPosition(Integer position) {
+ this.position = position;
+ }
+
+ public String getChainInfo() {
+ return chainInfo;
+ }
+
+ public void setChainInfo(String chainInfo) {
+ this.chainInfo = chainInfo;
+ }
+
+ public String getDatastoreName() {
+ return datastoreName;
+ }
+
+ public void setDatastoreName(String datastoreName) {
+ this.datastoreName = datastoreName;
+ }
+
+ public String getDatastoreHost() {
+ return datastoreHost;
+ }
+
+ public void setDatastoreHost(String datastoreHost) {
+ this.datastoreHost = datastoreHost;
+ }
+
+ public String getDatastorePath() {
+ return datastorePath;
+ }
+
+ public void setDatastorePath(String datastorePath) {
+ this.datastorePath = datastorePath;
+ }
+
+ public String getDatastoreType() {
+ return datastoreType;
+ }
+
+ public void setDatastoreType(String datastoreType) {
+ this.datastoreType = datastoreType;
+ }
+ }
+
+ public static class Nic {
+ private String nicId;
+
+ private String adapterType;
+
+ private String macAddress;
+
+ private String network;
+
+ private Integer vlan;
+
+ private Integer pvlan;
+
+ private String pvlanType;
+
+ private List<String> ipAddress;
+
+ private String pciSlot;
+
+ public String getNicId() {
+ return nicId;
+ }
+
+ public void setNicId(String nicId) {
+ this.nicId = nicId;
+ }
+
+ public String getAdapterType() {
+ return adapterType;
+ }
+
+ public void setAdapterType(String adapterType) {
+ this.adapterType = adapterType;
+ }
+
+ public String getMacAddress() {
+ return macAddress;
+ }
+
+ public void setMacAddress(String macAddress) {
+ this.macAddress = macAddress;
+ }
+
+ public String getNetwork() {
+ return network;
+ }
+
+ public void setNetwork(String network) {
+ this.network = network;
+ }
+
+ public Integer getVlan() {
+ return vlan;
+ }
+
+ public void setVlan(Integer vlan) {
+ this.vlan = vlan;
+ }
+
+ public Integer getPvlan() {
+ return pvlan;
+ }
+
+ public void setPvlan(Integer pvlan) {
+ this.pvlan = pvlan;
+ }
+
+ public String getPvlanType() {
+ return pvlanType;
+ }
+
+ public void setPvlanType(String pvlanType) {
+ this.pvlanType = pvlanType;
+ }
+
+ public List<String> getIpAddress() {
+ return ipAddress;
+ }
+
+ public void setIpAddress(List<String> ipAddress) {
+ this.ipAddress = ipAddress;
+ }
+
+ public String getPciSlot() {
+ return pciSlot;
+ }
+
+ public void setPciSlot(String pciSlot) {
+ this.pciSlot = pciSlot;
+ }
+ }
+}
diff --git a/api/src/main/java/org/apache/cloudstack/vm/VmImportService.java b/api/src/main/java/org/apache/cloudstack/vm/VmImportService.java
new file mode 100644
index 0000000..783a5d2
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/vm/VmImportService.java
@@ -0,0 +1,31 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.vm;
+
+import org.apache.cloudstack.api.command.admin.vm.ImportUnmanagedInstanceCmd;
+import org.apache.cloudstack.api.command.admin.vm.ListUnmanagedInstancesCmd;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.UnmanagedInstanceResponse;
+import org.apache.cloudstack.api.response.UserVmResponse;
+
+import com.cloud.utils.component.PluggableService;
+
+public interface VmImportService extends PluggableService {
+ ListResponse<UnmanagedInstanceResponse> listUnmanagedInstances(ListUnmanagedInstancesCmd cmd);
+ UserVmResponse importUnmanagedInstance(ImportUnmanagedInstanceCmd cmd);
+}
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java
index 8a28305..d0cc8be 100644
--- a/api/src/test/java/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java
+++ b/api/src/test/java/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java
@@ -20,9 +20,7 @@
import junit.framework.TestCase;
import org.junit.Before;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
import org.mockito.Matchers;
import org.mockito.Mockito;
import org.apache.cloudstack.api.ResponseGenerator;
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/test/AddSecondaryStorageCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/AddSecondaryStorageCmdTest.java
index d68cfb4..da5bff2 100644
--- a/api/src/test/java/org/apache/cloudstack/api/command/test/AddSecondaryStorageCmdTest.java
+++ b/api/src/test/java/org/apache/cloudstack/api/command/test/AddSecondaryStorageCmdTest.java
@@ -16,29 +16,29 @@
// under the License.
package org.apache.cloudstack.api.command.test;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.anyString;
+
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyObject;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.isNull;
import java.util.Map;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
+import org.apache.cloudstack.api.ResponseGenerator;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.storage.AddImageStoreCmd;
+import org.apache.cloudstack.api.response.ImageStoreResponse;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.mockito.Mockito;
-import org.apache.cloudstack.api.ResponseGenerator;
-import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.command.admin.storage.AddImageStoreCmd;
-import org.apache.cloudstack.api.response.ImageStoreResponse;
-
import com.cloud.storage.ImageStore;
import com.cloud.storage.StorageService;
+import junit.framework.TestCase;
+
public class AddSecondaryStorageCmdTest extends TestCase {
private AddImageStoreCmd addImageStoreCmd;
@@ -62,25 +62,22 @@
ImageStore store = Mockito.mock(ImageStore.class);
- Mockito.when(resourceService.discoverImageStore(anyString(), anyString(), anyString(), anyLong(), (Map)anyObject()))
- .thenReturn(store);
-
+ Mockito.when(resourceService.discoverImageStore(isNull(), isNull(), isNull(), isNull(), isNull())).thenReturn(store);
ResponseGenerator responseGenerator = Mockito.mock(ResponseGenerator.class);
addImageStoreCmd._responseGenerator = responseGenerator;
ImageStoreResponse responseHost = new ImageStoreResponse();
responseHost.setName("Test");
- Mockito.when(responseGenerator.createImageStoreResponse(store)).thenReturn(responseHost);
+ Mockito.doReturn(responseHost).when(responseGenerator).createImageStoreResponse(store);
addImageStoreCmd.execute();
Mockito.verify(responseGenerator).createImageStoreResponse(store);
ImageStoreResponse actualResponse = (ImageStoreResponse)addImageStoreCmd.getResponseObject();
-
- Assert.assertEquals(responseHost, actualResponse);
- Assert.assertEquals("addimagestoreresponse", actualResponse.getResponseName());
+ assertEquals(responseHost, actualResponse);
+ assertEquals("addimagestoreresponse", actualResponse.getResponseName());
}
@@ -96,7 +93,7 @@
try {
addImageStoreCmd.execute();
} catch (ServerApiException exception) {
- Assert.assertEquals("Failed to add secondary storage", exception.getDescription());
+ assertEquals("Failed to add secondary storage", exception.getDescription());
}
}
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java
index c8d99a8..8b93353 100644
--- a/api/src/test/java/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java
+++ b/api/src/test/java/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java
@@ -16,24 +16,25 @@
// under the License.
package org.apache.cloudstack.api.command.test;
-import junit.framework.Assert;
-import junit.framework.TestCase;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.ArgumentMatchers.nullable;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.user.vpn.AddVpnUserCmd;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import org.mockito.Matchers;
import org.mockito.Mockito;
-import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.command.user.vpn.AddVpnUserCmd;
-
import com.cloud.network.VpnUser;
import com.cloud.network.vpn.RemoteAccessVpnService;
import com.cloud.user.Account;
import com.cloud.user.AccountService;
+import junit.framework.Assert;
+import junit.framework.TestCase;
public class AddVpnUserCmdTest extends TestCase {
private AddVpnUserCmd addVpnUserCmd;
@@ -76,14 +77,15 @@
AccountService accountService = Mockito.mock(AccountService.class);
Account account = Mockito.mock(Account.class);
- Mockito.when(accountService.getAccount(Matchers.anyLong())).thenReturn(account);
+ Mockito.when(accountService.getAccount(nullable(Long.class))).thenReturn(account);
addVpnUserCmd._accountService = accountService;
RemoteAccessVpnService ravService = Mockito.mock(RemoteAccessVpnService.class);
VpnUser vpnUser = Mockito.mock(VpnUser.class);
- Mockito.when(ravService.addVpnUser(Matchers.anyLong(), Matchers.anyString(), Matchers.anyString())).thenReturn(vpnUser);
+
+ Mockito.when(ravService.addVpnUser(anyLong(), isNull(), isNull())).thenReturn(vpnUser);
addVpnUserCmd._ravService = ravService;
@@ -96,12 +98,13 @@
AccountService accountService = Mockito.mock(AccountService.class);
Account account = Mockito.mock(Account.class);
- Mockito.when(accountService.getAccount(Matchers.anyLong())).thenReturn(account);
+ Mockito.when(accountService.getAccount(nullable(Long.class))).thenReturn(account);
addVpnUserCmd._accountService = accountService;
RemoteAccessVpnService ravService = Mockito.mock(RemoteAccessVpnService.class);
- Mockito.when(ravService.addVpnUser(Matchers.anyLong(), Matchers.anyString(), Matchers.anyString())).thenReturn(null);
+
+ Mockito.when(ravService.addVpnUser(anyLong(), isNull(), isNull())).thenReturn(null);
addVpnUserCmd._ravService = ravService;
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/test/CreateSnapshotCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/CreateSnapshotCmdTest.java
index 4739082..0d3251a 100644
--- a/api/src/test/java/org/apache/cloudstack/api/command/test/CreateSnapshotCmdTest.java
+++ b/api/src/test/java/org/apache/cloudstack/api/command/test/CreateSnapshotCmdTest.java
@@ -16,8 +16,7 @@
// under the License.
package org.apache.cloudstack.api.command.test;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.anyString;
@@ -92,8 +91,8 @@
VolumeApiService volumeApiService = Mockito.mock(VolumeApiService.class);
Snapshot snapshot = Mockito.mock(Snapshot.class);
try {
- Mockito.when(volumeApiService.takeSnapshot(anyLong(), anyLong(), anyLong(),
- any(Account.class), anyBoolean(), isNull(Snapshot.LocationType.class), anyBoolean(), anyObject())).thenReturn(snapshot);
+ Mockito.when(volumeApiService.takeSnapshot(nullable(Long.class), nullable(Long.class), isNull(),
+ nullable(Account.class), nullable(Boolean.class), nullable(Snapshot.LocationType.class), nullable(Boolean.class), nullable(Map.class))).thenReturn(snapshot);
} catch (Exception e) {
Assert.fail("Received exception when success expected " + e.getMessage());
@@ -125,8 +124,8 @@
VolumeApiService volumeApiService = Mockito.mock(VolumeApiService.class);
try {
- Mockito.when(volumeApiService.takeSnapshot(anyLong(), anyLong(), anyLong(),
- any(Account.class), anyBoolean(), isNull(Snapshot.LocationType.class), anyBoolean(), anyObject())).thenReturn(null);
+ Mockito.when(volumeApiService.takeSnapshot(nullable(Long.class), nullable(Long.class), nullable(Long.class),
+ nullable(Account.class), nullable(Boolean.class), nullable(Snapshot.LocationType.class), nullable(Boolean.class), anyObject())).thenReturn(null);
} catch (Exception e) {
Assert.fail("Received exception when success expected " + e.getMessage());
}
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java
index 7911943..bb38189 100644
--- a/api/src/test/java/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java
+++ b/api/src/test/java/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java
@@ -23,9 +23,7 @@
import junit.framework.TestCase;
import org.junit.Before;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
import org.mockito.Mockito;
import org.apache.cloudstack.api.ResponseGenerator;
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/test/RegionCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/RegionCmdTest.java
index 10c3d85..5410d1b 100644
--- a/api/src/test/java/org/apache/cloudstack/api/command/test/RegionCmdTest.java
+++ b/api/src/test/java/org/apache/cloudstack/api/command/test/RegionCmdTest.java
@@ -16,15 +16,9 @@
// under the License.
package org.apache.cloudstack.api.command.test;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.mockito.Matchers;
-import org.mockito.Mockito;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.isNull;
import org.apache.cloudstack.api.ResponseGenerator;
import org.apache.cloudstack.api.ServerApiException;
@@ -32,6 +26,13 @@
import org.apache.cloudstack.api.response.RegionResponse;
import org.apache.cloudstack.region.Region;
import org.apache.cloudstack.region.RegionService;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.mockito.Mockito;
+
+import junit.framework.TestCase;
public class RegionCmdTest extends TestCase {
@@ -66,7 +67,8 @@
RegionService regionService = Mockito.mock(RegionService.class);
Region region = Mockito.mock(Region.class);
- Mockito.when(regionService.addRegion(Matchers.anyInt(), Matchers.anyString(), Matchers.anyString())).thenReturn(region);
+
+ Mockito.when(regionService.addRegion(anyInt(), anyString(), isNull())).thenReturn(region);
addRegionCmd._regionService = regionService;
responseGenerator = Mockito.mock(ResponseGenerator.class);
@@ -86,14 +88,15 @@
RegionService regionService = Mockito.mock(RegionService.class);
Region region = Mockito.mock(Region.class);
- Mockito.when(regionService.addRegion(Matchers.anyInt(), Matchers.anyString(), Matchers.anyString())).thenReturn(null);
+
+ Mockito.when(regionService.addRegion(anyInt(), anyString(), isNull())).thenReturn(null);
addRegionCmd._regionService = regionService;
try {
addRegionCmd.execute();
} catch (ServerApiException exception) {
- Assert.assertEquals("Failed to add Region", exception.getDescription());
+ assertEquals("Failed to add Region", exception.getDescription());
}
}
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java
index 65b9330..7e24f88 100644
--- a/api/src/test/java/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java
+++ b/api/src/test/java/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java
@@ -21,9 +21,7 @@
import org.apache.cloudstack.acl.RoleService;
import org.junit.Before;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
import org.mockito.Mockito;
import org.apache.cloudstack.api.ResponseGenerator;
diff --git a/client/conf/db.properties.in b/client/conf/db.properties.in
index 2f1dcf0..7ef25af 100644
--- a/client/conf/db.properties.in
+++ b/client/conf/db.properties.in
@@ -39,7 +39,7 @@
db.cloud.timeBetweenEvictionRunsMillis=40000
db.cloud.minEvictableIdleTimeMillis=240000
db.cloud.poolPreparedStatements=false
-db.cloud.url.params=prepStmtCacheSize=517&cachePrepStmts=true&sessionVariables=sql_mode='STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'
+db.cloud.url.params=prepStmtCacheSize=517&cachePrepStmts=true&sessionVariables=sql_mode='STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'&serverTimezone=UTC
# CloudStack database SSL settings
db.cloud.useSSL=false
@@ -64,7 +64,7 @@
db.usage.maxActive=100
db.usage.maxIdle=30
db.usage.maxWait=10000
-db.usage.url.params=
+db.usage.url.params=serverTimezone=UTC
# Simulator database settings
db.simulator.username=@DBUSER@
diff --git a/client/pom.xml b/client/pom.xml
index ecacdba..c6289e5 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -25,12 +25,12 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
</parent>
<repositories>
<repository>
<id>juniper-contrail</id>
- <url>http://juniper.github.io/contrail-maven/snapshots</url>
+ <url>https://juniper.github.io/contrail-maven/snapshots</url>
</repository>
</repositories>
<dependencies>
@@ -61,7 +61,6 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
@@ -479,6 +478,16 @@
<artifactId>cloud-plugin-integrations-prometheus-exporter</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-plugin-backup-dummy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-plugin-integrations-kubernetes-service</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -537,9 +546,13 @@
</dependency>
</dependencies>
<configuration>
+ <supportedPackagings>
+ <supportedPackaging>jar</supportedPackaging>
+ </supportedPackagings>
<scanIntervalSeconds>0</scanIntervalSeconds>
<stopPort>9966</stopPort>
<stopKey>stop-jetty</stopKey>
+ <stopWait>10</stopWait>
<connectors>
<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
<port>8080</port>
@@ -548,11 +561,11 @@
</connectors>
<webXml>${project.build.directory}/classes/META-INF/webapp/WEB-INF/web.xml</webXml>
<webAppSourceDirectory>${project.build.directory}/classes/META-INF/webapp/</webAppSourceDirectory>
- <webAppConfig>
+ <webApp>
<contextPath>/client</contextPath>
- <extraClasspath>${project.build.directory}/conf/;${project.build.directory}/common;${project.build.directory}/utilities/scripts/db/;${project.build.directory}/utilities/scripts/db/db/</extraClasspath>
+ <extraClasspath>${project.build.directory}/conf/;${project.build.directory}/common;${project.build.directory}/utilities/scripts/db/;${project.build.directory}/utilities/scripts/db/db/;${project.build.directory}/cloud-client-ui-${project.version}.jar</extraClasspath>
<webInfIncludeJarPattern>.*/cloud.*jar$|.*/classes/.*</webInfIncludeJarPattern>
- </webAppConfig>
+ </webApp>
<systemProperties>
<systemProperty>
<name>log4j.configuration</name>
@@ -698,6 +711,12 @@
<outputDirectory>${project.build.directory}/pythonlibs</outputDirectory>
</artifactItem>
<artifactItem>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <overWrite>false</overWrite>
+ <outputDirectory>${project.build.directory}/lib</outputDirectory>
+ </artifactItem>
+ <artifactItem>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<overWrite>false</overWrite>
@@ -737,7 +756,7 @@
<exclude>org.mockito:mockito-all</exclude>
<exclude>org.hamcrest:hamcrest-all</exclude>
<exclude>org.powermock:powermock-module-junit4</exclude>
- <exclude>org.powermock:powermock-api-mockito</exclude>
+ <exclude>org.powermock:powermock-api-mockito2</exclude>
<exclude>org.springframework:spring-test</exclude>
<exclude>org.apache.tomcat.embed:tomcat-embed-core</exclude>
<exclude>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</exclude>
@@ -759,6 +778,33 @@
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/spring.schemas</resource>
</transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+ <resource>META-INF/services/com.sun.tools.xjc.Plugin</resource>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+ <resource>META-INF/cxf/cxf.extension</resource>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
+ <resource>META-INF/extensions.xml</resource>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
+ <resource>META-INF/cxf/extensions.xml</resource>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+ <resource>META-INF/cxf/bus-extensions.txt</resource>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
+ <resource>META-INF/cxf/bus-extensions.xml</resource>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
+ <resource>META-INF/wsdl.plugin.xml</resource>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
+ <resource>META-INF/tools.service.validator.xml</resource>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
+ <resource>META-INF/cxf/java2wsbeans.xml</resource>
+ </transformer>
</transformers>
<filters>
<filter>
@@ -893,6 +939,16 @@
<artifactId>cloud-plugin-network-cisco-vnmc</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-plugin-api-vmware-sioc</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-plugin-backup-veeam</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</profile>
<profile>
@@ -911,21 +967,6 @@
</dependencies>
</profile>
<profile>
- <id>vmwaresioc</id>
- <activation>
- <property>
- <name>noredist</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-plugin-api-vmware-sioc</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>quickcloud</id>
<activation>
<property>
diff --git a/core/pom.xml b/core/pom.xml
index 3d245b3..2b3641b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/core/src/main/java/com/cloud/agent/api/GetHostStatsAnswer.java b/core/src/main/java/com/cloud/agent/api/GetHostStatsAnswer.java
index 05a7e3e..ffe2ab5 100644
--- a/core/src/main/java/com/cloud/agent/api/GetHostStatsAnswer.java
+++ b/core/src/main/java/com/cloud/agent/api/GetHostStatsAnswer.java
@@ -70,6 +70,11 @@
}
@Override
+ public double getLoadAverage() {
+ return hostStats.getLoadAverage();
+ }
+
+ @Override
public double getNetworkReadKBs() {
return hostStats.getNetworkReadKBs();
}
diff --git a/core/src/main/java/com/cloud/agent/api/GetUnmanagedInstancesAnswer.java b/core/src/main/java/com/cloud/agent/api/GetUnmanagedInstancesAnswer.java
new file mode 100644
index 0000000..3c6118d
--- /dev/null
+++ b/core/src/main/java/com/cloud/agent/api/GetUnmanagedInstancesAnswer.java
@@ -0,0 +1,58 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.agent.api;
+
+import java.util.HashMap;
+
+import org.apache.cloudstack.vm.UnmanagedInstanceTO;
+
+@LogLevel(LogLevel.Log4jLevel.Trace)
+public class GetUnmanagedInstancesAnswer extends Answer {
+
+ private String instanceName;
+ private HashMap<String, UnmanagedInstanceTO> unmanagedInstances;
+
+ GetUnmanagedInstancesAnswer() {
+ }
+
+ public GetUnmanagedInstancesAnswer(GetUnmanagedInstancesCommand cmd, String details, HashMap<String, UnmanagedInstanceTO> unmanagedInstances) {
+ super(cmd, true, details);
+ this.instanceName = cmd.getInstanceName();
+ this.unmanagedInstances = unmanagedInstances;
+ }
+
+ public String getInstanceName() {
+ return instanceName;
+ }
+
+ public void setInstanceName(String instanceName) {
+ this.instanceName = instanceName;
+ }
+
+ public HashMap<String, UnmanagedInstanceTO> getUnmanagedInstances() {
+ return unmanagedInstances;
+ }
+
+ public void setUnmanagedInstances(HashMap<String, UnmanagedInstanceTO> unmanagedInstances) {
+ this.unmanagedInstances = unmanagedInstances;
+ }
+
+ public String getString() {
+ return "GetUnmanagedInstancesAnswer [instanceName=" + instanceName + "]";
+ }
+}
diff --git a/core/src/main/java/com/cloud/agent/api/GetUnmanagedInstancesCommand.java b/core/src/main/java/com/cloud/agent/api/GetUnmanagedInstancesCommand.java
new file mode 100644
index 0000000..968c586
--- /dev/null
+++ b/core/src/main/java/com/cloud/agent/api/GetUnmanagedInstancesCommand.java
@@ -0,0 +1,73 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.agent.api;
+
+import java.util.List;
+
+/**
+ * Unmanaged instances are those virtual machines which are present at hypervisor end but not available in CloudStack.
+ * Such virtual machines might have been created out of band, directly from hypervisor.
+ * Managed instances will be those virtual machines that are created from CloudStack or CloudStack have database record for them.
+ * All managed instances will be filtered while trying to find unmanaged instances.
+ */
+
+@LogLevel(LogLevel.Log4jLevel.Trace)
+public class GetUnmanagedInstancesCommand extends Command {
+
+ String instanceName;
+ List<String> managedInstancesNames;
+
+ public GetUnmanagedInstancesCommand() {
+ }
+
+ public GetUnmanagedInstancesCommand(String instanceName) {
+ this.instanceName = instanceName;
+ }
+
+ public String getInstanceName() {
+ return instanceName;
+ }
+
+ public void setInstanceName(String instanceName) {
+ this.instanceName = instanceName;
+ }
+
+ public List<String> getManagedInstancesNames() {
+ return managedInstancesNames;
+ }
+
+ public void setManagedInstancesNames(List<String> managedInstancesNames) {
+ this.managedInstancesNames = managedInstancesNames;
+ }
+
+ public boolean hasManagedInstance(String name) {
+ if (managedInstancesNames!=null && !managedInstancesNames.isEmpty()) {
+ return managedInstancesNames.contains(name);
+ }
+ return false;
+ }
+
+ @Override
+ public boolean executeInSequence() {
+ return false;
+ }
+
+ public String getString() {
+ return "GetUnmanagedInstancesCommand [instanceName=" + instanceName + "]";
+ }
+}
diff --git a/core/src/main/java/com/cloud/agent/api/HostStatsEntry.java b/core/src/main/java/com/cloud/agent/api/HostStatsEntry.java
index 5fd1c51..2de15d1 100644
--- a/core/src/main/java/com/cloud/agent/api/HostStatsEntry.java
+++ b/core/src/main/java/com/cloud/agent/api/HostStatsEntry.java
@@ -28,6 +28,7 @@
HostVO hostVo;
String entityType;
double cpuUtilization;
+ double averageLoad;
double networkReadKBs;
double networkWriteKBs;
double totalMemoryKBs;
@@ -45,6 +46,7 @@
this.networkWriteKBs = networkWriteKBs;
this.totalMemoryKBs = totalMemoryKBs;
this.freeMemoryKBs = freeMemoryKBs;
+ this.averageLoad = averageLoad;
}
@Override
@@ -102,6 +104,15 @@
}
@Override
+ public double getLoadAverage() {
+ return this.averageLoad;
+ }
+
+ public void setAverageLoad(double cpuAvgLoad) {
+ this.averageLoad = cpuAvgLoad;
+ }
+
+ @Override
public double getUsedMemory() {
return (totalMemoryKBs - freeMemoryKBs) * 1024;
}
diff --git a/core/src/main/java/com/cloud/agent/api/RebootCommand.java b/core/src/main/java/com/cloud/agent/api/RebootCommand.java
index eecf7f6..74ed762 100644
--- a/core/src/main/java/com/cloud/agent/api/RebootCommand.java
+++ b/core/src/main/java/com/cloud/agent/api/RebootCommand.java
@@ -19,8 +19,11 @@
package com.cloud.agent.api;
+import com.cloud.agent.api.to.VirtualMachineTO;
+
public class RebootCommand extends Command {
String vmName;
+ VirtualMachineTO vm;
protected boolean executeInSequence = false;
protected RebootCommand() {
@@ -35,6 +38,14 @@
return this.vmName;
}
+ public void setVirtualMachine(VirtualMachineTO vm) {
+ this.vm = vm;
+ }
+
+ public VirtualMachineTO getVirtualMachine() {
+ return vm;
+ }
+
@Override
public boolean executeInSequence() {
return this.executeInSequence;
diff --git a/core/src/main/java/com/cloud/agent/api/RollingMaintenanceAnswer.java b/core/src/main/java/com/cloud/agent/api/RollingMaintenanceAnswer.java
new file mode 100644
index 0000000..de7b1ba
--- /dev/null
+++ b/core/src/main/java/com/cloud/agent/api/RollingMaintenanceAnswer.java
@@ -0,0 +1,56 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+package com.cloud.agent.api;
+
+public class RollingMaintenanceAnswer extends Answer {
+
+ private boolean finished;
+ private boolean avoidMaintenance;
+ private boolean maintenaceScriptDefined;
+
+ public RollingMaintenanceAnswer(Command command, boolean success, String details, boolean finished) {
+ super(command, success, details);
+ this.finished = finished;
+ }
+
+ public RollingMaintenanceAnswer(Command command, boolean isMaintenanceScript) {
+ super(command, true, "");
+ this.maintenaceScriptDefined = isMaintenanceScript;
+ }
+
+ public boolean isFinished() {
+ return finished;
+ }
+
+ public boolean isAvoidMaintenance() {
+ return avoidMaintenance;
+ }
+
+ public void setAvoidMaintenance(boolean avoidMaintenance) {
+ this.avoidMaintenance = avoidMaintenance;
+ }
+
+ public boolean isMaintenaceScriptDefined() {
+ return maintenaceScriptDefined;
+ }
+
+ public void setMaintenaceScriptDefined(boolean maintenaceScriptDefined) {
+ this.maintenaceScriptDefined = maintenaceScriptDefined;
+ }
+}
diff --git a/core/src/main/java/com/cloud/agent/api/RollingMaintenanceCommand.java b/core/src/main/java/com/cloud/agent/api/RollingMaintenanceCommand.java
new file mode 100644
index 0000000..ae1f493
--- /dev/null
+++ b/core/src/main/java/com/cloud/agent/api/RollingMaintenanceCommand.java
@@ -0,0 +1,70 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.agent.api;
+
+public class RollingMaintenanceCommand extends Command {
+
+ private String stage;
+ private String payload;
+ private boolean started;
+ private boolean checkMaintenanceScript;
+
+ public RollingMaintenanceCommand(boolean checkMaintenanceScript) {
+ this.checkMaintenanceScript = checkMaintenanceScript;
+ }
+
+ public RollingMaintenanceCommand(String stage) {
+ this.stage = stage;
+ }
+
+ public void setStage(String stage) {
+ this.stage = stage;
+ }
+
+ public String getStage() {
+ return this.stage;
+ }
+
+ public String getPayload() {
+ return payload;
+ }
+
+ public void setPayload(String payload) {
+ this.payload = payload;
+ }
+
+ public boolean isStarted() {
+ return started;
+ }
+
+ public void setStarted(boolean started) {
+ this.started = started;
+ }
+
+ public boolean isCheckMaintenanceScript() {
+ return checkMaintenanceScript;
+ }
+
+ @Override
+ public boolean executeInSequence() {
+ return false;
+ }
+
+}
diff --git a/core/src/main/java/com/cloud/agent/api/SecurityGroupRulesCmd.java b/core/src/main/java/com/cloud/agent/api/SecurityGroupRulesCmd.java
index 1d3d154..ea4ab96 100644
--- a/core/src/main/java/com/cloud/agent/api/SecurityGroupRulesCmd.java
+++ b/core/src/main/java/com/cloud/agent/api/SecurityGroupRulesCmd.java
@@ -30,12 +30,13 @@
import org.apache.log4j.Logger;
import com.cloud.agent.api.LogLevel.Log4jLevel;
+import com.cloud.agent.api.to.VirtualMachineTO;
import com.cloud.utils.net.NetUtils;
public class SecurityGroupRulesCmd extends Command {
private static final String CIDR_LENGTH_SEPARATOR = "/";
- private static final char RULE_TARGET_SEPARATOR = ',';
- private static final char RULE_COMMAND_SEPARATOR = ';';
+ public static final char RULE_TARGET_SEPARATOR = ',';
+ public static final char RULE_COMMAND_SEPARATOR = ';';
protected static final String EGRESS_RULE = "E:";
protected static final String INGRESS_RULE = "I:";
private static final Logger LOGGER = Logger.getLogger(SecurityGroupRulesCmd.class);
@@ -51,6 +52,7 @@
private List<IpPortAndProto> ingressRuleSet;
private List<IpPortAndProto> egressRuleSet;
private final List<String> secIps;
+ private VirtualMachineTO vmTO;
public static class IpPortAndProto {
private final String proto;
@@ -252,6 +254,14 @@
return vmId;
}
+ public void setVmTO(VirtualMachineTO vmTO) {
+ this.vmTO = vmTO;
+ }
+
+ public VirtualMachineTO getVmTO() {
+ return vmTO;
+ }
+
/**
* used for logging
* @return the number of Cidrs in the in and egress rule sets for this security group rules command.
diff --git a/core/src/main/java/com/cloud/agent/api/routing/GetRouterMonitorResultsAnswer.java b/core/src/main/java/com/cloud/agent/api/routing/GetRouterMonitorResultsAnswer.java
new file mode 100644
index 0000000..4db59df
--- /dev/null
+++ b/core/src/main/java/com/cloud/agent/api/routing/GetRouterMonitorResultsAnswer.java
@@ -0,0 +1,46 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.agent.api.routing;
+
+import java.util.List;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.Command;
+
+public class GetRouterMonitorResultsAnswer extends Answer {
+ private List<String> failingChecks;
+ private String monitoringResults;
+
+ protected GetRouterMonitorResultsAnswer() {
+ super();
+ }
+
+ public GetRouterMonitorResultsAnswer(Command cmd, boolean success, List<String> failingChecks, String monitoringResults) {
+ super(cmd, success, monitoringResults);
+ this.failingChecks = failingChecks;
+ this.monitoringResults = monitoringResults;
+ }
+
+ public List<String> getFailingChecks() {
+ return failingChecks;
+ }
+
+ public String getMonitoringResults() {
+ return monitoringResults;
+ }
+}
diff --git a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java b/core/src/main/java/com/cloud/agent/api/routing/GetRouterMonitorResultsCommand.java
similarity index 60%
copy from agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
copy to core/src/main/java/com/cloud/agent/api/routing/GetRouterMonitorResultsCommand.java
index b244d02..779a0f4 100644
--- a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
+++ b/core/src/main/java/com/cloud/agent/api/routing/GetRouterMonitorResultsCommand.java
@@ -1,4 +1,3 @@
-//
// 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
@@ -15,22 +14,25 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-//
-package com.cloud.agent.direct.download;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+package com.cloud.agent.api.routing;
-@RunWith(MockitoJUnitRunner.class)
-public class DirectTemplateDownloaderImplTest {
+public class GetRouterMonitorResultsCommand extends NetworkElementCommand {
+ private boolean performFreshChecks;
- private static final Long templateId = 202l;
-
- @Test
- public void testGetDirectDownloadTempPath() {
- String path = DirectTemplateDownloaderImpl.getDirectDownloadTempPath(templateId);
- Assert.assertEquals("template/2/202", path);
+ protected GetRouterMonitorResultsCommand() {
}
-}
+
+ public GetRouterMonitorResultsCommand(boolean performFreshChecks) {
+ this.performFreshChecks = performFreshChecks;
+ }
+
+ @Override
+ public boolean isQuery() {
+ return true;
+ }
+
+ public boolean shouldPerformFreshChecks() {
+ return performFreshChecks;
+ }
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/cloud/agent/api/routing/LoadRouterHealthChecksConfigCommand.java b/core/src/main/java/com/cloud/agent/api/routing/LoadRouterHealthChecksConfigCommand.java
new file mode 100644
index 0000000..b705a46
--- /dev/null
+++ b/core/src/main/java/com/cloud/agent/api/routing/LoadRouterHealthChecksConfigCommand.java
@@ -0,0 +1,41 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.agent.api.routing;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Loads new and updates old configuration details on VR for health checks.
+ */
+public class LoadRouterHealthChecksConfigCommand extends NetworkElementCommand {
+
+ private Map<String, String> details;
+
+ protected LoadRouterHealthChecksConfigCommand() {
+ details = new HashMap<>();
+ }
+
+ public void addDetail(String key, String value) {
+ this.details.put(key, value);
+ }
+
+ public Map<String, String> getDetails() {
+ return details;
+ }
+}
diff --git a/core/src/main/java/com/cloud/agent/api/routing/NetworkElementCommand.java b/core/src/main/java/com/cloud/agent/api/routing/NetworkElementCommand.java
index ae482ac..de3843e 100644
--- a/core/src/main/java/com/cloud/agent/api/routing/NetworkElementCommand.java
+++ b/core/src/main/java/com/cloud/agent/api/routing/NetworkElementCommand.java
@@ -38,7 +38,6 @@
public static final String GUEST_BRIDGE = "guest.bridge";
public static final String VPC_PRIVATE_GATEWAY = "vpc.gateway.private";
public static final String FIREWALL_EGRESS_DEFAULT = "firewall.egress.default";
- public static final String ROUTER_MONITORING_ENABLE = "router.monitor.enable";
public static final String NETWORK_PUB_LAST_IP = "network.public.last.ip";
private String routerAccessIp;
diff --git a/core/src/main/java/com/cloud/agent/api/routing/SetMonitorServiceCommand.java b/core/src/main/java/com/cloud/agent/api/routing/SetMonitorServiceCommand.java
index a537703..86fc14c 100644
--- a/core/src/main/java/com/cloud/agent/api/routing/SetMonitorServiceCommand.java
+++ b/core/src/main/java/com/cloud/agent/api/routing/SetMonitorServiceCommand.java
@@ -20,6 +20,9 @@
package com.cloud.agent.api.routing;
import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.collections.CollectionUtils;
import com.cloud.agent.api.to.MonitorServiceTO;
@@ -29,13 +32,24 @@
* how to access the components inside the command.
*/
public class SetMonitorServiceCommand extends NetworkElementCommand {
- MonitorServiceTO[] services;
+ public static final String ROUTER_MONITORING_ENABLED = "router.monitor.enabled";
+ public static final String ROUTER_HEALTH_CHECKS_ENABLED = "router.health.checks.enabled";
+ public static final String ROUTER_HEALTH_CHECKS_BASIC_INTERVAL = "router.health.checks.basic.interval";
+ public static final String ROUTER_HEALTH_CHECKS_ADVANCED_INTERVAL = "router.health.checks.advanced.interval";
+ public static final String ROUTER_HEALTH_CHECKS_EXCLUDED = "router.health.checks.excluded";
+
+ private MonitorServiceTO[] services;
+ private Map<String, String> healthChecksConfig;
+ private boolean reconfigureAfterUpdate;
+ private boolean deleteFromProcessedCache;
protected SetMonitorServiceCommand() {
}
public SetMonitorServiceCommand(List<MonitorServiceTO> services) {
- this.services = services.toArray(new MonitorServiceTO[services.size()]);
+ if (CollectionUtils.isNotEmpty(services)) {
+ this.services = services.toArray(new MonitorServiceTO[services.size()]);
+ }
}
public MonitorServiceTO[] getRules() {
@@ -43,7 +57,9 @@
}
public String getConfiguration() {
-
+ if (services == null) {
+ return null;
+ }
StringBuilder sb = new StringBuilder();
for (MonitorServiceTO service : services) {
sb.append("[").append(service.getService()).append("]").append(":");
@@ -55,4 +71,28 @@
return sb.toString();
}
+
+ public Map<String, String> getHealthChecksConfig() {
+ return healthChecksConfig;
+ }
+
+ public void setHealthChecksConfig(Map<String, String> healthChecksConfig) {
+ this.healthChecksConfig = healthChecksConfig;
+ }
+
+ public boolean shouldReconfigureAfterUpdate() {
+ return reconfigureAfterUpdate;
+ }
+
+ public void setReconfigureAfterUpdate(boolean reconfigureAfterUpdate) {
+ this.reconfigureAfterUpdate = reconfigureAfterUpdate;
+ }
+
+ public boolean shouldDeleteFromProcessedCache() {
+ return deleteFromProcessedCache;
+ }
+
+ public void setDeleteFromProcessedCache(boolean deleteFromProcessedCache) {
+ this.deleteFromProcessedCache = deleteFromProcessedCache;
+ }
}
diff --git a/core/src/main/java/com/cloud/agent/resource/virtualnetwork/VRScripts.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/VRScripts.java
index 2c75a78..f8cf6d4 100644
--- a/core/src/main/java/com/cloud/agent/resource/virtualnetwork/VRScripts.java
+++ b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/VRScripts.java
@@ -47,6 +47,8 @@
// New scripts for use with chef
public static final String UPDATE_CONFIG = "update_config.py";
+ public static final String CONFIGURE = "configure.py";
+
// Script still in use - mostly by HyperV
public static final String S2SVPN_CHECK = "checkbatchs2svpn.sh";
@@ -66,8 +68,11 @@
public static final String VPC_STATIC_ROUTE = "vpc_staticroute.sh";
public static final String VPN_L2TP = "vpn_l2tp.sh";
public static final String UPDATE_HOST_PASSWD = "update_host_passwd.sh";
+ public static final String ROUTER_MONITOR_RESULTS = "getRouterMonitorResults.sh";
public static final String VR_CFG = "vr_cfg.sh";
public static final String DIAGNOSTICS = "diagnostics.py";
+ public static final String RETRIEVE_DIAGNOSTICS = "get_diagnostics_files.py";
+ public static final String VR_FILE_CLEANUP = "cleanup.sh";
}
\ No newline at end of file
diff --git a/core/src/main/java/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index 6db8913..839f34a 100644
--- a/core/src/main/java/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -22,10 +22,6 @@
import java.io.IOException;
import java.net.InetSocketAddress;
import java.nio.channels.SocketChannel;
-
-import org.apache.cloudstack.diagnostics.DiagnosticsAnswer;
-import org.apache.cloudstack.diagnostics.DiagnosticsCommand;
-import org.joda.time.Duration;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -42,8 +38,14 @@
import org.apache.cloudstack.ca.SetupCertificateCommand;
import org.apache.cloudstack.ca.SetupKeyStoreCommand;
import org.apache.cloudstack.ca.SetupKeystoreAnswer;
+import org.apache.cloudstack.diagnostics.DeleteFileInVrCommand;
+import org.apache.cloudstack.diagnostics.DiagnosticsAnswer;
+import org.apache.cloudstack.diagnostics.DiagnosticsCommand;
+import org.apache.cloudstack.diagnostics.PrepareFilesAnswer;
+import org.apache.cloudstack.diagnostics.PrepareFilesCommand;
import org.apache.cloudstack.utils.security.KeyStoreUtils;
import org.apache.log4j.Logger;
+import org.joda.time.Duration;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.CheckRouterAnswer;
@@ -56,6 +58,8 @@
import com.cloud.agent.api.routing.AggregationControlCommand;
import com.cloud.agent.api.routing.AggregationControlCommand.Action;
import com.cloud.agent.api.routing.GetRouterAlertsCommand;
+import com.cloud.agent.api.routing.GetRouterMonitorResultsAnswer;
+import com.cloud.agent.api.routing.GetRouterMonitorResultsCommand;
import com.cloud.agent.api.routing.GroupAnswer;
import com.cloud.agent.api.routing.NetworkElementCommand;
import com.cloud.agent.resource.virtualnetwork.facade.AbstractConfigItemFacade;
@@ -196,7 +200,13 @@
} else if (cmd instanceof GetRouterAlertsCommand) {
return execute((GetRouterAlertsCommand)cmd);
} else if (cmd instanceof DiagnosticsCommand) {
- return execute((DiagnosticsCommand)cmd);
+ return execute((DiagnosticsCommand) cmd);
+ } else if (cmd instanceof PrepareFilesCommand) {
+ return execute((PrepareFilesCommand) cmd);
+ } else if (cmd instanceof DeleteFileInVrCommand) {
+ return execute((DeleteFileInVrCommand)cmd);
+ } else if (cmd instanceof GetRouterMonitorResultsCommand) {
+ return execute((GetRouterMonitorResultsCommand)cmd);
} else {
s_logger.error("Unknown query command in VirtualRoutingResource!");
return Answer.createUnsupportedCommandAnswer(cmd);
@@ -218,10 +228,7 @@
throw new CloudRuntimeException("Unable to apply unknown configitem of type " + c.getClass().getSimpleName());
}
-
private Answer applyConfig(NetworkElementCommand cmd, List<ConfigItem> cfg) {
-
-
if (cfg.isEmpty()) {
return new Answer(cmd, true, "Nothing to do");
}
@@ -249,7 +256,6 @@
s_logger.warn("Expected " + cmd.getAnswersCount() + " answers while executing " + cmd.getClass().getSimpleName() + " but received " + results.size());
}
-
if (results.size() == 1) {
return new Answer(cmd, finalResult, results.get(0).getDetails());
} else {
@@ -268,6 +274,60 @@
return new CheckS2SVpnConnectionsAnswer(cmd, result.isSuccess(), result.getDetails());
}
+ private List<String> getFailingChecks(String line) {
+ List<String> failingChecks = new ArrayList<>();
+ for (String w : line.split(",")) {
+ if (!w.trim().isEmpty()) {
+ failingChecks.add(w.trim());
+ }
+ }
+ return failingChecks;
+ }
+
+ private GetRouterMonitorResultsAnswer parseLinesForHealthChecks(GetRouterMonitorResultsCommand cmd, String executionResult) {
+ List<String> failingChecks = new ArrayList<>();
+ StringBuilder monitorResults = new StringBuilder();
+ String[] lines = executionResult.trim().split("\n");
+ boolean readingFailedChecks = false, readingMonitorResults = false;
+ for (String line : lines) {
+ line = line.trim();
+ if (line.contains("FAILING CHECKS")) { // Toggle to reading failing checks from next line
+ readingFailedChecks = true;
+ readingMonitorResults = false;
+ } else if (line.contains("MONITOR RESULTS")) { // Toggle to reading monitor results from next line
+ readingFailedChecks = false;
+ readingMonitorResults = true;
+ } else if (readingFailedChecks && !readingMonitorResults) { // Reading failing checks section
+ failingChecks.addAll(getFailingChecks(line));
+ } else if (!readingFailedChecks && readingMonitorResults) { // Reading monitor checks result
+ monitorResults.append(line);
+ } else {
+ s_logger.error("Unexpected lines reached while parsing health check response. Skipping line:- " + line);
+ }
+ }
+
+ return new GetRouterMonitorResultsAnswer(cmd, true, failingChecks, monitorResults.toString());
+ }
+
+ private GetRouterMonitorResultsAnswer execute(GetRouterMonitorResultsCommand cmd) {
+ String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
+ String args = cmd.shouldPerformFreshChecks() ? "true" : "false";
+ s_logger.info("Fetching health check result for " + routerIp + " and executing fresh checks: " + args);
+ ExecutionResult result = _vrDeployer.executeInVR(routerIp, VRScripts.ROUTER_MONITOR_RESULTS, args);
+
+ if (!result.isSuccess()) {
+ s_logger.warn("Result of " + cmd + " failed with details: " + result.getDetails());
+ return new GetRouterMonitorResultsAnswer(cmd, false, null, result.getDetails());
+ }
+
+ if (result.getDetails().isEmpty()) {
+ s_logger.warn("Result of " + cmd + " received no details.");
+ return new GetRouterMonitorResultsAnswer(cmd, false, null, "No results available.");
+ }
+
+ return parseLinesForHealthChecks(cmd, result.getDetails());
+ }
+
private GetRouterAlertsAnswer execute(GetRouterAlertsCommand cmd) {
String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
@@ -306,6 +366,24 @@
return new DiagnosticsAnswer(cmd, result.isSuccess(), result.getDetails());
}
+ private Answer execute(PrepareFilesCommand cmd) {
+ String fileList = String.join(" ", cmd.getFilesToRetrieveList());
+ _eachTimeout = Duration.standardSeconds(cmd.getTimeout());
+ final ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), VRScripts.RETRIEVE_DIAGNOSTICS, fileList, _eachTimeout);
+ if (result.isSuccess()) {
+ return new PrepareFilesAnswer(cmd, true, result.getDetails());
+ }
+ return new PrepareFilesAnswer(cmd, false, result.getDetails());
+ }
+
+ private Answer execute(DeleteFileInVrCommand cmd) {
+ ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), VRScripts.VR_FILE_CLEANUP, cmd.getFileName());
+ if (result.isSuccess()) {
+ return new Answer(cmd, result.isSuccess(), result.getDetails());
+ }
+ return new Answer(cmd, result.isSuccess(), result.getDetails());
+ }
+
private Answer execute(GetDomRVersionCmd cmd) {
final ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), VRScripts.VERSION, null);
if (!result.isSuccess()) {
diff --git a/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/AbstractConfigItemFacade.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/AbstractConfigItemFacade.java
index a083012..1042d23 100644
--- a/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/AbstractConfigItemFacade.java
+++ b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/AbstractConfigItemFacade.java
@@ -127,7 +127,10 @@
final ConfigItem configFile = new FileConfigItem(VRScripts.CONFIG_PERSIST_LOCATION, remoteFilename, gson.toJson(configuration));
cfg.add(configFile);
- final ConfigItem updateCommand = new ScriptConfigItem(VRScripts.UPDATE_CONFIG, remoteFilename);
+ // By default keep files in processed cache on VR
+ final String args = configuration.shouldDeleteFromProcessedCache() ? remoteFilename + " false" : remoteFilename;
+
+ final ConfigItem updateCommand = new ScriptConfigItem(VRScripts.UPDATE_CONFIG, args);
cfg.add(updateCommand);
return cfg;
diff --git a/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetMonitorServiceConfigItem.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetMonitorServiceConfigItem.java
index 2cf03e4..8ddf17b 100644
--- a/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetMonitorServiceConfigItem.java
+++ b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetMonitorServiceConfigItem.java
@@ -21,21 +21,56 @@
import java.util.List;
+import org.apache.log4j.Logger;
+
import com.cloud.agent.api.routing.NetworkElementCommand;
import com.cloud.agent.api.routing.SetMonitorServiceCommand;
import com.cloud.agent.resource.virtualnetwork.ConfigItem;
+import com.cloud.agent.resource.virtualnetwork.ScriptConfigItem;
import com.cloud.agent.resource.virtualnetwork.VRScripts;
import com.cloud.agent.resource.virtualnetwork.model.ConfigBase;
import com.cloud.agent.resource.virtualnetwork.model.MonitorService;
public class SetMonitorServiceConfigItem extends AbstractConfigItemFacade {
+ private static final Logger s_logger = Logger.getLogger(SetMonitorServiceConfigItem.class);
@Override
public List<ConfigItem> generateConfig(final NetworkElementCommand cmd) {
final SetMonitorServiceCommand command = (SetMonitorServiceCommand) cmd;
- final MonitorService monitorService = new MonitorService(command.getConfiguration(), cmd.getAccessDetail(NetworkElementCommand.ROUTER_MONITORING_ENABLE));
- return generateConfigItems(monitorService);
+ final MonitorService monitorService = new MonitorService(
+ command.getConfiguration(),
+ cmd.getAccessDetail(SetMonitorServiceCommand.ROUTER_MONITORING_ENABLED),
+ cmd.getAccessDetail(SetMonitorServiceCommand.ROUTER_HEALTH_CHECKS_ENABLED));
+
+ setupHealthChecksRelatedInfo(monitorService, command);
+
+ monitorService.setDeleteFromProcessedCache(command.shouldDeleteFromProcessedCache());
+
+ List<ConfigItem> configItems = generateConfigItems(monitorService);
+ if (configItems != null && command.shouldReconfigureAfterUpdate()) {
+ configItems.add(new ScriptConfigItem(VRScripts.CONFIGURE, "monitor_service.json"));
+ }
+ return configItems;
+ }
+
+ private void setupHealthChecksRelatedInfo(MonitorService monitorService, SetMonitorServiceCommand command) {
+ try {
+ monitorService.setHealthChecksBasicRunInterval(Integer.parseInt(command.getAccessDetail(SetMonitorServiceCommand.ROUTER_HEALTH_CHECKS_BASIC_INTERVAL)));
+ } catch (NumberFormatException exception) {
+ s_logger.error("Unexpected health check basic interval set" + command.getAccessDetail(SetMonitorServiceCommand.ROUTER_HEALTH_CHECKS_BASIC_INTERVAL) +
+ ". Exception: " + exception + "Will use default value");
+ }
+
+ try {
+ monitorService.setHealthChecksAdvancedRunInterval(Integer.parseInt(command.getAccessDetail(SetMonitorServiceCommand.ROUTER_HEALTH_CHECKS_ADVANCED_INTERVAL)));
+ } catch (NumberFormatException exception) {
+ s_logger.error("Unexpected health check advanced interval set" + command.getAccessDetail(SetMonitorServiceCommand.ROUTER_HEALTH_CHECKS_ADVANCED_INTERVAL) +
+ ". Exception: " + exception + "Will use default value");
+ }
+
+ monitorService.setExcludedHealthChecks(command.getAccessDetail(SetMonitorServiceCommand.ROUTER_HEALTH_CHECKS_EXCLUDED));
+ monitorService.setHealthChecksConfig(command.getHealthChecksConfig());
}
@Override
diff --git a/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/ConfigBase.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/ConfigBase.java
index edc7211..51424ea 100644
--- a/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/ConfigBase.java
+++ b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/ConfigBase.java
@@ -41,6 +41,10 @@
private String type = UNKNOWN;
+ // For use in update_config.py which by default persists files in /var/cache/cloud/processed
+ // If true we don't keep the file in cache. Useful for monitor service command to avoid space waste
+ protected boolean deleteFromProcessedCache;
+
private ConfigBase() {
// Empty constructor for (de)serialization
}
@@ -57,4 +61,7 @@
this.type = type;
}
+ public boolean shouldDeleteFromProcessedCache() {
+ return deleteFromProcessedCache;
+ }
}
diff --git a/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/MonitorService.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/MonitorService.java
index fdf9e47..fe20476 100644
--- a/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/MonitorService.java
+++ b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/MonitorService.java
@@ -19,34 +19,84 @@
package com.cloud.agent.resource.virtualnetwork.model;
+import java.util.Map;
+
public class MonitorService extends ConfigBase {
public String config, disableMonitoring;
+ public Boolean healthChecksEnabled;
+ public Integer healthChecksBasicRunInterval;
+ public Integer healthChecksAdvancedRunInterval;
+ public String excludedHealthChecks;
+ public Map<String, String> healthChecksConfig;
public MonitorService() {
super(ConfigBase.MONITORSERVICE);
}
- public MonitorService(String config, String disableMonitoring) {
+ public MonitorService(String config, String disableMonitoring, String healthChecksEnabled) {
super(ConfigBase.MONITORSERVICE);
this.config = config;
this.disableMonitoring = disableMonitoring;
+ this.healthChecksEnabled = Boolean.parseBoolean(healthChecksEnabled);
}
public String getConfig() {
return config;
}
- public void setConfig(String config) {
- this.config = config;
- }
-
public String getDisableMonitoring() {
return disableMonitoring;
}
+ public Boolean getHealthChecksEnabled() {
+ return healthChecksEnabled;
+ }
+
+ public Integer getHealthChecksBasicRunInterval() {
+ return healthChecksBasicRunInterval;
+ }
+
+ public Integer getHealthChecksAdvancedRunInterval() {
+ return healthChecksAdvancedRunInterval;
+ }
+
+ public String getExcludedHealthChecks() {
+ return excludedHealthChecks;
+ }
+
+ public Map<String, String> getHealthChecksConfig() {
+ return healthChecksConfig;
+ }
+
+ public void setConfig(String config) {
+ this.config = config;
+ }
+
public void setDisableMonitoring(String disableMonitoring) {
this.disableMonitoring = disableMonitoring;
}
+ public void setHealthChecksEnabled(Boolean healthChecksEnabled) {
+ this.healthChecksEnabled = healthChecksEnabled;
+ }
+ public void setHealthChecksBasicRunInterval(Integer healthChecksBasicRunInterval) {
+ this.healthChecksBasicRunInterval = healthChecksBasicRunInterval;
+ }
+
+ public void setHealthChecksAdvancedRunInterval(Integer healthChecksAdvancedRunInterval) {
+ this.healthChecksAdvancedRunInterval = healthChecksAdvancedRunInterval;
+ }
+
+ public void setExcludedHealthChecks(String excludedHealthChecks) {
+ this.excludedHealthChecks = excludedHealthChecks;
+ }
+
+ public void setHealthChecksConfig(Map<String, String> healthChecksConfig) {
+ this.healthChecksConfig = healthChecksConfig;
+ }
+
+ public void setDeleteFromProcessedCache(boolean deleteFromProcessedCache) {
+ this.deleteFromProcessedCache = deleteFromProcessedCache;
+ }
}
diff --git a/core/src/main/java/com/cloud/storage/resource/StorageProcessor.java b/core/src/main/java/com/cloud/storage/resource/StorageProcessor.java
index 5d57616..f940e22 100644
--- a/core/src/main/java/com/cloud/storage/resource/StorageProcessor.java
+++ b/core/src/main/java/com/cloud/storage/resource/StorageProcessor.java
@@ -74,4 +74,6 @@
public Answer resignature(ResignatureCommand cmd);
public Answer handleDownloadTemplateToPrimaryStorage(DirectDownloadCommand cmd);
+
+ Answer copyVolumeFromPrimaryToPrimary(CopyCommand cmd);
}
diff --git a/core/src/main/java/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java b/core/src/main/java/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java
index 8c0399e..17b9b70 100644
--- a/core/src/main/java/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java
+++ b/core/src/main/java/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java
@@ -20,6 +20,7 @@
package com.cloud.storage.resource;
import org.apache.cloudstack.agent.directdownload.DirectDownloadCommand;
+import org.apache.cloudstack.storage.to.VolumeObjectTO;
import org.apache.log4j.Logger;
import org.apache.cloudstack.storage.command.AttachCommand;
@@ -95,7 +96,9 @@
//copy volume from image cache to primary
return processor.copyVolumeFromImageCacheToPrimary(cmd);
} else if (srcData.getObjectType() == DataObjectType.VOLUME && srcData.getDataStore().getRole() == DataStoreRole.Primary) {
- if (destData.getObjectType() == DataObjectType.VOLUME) {
+ if (destData.getObjectType() == DataObjectType.VOLUME && srcData instanceof VolumeObjectTO && ((VolumeObjectTO)srcData).isDirectDownload()) {
+ return processor.copyVolumeFromPrimaryToPrimary(cmd);
+ } else if (destData.getObjectType() == DataObjectType.VOLUME) {
return processor.copyVolumeFromPrimaryToSecondary(cmd);
} else if (destData.getObjectType() == DataObjectType.TEMPLATE) {
return processor.createTemplateFromVolume(cmd);
diff --git a/core/src/main/java/org/apache/cloudstack/agent/directdownload/DirectDownloadCommand.java b/core/src/main/java/org/apache/cloudstack/agent/directdownload/DirectDownloadCommand.java
index 7a05d61..aafcb53 100644
--- a/core/src/main/java/org/apache/cloudstack/agent/directdownload/DirectDownloadCommand.java
+++ b/core/src/main/java/org/apache/cloudstack/agent/directdownload/DirectDownloadCommand.java
@@ -19,11 +19,11 @@
package org.apache.cloudstack.agent.directdownload;
+import java.util.Map;
+
import org.apache.cloudstack.storage.command.StorageSubSystemCommand;
import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
-import java.util.Map;
-
public abstract class DirectDownloadCommand extends StorageSubSystemCommand {
public enum DownloadProtocol {
@@ -35,13 +35,21 @@
private PrimaryDataStoreTO destPool;
private String checksum;
private Map<String, String> headers;
+ private Integer connectTimeout;
+ private Integer soTimeout;
+ private Integer connectionRequestTimeout;
+ private Long templateSize;
+ private boolean iso;
- protected DirectDownloadCommand (final String url, final Long templateId, final PrimaryDataStoreTO destPool, final String checksum, final Map<String, String> headers) {
+ protected DirectDownloadCommand (final String url, final Long templateId, final PrimaryDataStoreTO destPool, final String checksum, final Map<String, String> headers, final Integer connectTimeout, final Integer soTimeout, final Integer connectionRequestTimeout) {
this.url = url;
this.templateId = templateId;
this.destPool = destPool;
this.checksum = checksum;
this.headers = headers;
+ this.connectTimeout = connectTimeout;
+ this.soTimeout = soTimeout;
+ this.connectionRequestTimeout = connectionRequestTimeout;
}
public String getUrl() {
@@ -64,6 +72,46 @@
return headers;
}
+ public Integer getConnectTimeout() {
+ return connectTimeout;
+ }
+
+ public void setConnectTimeout(Integer connectTimeout) {
+ this.connectTimeout = connectTimeout;
+ }
+
+ public Integer getSoTimeout() {
+ return soTimeout;
+ }
+
+ public void setSoTimeout(Integer soTimeout) {
+ this.soTimeout = soTimeout;
+ }
+
+ public Integer getConnectionRequestTimeout() {
+ return connectionRequestTimeout;
+ }
+
+ public void setConnectionRequestTimeout(Integer connectionRequestTimeout) {
+ this.connectionRequestTimeout = connectionRequestTimeout;
+ }
+
+ public Long getTemplateSize() {
+ return templateSize;
+ }
+
+ public void setTemplateSize(Long templateSize) {
+ this.templateSize = templateSize;
+ }
+
+ public boolean isIso() {
+ return iso;
+ }
+
+ public void setIso(boolean iso) {
+ this.iso = iso;
+ }
+
@Override
public void setExecuteInSequence(boolean inSeq) {
}
diff --git a/core/src/main/java/org/apache/cloudstack/agent/directdownload/HttpDirectDownloadCommand.java b/core/src/main/java/org/apache/cloudstack/agent/directdownload/HttpDirectDownloadCommand.java
index 7e32688..f131b3b 100644
--- a/core/src/main/java/org/apache/cloudstack/agent/directdownload/HttpDirectDownloadCommand.java
+++ b/core/src/main/java/org/apache/cloudstack/agent/directdownload/HttpDirectDownloadCommand.java
@@ -18,14 +18,14 @@
*/
package org.apache.cloudstack.agent.directdownload;
-import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
-
import java.util.Map;
+import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
+
public class HttpDirectDownloadCommand extends DirectDownloadCommand {
- public HttpDirectDownloadCommand(String url, Long templateId, PrimaryDataStoreTO destPool, String checksum, Map<String, String> headers) {
- super(url, templateId, destPool, checksum, headers);
+ public HttpDirectDownloadCommand(String url, Long templateId, PrimaryDataStoreTO destPool, String checksum, Map<String, String> headers, int connectTimeout, int soTimeout) {
+ super(url, templateId, destPool, checksum, headers, connectTimeout, soTimeout, null);
}
}
diff --git a/core/src/main/java/org/apache/cloudstack/agent/directdownload/HttpsDirectDownloadCommand.java b/core/src/main/java/org/apache/cloudstack/agent/directdownload/HttpsDirectDownloadCommand.java
index ca926f1..8c415b6 100644
--- a/core/src/main/java/org/apache/cloudstack/agent/directdownload/HttpsDirectDownloadCommand.java
+++ b/core/src/main/java/org/apache/cloudstack/agent/directdownload/HttpsDirectDownloadCommand.java
@@ -19,13 +19,13 @@
package org.apache.cloudstack.agent.directdownload;
-import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
-
import java.util.Map;
+import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
+
public class HttpsDirectDownloadCommand extends DirectDownloadCommand {
- public HttpsDirectDownloadCommand(String url, Long templateId, PrimaryDataStoreTO destPool, String checksum, Map<String, String> headers) {
- super(url, templateId, destPool, checksum, headers);
+ public HttpsDirectDownloadCommand(String url, Long templateId, PrimaryDataStoreTO destPool, String checksum, Map<String, String> headers, int connectTimeout, int soTimeout, int connectionRequestTimeout) {
+ super(url, templateId, destPool, checksum, headers, connectTimeout, soTimeout, connectionRequestTimeout);
}
}
\ No newline at end of file
diff --git a/core/src/main/java/org/apache/cloudstack/agent/directdownload/MetalinkDirectDownloadCommand.java b/core/src/main/java/org/apache/cloudstack/agent/directdownload/MetalinkDirectDownloadCommand.java
index da528d9..a3edceb 100644
--- a/core/src/main/java/org/apache/cloudstack/agent/directdownload/MetalinkDirectDownloadCommand.java
+++ b/core/src/main/java/org/apache/cloudstack/agent/directdownload/MetalinkDirectDownloadCommand.java
@@ -18,14 +18,14 @@
//
package org.apache.cloudstack.agent.directdownload;
-import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
-
import java.util.Map;
+import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
+
public class MetalinkDirectDownloadCommand extends DirectDownloadCommand {
- public MetalinkDirectDownloadCommand(String url, Long templateId, PrimaryDataStoreTO destPool, String checksum, Map<String, String> headers) {
- super(url, templateId, destPool, checksum, headers);
+ public MetalinkDirectDownloadCommand(String url, Long templateId, PrimaryDataStoreTO destPool, String checksum, Map<String, String> headers, int connectTimeout, int soTimeout) {
+ super(url, templateId, destPool, checksum, headers, connectTimeout, soTimeout, null);
}
}
diff --git a/core/src/main/java/org/apache/cloudstack/agent/directdownload/NfsDirectDownloadCommand.java b/core/src/main/java/org/apache/cloudstack/agent/directdownload/NfsDirectDownloadCommand.java
index abc0137..0bf9c4d 100644
--- a/core/src/main/java/org/apache/cloudstack/agent/directdownload/NfsDirectDownloadCommand.java
+++ b/core/src/main/java/org/apache/cloudstack/agent/directdownload/NfsDirectDownloadCommand.java
@@ -18,14 +18,14 @@
//
package org.apache.cloudstack.agent.directdownload;
-import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
-
import java.util.Map;
+import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
+
public class NfsDirectDownloadCommand extends DirectDownloadCommand {
public NfsDirectDownloadCommand(final String url, final Long templateId, final PrimaryDataStoreTO destPool, final String checksum, final Map<String, String> headers) {
- super(url, templateId, destPool, checksum, headers);
+ super(url, templateId, destPool, checksum, headers, null, null, null);
}
}
diff --git a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java b/core/src/main/java/org/apache/cloudstack/diagnostics/CopyToSecondaryStorageAnswer.java
similarity index 60%
copy from agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
copy to core/src/main/java/org/apache/cloudstack/diagnostics/CopyToSecondaryStorageAnswer.java
index b244d02..044eccb 100644
--- a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
+++ b/core/src/main/java/org/apache/cloudstack/diagnostics/CopyToSecondaryStorageAnswer.java
@@ -1,4 +1,3 @@
-//
// 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
@@ -15,22 +14,13 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-//
-package com.cloud.agent.direct.download;
+package org.apache.cloudstack.diagnostics;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import com.cloud.agent.api.Answer;
-@RunWith(MockitoJUnitRunner.class)
-public class DirectTemplateDownloaderImplTest {
+public class CopyToSecondaryStorageAnswer extends Answer {
- private static final Long templateId = 202l;
-
- @Test
- public void testGetDirectDownloadTempPath() {
- String path = DirectTemplateDownloaderImpl.getDirectDownloadTempPath(templateId);
- Assert.assertEquals("template/2/202", path);
+ public CopyToSecondaryStorageAnswer(CopyToSecondaryStorageCommand command, boolean success, String details) {
+ super(command, success, details);
}
}
diff --git a/core/src/main/java/org/apache/cloudstack/diagnostics/CopyToSecondaryStorageCommand.java b/core/src/main/java/org/apache/cloudstack/diagnostics/CopyToSecondaryStorageCommand.java
new file mode 100644
index 0000000..8e76aad
--- /dev/null
+++ b/core/src/main/java/org/apache/cloudstack/diagnostics/CopyToSecondaryStorageCommand.java
@@ -0,0 +1,53 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.diagnostics;
+
+import org.apache.cloudstack.storage.command.StorageSubSystemCommand;
+
+public class CopyToSecondaryStorageCommand extends StorageSubSystemCommand {
+ private String secondaryStorageUrl;
+ private String systemVmIp;
+ private String fileName;
+
+ public CopyToSecondaryStorageCommand(String secondaryStorageUrl, String systemVmIp, String fileName) {
+ this.secondaryStorageUrl = secondaryStorageUrl;
+ this.systemVmIp = systemVmIp;
+ this.fileName = fileName;
+ }
+
+ public String getSecondaryStorageUrl() {
+ return secondaryStorageUrl;
+ }
+
+ public String getSystemVmIp() {
+ return systemVmIp;
+ }
+
+ public String getFileName() {
+ return fileName;
+ }
+
+ @Override
+ public boolean executeInSequence() {
+ return false;
+ }
+
+ @Override
+ public void setExecuteInSequence(boolean inSeq) {
+
+ }
+}
diff --git a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java b/core/src/main/java/org/apache/cloudstack/diagnostics/DeleteFileInVrCommand.java
similarity index 60%
copy from agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
copy to core/src/main/java/org/apache/cloudstack/diagnostics/DeleteFileInVrCommand.java
index b244d02..025168b 100644
--- a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
+++ b/core/src/main/java/org/apache/cloudstack/diagnostics/DeleteFileInVrCommand.java
@@ -1,4 +1,3 @@
-//
// 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
@@ -15,22 +14,23 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-//
-package com.cloud.agent.direct.download;
+package org.apache.cloudstack.diagnostics;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import com.cloud.agent.api.routing.NetworkElementCommand;
-@RunWith(MockitoJUnitRunner.class)
-public class DirectTemplateDownloaderImplTest {
+public class DeleteFileInVrCommand extends NetworkElementCommand {
+ private String fileName;
- private static final Long templateId = 202l;
+ public DeleteFileInVrCommand(String fileName) {
+ this.fileName = fileName;
+ }
- @Test
- public void testGetDirectDownloadTempPath() {
- String path = DirectTemplateDownloaderImpl.getDirectDownloadTempPath(templateId);
- Assert.assertEquals("template/2/202", path);
+ public String getFileName() {
+ return fileName;
+ }
+
+ @Override
+ public boolean isQuery() {
+ return true;
}
}
diff --git a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java b/core/src/main/java/org/apache/cloudstack/diagnostics/PrepareFilesAnswer.java
similarity index 60%
copy from agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
copy to core/src/main/java/org/apache/cloudstack/diagnostics/PrepareFilesAnswer.java
index b244d02..784a84a 100644
--- a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
+++ b/core/src/main/java/org/apache/cloudstack/diagnostics/PrepareFilesAnswer.java
@@ -1,4 +1,3 @@
-//
// 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
@@ -15,22 +14,14 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-//
-package com.cloud.agent.direct.download;
+package org.apache.cloudstack.diagnostics;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import com.cloud.agent.api.Answer;
-@RunWith(MockitoJUnitRunner.class)
-public class DirectTemplateDownloaderImplTest {
+public class PrepareFilesAnswer extends Answer {
- private static final Long templateId = 202l;
-
- @Test
- public void testGetDirectDownloadTempPath() {
- String path = DirectTemplateDownloaderImpl.getDirectDownloadTempPath(templateId);
- Assert.assertEquals("template/2/202", path);
+ public PrepareFilesAnswer(PrepareFilesCommand command, boolean success, String details) {
+ super(command, success, details);
}
+
}
diff --git a/core/src/main/java/org/apache/cloudstack/diagnostics/PrepareFilesCommand.java b/core/src/main/java/org/apache/cloudstack/diagnostics/PrepareFilesCommand.java
new file mode 100644
index 0000000..db65544
--- /dev/null
+++ b/core/src/main/java/org/apache/cloudstack/diagnostics/PrepareFilesCommand.java
@@ -0,0 +1,44 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.diagnostics;
+
+import java.util.List;
+
+import com.cloud.agent.api.routing.NetworkElementCommand;
+
+public class PrepareFilesCommand extends NetworkElementCommand {
+ private List<String> filesToRetrieveList;
+ private long timeout;
+
+ public PrepareFilesCommand(List<String> filesToRetrieve, long timeout) {
+ this.filesToRetrieveList = filesToRetrieve;
+ this.timeout = timeout;
+ }
+
+ public List<String> getFilesToRetrieveList() {
+ return filesToRetrieveList;
+ }
+
+ public long getTimeout() {
+ return timeout;
+ }
+
+ @Override
+ public boolean isQuery() {
+ return true;
+ }
+}
diff --git a/core/src/main/java/org/apache/cloudstack/storage/to/VolumeObjectTO.java b/core/src/main/java/org/apache/cloudstack/storage/to/VolumeObjectTO.java
index 5a9ff21..e47d13e 100644
--- a/core/src/main/java/org/apache/cloudstack/storage/to/VolumeObjectTO.java
+++ b/core/src/main/java/org/apache/cloudstack/storage/to/VolumeObjectTO.java
@@ -61,6 +61,7 @@
private DiskCacheMode cacheMode;
private Hypervisor.HypervisorType hypervisorType;
private MigrationOptions migrationOptions;
+ private boolean directDownload;
public VolumeObjectTO() {
@@ -100,6 +101,7 @@
hypervisorType = volume.getHypervisorType();
setDeviceId(volume.getDeviceId());
this.migrationOptions = volume.getMigrationOptions();
+ this.directDownload = volume.isDirectDownload();
}
public String getUuid() {
@@ -307,4 +309,8 @@
public MigrationOptions getMigrationOptions() {
return migrationOptions;
}
+
+ public boolean isDirectDownload() {
+ return directDownload;
+ }
}
diff --git a/packaging/centos63/rhel7/cloudstack-management.conf b/core/src/main/resources/META-INF/cloudstack/backup/module.properties
similarity index 92%
copy from packaging/centos63/rhel7/cloudstack-management.conf
copy to core/src/main/resources/META-INF/cloudstack/backup/module.properties
index 881af1a..b85b65c 100644
--- a/packaging/centos63/rhel7/cloudstack-management.conf
+++ b/core/src/main/resources/META-INF/cloudstack/backup/module.properties
@@ -1,3 +1,4 @@
+#
# 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
@@ -14,5 +15,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
-f /var/run/cloudstack-management.pid 0644 cloud cloud -
\ No newline at end of file
+name=backup
+parent=backend
diff --git a/core/src/main/resources/META-INF/cloudstack/backup/spring-core-lifecycle-backup-context-inheritable.xml b/core/src/main/resources/META-INF/cloudstack/backup/spring-core-lifecycle-backup-context-inheritable.xml
new file mode 100644
index 0000000..175d45e
--- /dev/null
+++ b/core/src/main/resources/META-INF/cloudstack/backup/spring-core-lifecycle-backup-context-inheritable.xml
@@ -0,0 +1,32 @@
+<!--
+
+ 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.
+
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"
+>
+
+ <bean class="org.apache.cloudstack.spring.lifecycle.registry.RegistryLifecycle">
+ <property name="registry" ref="backupProvidersRegistry" />
+ <property name="typeClass" value="org.apache.cloudstack.backup.BackupProvider" />
+ </bean>
+
+</beans>
diff --git a/core/src/main/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml b/core/src/main/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
index 2569d8b..affd441 100644
--- a/core/src/main/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
+++ b/core/src/main/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
@@ -328,4 +328,8 @@
class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry">
</bean>
+ <bean id="backupProvidersRegistry"
+ class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry">
+ </bean>
+
</beans>
diff --git a/core/src/test/java/com/cloud/storage/template/QCOW2ProcessorTest.java b/core/src/test/java/com/cloud/storage/template/QCOW2ProcessorTest.java
index c268c41..c8c6fb7 100644
--- a/core/src/test/java/com/cloud/storage/template/QCOW2ProcessorTest.java
+++ b/core/src/test/java/com/cloud/storage/template/QCOW2ProcessorTest.java
@@ -18,23 +18,26 @@
*/
package com.cloud.storage.template;
-import com.cloud.exception.InternalErrorException;
-import com.cloud.storage.Storage;
-import com.cloud.storage.StorageLayer;
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
+import com.cloud.exception.InternalErrorException;
+import com.cloud.storage.Storage;
+import com.cloud.storage.StorageLayer;
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(PowerMockRunner.class)
+@PrepareForTest(QCOW2Processor.class)
public class QCOW2ProcessorTest {
QCOW2Processor processor;
diff --git a/core/src/test/java/com/cloud/storage/template/VhdProcessorTest.java b/core/src/test/java/com/cloud/storage/template/VhdProcessorTest.java
index 3c695d7..2be4353 100644
--- a/core/src/test/java/com/cloud/storage/template/VhdProcessorTest.java
+++ b/core/src/test/java/com/cloud/storage/template/VhdProcessorTest.java
@@ -19,17 +19,6 @@
package com.cloud.storage.template;
-import com.cloud.exception.InternalErrorException;
-import com.cloud.storage.Storage;
-import com.cloud.storage.StorageLayer;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
-
import java.io.File;
import java.io.IOException;
import java.net.URLDecoder;
@@ -37,7 +26,21 @@
import java.util.HashMap;
import java.util.Map;
-@RunWith(MockitoJUnitRunner.class)
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import com.cloud.exception.InternalErrorException;
+import com.cloud.storage.Storage;
+import com.cloud.storage.StorageLayer;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest(VhdProcessor.class)
public class VhdProcessorTest {
VhdProcessor processor;
diff --git a/core/src/test/java/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java b/core/src/test/java/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java
index 3cba492..f7d7562 100644
--- a/core/src/test/java/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java
+++ b/core/src/test/java/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java
@@ -27,8 +27,6 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-import org.apache.cloudstack.ha.HAResource;
-import org.apache.cloudstack.kernel.Partition;
import org.junit.Test;
import com.cloud.agent.api.CheckOnHostCommand;
diff --git a/debian/changelog b/debian/changelog
index 4e8a1d3..559c0b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,24 +1,18 @@
-cloudstack (4.13.2.0-SNAPSHOT) unstable; urgency=low
+cloudstack (4.14.1.0-SNAPSHOT) unstable; urgency=low
- * Update the version to 4.13.2.0-SNAPSHOT
+ * Update the version to 4.14.1.0-SNAPSHOT
- -- the Apache CloudStack project <dev@cloudstack.apache.org> Thu, 23 Apr 2020 19:17:09 +0100
+ -- the Apache CloudStack project <dev@cloudstack.apache.org> Mon, 11 May 2020 15:03:14 +0100
-cloudstack (4.13.2.0-SNAPSHOT-SNAPSHOT) unstable; urgency=low
+cloudstack (4.14.1.0-SNAPSHOT-SNAPSHOT) unstable; urgency=low
- * Update the version to 4.13.2.0-SNAPSHOT-SNAPSHOT
-
- -- the Apache CloudStack project <dev@cloudstack.apache.org> Tue, 20 Aug 2019 15:35:49 +0100
-
-cloudstack (4.13.2.0-SNAPSHOT-SNAPSHOT-SNAPSHOT) unstable; urgency=low
-
- * Update the version to 4.13.2.0-SNAPSHOT-SNAPSHOT-SNAPSHOT
+ * Update the version to 4.14.1.0-SNAPSHOT-SNAPSHOT
-- the Apache CloudStack project <dev@cloudstack.apache.org> Thu, 14 Mar 2019 10:11:46 -0300
-cloudstack (4.13.2.0-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT) unstable; urgency=low
+cloudstack (4.14.1.0-SNAPSHOT-SNAPSHOT-SNAPSHOT) unstable; urgency=low
- * Update the version to 4.13.2.0-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT
+ * Update the version to 4.14.1.0-SNAPSHOT-SNAPSHOT-SNAPSHOT
-- the Apache CloudStack project <dev@cloudstack.apache.org> Mon, 15 Jan 2018 17:42:30 +0530
diff --git a/debian/cloudstack-common.install b/debian/cloudstack-common.install
index accc6fa..9a9cf3b 100644
--- a/debian/cloudstack-common.install
+++ b/debian/cloudstack-common.install
@@ -26,6 +26,7 @@
/usr/share/cloudstack-common/scripts/vm/hypervisor/kvm/*
/usr/share/cloudstack-common/scripts/vm/hypervisor/update_host_passwd.sh
/usr/share/cloudstack-common/scripts/vm/hypervisor/versions.sh
+/usr/share/cloudstack-common/scripts/vm/hypervisor/vmware/*
/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/*
/usr/share/cloudstack-common/lib/*
/usr/bin/cloudstack-set-guest-password
diff --git a/debian/cloudstack-usage.postinst b/debian/cloudstack-usage.postinst
index 9529711..e51a305 100755
--- a/debian/cloudstack-usage.postinst
+++ b/debian/cloudstack-usage.postinst
@@ -21,15 +21,10 @@
case "$1" in
configure)
- # We copy the db.properties file from the management server to the usage server
- # This used to be a symlink, but we don't do that anymore
- if [ -f "/etc/cloud/management/db.properties" ]; then
- cp -a /etc/cloud/management/db.properties /etc/cloudstack/usage/db.properties
- fi
-
- # Replacing db.properties with management server db.properties
+
+ # Linking usage server db.properties to management server db.properties
if [ -f "/etc/cloudstack/management/db.properties" ]; then
- rm -rf /etc/cloudstack/usage/db.properties
+ rm -f /etc/cloudstack/usage/db.properties
ln -s /etc/cloudstack/management/db.properties /etc/cloudstack/usage/db.properties
fi
@@ -40,7 +35,7 @@
# Replacing key with management server key
if [ -f "/etc/cloudstack/management/key" ]; then
- rm -rf /etc/cloudstack/usage/key
+ rm -f /etc/cloudstack/usage/key
ln -s /etc/cloudstack/management/key /etc/cloudstack/usage/key
fi
;;
diff --git a/debian/control b/debian/control
index 4a51015..91c5ed6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,27 +2,27 @@
Section: libs
Priority: extra
Maintainer: Wido den Hollander <wido@widodh.nl>
-Build-Depends: debhelper (>= 9), openjdk-8-jdk | java8-sdk | java8-jdk | openjdk-9-jdk, genisoimage,
- python-mysql.connector, maven (>= 3) | maven3, python (>= 2.7), lsb-release, dh-systemd, python-setuptools
+Build-Depends: debhelper (>= 9), openjdk-11-jdk | java11-sdk | java11-jdk | zulu-11, genisoimage,
+ python-mysql.connector, maven (>= 3) | maven3, python (>= 2.7), python3 (>= 3), lsb-release, dh-systemd, python-setuptools
Standards-Version: 3.8.1
Homepage: http://www.cloudstack.org/
Package: cloudstack-common
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, genisoimage, nfs-common, python-netaddr
+Depends: ${misc:Depends}, ${python:Depends}, genisoimage, nfs-common
Conflicts: cloud-scripts, cloud-utils, cloud-system-iso, cloud-console-proxy, cloud-daemonize, cloud-deps, cloud-python, cloud-setup
Description: A common package which contains files which are shared by several CloudStack packages
Package: cloudstack-management
Architecture: all
-Depends: ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless | java8-runtime | openjdk-9-jre-headless, cloudstack-common (= ${source:Version}), sudo, python-mysql.connector, libmysql-java, augeas-tools, mysql-client, adduser, bzip2, ipmitool, file, gawk, iproute2, lsb-release, init-system-helpers (>= 1.14~), qemu-utils, python-dnspython
+Depends: ${python:Depends}, openjdk-11-jre-headless | java11-runtime-headless | java11-runtime | openjdk-11-jre-headless | zulu-11, cloudstack-common (= ${source:Version}), sudo, python-mysql.connector, augeas-tools, mysql-client | mariadb-client, adduser, bzip2, ipmitool, file, gawk, iproute2, qemu-utils, python-dnspython, lsb-release, init-system-helpers (>= 1.14~)
Conflicts: cloud-server, cloud-client, cloud-client-ui
Description: CloudStack server library
The CloudStack management server
Package: cloudstack-agent
Architecture: all
-Depends: ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless | java8-runtime | openjdk-9-jre-headless, cloudstack-common (= ${source:Version}), lsb-base (>= 9), openssh-client, qemu-kvm (>= 2.5), libvirt-bin (>= 1.3) | libvirt-daemon-system (>= 3.0), uuid-runtime, iproute2, ebtables, vlan, ipset, python-libvirt, ethtool, iptables, lsb-release, aria2
+Depends: ${python:Depends}, openjdk-11-jre-headless | java11-runtime-headless | java11-runtime | openjdk-11-jre-headless | zulu-11, cloudstack-common (= ${source:Version}), lsb-base (>= 9), openssh-client, qemu-kvm (>= 2.5), libvirt-bin (>= 1.3) | libvirt-daemon-system (>= 3.0), uuid-runtime, iproute2, ebtables, vlan, ipset, python3-libvirt, ethtool, iptables, lsb-release, aria2
Recommends: init-system-helpers
Conflicts: cloud-agent, cloud-agent-libs, cloud-agent-deps, cloud-agent-scripts
Description: CloudStack agent
@@ -32,7 +32,7 @@
Package: cloudstack-usage
Architecture: all
-Depends: openjdk-8-jre-headless | java8-runtime-headless | java8-runtime | openjdk-9-jre-headless, cloudstack-common (= ${source:Version}), libmysql-java, init-system-helpers
+Depends: openjdk-11-jre-headless | java11-runtime-headless | java11-runtime | openjdk-11-jre-headless | zulu-11, cloudstack-common (= ${source:Version}), init-system-helpers
Description: CloudStack usage monitor
The CloudStack usage monitor provides usage accounting across the entire cloud for
cloud operators to charge based on usage parameters.
diff --git a/debian/rules b/debian/rules
index 07f5715..408a255 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,6 +45,7 @@
install -d -m0755 debian/$(PACKAGE)-agent/lib/systemd/system
install -m0644 packaging/systemd/$(PACKAGE)-agent.service debian/$(PACKAGE)-agent/lib/systemd/system/$(PACKAGE)-agent.service
install -m0644 packaging/systemd/$(PACKAGE)-agent.default $(DESTDIR)/$(SYSCONFDIR)/default/$(PACKAGE)-agent
+ install -m0644 packaging/systemd/$(PACKAGE)-rolling-maintenance@.service debian/$(PACKAGE)-agent/lib/systemd/system/$(PACKAGE)-rolling-maintenance@.service
install -D -m0644 agent/target/transformed/cloudstack-agent.logrotate $(DESTDIR)/$(SYSCONFDIR)/logrotate.d/cloudstack-agent
@@ -52,7 +53,9 @@
install -D agent/target/transformed/cloud-ssh $(DESTDIR)/usr/bin/cloudstack-ssh
install -D agent/target/transformed/cloudstack-agent-profile.sh $(DESTDIR)/$(SYSCONFDIR)/profile.d/cloudstack-agent-profile.sh
install -D agent/target/transformed/cloudstack-agent-upgrade $(DESTDIR)/usr/bin/cloudstack-agent-upgrade
+ install -D agent/target/transformed/cloud-guest-tool $(DESTDIR)/usr/bin/cloudstack-guest-tool
install -D agent/target/transformed/libvirtqemuhook $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/
+ install -D agent/target/transformed/rolling-maintenance $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/
install -D agent/target/transformed/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/agent
# cloudstack-management
@@ -109,7 +112,7 @@
install -D client/target/utilities/bin/cloud-sysvmadm $(DESTDIR)/usr/bin/cloudstack-sysvmadm
install -D systemvm/dist/systemvm.iso $(DESTDIR)/usr/share/$(PACKAGE)-common/vms/systemvm.iso
# We need jasypt for cloud-install-sys-tmplt, so this is a nasty hack to get it into the right place
- install -D agent/target/dependencies/jasypt-1.9.2.jar $(DESTDIR)/usr/share/$(PACKAGE)-common/lib
+ install -D agent/target/dependencies/jasypt-1.9.3.jar $(DESTDIR)/usr/share/$(PACKAGE)-common/lib
# cloudstack-python
mkdir -p $(DESTDIR)/usr/share/pyshared
@@ -121,6 +124,7 @@
mkdir $(DESTDIR)/usr/share/$(PACKAGE)-usage/plugins
install -D usage/target/cloud-usage-$(VERSION).jar $(DESTDIR)/usr/share/$(PACKAGE)-usage/lib/$(PACKAGE)-usage.jar
install -D usage/target/dependencies/* $(DESTDIR)/usr/share/$(PACKAGE)-usage/lib/
+ cp client/target/lib/mysql*jar $(DESTDIR)/usr/share/$(PACKAGE)-usage/lib/
cp usage/target/transformed/db.properties $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/usage/
cp usage/target/transformed/log4j-cloud_usage.xml $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/usage/log4j-cloud.xml
diff --git a/deps/install-non-oss.sh b/deps/install-non-oss.sh
index 632e718..a387050 100755
--- a/deps/install-non-oss.sh
+++ b/deps/install-non-oss.sh
@@ -36,3 +36,6 @@
# From https://my.vmware.com/group/vmware/get-download?downloadGroup=VS-MGMT-SDK65
mvn install:install-file -Dfile=vim25_65.jar -DgroupId=com.cloud.com.vmware -DartifactId=vmware-vim25 -Dversion=6.5 -Dpackaging=jar
+
+# From https://my.vmware.com/group/vmware/details?downloadGroup=WEBCLIENTSDK67U2&productId=742
+mvn install:install-file -Dfile=vim25_67.jar -DgroupId=com.cloud.com.vmware -DartifactId=vmware-vim25 -Dversion=6.7 -Dpackaging=jar
diff --git a/developer/pom.xml b/developer/pom.xml
index 2c49d3a..10f4631 100644
--- a/developer/pom.xml
+++ b/developer/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/engine/api/pom.xml b/engine/api/pom.xml
index 9806324..4caf227 100644
--- a/engine/api/pom.xml
+++ b/engine/api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
@@ -58,5 +58,20 @@
<artifactId>cloud-framework-config</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${cs.jaxb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>${cs.jaxb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${cs.jaxb.version}</version>
+ </dependency>
</dependencies>
</project>
diff --git a/engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java b/engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java
index 9c7c0d4..3b9358a 100644
--- a/engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java
+++ b/engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java
@@ -58,6 +58,9 @@
ConfigKey<Boolean> VmConfigDriveOnPrimaryPool = new ConfigKey<>("Advanced", Boolean.class, "vm.configdrive.primarypool.enabled", "false",
"If config drive need to be created and hosted on primary storage pool. Currently only supported for KVM.", true);
+ ConfigKey<Boolean> ResoureCountRunningVMsonly = new ConfigKey<Boolean>("Advanced", Boolean.class, "resource.count.running.vms.only", "false",
+ "Count the resources of only running VMs in resource limitation.", true);
+
interface Topics {
String VM_POWER_STATE = "vm.powerstate";
}
diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java b/engine/api/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java
index c004514..7b34077 100644
--- a/engine/api/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java
+++ b/engine/api/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java
@@ -171,4 +171,10 @@
* @param netowrk network to disconnect from
*/
void disconnectFrom(NetworkEntity netowrk, short nicId);
+
+ /**
+ * passing additional params of deployment associated with the virtual machine
+ */
+ void setParamsToEntity(Map<VirtualMachineProfile.Param, Object> params);
+
}
diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
index 94a4259..1e81354 100644
--- a/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
+++ b/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
@@ -23,6 +23,7 @@
import org.apache.cloudstack.acl.ControlledEntity.ACLType;
import org.apache.cloudstack.framework.config.ConfigKey;
import org.apache.cloudstack.framework.config.ConfigKey.Scope;
+
import com.cloud.deploy.DataCenterDeployment;
import com.cloud.deploy.DeployDestination;
import com.cloud.deploy.DeploymentPlan;
@@ -177,9 +178,11 @@
boolean destroyNetwork(long networkId, ReservationContext context, boolean forced);
+ Network createPrivateNetwork(long networkOfferingId, String name, String displayText, String gateway, String cidr, String vlanId, boolean bypassVlanOverlapCheck, Account owner, PhysicalNetwork pNtwk, Long vpcId) throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException;
+
Network createGuestNetwork(long networkOfferingId, String name, String displayText, String gateway, String cidr, String vlanId, boolean bypassVlanOverlapCheck, String networkDomain, Account owner,
Long domainId, PhysicalNetwork physicalNetwork, long zoneId, ACLType aclType, Boolean subdomainAccess, Long vpcId, String ip6Gateway, String ip6Cidr,
- Boolean displayNetworkEnabled, String isolatedPvlan, String externalId) throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException;
+ Boolean displayNetworkEnabled, String isolatedPvlan, Network.PVlanType isolatedPvlanType, String externalId) throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException;
UserDataServiceProvider getPasswordResetProvider(Network network);
@@ -313,4 +316,6 @@
* Remove entry from /etc/dhcphosts and /etc/hosts on virtual routers
*/
void cleanupNicDhcpDnsEntry(Network network, VirtualMachineProfile vmProfile, NicProfile nicProfile);
+
+ Pair<NicProfile, Integer> importNic(final String macAddress, int deviceId, final Network network, final Boolean isDefaultNic, final VirtualMachine vm, final Network.IpAddresses ipAddresses) throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException;
}
diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java
index fa6f2c6..a769a34 100644
--- a/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java
+++ b/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java
@@ -88,6 +88,8 @@
Volume migrateVolume(Volume volume, StoragePool destPool) throws StorageUnavailableException;
+ Volume liveMigrateVolume(Volume volume, StoragePool destPool);
+
void cleanupStorageJobs();
void destroyVolume(Volume volume);
@@ -127,4 +129,24 @@
StoragePool findStoragePool(DiskProfile dskCh, DataCenter dc, Pod pod, Long clusterId, Long hostId, VirtualMachine vm, Set<StoragePool> avoid);
void updateVolumeDiskChain(long volumeId, String path, String chainInfo);
+
+ /**
+ * Imports an existing volume for a VM into database. Useful while ingesting an unmanaged VM.
+ * @param type Type of the volume - ROOT, DATADISK, etc
+ * @param name Name of the volume
+ * @param offering DiskOffering for the volume
+ * @param size DiskOffering for the volume
+ * @param minIops minimum IOPS for the disk, if not passed DiskOffering value will be used
+ * @param maxIops maximum IOPS for the disk, if not passed DiskOffering value will be used
+ * @param vm VirtualMachine this volume is attached to
+ * @param template Template of the VM of the volume
+ * @param owner owner Account for the volume
+ * @param deviceId device ID of the virtual disk
+ * @param poolId ID of pool in which volume is stored
+ * @param path image path of the volume
+ * @param chainInfo chain info for the volume. Hypervisor specific.
+ * @return DiskProfile of imported volume
+ */
+ DiskProfile importVolume(Type type, String name, DiskOffering offering, Long size, Long minIops, Long maxIops, VirtualMachine vm, VirtualMachineTemplate template,
+ Account owner, Long deviceId, Long poolId, String path, String chainInfo);
}
diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VolumeInfo.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VolumeInfo.java
index 99e47df..f4a7381 100644
--- a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VolumeInfo.java
+++ b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VolumeInfo.java
@@ -79,4 +79,8 @@
MigrationOptions getMigrationOptions();
void setMigrationOptions(MigrationOptions migrationOptions);
+
+ boolean isDirectDownload();
+
+ void setDirectDownload(boolean directDownload);
}
diff --git a/engine/components-api/pom.xml b/engine/components-api/pom.xml
index 41a0b6d..01fdde5 100644
--- a/engine/components-api/pom.xml
+++ b/engine/components-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/engine/components-api/src/main/java/com/cloud/ha/HighAvailabilityManager.java b/engine/components-api/src/main/java/com/cloud/ha/HighAvailabilityManager.java
index 0894a0b..18ceddb 100644
--- a/engine/components-api/src/main/java/com/cloud/ha/HighAvailabilityManager.java
+++ b/engine/components-api/src/main/java/com/cloud/ha/HighAvailabilityManager.java
@@ -146,6 +146,7 @@
boolean hasPendingHaWork(long vmId);
+ boolean hasPendingMigrationsWork(long vmId);
/**
* @return
*/
diff --git a/engine/components-api/src/main/java/com/cloud/network/IpAddressManager.java b/engine/components-api/src/main/java/com/cloud/network/IpAddressManager.java
index a551278..e9f4d9c 100644
--- a/engine/components-api/src/main/java/com/cloud/network/IpAddressManager.java
+++ b/engine/components-api/src/main/java/com/cloud/network/IpAddressManager.java
@@ -48,6 +48,13 @@
ConfigKey<Boolean> RulesContinueOnError = new ConfigKey<Boolean>("Advanced", Boolean.class, "network.rule.delete.ignoreerror", "true",
"When true, ip address delete (ipassoc) failures are ignored", true);
+ ConfigKey<String> VrouterRedundantTiersPlacement = new ConfigKey<String>(
+ "Advanced", String.class,
+ "vrouter.redundant.tiers.placement",
+ "random",
+ "Set placement of vrouter ips in redundant mode in vpc tiers, this can be 3 value: `first` to use first ips in tiers, `last` to use last ips in tiers and `random` to take random ips in tiers.",
+ true, ConfigKey.Scope.Account);
+
/**
* Assigns a new public ip address.
*
@@ -103,6 +110,12 @@
String acquireGuestIpAddress(Network network, String requestedIp);
+ String acquireFirstGuestIpAddress(Network network);
+
+ String acquireLastGuestIpAddress(Network network);
+
+ String acquireGuestIpAddressByPlacement(Network network, String requestedIp);
+
boolean applyStaticNats(List<? extends StaticNat> staticNats, boolean continueOnError, boolean forRevoke) throws ResourceUnavailableException;
IpAddress assignSystemIp(long networkId, Account owner, boolean forElasticLb, boolean forElasticIp) throws InsufficientAddressCapacityException;
@@ -169,12 +182,15 @@
PublicIp assignDedicateIpAddress(Account owner, Long guestNtwkId, Long vpcId, long dcId, boolean isSourceNat)
throws ConcurrentOperationException, InsufficientAddressCapacityException;
- IpAddress allocateIp(Account ipOwner, boolean isSystem, Account caller, long callerId, DataCenter zone, Boolean displayIp)
+ IpAddress allocateIp(Account ipOwner, boolean isSystem, Account caller, long callerId, DataCenter zone, Boolean displayIp, String ipaddress)
throws ConcurrentOperationException, ResourceAllocationException, InsufficientAddressCapacityException;
PublicIp assignPublicIpAddressFromVlans(long dcId, Long podId, Account owner, VlanType type, List<Long> vlanDbIds, Long networkId, String requestedIp, boolean isSystem)
throws InsufficientAddressCapacityException;
+ PublicIp getAvailablePublicIpAddressFromVlans(long dcId, Long podId, Account owner, VlanType type, List<Long> vlanDbIds, Long networkId, String requestedIp, boolean isSystem)
+ throws InsufficientAddressCapacityException;
+
@DB
void allocateNicValues(NicProfile nic, DataCenter dc, VirtualMachineProfile vm, Network network, String requestedIpv4, String requestedIpv6)
throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException;
diff --git a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java b/engine/components-api/src/main/java/com/cloud/network/IpPlacement.java
similarity index 60%
copy from agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
copy to engine/components-api/src/main/java/com/cloud/network/IpPlacement.java
index b244d02..f5a80c9 100644
--- a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
+++ b/engine/components-api/src/main/java/com/cloud/network/IpPlacement.java
@@ -1,4 +1,5 @@
-//
+package com.cloud.network;
+
// 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
@@ -15,22 +16,19 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-//
-package com.cloud.agent.direct.download;
+public enum IpPlacement {
+ Random,
+ First,
+ Last;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
-@RunWith(MockitoJUnitRunner.class)
-public class DirectTemplateDownloaderImplTest {
-
- private static final Long templateId = 202l;
-
- @Test
- public void testGetDirectDownloadTempPath() {
- String path = DirectTemplateDownloaderImpl.getDirectDownloadTempPath(templateId);
- Assert.assertEquals("template/2/202", path);
+ public static IpPlacement fromString(String param) {
+ switch (param.trim().toLowerCase()) {
+ case "first":
+ return First;
+ case "last":
+ return Last;
+ }
+ return Random;
}
}
diff --git a/server/src/main/java/com/cloud/network/security/SecurityGroupManager.java b/engine/components-api/src/main/java/com/cloud/network/security/SecurityGroupManager.java
similarity index 95%
rename from server/src/main/java/com/cloud/network/security/SecurityGroupManager.java
rename to engine/components-api/src/main/java/com/cloud/network/security/SecurityGroupManager.java
index 16d8ba6..ffca4bb 100644
--- a/server/src/main/java/com/cloud/network/security/SecurityGroupManager.java
+++ b/engine/components-api/src/main/java/com/cloud/network/security/SecurityGroupManager.java
@@ -53,4 +53,6 @@
SecurityGroup getSecurityGroup(String name, long accountId);
boolean isVmMappedToDefaultSecurityGroup(long vmId);
+
+ void scheduleRulesetUpdateToHosts(List<Long> affectedVms, boolean updateSeqno, Long delayMs);
}
diff --git a/engine/components-api/src/main/java/com/cloud/resource/ResourceManager.java b/engine/components-api/src/main/java/com/cloud/resource/ResourceManager.java
index b66f792..db7a27f 100755
--- a/engine/components-api/src/main/java/com/cloud/resource/ResourceManager.java
+++ b/engine/components-api/src/main/java/com/cloud/resource/ResourceManager.java
@@ -47,11 +47,6 @@
*/
public interface ResourceManager extends ResourceService, Configurable {
- ConfigKey<Integer> HostMaintenanceRetries = new ConfigKey<>("Advanced", Integer.class,
- "host.maintenance.retries","20",
- "Number of retries when preparing a host into Maintenance Mode is faulty before failing",
- true, ConfigKey.Scope.Cluster);
-
ConfigKey<Boolean> KvmSshToAgentEnabled = new ConfigKey<>("Advanced", Boolean.class,
"kvm.ssh.to.agent","true",
"Number of retries when preparing a host into Maintenance Mode is faulty before failing",
@@ -97,7 +92,7 @@
boolean umanageHost(long hostId);
- boolean maintenanceFailed(long hostId);
+ boolean migrateAwayFailed(long hostId, long vmId);
public boolean maintain(final long hostId) throws AgentUnavailableException;
@@ -210,4 +205,6 @@
HashMap<String, HashMap<String, VgpuTypesInfo>> getGPUStatistics(HostVO host);
HostVO findOneRandomRunningHostByHypervisor(HypervisorType type);
+
+ boolean cancelMaintenance(final long hostId);
}
diff --git a/engine/network/pom.xml b/engine/network/pom.xml
index f26cd1d..b9d238e 100644
--- a/engine/network/pom.xml
+++ b/engine/network/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/engine/orchestration/pom.xml b/engine/orchestration/pom.xml
index 095aca4..b71d8fd 100755
--- a/engine/orchestration/pom.xml
+++ b/engine/orchestration/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentAttache.java b/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentAttache.java
index e96181b..45df231 100644
--- a/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentAttache.java
+++ b/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentAttache.java
@@ -34,6 +34,7 @@
import com.cloud.agent.api.ModifySshKeysCommand;
import com.cloud.agent.api.ModifyStoragePoolCommand;
import org.apache.cloudstack.agent.lb.SetupMSListCommand;
+import com.cloud.agent.api.RollingMaintenanceCommand;
import org.apache.cloudstack.managed.context.ManagedContextRunnable;
import org.apache.log4j.Logger;
@@ -117,7 +118,7 @@
StopCommand.class.toString(), CheckVirtualMachineCommand.class.toString(), PingTestCommand.class.toString(), CheckHealthCommand.class.toString(),
ReadyCommand.class.toString(), ShutdownCommand.class.toString(), SetupCommand.class.toString(),
CleanupNetworkRulesCmd.class.toString(), CheckNetworkCommand.class.toString(), PvlanSetupCommand.class.toString(), CheckOnHostCommand.class.toString(),
- ModifyTargetsCommand.class.toString(), ModifySshKeysCommand.class.toString(), ModifyStoragePoolCommand.class.toString(), SetupMSListCommand.class.toString()};
+ ModifyTargetsCommand.class.toString(), ModifySshKeysCommand.class.toString(), ModifyStoragePoolCommand.class.toString(), SetupMSListCommand.class.toString(), RollingMaintenanceCommand.class.toString()};
protected final static String[] s_commandsNotAllowedInConnectingMode = new String[] { StartCommand.class.toString(), CreateCommand.class.toString() };
static {
Arrays.sort(s_commandsAllowedInMaintenanceMode);
diff --git a/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java
index 2270a51..e80d3ec 100644
--- a/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java
@@ -1583,7 +1583,7 @@
final HostVO h = sc.find();
if (h != null) {
final ResourceState resourceState = h.getResourceState();
- if (resourceState == ResourceState.Disabled || resourceState == ResourceState.Maintenance || resourceState == ResourceState.ErrorInMaintenance) {
+ if (resourceState == ResourceState.Disabled || resourceState == ResourceState.Maintenance) {
/*
* Host is in non-operation state, so no investigation and direct put agent to Disconnected
*/
@@ -1605,7 +1605,9 @@
}
final QueryBuilder<HostVO> sc = QueryBuilder.create(HostVO.class);
- sc.and(sc.entity().getResourceState(), Op.IN, ResourceState.PrepareForMaintenance, ResourceState.ErrorInMaintenance);
+ sc.and(sc.entity().getResourceState(), Op.IN,
+ ResourceState.PrepareForMaintenance,
+ ResourceState.ErrorInPrepareForMaintenance);
final List<HostVO> hosts = sc.list();
for (final HostVO host : hosts) {
diff --git a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
index b7c7ad3..a397e12 100755
--- a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -24,6 +24,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -39,12 +40,8 @@
import javax.inject.Inject;
import javax.naming.ConfigurationException;
-import com.cloud.agent.api.PrepareForMigrationAnswer;
-import com.cloud.agent.api.to.DpdkTO;
-import com.cloud.event.UsageEventVO;
-import com.cloud.offering.NetworkOffering;
-import com.cloud.offerings.dao.NetworkOfferingDetailsDao;
import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao;
+import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.command.admin.vm.MigrateVMCmd;
import org.apache.cloudstack.api.command.admin.volume.MigrateVolumeCmdByAdmin;
import org.apache.cloudstack.api.command.user.volume.MigrateVolumeCmd;
@@ -98,6 +95,7 @@
import com.cloud.agent.api.PingRoutingCommand;
import com.cloud.agent.api.PlugNicAnswer;
import com.cloud.agent.api.PlugNicCommand;
+import com.cloud.agent.api.PrepareForMigrationAnswer;
import com.cloud.agent.api.PrepareForMigrationCommand;
import com.cloud.agent.api.RebootAnswer;
import com.cloud.agent.api.RebootCommand;
@@ -117,6 +115,7 @@
import com.cloud.agent.api.UnregisterVMCommand;
import com.cloud.agent.api.routing.NetworkElementCommand;
import com.cloud.agent.api.to.DiskTO;
+import com.cloud.agent.api.to.DpdkTO;
import com.cloud.agent.api.to.GPUDeviceTO;
import com.cloud.agent.api.to.NicTO;
import com.cloud.agent.api.to.VirtualMachineTO;
@@ -124,6 +123,7 @@
import com.cloud.agent.manager.allocator.HostAllocator;
import com.cloud.alert.AlertManager;
import com.cloud.capacity.CapacityManager;
+import com.cloud.configuration.Resource.ResourceType;
import com.cloud.dc.ClusterDetailsDao;
import com.cloud.dc.ClusterDetailsVO;
import com.cloud.dc.DataCenter;
@@ -141,6 +141,7 @@
import com.cloud.deploy.DeploymentPlanningManager;
import com.cloud.event.EventTypes;
import com.cloud.event.UsageEventUtils;
+import com.cloud.event.UsageEventVO;
import com.cloud.exception.AffinityConflictException;
import com.cloud.exception.AgentUnavailableException;
import com.cloud.exception.ConcurrentOperationException;
@@ -163,11 +164,16 @@
import com.cloud.network.Network;
import com.cloud.network.NetworkModel;
import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkDetailVO;
+import com.cloud.network.dao.NetworkDetailsDao;
import com.cloud.network.dao.NetworkVO;
import com.cloud.network.router.VirtualRouter;
+import com.cloud.network.security.SecurityGroupManager;
import com.cloud.offering.DiskOffering;
import com.cloud.offering.DiskOfferingInfo;
+import com.cloud.offering.NetworkOffering;
import com.cloud.offering.ServiceOffering;
+import com.cloud.offerings.dao.NetworkOfferingDetailsDao;
import com.cloud.org.Cluster;
import com.cloud.resource.ResourceManager;
import com.cloud.resource.ResourceState;
@@ -191,6 +197,7 @@
import com.cloud.storage.dao.VolumeDao;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
+import com.cloud.user.ResourceLimitService;
import com.cloud.user.User;
import com.cloud.utils.DateUtil;
import com.cloud.utils.Journal;
@@ -304,6 +311,8 @@
@Inject
private ResourceManager _resourceMgr;
@Inject
+ private ResourceLimitService _resourceLimitMgr;
+ @Inject
private VMSnapshotManager _vmSnapshotMgr;
@Inject
private ClusterDetailsDao _clusterDetailsDao;
@@ -327,6 +336,10 @@
private StorageManager storageMgr;
@Inject
private NetworkOfferingDetailsDao networkOfferingDetailsDao;
+ @Inject
+ private NetworkDetailsDao networkDetailsDao;
+ @Inject
+ private SecurityGroupManager _securityGroupManager;
VmWorkJobHandlerProxy _jobHandlerProxy = new VmWorkJobHandlerProxy(this);
@@ -972,6 +985,12 @@
final HypervisorGuru hvGuru = _hvGuruMgr.getGuru(vm.getHypervisorType());
+ // check resource count if ResoureCountRunningVMsonly.value() = true
+ final Account owner = _entityMgr.findById(Account.class, vm.getAccountId());
+ if (VirtualMachine.Type.User.equals(vm.type) && ResoureCountRunningVMsonly.value()) {
+ resourceCountIncrement(owner.getAccountId(),new Long(offering.getCpu()), new Long(offering.getRamSize()));
+ }
+
boolean canRetry = true;
ExcludeList avoids = null;
try {
@@ -1047,8 +1066,11 @@
}
}
- final Account owner = _entityMgr.findById(Account.class, vm.getAccountId());
final VirtualMachineProfileImpl vmProfile = new VirtualMachineProfileImpl(vm, template, offering, owner, params);
+ s_logger.info(" Uefi params " + "UefiFlag: " + params.get(VirtualMachineProfile.Param.UefiFlag)
+ + " Boot Type: " + params.get(VirtualMachineProfile.Param.BootType)
+ + " Boot Mode: " + params.get(VirtualMachineProfile.Param.BootMode)
+ );
DeployDestination dest = null;
try {
dest = _dpMgr.planDeployment(vmProfile, plan, avoids, planner);
@@ -1126,6 +1148,9 @@
vmGuru.finalizeDeployment(cmds, vmProfile, dest, ctx);
+ // Get VM extraConfig from DB and set to VM TO
+ addExtraConfig(vmTO);
+
work = _workDao.findById(work.getId());
if (work == null || work.getStep() != Step.Prepare) {
throw new ConcurrentOperationException("Work steps have been changed: " + work);
@@ -1271,6 +1296,9 @@
}
} finally {
if (startedVm == null) {
+ if (VirtualMachine.Type.User.equals(vm.type) && ResoureCountRunningVMsonly.value()) {
+ resourceCountDecrement(owner.getAccountId(),new Long(offering.getCpu()), new Long(offering.getRamSize()));
+ }
if (canRetry) {
try {
changeState(vm, Event.OperationFailed, null, work, Step.Done);
@@ -1290,6 +1318,16 @@
}
}
+ // Add extra config data to the vmTO as a Map
+ private void addExtraConfig(VirtualMachineTO vmTO) {
+ Map<String, String> details = vmTO.getDetails();
+ for (String key : details.keySet()) {
+ if (key.startsWith(ApiConstants.EXTRA_CONFIG)) {
+ vmTO.addExtraConfig(key, details.get(key));
+ }
+ }
+ }
+
// for managed storage on KVM, need to make sure the path field of the volume in question is populated with the IQN
private void handlePath(final DiskTO[] disks, final HypervisorType hypervisorType) {
if (hypervisorType != HypervisorType.KVM) {
@@ -1806,7 +1844,14 @@
_workDao.update(work.getId(), work);
}
- if (!stateTransitTo(vm, Event.OperationSucceeded, null)) {
+ boolean result = stateTransitTo(vm, Event.OperationSucceeded, null);
+ if (result) {
+ if (VirtualMachine.Type.User.equals(vm.type) && ResoureCountRunningVMsonly.value()) {
+ //update resource count if stop successfully
+ ServiceOfferingVO offering = _offeringDao.findById(vm.getId(), vm.getServiceOfferingId());
+ resourceCountDecrement(vm.getAccountId(),new Long(offering.getCpu()), new Long(offering.getRamSize()));
+ }
+ } else {
throw new CloudRuntimeException("unable to stop " + vm);
}
} catch (final NoTransitionException e) {
@@ -2959,6 +3004,7 @@
while (true) {
try {
+ plan.setMigrationPlan(true);
dest = _dpMgr.planDeployment(profile, plan, excludes, planner);
} catch (final AffinityConflictException e2) {
s_logger.warn("Unable to create deployment, affinity rules associted to the VM conflict", e2);
@@ -3106,11 +3152,18 @@
try {
final Commands cmds = new Commands(Command.OnError.Stop);
- cmds.addCommand(new RebootCommand(vm.getInstanceName(), getExecuteInSequence(vm.getHypervisorType())));
+ RebootCommand rebootCmd = new RebootCommand(vm.getInstanceName(), getExecuteInSequence(vm.getHypervisorType()));
+ rebootCmd.setVirtualMachine(getVmTO(vm.getId()));
+ cmds.addCommand(rebootCmd);
_agentMgr.send(host.getId(), cmds);
final Answer rebootAnswer = cmds.getAnswer(RebootAnswer.class);
if (rebootAnswer != null && rebootAnswer.getResult()) {
+ if (dc.isSecurityGroupEnabled() && vm.getType() == VirtualMachine.Type.User) {
+ List<Long> affectedVms = new ArrayList<Long>();
+ affectedVms.add(vm.getId());
+ _securityGroupManager.scheduleRulesetUpdateToHosts(affectedVms, true, null);
+ }
return;
}
s_logger.info("Unable to reboot VM " + vm + " on " + dest.getHost() + " due to " + (rebootAnswer == null ? " no reboot answer" : rebootAnswer.getDetails()));
@@ -3120,6 +3173,29 @@
}
}
+ protected VirtualMachineTO getVmTO(Long vmId) {
+ final VMInstanceVO vm = _vmDao.findById(vmId);
+ final VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);
+ final List<NicVO> nics = _nicsDao.listByVmId(profile.getId());
+ Collections.sort(nics, new Comparator<NicVO>() {
+ @Override
+ public int compare(NicVO nic1, NicVO nic2) {
+ Long nicId1 = Long.valueOf(nic1.getDeviceId());
+ Long nicId2 = Long.valueOf(nic2.getDeviceId());
+ return nicId1.compareTo(nicId2);
+ }
+ });
+ for (final NicVO nic : nics) {
+ final Network network = _networkModel.getNetwork(nic.getNetworkId());
+ final NicProfile nicProfile =
+ new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), null, _networkModel.isSecurityGroupSupportedInNetwork(network),
+ _networkModel.getNetworkTag(profile.getHypervisorType(), network));
+ profile.addNic(nicProfile);
+ }
+ final VirtualMachineTO to = toVmTO(profile);
+ return to;
+ }
+
public Command cleanup(final VirtualMachine vm, Map<String, DpdkTO> dpdkInterfaceMapping) {
StopCommand cmd = new StopCommand(vm, getExecuteInSequence(vm.getHypervisorType()), false);
cmd.setControlIp(getControlNicIpForVM(vm));
@@ -3643,7 +3719,7 @@
//3) Remove the nic
_networkMgr.removeNic(vmProfile, nic);
- _nicsDao.expunge(nic.getId());
+ _nicsDao.remove(nic.getId());
return true;
}
@@ -4036,6 +4112,13 @@
final VMInstanceVO router = _vmDao.findById(vm.getId());
if (router.getState() == State.Running) {
try {
+ NetworkDetailVO pvlanTypeDetail = networkDetailsDao.findDetail(network.getId(), ApiConstants.ISOLATED_PVLAN_TYPE);
+ if (pvlanTypeDetail != null) {
+ Map<NetworkOffering.Detail, String> nicDetails = nic.getDetails() == null ? new HashMap<>() : nic.getDetails();
+ s_logger.debug("Found PVLAN type: " + pvlanTypeDetail.getValue() + " on network details, adding it as part of the PlugNicCommand");
+ nicDetails.putIfAbsent(NetworkOffering.Detail.pvlanType, pvlanTypeDetail.getValue());
+ nic.setDetails(nicDetails);
+ }
final PlugNicCommand plugNicCmd = new PlugNicCommand(nic, vm.getName(), vm.getType(), vm.getDetails());
final Commands cmds = new Commands(Command.OnError.Stop);
cmds.addCommand("plugnic", plugNicCmd);
@@ -4241,7 +4324,8 @@
public ConfigKey<?>[] getConfigKeys() {
return new ConfigKey<?>[] {ClusterDeltaSyncInterval, StartRetry, VmDestroyForcestop, VmOpCancelInterval, VmOpCleanupInterval, VmOpCleanupWait,
VmOpLockStateRetry,
- VmOpWaitInterval, ExecuteInSequence, VmJobCheckInterval, VmJobTimeout, VmJobStateReportInterval, VmConfigDriveLabel, VmConfigDriveOnPrimaryPool, HaVmRestartHostUp};
+ VmOpWaitInterval, ExecuteInSequence, VmJobCheckInterval, VmJobTimeout, VmJobStateReportInterval, VmConfigDriveLabel, VmConfigDriveOnPrimaryPool, HaVmRestartHostUp,
+ ResoureCountRunningVMsonly };
}
public List<StoragePoolAllocator> getStoragePoolAllocators() {
@@ -5321,7 +5405,7 @@
ServiceOfferingVO newServiceOffering = _offeringDao.findById(work.getNewServiceOfferingId());
if (newServiceOffering.isDynamic()) {
// update the service offering object with the custom parameters like cpu, memory
- newServiceOffering = _offeringDao.getcomputeOffering(newServiceOffering, work.getCustomParameters());
+ newServiceOffering = _offeringDao.getComputeOffering(newServiceOffering, work.getCustomParameters());
}
reConfigureVm(vm.getUuid(), oldServiceOffering, newServiceOffering, work.getCustomParameters(),
@@ -5365,4 +5449,17 @@
return workJob;
}
+
+ protected void resourceCountIncrement (long accountId, Long cpu, Long memory) {
+ _resourceLimitMgr.incrementResourceCount(accountId, ResourceType.user_vm);
+ _resourceLimitMgr.incrementResourceCount(accountId, ResourceType.cpu, cpu);
+ _resourceLimitMgr.incrementResourceCount(accountId, ResourceType.memory, memory);
+ }
+
+ protected void resourceCountDecrement (long accountId, Long cpu, Long memory) {
+ _resourceLimitMgr.decrementResourceCount(accountId, ResourceType.user_vm);
+ _resourceLimitMgr.decrementResourceCount(accountId, ResourceType.cpu, cpu);
+ _resourceLimitMgr.decrementResourceCount(accountId, ResourceType.memory, memory);
+ }
+
}
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 7ff3f10..a8a71b4 100644
--- a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachinePowerStateSyncImpl.java
+++ b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachinePowerStateSyncImpl.java
@@ -24,12 +24,12 @@
import javax.inject.Inject;
-import org.apache.log4j.Logger;
-import com.cloud.configuration.ManagementServiceConfiguration;
import org.apache.cloudstack.framework.messagebus.MessageBus;
import org.apache.cloudstack.framework.messagebus.PublishScope;
+import org.apache.log4j.Logger;
import com.cloud.agent.api.HostVmStateReportEntry;
+import com.cloud.configuration.ManagementServiceConfiguration;
import com.cloud.utils.DateUtil;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.dao.VMInstanceDao;
diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java
index ef9c44a..567675a 100644
--- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java
+++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java
@@ -29,6 +29,7 @@
import org.apache.cloudstack.engine.cloud.entity.api.db.dao.VMReservationDao;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+import org.apache.commons.collections.MapUtils;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@@ -148,6 +149,15 @@
VMInstanceVO vm = _vmDao.findByUuid(vmEntityVO.getUuid());
VirtualMachineProfileImpl vmProfile = new VirtualMachineProfileImpl(vm);
vmProfile.setServiceOffering(_serviceOfferingDao.findByIdIncludingRemoved(vm.getId(), vm.getServiceOfferingId()));
+ if (MapUtils.isNotEmpty(vmEntityVO.getDetails()) &&
+ vmEntityVO.getDetails().containsKey(VirtualMachineProfile.Param.UefiFlag.getName()) &&
+ "yes".equalsIgnoreCase(vmEntityVO.getDetails().get(VirtualMachineProfile.Param.UefiFlag.getName())))
+ {
+ Map<String, String> details = vmEntityVO.getDetails();
+ vmProfile.getParameters().put(VirtualMachineProfile.Param.BootType, details.get(VirtualMachineProfile.Param.BootType.getName()));
+ vmProfile.getParameters().put(VirtualMachineProfile.Param.BootMode, details.get(VirtualMachineProfile.Param.BootMode.getName()));
+ vmProfile.getParameters().put(VirtualMachineProfile.Param.UefiFlag, details.get(VirtualMachineProfile.Param.UefiFlag.getName()));
+ }
DataCenterDeployment plan = new DataCenterDeployment(vm.getDataCenterId(), vm.getPodIdToDeployIn(), null, null, null, null);
if (planToDeploy != null && planToDeploy.getDataCenterId() != 0) {
plan =
diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java
index 598e619..3e5f910 100644
--- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java
+++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java
@@ -20,9 +20,11 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.HashMap;
import javax.inject.Inject;
+import org.apache.commons.collections.MapUtils;
import org.springframework.stereotype.Component;
import org.apache.cloudstack.engine.cloud.entity.api.db.VMEntityVO;
@@ -269,4 +271,22 @@
}
+ @Override
+ public void setParamsToEntity(Map<VirtualMachineProfile.Param, Object> map) {
+ if (MapUtils.isNotEmpty(map)) {
+ if (this.vmEntityVO != null) {
+ Map<String, String> details = this.vmEntityVO.getDetails();
+ if (details == null) {
+ details = new HashMap<String, String>();
+ }
+ for (Map.Entry<VirtualMachineProfile.Param, Object> entry : map.entrySet()) {
+ if (null != entry && null != entry.getValue() && null != entry.getKey()) {
+ details.put(entry.getKey().getName(), entry.getValue().toString());
+ }
+ }
+ this.vmEntityVO.setDetails(details);
+ }
+ }
+
+ }
}
diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java
index be1484f..846b415 100644
--- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java
+++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java
@@ -16,16 +16,10 @@
// under the License.
package org.apache.cloudstack.engine.datacenter.entity.api.db;
-import com.cloud.host.Status;
-import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.resource.ResourceState;
-import com.cloud.storage.Storage.StoragePoolType;
-import com.cloud.utils.NumbersUtil;
-import com.cloud.utils.db.GenericDao;
-import com.cloud.utils.db.StateMachine;
-import org.apache.cloudstack.api.Identity;
-import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State;
-import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
import javax.persistence.Column;
import javax.persistence.DiscriminatorColumn;
@@ -42,10 +36,18 @@
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Transient;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State;
+import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event;
+
+import com.cloud.host.Status;
+import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.resource.ResourceState;
+import com.cloud.storage.Storage.StoragePoolType;
+import com.cloud.utils.NumbersUtil;
+import com.cloud.utils.db.GenericDao;
+import com.cloud.utils.db.StateMachine;
@Entity
@Table(name = "host")
@@ -730,7 +732,7 @@
@Override
public boolean isInMaintenanceStates() {
- return (getResourceState() == ResourceState.Maintenance || getResourceState() == ResourceState.ErrorInMaintenance || getResourceState() == ResourceState.PrepareForMaintenance);
+ return ResourceState.isMaintenanceState(getResourceState());
}
public long getUpdated() {
diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index 78f9315..4c6d260 100644
--- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -38,7 +38,10 @@
import javax.inject.Inject;
import javax.naming.ConfigurationException;
+import com.cloud.network.dao.NetworkDetailVO;
+import com.cloud.network.dao.NetworkDetailsDao;
import org.apache.cloudstack.acl.ControlledEntity.ACLType;
+import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.engine.cloud.entity.api.db.VMNetworkMapVO;
import org.apache.cloudstack.engine.cloud.entity.api.db.dao.VMNetworkMapDao;
@@ -222,6 +225,8 @@
import com.cloud.vm.dao.VMInstanceDao;
import com.google.common.base.Strings;
+import static org.apache.commons.lang.StringUtils.isNotBlank;
+
/**
* NetworkManagerImpl implements NetworkManager.
*/
@@ -251,6 +256,8 @@
@Inject
NetworkDao _networksDao;
@Inject
+ NetworkDetailsDao networkDetailsDao;
+ @Inject
NicDao _nicDao;
@Inject
RulesManager _rulesMgr;
@@ -698,6 +705,11 @@
finalizeServicesAndProvidersForNetwork(offering, plan.getPhysicalNetworkId()));
networks.add(networkPersisted);
+ if (network.getPvlanType() != null) {
+ NetworkDetailVO detailVO = new NetworkDetailVO(networkPersisted.getId(), ApiConstants.ISOLATED_PVLAN_TYPE, network.getPvlanType().toString(), true);
+ networkDetailsDao.persist(detailVO);
+ }
+
if (predefined instanceof NetworkVO && guru instanceof NetworkGuruAdditionalFunctions){
final NetworkGuruAdditionalFunctions functions = (NetworkGuruAdditionalFunctions) guru;
functions.finalizeNetworkDesign(networkPersisted.getId(), ((NetworkVO)predefined).getVlanIdAsUUID());
@@ -2165,10 +2177,30 @@
@Override
@DB
+ public Network createPrivateNetwork(final long networkOfferingId, final String name, final String displayText, final String gateway, final String cidr, final String vlanId, final boolean bypassVlanOverlapCheck, final Account owner, final PhysicalNetwork pNtwk, final Long vpcId) throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException {
+ // create network for private gateway
+ return createGuestNetwork(networkOfferingId, name, displayText, gateway, cidr, vlanId,
+ bypassVlanOverlapCheck, null, owner, null, pNtwk, pNtwk.getDataCenterId(), ACLType.Account, null,
+ vpcId, null, null, true, null, null, null, true);
+ }
+
+ @Override
+ @DB
public Network createGuestNetwork(final long networkOfferingId, final String name, final String displayText, final String gateway, final String cidr, String vlanId,
boolean bypassVlanOverlapCheck, String networkDomain, final Account owner, final Long domainId, final PhysicalNetwork pNtwk,
final long zoneId, final ACLType aclType, Boolean subdomainAccess, final Long vpcId, final String ip6Gateway, final String ip6Cidr,
- final Boolean isDisplayNetworkEnabled, final String isolatedPvlan, String externalId) throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException {
+ final Boolean isDisplayNetworkEnabled, final String isolatedPvlan, Network.PVlanType isolatedPvlanType, String externalId) throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException {
+ // create Isolated/Shared/L2 network
+ return createGuestNetwork(networkOfferingId, name, displayText, gateway, cidr, vlanId, bypassVlanOverlapCheck,
+ networkDomain, owner, domainId, pNtwk, zoneId, aclType, subdomainAccess, vpcId, ip6Gateway, ip6Cidr,
+ isDisplayNetworkEnabled, isolatedPvlan, isolatedPvlanType, externalId, false);
+ }
+
+ @DB
+ private Network createGuestNetwork(final long networkOfferingId, final String name, final String displayText, final String gateway, final String cidr, String vlanId,
+ boolean bypassVlanOverlapCheck, String networkDomain, final Account owner, final Long domainId, final PhysicalNetwork pNtwk,
+ final long zoneId, final ACLType aclType, Boolean subdomainAccess, final Long vpcId, final String ip6Gateway, final String ip6Cidr,
+ final Boolean isDisplayNetworkEnabled, final String isolatedPvlan, Network.PVlanType isolatedPvlanType, String externalId, final Boolean isPrivateNetwork) throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException {
final NetworkOfferingVO ntwkOff = _networkOfferingDao.findById(networkOfferingId);
final DataCenterVO zone = _dcDao.findById(zoneId);
@@ -2280,16 +2312,25 @@
if (vlanSpecified) {
URI uri = BroadcastDomainType.fromString(vlanId);
+ // Aux: generate secondary URI for secondary VLAN ID (if provided) for performing checks
+ URI secondaryUri = isNotBlank(isolatedPvlan) ? BroadcastDomainType.fromString(isolatedPvlan) : null;
//don't allow to specify vlan tag used by physical network for dynamic vlan allocation
if (!(bypassVlanOverlapCheck && ntwkOff.getGuestType() == GuestType.Shared) && _dcDao.findVnet(zoneId, pNtwk.getId(), BroadcastDomainType.getValue(uri)).size() > 0) {
throw new InvalidParameterValueException("The VLAN tag " + vlanId + " is already being used for dynamic vlan allocation for the guest network in zone "
+ zone.getName());
}
+ if (secondaryUri != null && !(bypassVlanOverlapCheck && ntwkOff.getGuestType() == GuestType.Shared) &&
+ _dcDao.findVnet(zoneId, pNtwk.getId(), BroadcastDomainType.getValue(secondaryUri)).size() > 0) {
+ throw new InvalidParameterValueException("The VLAN tag " + isolatedPvlan + " is already being used for dynamic vlan allocation for the guest network in zone "
+ + zone.getName());
+ }
if (! UuidUtils.validateUUID(vlanId)){
// For Isolated and L2 networks, don't allow to create network with vlan that already exists in the zone
- if (ntwkOff.getGuestType() == GuestType.Isolated || !hasGuestBypassVlanOverlapCheck(bypassVlanOverlapCheck, ntwkOff)) {
+ if (!hasGuestBypassVlanOverlapCheck(bypassVlanOverlapCheck, ntwkOff, isPrivateNetwork)) {
if (_networksDao.listByZoneAndUriAndGuestType(zoneId, uri.toString(), null).size() > 0) {
throw new InvalidParameterValueException("Network with vlan " + vlanId + " already exists or overlaps with other network vlans in zone " + zoneId);
+ } else if (secondaryUri != null && _networksDao.listByZoneAndUriAndGuestType(zoneId, secondaryUri.toString(), null).size() > 0) {
+ throw new InvalidParameterValueException("Network with vlan " + isolatedPvlan + " already exists or overlaps with other network vlans in zone " + zoneId);
} else {
final List<DataCenterVnetVO> dcVnets = _datacenterVnetDao.findVnet(zoneId, BroadcastDomainType.getValue(uri));
//for the network that is created as part of private gateway,
@@ -2436,8 +2477,15 @@
if (vlanIdFinal.equalsIgnoreCase(Vlan.UNTAGGED)) {
throw new InvalidParameterValueException("Cannot support pvlan with untagged primary vlan!");
}
- userNetwork.setBroadcastUri(NetUtils.generateUriForPvlan(vlanIdFinal, isolatedPvlan));
+ URI uri = NetUtils.generateUriForPvlan(vlanIdFinal, isolatedPvlan);
+ if (_networksDao.listByPhysicalNetworkPvlan(physicalNetworkId, uri.toString(), isolatedPvlanType).size() > 0) {
+ throw new InvalidParameterValueException("Network with primary vlan " + vlanIdFinal +
+ " and secondary vlan " + isolatedPvlan + " type " + isolatedPvlanType +
+ " already exists or overlaps with other network pvlans in zone " + zoneId);
+ }
+ userNetwork.setBroadcastUri(uri);
userNetwork.setBroadcastDomainType(BroadcastDomainType.Pvlan);
+ userNetwork.setPvlanType(isolatedPvlanType);
}
}
@@ -2480,8 +2528,8 @@
* @param bypassVlanOverlapCheck bypass VLAN id/range overlap check
* @param ntwkOff network offering
*/
- private boolean hasGuestBypassVlanOverlapCheck(final boolean bypassVlanOverlapCheck, final NetworkOfferingVO ntwkOff) {
- return bypassVlanOverlapCheck && ntwkOff.getGuestType() != GuestType.Isolated;
+ private boolean hasGuestBypassVlanOverlapCheck(final boolean bypassVlanOverlapCheck, final NetworkOfferingVO ntwkOff, final boolean isPrivateNetwork) {
+ return bypassVlanOverlapCheck && (ntwkOff.getGuestType() == GuestType.Shared || isPrivateNetwork);
}
/**
@@ -2972,7 +3020,7 @@
for (final VirtualRouter router : routers) {
if (router.getState() == VirtualMachine.State.Stopped ||
router.getState() == VirtualMachine.State.Error ||
- router.getState() == VirtualMachine.State.Shutdowned ||
+ router.getState() == VirtualMachine.State.Shutdown ||
router.getState() == VirtualMachine.State.Unknown) {
s_logger.debug("Destroying old router " + router);
_routerService.destroyRouter(router.getId(), context.getAccount(), context.getCaller().getId());
@@ -3952,6 +4000,71 @@
return _nicDao.persist(nic);
}
+ @DB
+ @Override
+ public Pair<NicProfile, Integer> importNic(final String macAddress, int deviceId, final Network network, final Boolean isDefaultNic, final VirtualMachine vm, final Network.IpAddresses ipAddresses)
+ throws ConcurrentOperationException, InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException {
+ s_logger.debug("Allocating nic for vm " + vm.getUuid() + " in network " + network + " during import");
+ String guestIp = null;
+ if (ipAddresses != null && !Strings.isNullOrEmpty(ipAddresses.getIp4Address())) {
+ if (ipAddresses.getIp4Address().equals("auto")) {
+ ipAddresses.setIp4Address(null);
+ }
+ if (network.getGuestType() != GuestType.L2) {
+ guestIp = _ipAddrMgr.acquireGuestIpAddress(network, ipAddresses.getIp4Address());
+ } else {
+ guestIp = null;
+ }
+ if (guestIp == null && network.getGuestType() != GuestType.L2 && !_networkModel.listNetworkOfferingServices(network.getNetworkOfferingId()).isEmpty()) {
+ throw new InsufficientVirtualNetworkCapacityException("Unable to acquire Guest IP address for network " + network, DataCenter.class,
+ network.getDataCenterId());
+ }
+ }
+ final String finalGuestIp = guestIp;
+ final NicVO vo = Transaction.execute(new TransactionCallback<NicVO>() {
+ @Override
+ public NicVO doInTransaction(TransactionStatus status) {
+ NicVO vo = new NicVO(network.getGuruName(), vm.getId(), network.getId(), vm.getType());
+ vo.setMacAddress(macAddress);
+ vo.setAddressFormat(Networks.AddressFormat.Ip4);
+ if (NetUtils.isValidIp4(finalGuestIp) && !Strings.isNullOrEmpty(network.getGateway())) {
+ vo.setIPv4Address(finalGuestIp);
+ vo.setIPv4Gateway(network.getGateway());
+ if (!Strings.isNullOrEmpty(network.getCidr())) {
+ vo.setIPv4Netmask(NetUtils.cidr2Netmask(network.getCidr()));
+ }
+ }
+ vo.setBroadcastUri(network.getBroadcastUri());
+ vo.setMode(network.getMode());
+ vo.setState(Nic.State.Reserved);
+ vo.setReservationStrategy(ReservationStrategy.Start);
+ vo.setReservationId(UUID.randomUUID().toString());
+ vo.setIsolationUri(network.getBroadcastUri());
+ vo.setDeviceId(deviceId);
+ vo.setDefaultNic(isDefaultNic);
+ vo = _nicDao.persist(vo);
+
+ int count = 1;
+ if (vo.getVmType() == VirtualMachine.Type.User) {
+ s_logger.debug("Changing active number of nics for network id=" + network.getUuid() + " on " + count);
+ _networksDao.changeActiveNicsBy(network.getId(), count);
+ }
+ if (vo.getVmType() == VirtualMachine.Type.User
+ || vo.getVmType() == VirtualMachine.Type.DomainRouter && _networksDao.findById(network.getId()).getTrafficType() == TrafficType.Guest) {
+ _networksDao.setCheckForGc(network.getId());
+ }
+
+ return vo;
+ }
+ });
+
+ final Integer networkRate = _networkModel.getNetworkRate(network.getId(), vm.getId());
+ final NicProfile vmNic = new NicProfile(vo, network, vo.getBroadcastUri(), vo.getIsolationUri(), networkRate, _networkModel.isSecurityGroupSupportedInNetwork(network),
+ _networkModel.getNetworkTag(vm.getHypervisorType(), network));
+
+ return new Pair<NicProfile, Integer>(vmNic, Integer.valueOf(deviceId));
+ }
+
@Override
public String getConfigComponentName() {
return NetworkOrchestrationService.class.getSimpleName();
diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
index 6e71864..9e2168e 100644
--- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
+++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
@@ -30,7 +30,6 @@
import javax.inject.Inject;
import javax.naming.ConfigurationException;
-import com.cloud.storage.VolumeApiService;
import org.apache.cloudstack.api.command.admin.vm.MigrateVMCmd;
import org.apache.cloudstack.api.command.admin.volume.MigrateVolumeCmdByAdmin;
import org.apache.cloudstack.api.command.user.volume.MigrateVolumeCmd;
@@ -106,6 +105,7 @@
import com.cloud.storage.VMTemplateStorageResourceAssoc;
import com.cloud.storage.Volume;
import com.cloud.storage.Volume.Type;
+import com.cloud.storage.VolumeApiService;
import com.cloud.storage.VolumeVO;
import com.cloud.storage.dao.SnapshotDao;
import com.cloud.storage.dao.VolumeDao;
@@ -645,7 +645,7 @@
if (size < 0 || (size > 0 && size < (1024 * 1024 * 1024))) {
throw new InvalidParameterValueException("Please specify a size of at least 1 GB.");
} else if (size > (MaxVolumeSize.value() * 1024 * 1024 * 1024)) {
- throw new InvalidParameterValueException("volume size " + size + ", but the maximum size allowed is " + MaxVolumeSize + " GB.");
+ throw new InvalidParameterValueException("volume size " + size + ", but the maximum size allowed is " + MaxVolumeSize.value() + " GB.");
}
return true;
@@ -1005,10 +1005,12 @@
}
}
+ @Override
@DB
- protected Volume liveMigrateVolume(Volume volume, StoragePool destPool) {
+ public Volume liveMigrateVolume(Volume volume, StoragePool destPool) {
VolumeInfo vol = volFactory.getVolume(volume.getId());
- AsyncCallFuture<VolumeApiResult> future = volService.migrateVolume(vol, (DataStore)destPool);
+ DataStore dataStoreTarget = dataStoreMgr.getDataStore(destPool.getId(), DataStoreRole.Primary);
+ AsyncCallFuture<VolumeApiResult> future = volService.migrateVolume(vol, dataStoreTarget);
try {
VolumeApiResult result = future.get();
if (result.isFailed()) {
@@ -1576,6 +1578,8 @@
if (volume.getState() == Volume.State.Allocated) {
_volsDao.remove(volume.getId());
stateTransitTo(volume, Volume.Event.DestroyRequested);
+ _resourceLimitMgr.decrementResourceCount(volume.getAccountId(), ResourceType.volume, volume.isDisplay());
+ _resourceLimitMgr.decrementResourceCount(volume.getAccountId(), ResourceType.primary_storage, volume.isDisplay(), new Long(volume.getSize()));
} else {
volService.destroyVolume(volume.getId());
}
@@ -1583,8 +1587,6 @@
// publish usage event for the volume
UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_DELETE, volume.getAccountId(), volume.getDataCenterId(), volume.getId(), volume.getName(), Volume.class.getName(),
volume.getUuid(), volume.isDisplayVolume());
- _resourceLimitMgr.decrementResourceCount(volume.getAccountId(), ResourceType.volume, volume.isDisplay());
- _resourceLimitMgr.decrementResourceCount(volume.getAccountId(), ResourceType.primary_storage, volume.isDisplay(), new Long(volume.getSize()));
} catch (Exception e) {
s_logger.debug("Failed to destroy volume" + volume.getId(), e);
throw new CloudRuntimeException("Failed to destroy volume" + volume.getId(), e);
@@ -1626,4 +1628,56 @@
_volsDao.update(volumeId, vol);
}
}
+
+ @Override
+ public DiskProfile importVolume(Type type, String name, DiskOffering offering, Long size, Long minIops, Long maxIops,
+ VirtualMachine vm, VirtualMachineTemplate template, Account owner,
+ Long deviceId, Long poolId, String path, String chainInfo) {
+ if (size == null) {
+ size = offering.getDiskSize();
+ } else {
+ size = (size * 1024 * 1024 * 1024);
+ }
+
+ minIops = minIops != null ? minIops : offering.getMinIops();
+ maxIops = maxIops != null ? maxIops : offering.getMaxIops();
+
+ VolumeVO vol = new VolumeVO(type, name, vm.getDataCenterId(), owner.getDomainId(), owner.getId(), offering.getId(), offering.getProvisioningType(), size, minIops, maxIops, null);
+ if (vm != null) {
+ vol.setInstanceId(vm.getId());
+ }
+
+ if (deviceId != null) {
+ vol.setDeviceId(deviceId);
+ } else if (type.equals(Type.ROOT)) {
+ vol.setDeviceId(0l);
+ } else {
+ vol.setDeviceId(1l);
+ }
+
+ if (template != null) {
+ if (ImageFormat.ISO.equals(template.getFormat())) {
+ vol.setIsoId(template.getId());
+ } else if (Storage.TemplateType.DATADISK.equals(template.getTemplateType())) {
+ vol.setTemplateId(template.getId());
+ }
+ if (type == Type.ROOT) {
+ vol.setTemplateId(template.getId());
+ }
+ }
+
+ // display flag matters only for the User vms
+ if (VirtualMachine.Type.User.equals(vm.getType())) {
+ UserVmVO userVm = _userVmDao.findById(vm.getId());
+ vol.setDisplayVolume(userVm.isDisplayVm());
+ }
+
+ vol.setFormat(getSupportedImageFormatForCluster(vm.getHypervisorType()));
+ vol.setPoolId(poolId);
+ vol.setPath(path);
+ vol.setChainInfo(chainInfo);
+ vol.setState(Volume.State.Ready);
+ vol = _volsDao.persist(vol);
+ return toDiskProfile(vol, offering);
+ }
}
diff --git a/engine/pom.xml b/engine/pom.xml
index 8ce1567..f815b1b 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
diff --git a/engine/schema/pom.xml b/engine/schema/pom.xml
index ac69b90..bc0104c 100644
--- a/engine/schema/pom.xml
+++ b/engine/schema/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
@@ -48,5 +48,9 @@
<artifactId>cloud-framework-db</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/engine/schema/src/main/java/com/cloud/host/HostVO.java b/engine/schema/src/main/java/com/cloud/host/HostVO.java
index 7fd1e71..f234359 100644
--- a/engine/schema/src/main/java/com/cloud/host/HostVO.java
+++ b/engine/schema/src/main/java/com/cloud/host/HostVO.java
@@ -16,12 +16,11 @@
// under the License.
package com.cloud.host;
-import com.cloud.agent.api.VgpuTypesInfo;
-import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.resource.ResourceState;
-import com.cloud.storage.Storage.StoragePoolType;
-import com.cloud.utils.NumbersUtil;
-import com.cloud.utils.db.GenericDao;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
import javax.persistence.Column;
import javax.persistence.DiscriminatorColumn;
@@ -38,11 +37,13 @@
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Transient;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+
+import com.cloud.agent.api.VgpuTypesInfo;
+import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.resource.ResourceState;
+import com.cloud.storage.Storage.StoragePoolType;
+import com.cloud.utils.NumbersUtil;
+import com.cloud.utils.db.GenericDao;
@Entity
@Table(name = "host")
@@ -714,9 +715,8 @@
@Override
public boolean isInMaintenanceStates() {
- return (getResourceState() == ResourceState.Maintenance || getResourceState() == ResourceState.ErrorInMaintenance || getResourceState() == ResourceState.PrepareForMaintenance);
+ return ResourceState.isMaintenanceState(getResourceState());
}
-
@Override
public boolean isDisabled() {
return (getResourceState() == ResourceState.Disabled);
diff --git a/engine/schema/src/main/java/com/cloud/host/dao/HostDao.java b/engine/schema/src/main/java/com/cloud/host/dao/HostDao.java
index 781f82f..ced19ce 100644
--- a/engine/schema/src/main/java/com/cloud/host/dao/HostDao.java
+++ b/engine/schema/src/main/java/com/cloud/host/dao/HostDao.java
@@ -111,4 +111,8 @@
HostVO findHostInZoneToExecuteCommand(long zoneId, HypervisorType hypervisorType);
List<HostVO> listAllHostsUpByZoneAndHypervisor(long zoneId, HypervisorType hypervisorType);
+
+ List<HostVO> listByHostCapability(Host.Type type, Long clusterId, Long podId, long dcId, String hostCapabilty);
+
+ List<HostVO> listByClusterAndHypervisorType(long clusterId, HypervisorType hypervisorType);
}
diff --git a/engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java b/engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java
index 2b2a80b..ec4573f 100644
--- a/engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java
@@ -43,6 +43,7 @@
import com.cloud.gpu.dao.HostGpuGroupsDao;
import com.cloud.gpu.dao.VGPUTypesDao;
import com.cloud.host.Host;
+import com.cloud.host.DetailVO;
import com.cloud.host.Host.Type;
import com.cloud.host.HostTagVO;
import com.cloud.host.HostVO;
@@ -109,6 +110,7 @@
protected SearchBuilder<HostVO> ClusterStatusSearch;
protected SearchBuilder<HostVO> TypeNameZoneSearch;
protected SearchBuilder<HostVO> AvailHypevisorInZone;
+ protected SearchBuilder<HostVO> ClusterHypervisorSearch;
protected SearchBuilder<HostVO> DirectConnectSearch;
protected SearchBuilder<HostVO> ManagedDirectConnectSearch;
@@ -293,6 +295,13 @@
DirectlyConnectedSearch.and("resourceState", DirectlyConnectedSearch.entity().getResourceState(), SearchCriteria.Op.NOTIN);
DirectlyConnectedSearch.done();
+ ClusterHypervisorSearch = createSearchBuilder();
+ ClusterHypervisorSearch.and("clusterId", ClusterHypervisorSearch.entity().getClusterId(), SearchCriteria.Op.EQ);
+ ClusterHypervisorSearch.and("hypervisor", ClusterHypervisorSearch.entity().getHypervisorType(), SearchCriteria.Op.EQ);
+ ClusterHypervisorSearch.and("type", ClusterHypervisorSearch.entity().getType(), SearchCriteria.Op.EQ);
+ ClusterHypervisorSearch.and("status", ClusterHypervisorSearch.entity().getStatus(), SearchCriteria.Op.EQ);
+ ClusterHypervisorSearch.done();
+
UnmanagedDirectConnectSearch = createSearchBuilder();
UnmanagedDirectConnectSearch.and("resource", UnmanagedDirectConnectSearch.entity().getResource(), SearchCriteria.Op.NNULL);
UnmanagedDirectConnectSearch.and("server", UnmanagedDirectConnectSearch.entity().getManagementServerId(), SearchCriteria.Op.NULL);
@@ -1213,6 +1222,49 @@
.collect(Collectors.toList());
}
+ @Override
+ public List<HostVO> listByHostCapability(Type type, Long clusterId, Long podId, long dcId, String hostCapabilty) {
+ SearchBuilder<DetailVO> hostCapabilitySearch = _detailsDao.createSearchBuilder();
+ DetailVO tagEntity = hostCapabilitySearch.entity();
+ hostCapabilitySearch.and("capability", tagEntity.getName(), SearchCriteria.Op.EQ);
+ hostCapabilitySearch.and("value", tagEntity.getValue(), SearchCriteria.Op.EQ);
+
+ SearchBuilder<HostVO> hostSearch = createSearchBuilder();
+ HostVO entity = hostSearch.entity();
+ hostSearch.and("type", entity.getType(), SearchCriteria.Op.EQ);
+ hostSearch.and("pod", entity.getPodId(), SearchCriteria.Op.EQ);
+ hostSearch.and("dc", entity.getDataCenterId(), SearchCriteria.Op.EQ);
+ hostSearch.and("cluster", entity.getClusterId(), SearchCriteria.Op.EQ);
+ hostSearch.and("status", entity.getStatus(), SearchCriteria.Op.EQ);
+ hostSearch.and("resourceState", entity.getResourceState(), SearchCriteria.Op.EQ);
+ hostSearch.join("hostCapabilitySearch", hostCapabilitySearch, entity.getId(), tagEntity.getHostId(), JoinBuilder.JoinType.INNER);
+
+ SearchCriteria<HostVO> sc = hostSearch.create();
+ sc.setJoinParameters("hostCapabilitySearch", "value", Boolean.toString(true));
+ sc.setJoinParameters("hostCapabilitySearch", "capability", hostCapabilty);
+ sc.setParameters("type", type.toString());
+ if (podId != null) {
+ sc.setParameters("pod", podId);
+ }
+ if (clusterId != null) {
+ sc.setParameters("cluster", clusterId);
+ }
+ sc.setParameters("dc", dcId);
+ sc.setParameters("status", Status.Up.toString());
+ sc.setParameters("resourceState", ResourceState.Enabled.toString());
+
+ return listBy(sc);
+ }
+
+ public List<HostVO> listByClusterAndHypervisorType(long clusterId, HypervisorType hypervisorType) {
+ SearchCriteria<HostVO> sc = ClusterHypervisorSearch.create();
+ sc.setParameters("clusterId", clusterId);
+ sc.setParameters("hypervisor", hypervisorType);
+ sc.setParameters("type", Type.Routing);
+ sc.setParameters("status", Status.Up);
+ return listBy(sc);
+ }
+
private ResultSet executeSqlGetResultsetForMethodFindHostInZoneToExecuteCommand(HypervisorType hypervisorType, long zoneId, TransactionLegacy tx, String sql) throws SQLException {
PreparedStatement pstmt = tx.prepareAutoCloseStatement(sql);
pstmt.setString(1, Objects.toString(hypervisorType));
diff --git a/engine/schema/src/main/java/com/cloud/network/dao/NetworkDao.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkDao.java
index 5091ebd..a84e4d5 100644
--- a/engine/schema/src/main/java/com/cloud/network/dao/NetworkDao.java
+++ b/engine/schema/src/main/java/com/cloud/network/dao/NetworkDao.java
@@ -105,7 +105,7 @@
List<NetworkVO> listByVpc(long vpcId);
- NetworkVO getPrivateNetwork(String broadcastUri, String cidr, long accountId, long zoneId, Long networkOfferingId);
+ NetworkVO getPrivateNetwork(String broadcastUri, String cidr, long accountId, long zoneId, Long networkOfferingId, Long vpcId);
long countVpcNetworks(long vpcId);
@@ -120,4 +120,10 @@
int getNonSystemNetworkCountByVpcId(long vpcId);
List<NetworkVO> listNetworkVO(List<Long> idset);
+
+ NetworkVO findByVlan(String vlan);
+
+ List<NetworkVO> listByAccountIdNetworkName(long accountId, String name);
+
+ List<NetworkVO> listByPhysicalNetworkPvlan(long physicalNetworkId, String broadcastUri, Network.PVlanType pVlanType);
}
diff --git a/engine/schema/src/main/java/com/cloud/network/dao/NetworkDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkDaoImpl.java
index 23936cb..eeee3d1 100644
--- a/engine/schema/src/main/java/com/cloud/network/dao/NetworkDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/network/dao/NetworkDaoImpl.java
@@ -26,7 +26,9 @@
import javax.inject.Inject;
import javax.persistence.TableGenerator;
+import com.cloud.utils.exception.CloudRuntimeException;
import org.apache.cloudstack.acl.ControlledEntity.ACLType;
+import org.apache.cloudstack.api.ApiConstants;
import org.springframework.stereotype.Component;
import com.cloud.network.Network;
@@ -38,6 +40,8 @@
import com.cloud.network.Networks.BroadcastDomainType;
import com.cloud.network.Networks.Mode;
import com.cloud.network.Networks.TrafficType;
+import com.cloud.network.vpc.VpcGatewayVO;
+import com.cloud.network.vpc.dao.VpcGatewayDao;
import com.cloud.offering.NetworkOffering;
import com.cloud.offerings.NetworkOfferingVO;
import com.cloud.offerings.dao.NetworkOfferingDao;
@@ -77,6 +81,7 @@
SearchBuilder<NetworkVO> OfferingAccountNetworkSearch;
GenericSearchBuilder<NetworkVO, Long> GarbageCollectedSearch;
+ SearchBuilder<NetworkVO> PrivateNetworkSearch;
@Inject
ResourceTagDao _tagsDao;
@@ -92,6 +97,10 @@
NetworkOfferingDao _ntwkOffDao;
@Inject
NetworkOpDao _ntwkOpDao;
+ @Inject
+ NetworkDetailsDao networkDetailsDao;
+ @Inject
+ VpcGatewayDao _vpcGatewayDao;
TableGenerator _tgMacAddress;
@@ -104,6 +113,7 @@
@PostConstruct
protected void init() {
AllFieldsSearch = createSearchBuilder();
+ AllFieldsSearch.and("name", AllFieldsSearch.entity().getName(), Op.EQ);
AllFieldsSearch.and("trafficType", AllFieldsSearch.entity().getTrafficType(), Op.EQ);
AllFieldsSearch.and("cidr", AllFieldsSearch.entity().getCidr(), Op.EQ);
AllFieldsSearch.and("broadcastType", AllFieldsSearch.entity().getBroadcastDomainType(), Op.EQ);
@@ -246,6 +256,15 @@
GarbageCollectedSearch.join("ntwkOffGC", join8, GarbageCollectedSearch.entity().getNetworkOfferingId(), join8.entity().getId(), JoinBuilder.JoinType.INNER);
GarbageCollectedSearch.done();
+ PrivateNetworkSearch = createSearchBuilder();
+ PrivateNetworkSearch.and("cidr", PrivateNetworkSearch.entity().getCidr(), Op.EQ);
+ PrivateNetworkSearch.and("offering", PrivateNetworkSearch.entity().getNetworkOfferingId(), Op.EQ);
+ PrivateNetworkSearch.and("datacenter", PrivateNetworkSearch.entity().getDataCenterId(), Op.EQ);
+ PrivateNetworkSearch.and("broadcastUri", PrivateNetworkSearch.entity().getBroadcastUri(), Op.EQ);
+ final SearchBuilder<VpcGatewayVO> join10 = _vpcGatewayDao.createSearchBuilder();
+ join10.and("vpc", join10.entity().getVpcId(), Op.EQ);
+ PrivateNetworkSearch.join("vpcgateways", join10, PrivateNetworkSearch.entity().getId(), join10.entity().getNetworkId(), JoinBuilder.JoinType.INNER);
+ PrivateNetworkSearch.done();
}
@Override
@@ -592,16 +611,17 @@
}
@Override
- public NetworkVO getPrivateNetwork(final String broadcastUri, final String cidr, final long accountId, final long zoneId, Long networkOfferingId) {
+ public NetworkVO getPrivateNetwork(final String broadcastUri, final String cidr, final long accountId, final long zoneId, Long networkOfferingId, Long vpcId) {
if (networkOfferingId == null) {
networkOfferingId = _ntwkOffDao.findByUniqueName(NetworkOffering.SystemPrivateGatewayNetworkOffering).getId();
}
- final SearchCriteria<NetworkVO> sc = AllFieldsSearch.create();
+ final SearchCriteria<NetworkVO> sc = PrivateNetworkSearch.create();
sc.setParameters("datacenter", zoneId);
sc.setParameters("broadcastUri", broadcastUri);
sc.setParameters("cidr", cidr);
sc.setParameters("account", accountId);
sc.setParameters("offering", networkOfferingId);
+ sc.setJoinParameters("vpcgateways", "vpc", vpcId);
return findOneBy(sc);
}
@@ -697,4 +717,89 @@
sc_2.addAnd("removed", SearchCriteria.Op.EQ, null);
return this.search(sc_2, searchFilter_2);
}
+
+ @Override
+ public NetworkVO findByVlan(String vlan) {
+ SearchCriteria<NetworkVO> sc = AllFieldsSearch.create();
+ sc.setParameters("broadcastType", BroadcastDomainType.Vlan);
+ sc.setParameters("broadcastUri", BroadcastDomainType.Vlan.toUri(vlan));
+ return findOneBy(sc);
+ }
+
+ @Override
+ public List<NetworkVO> listByAccountIdNetworkName(final long accountId, final String name) {
+ final SearchCriteria<NetworkVO> sc = AllFieldsSearch.create();
+ sc.setParameters("account", accountId);
+ sc.setParameters("name", name);
+
+ return listBy(sc, null);
+ }
+
+ /**
+ * True when a requested PVLAN pair overlaps with any existing PVLAN pair within the same physical network, i.e when:
+ * - The requested exact PVLAN pair exists
+ * - The requested secondary VLAN ID is secondary VLAN ID of an existing PVLAN pair
+ * - The requested secondary VLAN ID is primary VLAN ID of an existing PVLAN pair
+ */
+ protected boolean isNetworkOverlappingRequestedPvlan(Integer existingPrimaryVlan, Integer existingSecondaryVlan, Network.PVlanType existingPvlanType,
+ Integer requestedPrimaryVlan, Integer requestedSecondaryVlan, Network.PVlanType requestedPvlanType) {
+ if (existingPrimaryVlan == null || existingSecondaryVlan == null || requestedPrimaryVlan == null || requestedSecondaryVlan == null) {
+ throw new CloudRuntimeException(String.format("Missing VLAN ID while checking PVLAN pair (%s, %s)" +
+ " against existing pair (%s, %s)", existingPrimaryVlan, existingSecondaryVlan, requestedPrimaryVlan, requestedSecondaryVlan));
+ }
+ boolean exactMatch = existingPrimaryVlan.equals(requestedPrimaryVlan) && existingSecondaryVlan.equals(requestedSecondaryVlan);
+ boolean secondaryVlanUsed = requestedPvlanType != Network.PVlanType.Promiscuous && requestedSecondaryVlan.equals(existingPrimaryVlan) || requestedSecondaryVlan.equals(existingSecondaryVlan);
+ boolean isolatedMax = false;
+ boolean promiscuousMax = false;
+ if (requestedPvlanType == Network.PVlanType.Isolated && existingPrimaryVlan.equals(requestedPrimaryVlan) && existingPvlanType.equals(Network.PVlanType.Isolated)) {
+ isolatedMax = true;
+ } else if (requestedPvlanType == Network.PVlanType.Promiscuous && existingPrimaryVlan.equals(requestedPrimaryVlan) && existingPvlanType == Network.PVlanType.Promiscuous) {
+ promiscuousMax = true;
+ }
+ return exactMatch || secondaryVlanUsed || isolatedMax || promiscuousMax;
+ }
+
+ protected Network.PVlanType getNetworkPvlanType(long networkId, List<Integer> existingPvlan) {
+ Network.PVlanType existingPvlanType = null;
+ NetworkDetailVO pvlanTypeDetail = networkDetailsDao.findDetail(networkId, ApiConstants.ISOLATED_PVLAN_TYPE);
+ if (pvlanTypeDetail != null) {
+ existingPvlanType = Network.PVlanType.valueOf(pvlanTypeDetail.getValue());
+ } else {
+ existingPvlanType = existingPvlan.get(0).equals(existingPvlan.get(1)) ? Network.PVlanType.Promiscuous : Network.PVlanType.Isolated;
+ }
+ return existingPvlanType;
+ }
+
+ @Override
+ public List<NetworkVO> listByPhysicalNetworkPvlan(long physicalNetworkId, String broadcastUri, Network.PVlanType pVlanType) {
+ final URI searchUri = BroadcastDomainType.fromString(broadcastUri);
+ if (!searchUri.getScheme().equalsIgnoreCase("pvlan")) {
+ throw new CloudRuntimeException("PVLAN requested but URI is not in the expected format: " + searchUri.toString());
+ }
+ final String searchRange = BroadcastDomainType.getValue(searchUri);
+ final List<Integer> searchVlans = UriUtils.expandPvlanUri(searchRange);
+ final List<NetworkVO> overlappingNetworks = new ArrayList<>();
+
+ final SearchCriteria<NetworkVO> sc = PhysicalNetworkSearch.create();
+ sc.setParameters("physicalNetworkId", physicalNetworkId);
+
+ for (final NetworkVO network : listBy(sc)) {
+ if (network.getBroadcastUri() == null || !network.getBroadcastUri().getScheme().equalsIgnoreCase("pvlan")) {
+ continue;
+ }
+ final String networkVlanRange = BroadcastDomainType.getValue(network.getBroadcastUri());
+ if (networkVlanRange == null || networkVlanRange.isEmpty()) {
+ continue;
+ }
+ List<Integer> existingPvlan = UriUtils.expandPvlanUri(networkVlanRange);
+ Network.PVlanType existingPvlanType = getNetworkPvlanType(network.getId(), existingPvlan);
+ if (isNetworkOverlappingRequestedPvlan(existingPvlan.get(0), existingPvlan.get(1), existingPvlanType,
+ searchVlans.get(0), searchVlans.get(1), pVlanType)) {
+ overlappingNetworks.add(network);
+ break;
+ }
+ }
+
+ return overlappingNetworks;
+ }
}
diff --git a/engine/schema/src/main/java/com/cloud/network/dao/NetworkVO.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkVO.java
index 0c0bd4d..6d59167 100644
--- a/engine/schema/src/main/java/com/cloud/network/dao/NetworkVO.java
+++ b/engine/schema/src/main/java/com/cloud/network/dao/NetworkVO.java
@@ -181,6 +181,9 @@
@Transient
boolean rollingRestart = false;
+ @Transient
+ PVlanType pVlanType;
+
public NetworkVO() {
uuid = UUID.randomUUID().toString();
}
@@ -661,4 +664,12 @@
public void setRollingRestart(boolean rollingRestart) {
this.rollingRestart = rollingRestart;
}
+
+ public PVlanType getPvlanType() {
+ return pVlanType;
+ }
+
+ public void setPvlanType(PVlanType pvlanType) {
+ this.pVlanType = pvlanType;
+ }
}
diff --git a/engine/schema/src/main/java/com/cloud/network/dao/RouterHealthCheckResultDao.java b/engine/schema/src/main/java/com/cloud/network/dao/RouterHealthCheckResultDao.java
new file mode 100644
index 0000000..66dcf68
--- /dev/null
+++ b/engine/schema/src/main/java/com/cloud/network/dao/RouterHealthCheckResultDao.java
@@ -0,0 +1,49 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.network.dao;
+
+import java.util.List;
+
+import com.cloud.utils.db.GenericDao;
+
+public interface RouterHealthCheckResultDao extends GenericDao<RouterHealthCheckResultVO, Long> {
+ /**
+ * @param routerId
+ * @return Returns all the health checks in the database for the given router id
+ */
+ List<RouterHealthCheckResultVO> getHealthCheckResults(long routerId);
+
+ boolean expungeHealthChecks(long routerId);
+
+ /**
+ * @param routerId
+ * @return true if there are checks that have been marked failed in the database
+ */
+ boolean hasFailingChecks(long routerId);
+
+ /**
+ * For a router, we have only one (check name, check type) possible as we keep the most
+ * recent check result. This method finds that last check result.
+ *
+ * @param routerId
+ * @param checkName
+ * @param checkType
+ * @return returns the check result for the routerId, check type and the check name.
+ */
+ RouterHealthCheckResultVO getRouterHealthCheckResult(long routerId, String checkName, String checkType);
+}
diff --git a/engine/schema/src/main/java/com/cloud/network/dao/RouterHealthCheckResultDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/RouterHealthCheckResultDaoImpl.java
new file mode 100644
index 0000000..991365b
--- /dev/null
+++ b/engine/schema/src/main/java/com/cloud/network/dao/RouterHealthCheckResultDaoImpl.java
@@ -0,0 +1,84 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.network.dao;
+
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
+import com.cloud.utils.db.GenericDaoBase;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
+
+@Component
+public class RouterHealthCheckResultDaoImpl extends GenericDaoBase<RouterHealthCheckResultVO, Long> implements RouterHealthCheckResultDao {
+ private final static Logger s_logger = Logger.getLogger(RouterHealthCheckResultDaoImpl.class);
+
+ private SearchBuilder<RouterHealthCheckResultVO> RouterChecksSearchBuilder;
+ private SearchBuilder<RouterHealthCheckResultVO> IsRouterFailingSearchBuilder;
+
+ protected RouterHealthCheckResultDaoImpl() {
+ super();
+ RouterChecksSearchBuilder = createSearchBuilder();
+ RouterChecksSearchBuilder.and("routerId", RouterChecksSearchBuilder.entity().getRouterId(), SearchCriteria.Op.EQ);
+ RouterChecksSearchBuilder.and("checkName", RouterChecksSearchBuilder.entity().getCheckName(), SearchCriteria.Op.EQ);
+ RouterChecksSearchBuilder.and("checkType", RouterChecksSearchBuilder.entity().getCheckType(), SearchCriteria.Op.EQ);
+ RouterChecksSearchBuilder.done();
+
+ IsRouterFailingSearchBuilder = createSearchBuilder();
+ IsRouterFailingSearchBuilder.and("routerId", IsRouterFailingSearchBuilder.entity().getRouterId(), SearchCriteria.Op.EQ);
+ IsRouterFailingSearchBuilder.and("checkResult", IsRouterFailingSearchBuilder.entity().getCheckResult(), SearchCriteria.Op.EQ);
+ IsRouterFailingSearchBuilder.done();
+ }
+
+ @Override
+ public List<RouterHealthCheckResultVO> getHealthCheckResults(long routerId) {
+ SearchCriteria<RouterHealthCheckResultVO> sc = RouterChecksSearchBuilder.create();
+ sc.setParameters("routerId", routerId);
+ return listBy(sc);
+ }
+
+ @Override
+ public boolean expungeHealthChecks(long routerId) {
+ SearchCriteria<RouterHealthCheckResultVO> sc = RouterChecksSearchBuilder.create();
+ sc.setParameters("routerId", routerId);
+ return expunge(sc) > 0;
+ }
+
+ @Override
+ public RouterHealthCheckResultVO getRouterHealthCheckResult(long routerId, String checkName, String checkType) {
+ SearchCriteria<RouterHealthCheckResultVO> sc = RouterChecksSearchBuilder.create();
+ sc.setParameters("routerId", routerId);
+ sc.setParameters("checkName", checkName);
+ sc.setParameters("checkType", checkType);
+ List<RouterHealthCheckResultVO> checks = listBy(sc);
+ if (checks.size() > 1) {
+ s_logger.error("Found multiple entries for router Id: " + routerId + ", check name: " + checkName);
+ }
+ return checks.isEmpty() ? null : checks.get(0);
+ }
+
+ @Override
+ public boolean hasFailingChecks(long routerId) {
+ SearchCriteria<RouterHealthCheckResultVO> sc = IsRouterFailingSearchBuilder.create();
+ sc.setParameters("routerId", routerId);
+ sc.setParameters("checkResult", false);
+ return !listBy(sc).isEmpty();
+ }
+}
diff --git a/engine/schema/src/main/java/com/cloud/network/dao/RouterHealthCheckResultVO.java b/engine/schema/src/main/java/com/cloud/network/dao/RouterHealthCheckResultVO.java
new file mode 100644
index 0000000..9803ccb
--- /dev/null
+++ b/engine/schema/src/main/java/com/cloud/network/dao/RouterHealthCheckResultVO.java
@@ -0,0 +1,129 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.network.dao;
+
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import com.cloud.network.RouterHealthCheckResult;
+import com.cloud.utils.StringUtils;
+
+@Entity
+@Table(name = "router_health_check")
+public class RouterHealthCheckResultVO implements RouterHealthCheckResult {
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "id", updatable = false, nullable = false)
+ private long id;
+
+ @Column(name = "router_id", updatable = false, nullable = false)
+ private long routerId;
+
+ @Column(name = "check_name", updatable = false, nullable = false)
+ private String checkName;
+
+ @Column(name = "check_type", updatable = false, nullable = false)
+ private String checkType;
+
+ @Column(name = "check_result")
+ private boolean checkResult;
+
+ @Temporal(TemporalType.TIMESTAMP)
+ @Column(name = "last_update", updatable = true, nullable = true)
+ private Date lastUpdateTime;
+
+ @Column(name = "check_details", updatable = true, nullable = true)
+ private byte[] checkDetails;
+
+ protected RouterHealthCheckResultVO() {
+ }
+
+ public RouterHealthCheckResultVO(long routerId, String checkName, String checkType) {
+ this.routerId = routerId;
+ this.checkName = checkName;
+ this.checkType = checkType;
+ }
+
+ public long getId() {
+ return id;
+ }
+
+ @Override
+ public long getRouterId() {
+ return routerId;
+ }
+
+ @Override
+ public String getCheckName() {
+ return checkName;
+ }
+
+ @Override
+ public String getCheckType() {
+ return checkType;
+ }
+
+ @Override
+ public boolean getCheckResult() {
+ return checkResult;
+ }
+
+ @Override
+ public Date getLastUpdateTime() {
+ return lastUpdateTime;
+ }
+
+ @Override
+ public String getParsedCheckDetails() {
+ return checkDetails != null ? new String(checkDetails, StringUtils.getPreferredCharset()) : "";
+ }
+
+ public byte[] getCheckDetails() {
+ return checkDetails;
+ }
+
+ public void setCheckResult(boolean checkResult) {
+ this.checkResult = checkResult;
+ }
+
+ public void setLastUpdateTime(Date lastUpdateTime) {
+ this.lastUpdateTime = lastUpdateTime;
+ }
+
+ public void setCheckDetails(byte[] checkDetails) {
+ this.checkDetails = checkDetails;
+ }
+
+ @Override
+ public String toString() {
+ return super.toString() +
+ "- check type: " + checkType +
+ ",check name: " + checkName +
+ ", check result: " + checkResult +
+ ", check last update: " + lastUpdateTime +
+ ", details: " + getParsedCheckDetails();
+ }
+}
diff --git a/engine/schema/src/main/java/com/cloud/network/security/SecurityGroupVO.java b/engine/schema/src/main/java/com/cloud/network/security/SecurityGroupVO.java
index 4a4c83a..3b7ceb8 100644
--- a/engine/schema/src/main/java/com/cloud/network/security/SecurityGroupVO.java
+++ b/engine/schema/src/main/java/com/cloud/network/security/SecurityGroupVO.java
@@ -70,6 +70,10 @@
return name;
}
+ public void setName(String name) {
+ this.name = name;
+ }
+
@Override
public String getDescription() {
return description;
diff --git a/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDao.java b/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDao.java
index 74728f8..623179c 100644
--- a/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDao.java
+++ b/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDao.java
@@ -48,7 +48,9 @@
boolean isDynamic(long serviceOfferingId);
- ServiceOfferingVO getcomputeOffering(ServiceOfferingVO serviceOffering, Map<String, String> customParameters);
+ ServiceOfferingVO getComputeOffering(ServiceOfferingVO serviceOffering, Map<String, String> customParameters);
ServiceOfferingVO findDefaultSystemOffering(String offeringName, Boolean useLocalStorage);
+
+ List<ServiceOfferingVO> listPublicByCpuAndMemory(Integer cpus, Integer memory);
}
diff --git a/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDaoImpl.java b/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDaoImpl.java
index 96b0c35..1440051 100644
--- a/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/service/dao/ServiceOfferingDaoImpl.java
@@ -51,6 +51,7 @@
protected final SearchBuilder<ServiceOfferingVO> UniqueNameSearch;
protected final SearchBuilder<ServiceOfferingVO> ServiceOfferingsByKeywordSearch;
+ protected final SearchBuilder<ServiceOfferingVO> PublicCpuRamSearch;
public ServiceOfferingDaoImpl() {
super();
@@ -64,6 +65,12 @@
ServiceOfferingsByKeywordSearch.or("name", ServiceOfferingsByKeywordSearch.entity().getName(), SearchCriteria.Op.EQ);
ServiceOfferingsByKeywordSearch.or("displayText", ServiceOfferingsByKeywordSearch.entity().getDisplayText(), SearchCriteria.Op.EQ);
ServiceOfferingsByKeywordSearch.done();
+
+ PublicCpuRamSearch = createSearchBuilder();
+ PublicCpuRamSearch.and("cpu", PublicCpuRamSearch.entity().getCpu(), SearchCriteria.Op.EQ);
+ PublicCpuRamSearch.and("ram", PublicCpuRamSearch.entity().getRamSize(), SearchCriteria.Op.EQ);
+ PublicCpuRamSearch.and("system_use", PublicCpuRamSearch.entity().isSystemUse(), SearchCriteria.Op.EQ);
+ PublicCpuRamSearch.done();
}
@Override
@@ -161,7 +168,7 @@
throw new CloudRuntimeException("missing argument vmId");
}
Map<String, String> dynamicOffering = userVmDetailsDao.listDetailsKeyPairs(vmId);
- return getcomputeOffering(offering, dynamicOffering);
+ return getComputeOffering(offering, dynamicOffering);
}
return offering;
}
@@ -175,7 +182,7 @@
throw new CloudRuntimeException("missing argument vmId");
}
Map<String, String> dynamicOffering = userVmDetailsDao.listDetailsKeyPairs(vmId);
- return getcomputeOffering(offering, dynamicOffering);
+ return getComputeOffering(offering, dynamicOffering);
}
return offering;
}
@@ -187,7 +194,7 @@
}
@Override
- public ServiceOfferingVO getcomputeOffering(ServiceOfferingVO serviceOffering, Map<String, String> customParameters) {
+ public ServiceOfferingVO getComputeOffering(ServiceOfferingVO serviceOffering, Map<String, String> customParameters) {
ServiceOfferingVO dummyoffering = new ServiceOfferingVO(serviceOffering);
dummyoffering.setDynamicFlag(true);
if (customParameters.containsKey(UsageEventVO.DynamicParameters.cpuNumber.name())) {
@@ -246,4 +253,13 @@
}
return serviceOffering;
}
+
+ @Override
+ public List<ServiceOfferingVO> listPublicByCpuAndMemory(Integer cpus, Integer memory) {
+ SearchCriteria<ServiceOfferingVO> sc = PublicCpuRamSearch.create();
+ sc.setParameters("cpu", cpus);
+ sc.setParameters("ram", memory);
+ sc.setParameters("system_use", false);
+ return listBy(sc);
+ }
}
diff --git a/engine/schema/src/main/java/com/cloud/storage/VMTemplateVO.java b/engine/schema/src/main/java/com/cloud/storage/VMTemplateVO.java
index 30440d3..af04099 100644
--- a/engine/schema/src/main/java/com/cloud/storage/VMTemplateVO.java
+++ b/engine/schema/src/main/java/com/cloud/storage/VMTemplateVO.java
@@ -230,6 +230,13 @@
return template;
}
+ public static VMTemplateVO createSystemIso(Long id, String uniqueName, String name, boolean isPublic,
+ String url, boolean requiresHvm, int bits, long accountId, String cksum,
+ String displayText, boolean enablePassword, long guestOSId) {
+ return new VMTemplateVO(id, uniqueName, name, ImageFormat.ISO, isPublic, false, TemplateType.SYSTEM, url, null, requiresHvm, bits, accountId, cksum, displayText, enablePassword,
+ guestOSId, false, null);
+ }
+
public VMTemplateVO(Long id, String uniqueName, String name, ImageFormat format, boolean isPublic, boolean featured, TemplateType type, String url, Date created,
boolean requiresHvm, int bits, long accountId, String cksum, String displayText, boolean enablePassword, long guestOSId, boolean bootable,
HypervisorType hyperType) {
diff --git a/engine/schema/src/main/java/com/cloud/storage/dao/DiskOfferingDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/DiskOfferingDao.java
index 89e2c83..3305752 100644
--- a/engine/schema/src/main/java/com/cloud/storage/dao/DiskOfferingDao.java
+++ b/engine/schema/src/main/java/com/cloud/storage/dao/DiskOfferingDao.java
@@ -19,6 +19,7 @@
import java.util.List;
import com.cloud.storage.DiskOfferingVO;
+import com.cloud.storage.Storage;
import com.cloud.utils.db.GenericDao;
public interface DiskOfferingDao extends GenericDao<DiskOfferingVO, Long> {
@@ -31,4 +32,6 @@
DiskOfferingVO persistDeafultDiskOffering(DiskOfferingVO offering);
+ List<DiskOfferingVO> listAllBySizeAndProvisioningType(long size, Storage.ProvisioningType provisioningType);
+
}
diff --git a/engine/schema/src/main/java/com/cloud/storage/dao/DiskOfferingDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/DiskOfferingDaoImpl.java
index d93a052..b9fa10c 100644
--- a/engine/schema/src/main/java/com/cloud/storage/dao/DiskOfferingDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/storage/dao/DiskOfferingDaoImpl.java
@@ -16,6 +16,10 @@
// under the License.
package com.cloud.storage.dao;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -27,12 +31,15 @@
import com.cloud.offering.DiskOffering.Type;
import com.cloud.storage.DiskOfferingVO;
+import com.cloud.storage.Storage;
import com.cloud.utils.db.Attribute;
import com.cloud.utils.db.Filter;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
+import com.cloud.utils.db.TransactionLegacy;
+import com.cloud.utils.exception.CloudRuntimeException;
@Component
public class DiskOfferingDaoImpl extends GenericDaoBase<DiskOfferingVO, Long> implements DiskOfferingDao {
@@ -43,7 +50,11 @@
private final SearchBuilder<DiskOfferingVO> PrivateDiskOfferingSearch;
private final SearchBuilder<DiskOfferingVO> PublicDiskOfferingSearch;
protected final SearchBuilder<DiskOfferingVO> UniqueNameSearch;
+ private final String SizeDiskOfferingSearch = "SELECT * FROM disk_offering WHERE " +
+ "disk_size = ? AND provisioning_type = ? AND removed IS NULL";
+
private final Attribute _typeAttr;
+ protected final static long GB_UNIT_BYTES = 1024 * 1024 * 1024;
protected DiskOfferingDaoImpl() {
PrivateDiskOfferingSearch = createSearchBuilder();
@@ -132,6 +143,36 @@
}
}
+ protected long getClosestDiskSizeInGB(long sizeInBytes) {
+ if (sizeInBytes < 0) {
+ throw new CloudRuntimeException("Disk size should be greater than 0 bytes, received: " + sizeInBytes + " bytes");
+ }
+ return (long) Math.ceil(1.0 * sizeInBytes / GB_UNIT_BYTES);
+ }
+
+ @Override
+ public List<DiskOfferingVO> listAllBySizeAndProvisioningType(long size, Storage.ProvisioningType provisioningType) {
+ StringBuilder sql = new StringBuilder(SizeDiskOfferingSearch);
+ TransactionLegacy txn = TransactionLegacy.currentTxn();
+ List<DiskOfferingVO> offerings = new ArrayList<>();
+ try(PreparedStatement pstmt = txn.prepareStatement(sql.toString());){
+ if(pstmt != null) {
+ pstmt.setLong(1, size);
+ pstmt.setString(2, provisioningType.toString());
+ try(ResultSet rs = pstmt.executeQuery()) {
+ while (rs.next()) {
+ offerings.add(toEntityBean(rs, false));
+ }
+ } catch (SQLException e) {
+ throw new CloudRuntimeException("Exception while listing disk offerings by size: " + e.getMessage(), e);
+ }
+ }
+ return offerings;
+ } catch (SQLException e) {
+ throw new CloudRuntimeException("Exception while listing disk offerings by size: " + e.getMessage(), e);
+ }
+ }
+
@Override
public boolean remove(Long id) {
DiskOfferingVO diskOffering = createForUpdate();
diff --git a/engine/schema/src/main/java/com/cloud/storage/dao/GuestOSHypervisorDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/GuestOSHypervisorDao.java
index a777516..cd00703 100644
--- a/engine/schema/src/main/java/com/cloud/storage/dao/GuestOSHypervisorDao.java
+++ b/engine/schema/src/main/java/com/cloud/storage/dao/GuestOSHypervisorDao.java
@@ -29,4 +29,6 @@
boolean removeGuestOsMapping(Long id);
GuestOSHypervisorVO findByOsIdAndHypervisorAndUserDefined(long guestOsId, String hypervisorType, String hypervisorVersion, boolean isUserDefined);
+
+ GuestOSHypervisorVO findByOsNameAndHypervisor(String guestOsName, String hypervisorType, String hypervisorVersion);
}
diff --git a/engine/schema/src/main/java/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java
index 29471f9..699ce0b 100644
--- a/engine/schema/src/main/java/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java
@@ -17,12 +17,14 @@
package com.cloud.storage.dao;
import java.util.Date;
+import java.util.List;
-
+import org.apache.commons.collections.CollectionUtils;
import org.springframework.stereotype.Component;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.storage.GuestOSHypervisorVO;
+import com.cloud.utils.db.Filter;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
@@ -33,6 +35,7 @@
protected final SearchBuilder<GuestOSHypervisorVO> guestOsSearch;
protected final SearchBuilder<GuestOSHypervisorVO> mappingSearch;
protected final SearchBuilder<GuestOSHypervisorVO> userDefinedMappingSearch;
+ protected final SearchBuilder<GuestOSHypervisorVO> guestOsNameSearch;
protected GuestOSHypervisorDaoImpl() {
guestOsSearch = createSearchBuilder();
@@ -51,6 +54,12 @@
userDefinedMappingSearch.and("hypervisor_version", userDefinedMappingSearch.entity().getHypervisorVersion(), SearchCriteria.Op.EQ);
userDefinedMappingSearch.and("is_user_defined", userDefinedMappingSearch.entity().getIsUserDefined(), SearchCriteria.Op.EQ);
userDefinedMappingSearch.done();
+
+ guestOsNameSearch = createSearchBuilder();
+ guestOsNameSearch.and("guest_os_name", guestOsNameSearch.entity().getGuestOsName(), SearchCriteria.Op.EQ);
+ guestOsNameSearch.and("hypervisor_type", guestOsNameSearch.entity().getHypervisorType(), SearchCriteria.Op.EQ);
+ guestOsNameSearch.and("hypervisor_version", guestOsNameSearch.entity().getHypervisorVersion(), SearchCriteria.Op.EQ);
+ guestOsNameSearch.done();
}
@Override
@@ -97,4 +106,19 @@
return super.remove(id);
}
+ @Override
+ public GuestOSHypervisorVO findByOsNameAndHypervisor(String guestOsName, String hypervisorType, String hypervisorVersion) {
+ SearchCriteria<GuestOSHypervisorVO> sc = guestOsNameSearch.create();
+ String version = "default";
+ if (!(hypervisorVersion == null || hypervisorVersion.isEmpty())) {
+ version = hypervisorVersion;
+ }
+ sc.setParameters("guest_os_name", guestOsName);
+ sc.setParameters("hypervisor_type", hypervisorType);
+ sc.setParameters("hypervisor_version", version);
+ final Filter filter = new Filter(GuestOSHypervisorVO.class, "guestOsId", true, null, null);
+ List<GuestOSHypervisorVO> results = listIncludingRemovedBy(sc, filter);
+ return CollectionUtils.isNotEmpty(results) ? results.get(0) : null;
+ }
+
}
diff --git a/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDaoImpl.java
index dd1f2fc..6773c20 100644
--- a/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDaoImpl.java
@@ -345,7 +345,7 @@
readySystemTemplateSearch.and("state", readySystemTemplateSearch.entity().getState(), SearchCriteria.Op.EQ);
readySystemTemplateSearch.and("templateType", readySystemTemplateSearch.entity().getTemplateType(), SearchCriteria.Op.EQ);
SearchBuilder<TemplateDataStoreVO> templateDownloadSearch = _templateDataStoreDao.createSearchBuilder();
- templateDownloadSearch.and("downloadState", templateDownloadSearch.entity().getDownloadState(), SearchCriteria.Op.EQ);
+ templateDownloadSearch.and("downloadState", templateDownloadSearch.entity().getDownloadState(), SearchCriteria.Op.IN);
readySystemTemplateSearch.join("vmTemplateJoinTemplateStoreRef", templateDownloadSearch, templateDownloadSearch.entity().getTemplateId(),
readySystemTemplateSearch.entity().getId(), JoinBuilder.JoinType.INNER);
SearchBuilder<HostVO> hostHyperSearch2 = _hostDao.createSearchBuilder();
@@ -860,7 +860,7 @@
sc.setParameters("state", VirtualMachineTemplate.State.Active);
sc.setJoinParameters("tmplHyper", "type", Host.Type.Routing);
sc.setJoinParameters("tmplHyper", "zoneId", zoneId);
- sc.setJoinParameters("vmTemplateJoinTemplateStoreRef", "downloadState", VMTemplateStorageResourceAssoc.Status.DOWNLOADED);
+ sc.setJoinParameters("vmTemplateJoinTemplateStoreRef", "downloadState", new VMTemplateStorageResourceAssoc.Status[] {VMTemplateStorageResourceAssoc.Status.DOWNLOADED, VMTemplateStorageResourceAssoc.Status.BYPASSED});
// order by descending order of id
List<VMTemplateVO> tmplts = listBy(sc, new Filter(VMTemplateVO.class, "id", false, null, null));
diff --git a/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplatePoolDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplatePoolDao.java
index 6216ef7..05afad6 100644
--- a/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplatePoolDao.java
+++ b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplatePoolDao.java
@@ -48,4 +48,8 @@
boolean templateAvailable(long templateId, long poolId);
public VMTemplateStoragePoolVO findByHostTemplate(Long hostId, Long templateId);
+
+ VMTemplateStoragePoolVO findByPoolPath(Long poolId, String path);
+
+ List<VMTemplateStoragePoolVO> listByTemplatePath(String templatePath);
}
diff --git a/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java
index bb3985f..3287470 100644
--- a/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java
@@ -59,6 +59,7 @@
protected final SearchBuilder<VMTemplateStoragePoolVO> TemplateStatesSearch;
protected final SearchBuilder<VMTemplateStoragePoolVO> TemplatePoolStateSearch;
protected final SearchBuilder<VMTemplateStoragePoolVO> updateStateSearch;
+ protected final SearchBuilder<VMTemplateStoragePoolVO> templatePathSearch;
protected static final String UPDATE_TEMPLATE_HOST_REF = "UPDATE template_spool_ref SET download_state = ?, download_pct= ?, last_updated = ? "
+ ", error_str = ?, local_path = ?, job_id = ? " + "WHERE pool_id = ? and template_id = ?";
@@ -114,6 +115,12 @@
updateStateSearch.and("state", updateStateSearch.entity().getState(), Op.EQ);
updateStateSearch.and("updatedCount", updateStateSearch.entity().getUpdatedCount(), Op.EQ);
updateStateSearch.done();
+
+ templatePathSearch = createSearchBuilder();
+ templatePathSearch.and("pool_id", templatePathSearch.entity().getPoolId(), Op.EQ);
+ templatePathSearch.and("local_path", templatePathSearch.entity().getLocalDownloadPath(), Op.EQ);
+ templatePathSearch.and("install_path", templatePathSearch.entity().getInstallPath(), Op.EQ);
+ templatePathSearch.done();
}
@Override
@@ -261,6 +268,23 @@
}
@Override
+ public VMTemplateStoragePoolVO findByPoolPath(Long poolId, String path) {
+ SearchCriteria<VMTemplateStoragePoolVO> sc = templatePathSearch.create();
+ sc.setParameters("local_path", path);
+ sc.setParameters("install_path", path);
+ sc.setParameters("pool_id", poolId);
+ return findOneBy(sc);
+ }
+
+ @Override
+ public List<VMTemplateStoragePoolVO> listByTemplatePath(String templatePath) {
+ SearchCriteria<VMTemplateStoragePoolVO> sc = templatePathSearch.create();
+ sc.setParameters("local_path", templatePath);
+ sc.setParameters("install_path", templatePath);
+ return listBy(sc);
+ }
+
+ @Override
public boolean updateState(State currentState, Event event, State nextState, DataObjectInStore vo, Object data) {
VMTemplateStoragePoolVO templatePool = (VMTemplateStoragePoolVO)vo;
Long oldUpdated = templatePool.getUpdatedCount();
diff --git a/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateZoneDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateZoneDao.java
index 67f7c3f..66f474a 100644
--- a/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateZoneDao.java
+++ b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateZoneDao.java
@@ -22,14 +22,15 @@
import com.cloud.utils.db.GenericDao;
public interface VMTemplateZoneDao extends GenericDao<VMTemplateZoneVO, Long> {
- public List<VMTemplateZoneVO> listByZoneId(long id);
+ List<VMTemplateZoneVO> listByZoneId(long id);
- public List<VMTemplateZoneVO> listByTemplateId(long templateId);
+ List<VMTemplateZoneVO> listByTemplateId(long templateId);
- public VMTemplateZoneVO findByZoneTemplate(long zoneId, long templateId);
+ VMTemplateZoneVO findByZoneTemplate(long zoneId, long templateId);
- public List<VMTemplateZoneVO> listByZoneTemplate(Long zoneId, long templateId);
+ List<VMTemplateZoneVO> listByZoneTemplate(Long zoneId, long templateId);
- public void deletePrimaryRecordsForTemplate(long templateId);
+ void deletePrimaryRecordsForTemplate(long templateId);
+ void deleteByZoneId(long zoneId);
}
diff --git a/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java
index 21b3150..489ac13 100644
--- a/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java
@@ -93,4 +93,13 @@
txn.commit();
}
+ @Override
+ public void deleteByZoneId(long zoneId) {
+ SearchCriteria<VMTemplateZoneVO> sc = ZoneSearch.create();
+ sc.setParameters("zone_id", zoneId);
+ TransactionLegacy txn = TransactionLegacy.currentTxn();
+ txn.start();
+ remove(sc);
+ txn.commit();
+ }
}
diff --git a/engine/schema/src/main/java/com/cloud/storage/dao/VolumeDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/VolumeDao.java
index 14f48ea..b410f48 100644
--- a/engine/schema/src/main/java/com/cloud/storage/dao/VolumeDao.java
+++ b/engine/schema/src/main/java/com/cloud/storage/dao/VolumeDao.java
@@ -46,6 +46,8 @@
List<VolumeVO> findByInstanceAndType(long id, Volume.Type vType);
+ List<VolumeVO> findIncludingRemovedByInstanceAndType(long id, Volume.Type vType);
+
List<VolumeVO> findByInstanceIdAndPoolId(long instanceId, long poolId);
List<VolumeVO> findByInstanceIdDestroyed(long vmId);
@@ -96,6 +98,8 @@
List<Long> listZoneWidePoolIdsByVolumeCount(long dcId, long accountId);
+ List<VolumeVO> findIncludingRemovedByZone(long zoneId);
+
/**
* Gets the Total Primary Storage space allocated for an account
*
diff --git a/engine/schema/src/main/java/com/cloud/storage/dao/VolumeDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/VolumeDaoImpl.java
index 7c63b9c..12e658a 100644
--- a/engine/schema/src/main/java/com/cloud/storage/dao/VolumeDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/storage/dao/VolumeDaoImpl.java
@@ -122,7 +122,7 @@
public List<VolumeVO> findByPoolId(long poolId) {
SearchCriteria<VolumeVO> sc = AllFieldsSearch.create();
sc.setParameters("poolId", poolId);
- sc.setParameters("notDestroyed", Volume.State.Destroy);
+ sc.setParameters("notDestroyed", Volume.State.Destroy, Volume.State.Expunged);
sc.setParameters("vType", Volume.Type.ROOT.toString());
return listBy(sc);
}
@@ -132,7 +132,7 @@
SearchCriteria<VolumeVO> sc = AllFieldsSearch.create();
sc.setParameters("instanceId", instanceId);
sc.setParameters("poolId", poolId);
- sc.setParameters("notDestroyed", Volume.State.Destroy);
+ sc.setParameters("notDestroyed", Volume.State.Destroy, Volume.State.Expunged);
return listBy(sc);
}
@@ -148,7 +148,7 @@
public List<VolumeVO> findByPoolId(long poolId, Volume.Type volumeType) {
SearchCriteria<VolumeVO> sc = AllFieldsSearch.create();
sc.setParameters("poolId", poolId);
- sc.setParameters("notDestroyed", Volume.State.Destroy);
+ sc.setParameters("notDestroyed", Volume.State.Destroy, Volume.State.Expunged);
if (volumeType != null) {
sc.setParameters("vType", volumeType.toString());
@@ -191,6 +191,16 @@
}
@Override
+ public List<VolumeVO> findIncludingRemovedByInstanceAndType(long id, Type vType) {
+ SearchCriteria<VolumeVO> sc = AllFieldsSearch.create();
+ sc.setParameters("instanceId", id);
+ if (vType != null) {
+ sc.setParameters("vType", vType.toString());
+ }
+ return listIncludingRemovedBy(sc);
+ }
+
+ @Override
public List<VolumeVO> findByInstanceIdDestroyed(long vmId) {
SearchCriteria<VolumeVO> sc = AllFieldsSearch.create();
sc.setParameters("instanceId", vmId);
@@ -349,7 +359,7 @@
AllFieldsSearch.and("vType", AllFieldsSearch.entity().getVolumeType(), Op.EQ);
AllFieldsSearch.and("id", AllFieldsSearch.entity().getId(), Op.EQ);
AllFieldsSearch.and("destroyed", AllFieldsSearch.entity().getState(), Op.EQ);
- AllFieldsSearch.and("notDestroyed", AllFieldsSearch.entity().getState(), Op.NEQ);
+ AllFieldsSearch.and("notDestroyed", AllFieldsSearch.entity().getState(), Op.NIN);
AllFieldsSearch.and("updateTime", AllFieldsSearch.entity().getUpdated(), SearchCriteria.Op.LT);
AllFieldsSearch.and("updatedCount", AllFieldsSearch.entity().getUpdatedCount(), Op.EQ);
AllFieldsSearch.and("name", AllFieldsSearch.entity().getName(), Op.EQ);
@@ -410,6 +420,7 @@
primaryStorageSearch.cp();
primaryStorageSearch.and("displayVolume", primaryStorageSearch.entity().isDisplayVolume(), Op.EQ);
primaryStorageSearch.and("isRemoved", primaryStorageSearch.entity().getRemoved(), Op.NULL);
+ primaryStorageSearch.and("NotCountStates", primaryStorageSearch.entity().getState(), Op.NIN);
primaryStorageSearch.done();
primaryStorageSearch2 = createSearchBuilder(SumCount.class);
@@ -423,6 +434,7 @@
primaryStorageSearch2.cp();
primaryStorageSearch2.and("displayVolume", primaryStorageSearch2.entity().isDisplayVolume(), Op.EQ);
primaryStorageSearch2.and("isRemoved", primaryStorageSearch2.entity().getRemoved(), Op.NULL);
+ primaryStorageSearch2.and("NotCountStates", primaryStorageSearch2.entity().getState(), Op.NIN);
primaryStorageSearch2.done();
secondaryStorageSearch = createSearchBuilder(SumCount.class);
@@ -448,7 +460,7 @@
public Long countAllocatedVolumesForAccount(long accountId) {
SearchCriteria<Long> sc = CountByAccount.create();
sc.setParameters("account", accountId);
- sc.setParameters("state", Volume.State.Destroy);
+ sc.setParameters("state", Volume.State.Destroy, Volume.State.Expunged);
sc.setParameters("displayVolume", 1);
return customSearch(sc, null).get(0);
}
@@ -464,6 +476,7 @@
}
sc.setParameters("accountId", accountId);
sc.setParameters("states", State.Allocated);
+ sc.setParameters("NotCountStates", State.Destroy, State.Expunged);
sc.setParameters("displayVolume", 1);
List<SumCount> storageSpace = customSearch(sc, null);
if (storageSpace != null) {
@@ -596,6 +609,13 @@
}
@Override
+ public List<VolumeVO> findIncludingRemovedByZone(long zoneId) {
+ SearchCriteria<VolumeVO> sc = AllFieldsSearch.create();
+ sc.setParameters("dcId", zoneId);
+ return searchIncludingRemoved(sc, null, null, false);
+ }
+
+ @Override
@DB()
public Pair<Long, Long> getNonDestroyedCountAndTotalByPool(long poolId) {
SearchCriteria<SumCount> sc = TotalSizeByPoolSearch.create();
diff --git a/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java b/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
index 301594d..eed2e2f 100644
--- a/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
+++ b/engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java
@@ -67,6 +67,7 @@
import com.cloud.upgrade.dao.Upgrade41120to41200;
import com.cloud.upgrade.dao.Upgrade41200to41300;
import com.cloud.upgrade.dao.Upgrade41300to41310;
+import com.cloud.upgrade.dao.Upgrade41310to41400;
import com.cloud.upgrade.dao.Upgrade420to421;
import com.cloud.upgrade.dao.Upgrade421to430;
import com.cloud.upgrade.dao.Upgrade430to440;
@@ -189,6 +190,7 @@
.next("4.11.3.0", new Upgrade41120to41200())
.next("4.12.0.0", new Upgrade41200to41300())
.next("4.13.0.0", new Upgrade41300to41310())
+ .next("4.13.1.0", new Upgrade41310to41400())
.build();
}
diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41200to41300.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41200to41300.java
index 2f6faf2..2de8dc9 100644
--- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41200to41300.java
+++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41200to41300.java
@@ -19,23 +19,11 @@
import java.io.InputStream;
import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import org.apache.log4j.Logger;
-
-import com.cloud.hypervisor.Hypervisor;
import com.cloud.utils.exception.CloudRuntimeException;
public class Upgrade41200to41300 implements DbUpgrade {
- final static Logger LOG = Logger.getLogger(Upgrade41200to41300.class);
-
@Override
public String[] getUpgradableVersionRange() {
return new String[] {"4.12.0.0", "4.13.0.0"};
@@ -64,175 +52,6 @@
@Override
public void performDataMigration(Connection conn) {
- updateSystemVmTemplates(conn);
- }
-
- @SuppressWarnings("serial")
- private void updateSystemVmTemplates(final Connection conn) {
- LOG.debug("Updating System Vm template IDs");
- final Set<Hypervisor.HypervisorType> hypervisorsListInUse = new HashSet<Hypervisor.HypervisorType>();
- try (PreparedStatement pstmt = conn.prepareStatement("select distinct(hypervisor_type) from `cloud`.`cluster` where removed is null"); ResultSet rs = pstmt.executeQuery()) {
- while (rs.next()) {
- switch (Hypervisor.HypervisorType.getType(rs.getString(1))) {
- case XenServer:
- hypervisorsListInUse.add(Hypervisor.HypervisorType.XenServer);
- break;
- case KVM:
- hypervisorsListInUse.add(Hypervisor.HypervisorType.KVM);
- break;
- case VMware:
- hypervisorsListInUse.add(Hypervisor.HypervisorType.VMware);
- break;
- case Hyperv:
- hypervisorsListInUse.add(Hypervisor.HypervisorType.Hyperv);
- break;
- case LXC:
- hypervisorsListInUse.add(Hypervisor.HypervisorType.LXC);
- break;
- case Ovm3:
- hypervisorsListInUse.add(Hypervisor.HypervisorType.Ovm3);
- break;
- default:
- break;
- }
- }
- } catch (final SQLException e) {
- LOG.error("updateSystemVmTemplates: Exception caught while getting hypervisor types from clusters: " + e.getMessage());
- throw new CloudRuntimeException("updateSystemVmTemplates:Exception while getting hypervisor types from clusters", e);
- }
-
- final Map<Hypervisor.HypervisorType, String> NewTemplateNameList = new HashMap<Hypervisor.HypervisorType, String>() {
- {
- put(Hypervisor.HypervisorType.KVM, "systemvm-kvm-4.11.3");
- put(Hypervisor.HypervisorType.VMware, "systemvm-vmware-4.11.3");
- put(Hypervisor.HypervisorType.XenServer, "systemvm-xenserver-4.11.3");
- put(Hypervisor.HypervisorType.Hyperv, "systemvm-hyperv-4.11.3");
- put(Hypervisor.HypervisorType.LXC, "systemvm-lxc-4.11.3");
- put(Hypervisor.HypervisorType.Ovm3, "systemvm-ovm3-4.11.3");
- }
- };
-
- final Map<Hypervisor.HypervisorType, String> routerTemplateConfigurationNames = new HashMap<Hypervisor.HypervisorType, String>() {
- {
- put(Hypervisor.HypervisorType.KVM, "router.template.kvm");
- put(Hypervisor.HypervisorType.VMware, "router.template.vmware");
- put(Hypervisor.HypervisorType.XenServer, "router.template.xenserver");
- put(Hypervisor.HypervisorType.Hyperv, "router.template.hyperv");
- put(Hypervisor.HypervisorType.LXC, "router.template.lxc");
- put(Hypervisor.HypervisorType.Ovm3, "router.template.ovm3");
- }
- };
-
- final Map<Hypervisor.HypervisorType, String> newTemplateUrl = new HashMap<Hypervisor.HypervisorType, String>() {
- {
- put(Hypervisor.HypervisorType.KVM, "https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.3-kvm.qcow2.bz2");
- put(Hypervisor.HypervisorType.VMware, "https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.3-vmware.ova");
- put(Hypervisor.HypervisorType.XenServer, "https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.3-xen.vhd.bz2");
- put(Hypervisor.HypervisorType.Hyperv, "https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.3-hyperv.vhd.zip");
- put(Hypervisor.HypervisorType.LXC, "https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.3-kvm.qcow2.bz2");
- put(Hypervisor.HypervisorType.Ovm3, "https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.3-ovm.raw.bz2");
- }
- };
-
- final Map<Hypervisor.HypervisorType, String> newTemplateChecksum = new HashMap<Hypervisor.HypervisorType, String>() {
- {
- put(Hypervisor.HypervisorType.KVM, "15ec268d0939a8fa0be1bc79f397a167");
- put(Hypervisor.HypervisorType.XenServer, "ae96f35fb746524edc4ebc9856719d71");
- put(Hypervisor.HypervisorType.VMware, "f50c82139430afce7e4e46d3a585abbd");
- put(Hypervisor.HypervisorType.Hyperv, "abf411f6cdd9139716b5d8172ab903a6");
- put(Hypervisor.HypervisorType.LXC, "15ec268d0939a8fa0be1bc79f397a167");
- put(Hypervisor.HypervisorType.Ovm3, "c71f143a477f4c7a0d5e8c82ccb00220");
- }
- };
-
- for (final Map.Entry<Hypervisor.HypervisorType, String> hypervisorAndTemplateName : NewTemplateNameList.entrySet()) {
- LOG.debug("Updating " + hypervisorAndTemplateName.getKey() + " System Vms");
- try (PreparedStatement pstmt = conn.prepareStatement("select id from `cloud`.`vm_template` where name = ? and removed is null order by id desc limit 1")) {
- // Get 4.11 systemvm template id for corresponding hypervisor
- long templateId = -1;
- pstmt.setString(1, hypervisorAndTemplateName.getValue());
- try (ResultSet rs = pstmt.executeQuery()) {
- if (rs.next()) {
- templateId = rs.getLong(1);
- }
- } catch (final SQLException e) {
- LOG.error("updateSystemVmTemplates: Exception caught while getting ids of templates: " + e.getMessage());
- throw new CloudRuntimeException("updateSystemVmTemplates: Exception caught while getting ids of templates", e);
- }
-
- // change template type to SYSTEM
- if (templateId != -1) {
- try (PreparedStatement templ_type_pstmt = conn.prepareStatement("update `cloud`.`vm_template` set type='SYSTEM' where id = ?");) {
- templ_type_pstmt.setLong(1, templateId);
- templ_type_pstmt.executeUpdate();
- } catch (final SQLException e) {
- LOG.error("updateSystemVmTemplates:Exception while updating template with id " + templateId + " to be marked as 'system': " + e.getMessage());
- throw new CloudRuntimeException("updateSystemVmTemplates:Exception while updating template with id " + templateId + " to be marked as 'system'", e);
- }
- // update template ID of system Vms
- try (PreparedStatement update_templ_id_pstmt = conn
- .prepareStatement("update `cloud`.`vm_instance` set vm_template_id = ? where type <> 'User' and hypervisor_type = ? and removed is NULL");) {
- update_templ_id_pstmt.setLong(1, templateId);
- update_templ_id_pstmt.setString(2, hypervisorAndTemplateName.getKey().toString());
- update_templ_id_pstmt.executeUpdate();
- } catch (final Exception e) {
- LOG.error("updateSystemVmTemplates:Exception while setting template for " + hypervisorAndTemplateName.getKey().toString() + " to " + templateId
- + ": " + e.getMessage());
- throw new CloudRuntimeException("updateSystemVmTemplates:Exception while setting template for " + hypervisorAndTemplateName.getKey().toString() + " to "
- + templateId, e);
- }
-
- // Change value of global configuration parameter
- // router.template.* for the corresponding hypervisor
- try (PreparedStatement update_pstmt = conn.prepareStatement("UPDATE `cloud`.`configuration` SET value = ? WHERE name = ?");) {
- update_pstmt.setString(1, hypervisorAndTemplateName.getValue());
- update_pstmt.setString(2, routerTemplateConfigurationNames.get(hypervisorAndTemplateName.getKey()));
- update_pstmt.executeUpdate();
- } catch (final SQLException e) {
- LOG.error("updateSystemVmTemplates:Exception while setting " + routerTemplateConfigurationNames.get(hypervisorAndTemplateName.getKey()) + " to "
- + hypervisorAndTemplateName.getValue() + ": " + e.getMessage());
- throw new CloudRuntimeException("updateSystemVmTemplates:Exception while setting "
- + routerTemplateConfigurationNames.get(hypervisorAndTemplateName.getKey()) + " to " + hypervisorAndTemplateName.getValue(), e);
- }
-
- // Change value of global configuration parameter
- // minreq.sysvmtemplate.version for the ACS version
- try (PreparedStatement update_pstmt = conn.prepareStatement("UPDATE `cloud`.`configuration` SET value = ? WHERE name = ?");) {
- update_pstmt.setString(1, "4.11.3");
- update_pstmt.setString(2, "minreq.sysvmtemplate.version");
- update_pstmt.executeUpdate();
- } catch (final SQLException e) {
- LOG.error("updateSystemVmTemplates:Exception while setting 'minreq.sysvmtemplate.version' to 4.11.3: " + e.getMessage());
- throw new CloudRuntimeException("updateSystemVmTemplates:Exception while setting 'minreq.sysvmtemplate.version' to 4.11.3", e);
- }
- } else {
- if (hypervisorsListInUse.contains(hypervisorAndTemplateName.getKey())) {
- throw new CloudRuntimeException(getUpgradedVersion() + hypervisorAndTemplateName.getKey() + " SystemVm template not found. Cannot upgrade system Vms");
- } else {
- LOG.warn(getUpgradedVersion() + hypervisorAndTemplateName.getKey() + " SystemVm template not found. " + hypervisorAndTemplateName.getKey()
- + " hypervisor is not used, so not failing upgrade");
- // Update the latest template URLs for corresponding
- // hypervisor
- try (PreparedStatement update_templ_url_pstmt = conn
- .prepareStatement("UPDATE `cloud`.`vm_template` SET url = ? , checksum = ? WHERE hypervisor_type = ? AND type = 'SYSTEM' AND removed is null order by id desc limit 1");) {
- update_templ_url_pstmt.setString(1, newTemplateUrl.get(hypervisorAndTemplateName.getKey()));
- update_templ_url_pstmt.setString(2, newTemplateChecksum.get(hypervisorAndTemplateName.getKey()));
- update_templ_url_pstmt.setString(3, hypervisorAndTemplateName.getKey().toString());
- update_templ_url_pstmt.executeUpdate();
- } catch (final SQLException e) {
- LOG.error("updateSystemVmTemplates:Exception while updating 'url' and 'checksum' for hypervisor type "
- + hypervisorAndTemplateName.getKey().toString() + ": " + e.getMessage());
- throw new CloudRuntimeException("updateSystemVmTemplates:Exception while updating 'url' and 'checksum' for hypervisor type "
- + hypervisorAndTemplateName.getKey().toString(), e);
- }
- }
- }
- } catch (final SQLException e) {
- LOG.error("updateSystemVmTemplates:Exception while getting ids of templates: " + e.getMessage());
- throw new CloudRuntimeException("updateSystemVmTemplates:Exception while getting ids of templates", e);
- }
- }
- LOG.debug("Updating System Vm Template IDs Complete");
}
@Override
diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41310to41400.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41310to41400.java
new file mode 100644
index 0000000..0ce6809
--- /dev/null
+++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41310to41400.java
@@ -0,0 +1,248 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.upgrade.dao;
+
+import java.io.InputStream;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.log4j.Logger;
+
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+public class Upgrade41310to41400 implements DbUpgrade {
+
+ final static Logger LOG = Logger.getLogger(Upgrade41310to41400.class);
+
+ @Override
+ public String[] getUpgradableVersionRange() {
+ return new String[] {"4.13.1.0", "4.14.0.0"};
+ }
+
+ @Override
+ public String getUpgradedVersion() {
+ return "4.14.0.0";
+ }
+
+ @Override
+ public boolean supportsRollingUpgrade() {
+ return false;
+ }
+
+ @Override
+ public InputStream[] getPrepareScripts() {
+ final String scriptFile = "META-INF/db/schema-41310to41400.sql";
+ final InputStream script = Thread.currentThread().getContextClassLoader().getResourceAsStream(scriptFile);
+ if (script == null) {
+ throw new CloudRuntimeException("Unable to find " + scriptFile);
+ }
+
+ return new InputStream[] {script};
+ }
+
+ @Override
+ public void performDataMigration(Connection conn) {
+ updateSystemVmTemplates(conn);
+ }
+
+ @SuppressWarnings("serial")
+ private void updateSystemVmTemplates(final Connection conn) {
+ LOG.debug("Updating System Vm template IDs");
+ final Set<Hypervisor.HypervisorType> hypervisorsListInUse = new HashSet<Hypervisor.HypervisorType>();
+ try (PreparedStatement pstmt = conn.prepareStatement("select distinct(hypervisor_type) from `cloud`.`cluster` where removed is null"); ResultSet rs = pstmt.executeQuery()) {
+ while (rs.next()) {
+ switch (Hypervisor.HypervisorType.getType(rs.getString(1))) {
+ case XenServer:
+ hypervisorsListInUse.add(Hypervisor.HypervisorType.XenServer);
+ break;
+ case KVM:
+ hypervisorsListInUse.add(Hypervisor.HypervisorType.KVM);
+ break;
+ case VMware:
+ hypervisorsListInUse.add(Hypervisor.HypervisorType.VMware);
+ break;
+ case Hyperv:
+ hypervisorsListInUse.add(Hypervisor.HypervisorType.Hyperv);
+ break;
+ case LXC:
+ hypervisorsListInUse.add(Hypervisor.HypervisorType.LXC);
+ break;
+ case Ovm3:
+ hypervisorsListInUse.add(Hypervisor.HypervisorType.Ovm3);
+ break;
+ default:
+ break;
+ }
+ }
+ } catch (final SQLException e) {
+ LOG.error("updateSystemVmTemplates: Exception caught while getting hypervisor types from clusters: " + e.getMessage());
+ throw new CloudRuntimeException("updateSystemVmTemplates:Exception while getting hypervisor types from clusters", e);
+ }
+
+ final Map<Hypervisor.HypervisorType, String> NewTemplateNameList = new HashMap<Hypervisor.HypervisorType, String>() {
+ {
+ put(Hypervisor.HypervisorType.KVM, "systemvm-kvm-4.14.0");
+ put(Hypervisor.HypervisorType.VMware, "systemvm-vmware-4.14.0");
+ put(Hypervisor.HypervisorType.XenServer, "systemvm-xenserver-4.14.0");
+ put(Hypervisor.HypervisorType.Hyperv, "systemvm-hyperv-4.14.0");
+ put(Hypervisor.HypervisorType.LXC, "systemvm-lxc-4.14.0");
+ put(Hypervisor.HypervisorType.Ovm3, "systemvm-ovm3-4.14.0");
+ }
+ };
+
+ final Map<Hypervisor.HypervisorType, String> routerTemplateConfigurationNames = new HashMap<Hypervisor.HypervisorType, String>() {
+ {
+ put(Hypervisor.HypervisorType.KVM, "router.template.kvm");
+ put(Hypervisor.HypervisorType.VMware, "router.template.vmware");
+ put(Hypervisor.HypervisorType.XenServer, "router.template.xenserver");
+ put(Hypervisor.HypervisorType.Hyperv, "router.template.hyperv");
+ put(Hypervisor.HypervisorType.LXC, "router.template.lxc");
+ put(Hypervisor.HypervisorType.Ovm3, "router.template.ovm3");
+ }
+ };
+
+ final Map<Hypervisor.HypervisorType, String> newTemplateUrl = new HashMap<Hypervisor.HypervisorType, String>() {
+ {
+ put(Hypervisor.HypervisorType.KVM, "https://download.cloudstack.org/systemvm/4.14/systemvmtemplate-4.14.0-kvm.qcow2.bz2");
+ put(Hypervisor.HypervisorType.VMware, "https://download.cloudstack.org/systemvm/4.14/systemvmtemplate-4.14.0-vmware.ova");
+ put(Hypervisor.HypervisorType.XenServer, "https://download.cloudstack.org/systemvm/4.14/systemvmtemplate-4.14.0-xen.vhd.bz2");
+ put(Hypervisor.HypervisorType.Hyperv, "https://download.cloudstack.org/systemvm/4.14/systemvmtemplate-4.14.0-hyperv.vhd.zip");
+ put(Hypervisor.HypervisorType.LXC, "https://download.cloudstack.org/systemvm/4.14/systemvmtemplate-4.14.0-kvm.qcow2.bz2");
+ put(Hypervisor.HypervisorType.Ovm3, "https://download.cloudstack.org/systemvm/4.14/systemvmtemplate-4.14.0-ovm.raw.bz2");
+ }
+ };
+
+ final Map<Hypervisor.HypervisorType, String> newTemplateChecksum = new HashMap<Hypervisor.HypervisorType, String>() {
+ {
+ put(Hypervisor.HypervisorType.KVM, "d15ed159be32151b07e3211caf9cb802");
+ put(Hypervisor.HypervisorType.XenServer, "fcaf1abc9aa62e7ed75f62b3092a01a2");
+ put(Hypervisor.HypervisorType.VMware, "eb39f8b5a556dfc93c6be23ae45f34e1");
+ put(Hypervisor.HypervisorType.Hyperv, "b4e91c14958e0fca9470695b0be05f99");
+ put(Hypervisor.HypervisorType.LXC, "d15ed159be32151b07e3211caf9cb802");
+ put(Hypervisor.HypervisorType.Ovm3, "1f97f4beb30af8cda886f1e977514704");
+ }
+ };
+
+ for (final Map.Entry<Hypervisor.HypervisorType, String> hypervisorAndTemplateName : NewTemplateNameList.entrySet()) {
+ LOG.debug("Updating " + hypervisorAndTemplateName.getKey() + " System Vms");
+ try (PreparedStatement pstmt = conn.prepareStatement("select id from `cloud`.`vm_template` where name = ? and removed is null order by id desc limit 1")) {
+ // Get 4.11 systemvm template id for corresponding hypervisor
+ long templateId = -1;
+ pstmt.setString(1, hypervisorAndTemplateName.getValue());
+ try (ResultSet rs = pstmt.executeQuery()) {
+ if (rs.next()) {
+ templateId = rs.getLong(1);
+ }
+ } catch (final SQLException e) {
+ LOG.error("updateSystemVmTemplates: Exception caught while getting ids of templates: " + e.getMessage());
+ throw new CloudRuntimeException("updateSystemVmTemplates: Exception caught while getting ids of templates", e);
+ }
+
+ // change template type to SYSTEM
+ if (templateId != -1) {
+ try (PreparedStatement templ_type_pstmt = conn.prepareStatement("update `cloud`.`vm_template` set type='SYSTEM' where id = ?");) {
+ templ_type_pstmt.setLong(1, templateId);
+ templ_type_pstmt.executeUpdate();
+ } catch (final SQLException e) {
+ LOG.error("updateSystemVmTemplates:Exception while updating template with id " + templateId + " to be marked as 'system': " + e.getMessage());
+ throw new CloudRuntimeException("updateSystemVmTemplates:Exception while updating template with id " + templateId + " to be marked as 'system'", e);
+ }
+ // update template ID of system Vms
+ try (PreparedStatement update_templ_id_pstmt = conn
+ .prepareStatement("update `cloud`.`vm_instance` set vm_template_id = ? where type <> 'User' and hypervisor_type = ? and removed is NULL");) {
+ update_templ_id_pstmt.setLong(1, templateId);
+ update_templ_id_pstmt.setString(2, hypervisorAndTemplateName.getKey().toString());
+ update_templ_id_pstmt.executeUpdate();
+ } catch (final Exception e) {
+ LOG.error("updateSystemVmTemplates:Exception while setting template for " + hypervisorAndTemplateName.getKey().toString() + " to " + templateId
+ + ": " + e.getMessage());
+ throw new CloudRuntimeException("updateSystemVmTemplates:Exception while setting template for " + hypervisorAndTemplateName.getKey().toString() + " to "
+ + templateId, e);
+ }
+
+ // Change value of global configuration parameter
+ // router.template.* for the corresponding hypervisor
+ try (PreparedStatement update_pstmt = conn.prepareStatement("UPDATE `cloud`.`configuration` SET value = ? WHERE name = ?");) {
+ update_pstmt.setString(1, hypervisorAndTemplateName.getValue());
+ update_pstmt.setString(2, routerTemplateConfigurationNames.get(hypervisorAndTemplateName.getKey()));
+ update_pstmt.executeUpdate();
+ } catch (final SQLException e) {
+ LOG.error("updateSystemVmTemplates:Exception while setting " + routerTemplateConfigurationNames.get(hypervisorAndTemplateName.getKey()) + " to "
+ + hypervisorAndTemplateName.getValue() + ": " + e.getMessage());
+ throw new CloudRuntimeException("updateSystemVmTemplates:Exception while setting "
+ + routerTemplateConfigurationNames.get(hypervisorAndTemplateName.getKey()) + " to " + hypervisorAndTemplateName.getValue(), e);
+ }
+
+ // Change value of global configuration parameter
+ // minreq.sysvmtemplate.version for the ACS version
+ try (PreparedStatement update_pstmt = conn.prepareStatement("UPDATE `cloud`.`configuration` SET value = ? WHERE name = ?");) {
+ update_pstmt.setString(1, "4.14.0");
+ update_pstmt.setString(2, "minreq.sysvmtemplate.version");
+ update_pstmt.executeUpdate();
+ } catch (final SQLException e) {
+ LOG.error("updateSystemVmTemplates:Exception while setting 'minreq.sysvmtemplate.version' to 4.14.0: " + e.getMessage());
+ throw new CloudRuntimeException("updateSystemVmTemplates:Exception while setting 'minreq.sysvmtemplate.version' to 4.14.0", e);
+ }
+ } else {
+ if (hypervisorsListInUse.contains(hypervisorAndTemplateName.getKey())) {
+ throw new CloudRuntimeException(getUpgradedVersion() + hypervisorAndTemplateName.getKey() + " SystemVm template not found. Cannot upgrade system Vms");
+ } else {
+ LOG.warn(getUpgradedVersion() + hypervisorAndTemplateName.getKey() + " SystemVm template not found. " + hypervisorAndTemplateName.getKey()
+ + " hypervisor is not used, so not failing upgrade");
+ // Update the latest template URLs for corresponding
+ // hypervisor
+ try (PreparedStatement update_templ_url_pstmt = conn
+ .prepareStatement("UPDATE `cloud`.`vm_template` SET url = ? , checksum = ? WHERE hypervisor_type = ? AND type = 'SYSTEM' AND removed is null order by id desc limit 1");) {
+ update_templ_url_pstmt.setString(1, newTemplateUrl.get(hypervisorAndTemplateName.getKey()));
+ update_templ_url_pstmt.setString(2, newTemplateChecksum.get(hypervisorAndTemplateName.getKey()));
+ update_templ_url_pstmt.setString(3, hypervisorAndTemplateName.getKey().toString());
+ update_templ_url_pstmt.executeUpdate();
+ } catch (final SQLException e) {
+ LOG.error("updateSystemVmTemplates:Exception while updating 'url' and 'checksum' for hypervisor type "
+ + hypervisorAndTemplateName.getKey().toString() + ": " + e.getMessage());
+ throw new CloudRuntimeException("updateSystemVmTemplates:Exception while updating 'url' and 'checksum' for hypervisor type "
+ + hypervisorAndTemplateName.getKey().toString(), e);
+ }
+ }
+ }
+ } catch (final SQLException e) {
+ LOG.error("updateSystemVmTemplates:Exception while getting ids of templates: " + e.getMessage());
+ throw new CloudRuntimeException("updateSystemVmTemplates:Exception while getting ids of templates", e);
+ }
+ }
+ LOG.debug("Updating System Vm Template IDs Complete");
+ }
+
+ @Override
+ public InputStream[] getCleanupScripts() {
+ final String scriptFile = "META-INF/db/schema-41310to41400-cleanup.sql";
+ final InputStream script = Thread.currentThread().getContextClassLoader().getResourceAsStream(scriptFile);
+ if (script == null) {
+ throw new CloudRuntimeException("Unable to find " + scriptFile);
+ }
+
+ return new InputStream[] {script};
+ }
+}
diff --git a/engine/schema/src/main/java/com/cloud/usage/UsageBackupVO.java b/engine/schema/src/main/java/com/cloud/usage/UsageBackupVO.java
new file mode 100644
index 0000000..43e3974
--- /dev/null
+++ b/engine/schema/src/main/java/com/cloud/usage/UsageBackupVO.java
@@ -0,0 +1,172 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.usage;
+
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import org.apache.cloudstack.api.InternalIdentity;
+
+@Entity
+@Table(name = "usage_backup")
+public class UsageBackupVO implements InternalIdentity {
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "id")
+ private Long id;
+
+ @Column(name = "zone_id")
+ private long zoneId;
+
+ @Column(name = "account_id")
+ private long accountId;
+
+ @Column(name = "domain_id")
+ private long domainId;
+
+ @Column(name = "vm_id")
+ private long vmId;
+
+ @Column(name = "backup_offering_id")
+ private long backupOfferingId;
+
+ @Column(name = "size")
+ private long size;
+
+ @Column(name = "protected_size")
+ private long protectedSize;
+
+ @Column(name = "created")
+ @Temporal(value = TemporalType.TIMESTAMP)
+ private Date created = null;
+
+ @Column(name = "removed")
+ @Temporal(value = TemporalType.TIMESTAMP)
+ private Date removed;
+
+ protected UsageBackupVO() {
+ }
+
+ public UsageBackupVO(long zoneId, long accountId, long domainId, long vmId, long backupOfferingId, Date created) {
+ this.zoneId = zoneId;
+ this.accountId = accountId;
+ this.domainId = domainId;
+ this.vmId = vmId;
+ this.backupOfferingId = backupOfferingId;
+ this.created = created;
+ }
+
+ public UsageBackupVO(long id, long zoneId, long accountId, long domainId, long vmId, long backupOfferingId, long size, long protectedSize, Date created, Date removed) {
+ this.id = id;
+ this.zoneId = zoneId;
+ this.accountId = accountId;
+ this.domainId = domainId;
+ this.vmId = vmId;
+ this.backupOfferingId = backupOfferingId;
+ this.size = size;
+ this.protectedSize = protectedSize;
+ this.created = created;
+ this.removed = removed;
+ }
+
+ @Override
+ public long getId() {
+ return id;
+ }
+
+ public long getZoneId() {
+ return zoneId;
+ }
+
+ public void setZoneId(long zoneId) {
+ this.zoneId = zoneId;
+ }
+
+ public long getAccountId() {
+ return accountId;
+ }
+
+ public void setAccountId(long accountId) {
+ this.accountId = accountId;
+ }
+
+ public long getDomainId() {
+ return domainId;
+ }
+
+ public void setDomainId(long domainId) {
+ this.domainId = domainId;
+ }
+
+ public long getVmId() {
+ return vmId;
+ }
+
+ public void setVmId(long vmId) {
+ this.vmId = vmId;
+ }
+
+ public long getBackupOfferingId() {
+ return backupOfferingId;
+ }
+
+ public void setBackupOfferingId(long backupOfferingId) {
+ this.backupOfferingId = backupOfferingId;
+ }
+
+ public long getSize() {
+ return size;
+ }
+
+ public void setSize(long size) {
+ this.size = size;
+ }
+
+ public long getProtectedSize() {
+ return protectedSize;
+ }
+
+ public void setProtectedSize(long protectedSize) {
+ this.protectedSize = protectedSize;
+ }
+
+ public Date getCreated() {
+ return created;
+ }
+
+ public void setCreated(Date created) {
+ this.created = created;
+ }
+
+ public Date getRemoved() {
+ return removed;
+ }
+
+ public void setRemoved(Date removed) {
+ this.removed = removed;
+ }
+}
diff --git a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageBackupDao.java
similarity index 60%
copy from agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
copy to engine/schema/src/main/java/com/cloud/usage/dao/UsageBackupDao.java
index b244d02..8a72182 100644
--- a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
+++ b/engine/schema/src/main/java/com/cloud/usage/dao/UsageBackupDao.java
@@ -1,4 +1,3 @@
-//
// 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
@@ -15,22 +14,17 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-//
-package com.cloud.agent.direct.download;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+package com.cloud.usage.dao;
-@RunWith(MockitoJUnitRunner.class)
-public class DirectTemplateDownloaderImplTest {
+import java.util.Date;
+import java.util.List;
- private static final Long templateId = 202l;
+import com.cloud.usage.UsageBackupVO;
+import com.cloud.utils.db.GenericDao;
- @Test
- public void testGetDirectDownloadTempPath() {
- String path = DirectTemplateDownloaderImpl.getDirectDownloadTempPath(templateId);
- Assert.assertEquals("template/2/202", path);
- }
+public interface UsageBackupDao extends GenericDao<UsageBackupVO, Long> {
+ void updateMetrics(Long vmId, Long size, Long virtualSize);
+ void removeUsage(Long accountId, Long vmId, Date eventDate);
+ List<UsageBackupVO> getUsageRecords(Long accountId, Date startDate, Date endDate);
}
diff --git a/engine/schema/src/main/java/com/cloud/usage/dao/UsageBackupDaoImpl.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageBackupDaoImpl.java
new file mode 100644
index 0000000..712f818
--- /dev/null
+++ b/engine/schema/src/main/java/com/cloud/usage/dao/UsageBackupDaoImpl.java
@@ -0,0 +1,138 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.usage.dao;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.TimeZone;
+
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
+import com.cloud.exception.CloudException;
+import com.cloud.usage.UsageBackupVO;
+import com.cloud.utils.DateUtil;
+import com.cloud.utils.db.GenericDaoBase;
+import com.cloud.utils.db.SearchCriteria;
+import com.cloud.utils.db.TransactionLegacy;
+
+@Component
+public class UsageBackupDaoImpl extends GenericDaoBase<UsageBackupVO, Long> implements UsageBackupDao {
+ public static final Logger LOGGER = Logger.getLogger(UsageBackupDaoImpl.class);
+ protected static final String UPDATE_DELETED = "UPDATE usage_backup SET removed = ? WHERE account_id = ? AND vm_id = ? and removed IS NULL";
+ protected static final String GET_USAGE_RECORDS_BY_ACCOUNT = "SELECT id, zone_id, account_id, domain_id, vm_id, backup_offering_id, size, protected_size, created, removed FROM usage_backup WHERE " +
+ " account_id = ? AND ((removed IS NULL AND created <= ?) OR (created BETWEEN ? AND ?) OR (removed BETWEEN ? AND ?) " +
+ " OR ((created <= ?) AND (removed >= ?)))";
+
+ @Override
+ public void updateMetrics(final Long vmId, final Long size, final Long virtualSize) {
+ try (TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.USAGE_DB)) {
+ SearchCriteria<UsageBackupVO> sc = this.createSearchCriteria();
+ sc.addAnd("vmId", SearchCriteria.Op.EQ, vmId);
+ UsageBackupVO vo = findOneBy(sc);
+ if (vo != null) {
+ vo.setSize(size);
+ vo.setProtectedSize(virtualSize);
+ update(vo.getId(), vo);
+ }
+ } catch (final Exception e) {
+ LOGGER.error("Error updating backup metrics: " + e.getMessage(), e);
+ }
+ }
+
+ @Override
+ public void removeUsage(Long accountId, Long vmId, Date eventDate) {
+ TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.USAGE_DB);
+ try {
+ txn.start();
+ try (PreparedStatement pstmt = txn.prepareStatement(UPDATE_DELETED);) {
+ if (pstmt != null) {
+ pstmt.setString(1, DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"), eventDate));
+ pstmt.setLong(2, accountId);
+ pstmt.setLong(3, vmId);
+ pstmt.executeUpdate();
+ }
+ } catch (SQLException e) {
+ LOGGER.error("Error removing UsageBackupVO: " + e.getMessage(), e);
+ throw new CloudException("Remove backup usage exception: " + e.getMessage(), e);
+ }
+ txn.commit();
+ } catch (Exception e) {
+ txn.rollback();
+ LOGGER.error("Exception caught while removing UsageBackupVO: " + e.getMessage(), e);
+ } finally {
+ txn.close();
+ }
+ }
+
+ @Override
+ public List<UsageBackupVO> getUsageRecords(Long accountId, Date startDate, Date endDate) {
+ List<UsageBackupVO> usageRecords = new ArrayList<UsageBackupVO>();
+ TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.USAGE_DB);
+ PreparedStatement pstmt;
+ try {
+ int i = 1;
+ pstmt = txn.prepareAutoCloseStatement(GET_USAGE_RECORDS_BY_ACCOUNT);
+ pstmt.setLong(i++, accountId);
+
+ pstmt.setString(i++, DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"), endDate));
+ pstmt.setString(i++, DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"), startDate));
+ pstmt.setString(i++, DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"), endDate));
+ pstmt.setString(i++, DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"), startDate));
+ pstmt.setString(i++, DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"), endDate));
+ pstmt.setString(i++, DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"), startDate));
+ pstmt.setString(i++, DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"), endDate));
+
+ ResultSet rs = pstmt.executeQuery();
+ while (rs.next()) {
+ //id, zone_id, account_id, domain_id, vm_id, disk_offering_id, size, created, processed
+ Long id = Long.valueOf(rs.getLong(1));
+ Long zoneId = Long.valueOf(rs.getLong(2));
+ Long acctId = Long.valueOf(rs.getLong(3));
+ Long domId = Long.valueOf(rs.getLong(4));
+ Long vmId = Long.valueOf(rs.getLong(5));
+ Long backupOfferingId = Long.valueOf(rs.getLong(6));
+ Long size = Long.valueOf(rs.getLong(7));
+ Long pSize = Long.valueOf(rs.getLong(8));
+ Date createdDate = null;
+ Date removedDate = null;
+ String createdTS = rs.getString(9);
+ String removedTS = rs.getString(10);
+
+ if (createdTS != null) {
+ createdDate = DateUtil.parseDateString(s_gmtTimeZone, createdTS);
+ }
+ if (removedTS != null) {
+ removedDate = DateUtil.parseDateString(s_gmtTimeZone, removedTS);
+ }
+ usageRecords.add(new UsageBackupVO(id, zoneId, acctId, domId, vmId, backupOfferingId, size, pSize, createdDate, removedDate));
+ }
+ } catch (Exception e) {
+ txn.rollback();
+ LOGGER.warn("Error getting VM backup usage records", e);
+ } finally {
+ txn.close();
+ }
+
+ return usageRecords;
+ }
+}
diff --git a/engine/schema/src/main/java/com/cloud/vm/VMInstanceVO.java b/engine/schema/src/main/java/com/cloud/vm/VMInstanceVO.java
index b0ebf24..5c81e55 100644
--- a/engine/schema/src/main/java/com/cloud/vm/VMInstanceVO.java
+++ b/engine/schema/src/main/java/com/cloud/vm/VMInstanceVO.java
@@ -16,14 +16,14 @@
// under the License.
package com.cloud.vm;
-import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.utils.db.Encrypt;
-import com.cloud.utils.db.GenericDao;
-import com.cloud.utils.db.StateMachine;
-import com.cloud.utils.fsm.FiniteStateObject;
-import com.cloud.vm.VirtualMachine.State;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.log4j.Logger;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
import javax.persistence.Column;
import javax.persistence.DiscriminatorColumn;
@@ -39,11 +39,19 @@
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Transient;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.util.Date;
-import java.util.Map;
-import java.util.UUID;
+
+import org.apache.cloudstack.backup.Backup;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.log4j.Logger;
+
+import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.utils.db.Encrypt;
+import com.cloud.utils.db.GenericDao;
+import com.cloud.utils.db.StateMachine;
+import com.cloud.utils.fsm.FiniteStateObject;
+import com.cloud.vm.VirtualMachine.State;
+import com.google.common.base.Strings;
+import com.google.gson.Gson;
@Entity
@Table(name = "vm_instance")
@@ -186,6 +194,15 @@
@Column(name = "power_host", updatable = true)
protected Long powerHostId;
+ @Column(name = "backup_offering_id")
+ protected Long backupOfferingId;
+
+ @Column(name = "backup_external_id")
+ protected String backupExternalId;
+
+ @Column(name = "backup_volumes")
+ protected String backupVolumes;
+
public VMInstanceVO(long id, long serviceOfferingId, String name, String instanceName, Type type, Long vmTemplateId, HypervisorType hypervisorType, long guestOSId,
long domainId, long accountId, long userId, boolean haEnabled) {
this.id = id;
@@ -483,6 +500,10 @@
this.details = details;
}
+ public void setRemoved(Date removed) {
+ this.removed = removed;
+ }
+
transient String toString;
@Override
@@ -573,4 +594,38 @@
public PartitionType partitionType() {
return PartitionType.VM;
}
+
+ public long getUserId() {
+ return userId;
+ }
+
+ @Override
+ public Long getBackupOfferingId() {
+ return backupOfferingId;
+ }
+
+ public void setBackupOfferingId(Long backupOfferingId) {
+ this.backupOfferingId = backupOfferingId;
+ }
+
+ @Override
+ public String getBackupExternalId() {
+ return backupExternalId;
+ }
+
+ public void setBackupExternalId(String backupExternalId) {
+ this.backupExternalId = backupExternalId;
+ }
+
+ @Override
+ public List<Backup.VolumeInfo> getBackupVolumeList() {
+ if (Strings.isNullOrEmpty(this.backupVolumes)) {
+ return Collections.emptyList();
+ }
+ return Arrays.asList(new Gson().fromJson(this.backupVolumes, Backup.VolumeInfo[].class));
+ }
+
+ public void setBackupVolumes(String backupVolumes) {
+ this.backupVolumes = backupVolumes;
+ }
}
diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/NicDao.java b/engine/schema/src/main/java/com/cloud/vm/dao/NicDao.java
index df4fb06..f06fb0f 100644
--- a/engine/schema/src/main/java/com/cloud/vm/dao/NicDao.java
+++ b/engine/schema/src/main/java/com/cloud/vm/dao/NicDao.java
@@ -50,6 +50,8 @@
NicVO findDefaultNicForVM(long instanceId);
+ NicVO findFirstNicForVM(long instanceId);
+
/**
* @param networkId
* @param instanceId
@@ -84,4 +86,6 @@
Long getPeerRouterId(String publicMacAddress, long routerId);
List<NicVO> listByVmIdAndKeyword(long instanceId, String keyword);
+
+ NicVO findByInstanceIdAndMacAddress(long instanceId, String macAddress);
}
diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/NicDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/NicDaoImpl.java
index c125d80..18630e8 100644
--- a/engine/schema/src/main/java/com/cloud/vm/dao/NicDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/vm/dao/NicDaoImpl.java
@@ -69,6 +69,7 @@
AllFieldsSearch.and("strategy", AllFieldsSearch.entity().getReservationStrategy(), Op.EQ);
AllFieldsSearch.and("reserverName",AllFieldsSearch.entity().getReserver(),Op.EQ);
AllFieldsSearch.and("macAddress", AllFieldsSearch.entity().getMacAddress(), Op.EQ);
+ AllFieldsSearch.and("deviceid", AllFieldsSearch.entity().getDeviceId(), Op.EQ);
AllFieldsSearch.done();
IpSearch = createSearchBuilder(String.class);
@@ -223,6 +224,14 @@
}
@Override
+ public NicVO findFirstNicForVM(long instanceId) {
+ SearchCriteria<NicVO> sc = AllFieldsSearch.create();
+ sc.setParameters("instance", instanceId);
+ sc.setParameters("deviceid", 0);
+ return findOneBy(sc);
+ }
+
+ @Override
public NicVO getControlNicForVM(long vmId){
SearchCriteria<NicVO> sc = AllFieldsSearch.create();
sc.setParameters("instance", vmId);
@@ -355,4 +364,12 @@
sc.setParameters("address", "%" + keyword + "%");
return listBy(sc);
}
+
+ @Override
+ public NicVO findByInstanceIdAndMacAddress(long instanceId, String macAddress) {
+ SearchCriteria<NicVO> sc = AllFieldsSearch.create();
+ sc.setParameters("instance", instanceId);
+ sc.setParameters("macAddress", macAddress);
+ return findOneBy(sc);
+ }
}
diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDao.java b/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDao.java
index dfcc7f7..0b1f936 100644
--- a/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDao.java
+++ b/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDao.java
@@ -77,7 +77,7 @@
List<Long> listPodIdsHavingVmsforAccount(long zoneId, long accountId);
- public Long countAllocatedVMsForAccount(long accountId);
+ public Long countAllocatedVMsForAccount(long accountId, boolean runningVMsonly);
Hashtable<Long, UserVmData> listVmDetails(Hashtable<Long, UserVmData> userVmData);
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..28940d7 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
@@ -635,11 +635,14 @@
}
@Override
- public Long countAllocatedVMsForAccount(long accountId) {
+ public Long countAllocatedVMsForAccount(long accountId, boolean runningVMsonly) {
SearchCriteria<Long> sc = CountByAccount.create();
sc.setParameters("account", accountId);
sc.setParameters("type", VirtualMachine.Type.User);
- sc.setParameters("state", new Object[] {State.Destroyed, State.Error, State.Expunging});
+ if (runningVMsonly)
+ sc.setParameters("state", new Object[] {State.Destroyed, State.Error, State.Expunging, State.Stopped});
+ else
+ sc.setParameters("state", new Object[] {State.Destroyed, State.Error, State.Expunging});
sc.setParameters("displayVm", 1);
return customSearch(sc, null).get(0);
}
diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDao.java b/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDao.java
index a7ed922..2052fd2 100755
--- a/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDao.java
+++ b/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDao.java
@@ -86,6 +86,8 @@
VMInstanceVO findVMByInstanceName(String name);
+ VMInstanceVO findVMByInstanceNameIncludingRemoved(String name);
+
VMInstanceVO findVMByHostName(String hostName);
void updateProxyId(long id, Long proxyId, Date time);
@@ -100,6 +102,8 @@
List<VMInstanceVO> listByLastHostId(Long hostId);
+ List<VMInstanceVO> listByLastHostIdAndStates(Long hostId, State... states);
+
List<VMInstanceVO> listByTypeAndState(VirtualMachine.Type type, State state);
List<VMInstanceVO> listByAccountId(long accountId);
@@ -112,6 +116,8 @@
List<VMInstanceVO> listVmsMigratingFromHost(Long hostId);
+ List<VMInstanceVO> listByZoneWithBackups(Long zoneId, Long backupOfferingId);
+
public Long countActiveByHostId(long hostId);
Pair<List<Long>, Map<Long, Double>> listClusterIdsInZoneByVmCount(long zoneId, long accountId);
diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDaoImpl.java
index e4f5dba..1d7d444 100755
--- a/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDaoImpl.java
@@ -94,6 +94,8 @@
protected SearchBuilder<VMInstanceVO> HostAndStateSearch;
protected SearchBuilder<VMInstanceVO> StartingWithNoHostSearch;
protected SearchBuilder<VMInstanceVO> NotMigratingSearch;
+ protected SearchBuilder<VMInstanceVO> BackupSearch;
+ protected SearchBuilder<VMInstanceVO> LastHostAndStatesSearch;
@Inject
ResourceTagDao _tagsDao;
@@ -286,6 +288,17 @@
NotMigratingSearch.and("lastHost", NotMigratingSearch.entity().getLastHostId(), Op.EQ);
NotMigratingSearch.and("state", NotMigratingSearch.entity().getState(), Op.NEQ);
NotMigratingSearch.done();
+
+ BackupSearch = createSearchBuilder();
+ BackupSearch.and("zone_id", BackupSearch.entity().getDataCenterId(), Op.EQ);
+ BackupSearch.and("backup_offering_not_null", BackupSearch.entity().getBackupOfferingId(), Op.NNULL);
+ BackupSearch.and("backup_offering_id", BackupSearch.entity().getBackupOfferingId(), Op.EQ);
+ BackupSearch.done();
+
+ LastHostAndStatesSearch = createSearchBuilder();
+ LastHostAndStatesSearch.and("lastHost", LastHostAndStatesSearch.entity().getLastHostId(), Op.EQ);
+ LastHostAndStatesSearch.and("states", LastHostAndStatesSearch.entity().getState(), Op.IN);
+ LastHostAndStatesSearch.done();
}
@Override
@@ -451,6 +464,13 @@
}
@Override
+ public VMInstanceVO findVMByInstanceNameIncludingRemoved(String name) {
+ SearchCriteria<VMInstanceVO> sc = InstanceNameSearch.create();
+ sc.setParameters("instanceName", name);
+ return findOneIncludingRemovedBy(sc);
+ }
+
+ @Override
public VMInstanceVO findVMByHostName(String hostName) {
SearchCriteria<VMInstanceVO> sc = HostNameSearch.create();
sc.setParameters("hostName", hostName);
@@ -561,6 +581,14 @@
}
@Override
+ public List<VMInstanceVO> listByLastHostIdAndStates(Long hostId, State... states) {
+ SearchCriteria<VMInstanceVO> sc = LastHostAndStatesSearch.create();
+ sc.setParameters("lastHost", hostId);
+ sc.setParameters("states", (Object[])states);
+ return listBy(sc);
+ }
+
+ @Override
public List<Long> findIdsOfAllocatedVirtualRoutersForAccount(long accountId) {
SearchCriteria<Long> sc = FindIdsOfVirtualRoutersByAccount.create();
sc.setParameters("account", accountId);
@@ -578,6 +606,16 @@
}
@Override
+ public List<VMInstanceVO> listByZoneWithBackups(Long zoneId, Long backupOfferingId) {
+ SearchCriteria<VMInstanceVO> sc = BackupSearch.create();
+ sc.setParameters("zone_id", zoneId);
+ if (backupOfferingId != null) {
+ sc.setParameters("backup_offering_id", backupOfferingId);
+ }
+ return listBy(sc);
+ }
+
+ @Override
public Long countActiveByHostId(long hostId) {
SearchCriteria<Long> sc = CountActiveByHost.create();
sc.setParameters("host", hostId);
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/backup/BackupOfferingVO.java b/engine/schema/src/main/java/org/apache/cloudstack/backup/BackupOfferingVO.java
new file mode 100644
index 0000000..c5d8790
--- /dev/null
+++ b/engine/schema/src/main/java/org/apache/cloudstack/backup/BackupOfferingVO.java
@@ -0,0 +1,126 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.backup;
+
+import java.util.Date;
+import java.util.UUID;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+@Entity
+@Table(name = "backup_offering")
+public class BackupOfferingVO implements BackupOffering {
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "id")
+ private long id;
+
+ @Column(name = "uuid")
+ private String uuid;
+
+ @Column(name = "name")
+ private String name;
+
+ @Column(name = "description")
+ private String description;
+
+ @Column(name = "external_id")
+ private String externalId;
+
+ @Column(name = "zone_id")
+ private long zoneId;
+
+ @Column(name = "user_driven_backup")
+ private boolean userDrivenBackupAllowed;
+
+ @Column(name = "provider")
+ private String provider;
+
+ @Column(name = "created")
+ @Temporal(value = TemporalType.TIMESTAMP)
+ private Date created;
+
+ @Column(name = "removed")
+ @Temporal(value = TemporalType.TIMESTAMP)
+ private Date removed;
+
+ public BackupOfferingVO() {
+ this.uuid = UUID.randomUUID().toString();
+ }
+
+ public BackupOfferingVO(final long zoneId, final String externalId, final String provider, final String name, final String description, final boolean userDrivenBackupAllowed) {
+ this();
+ this.name = name;
+ this.description = description;
+ this.zoneId = zoneId;
+ this.provider = provider;
+ this.externalId = externalId;
+ this.userDrivenBackupAllowed = userDrivenBackupAllowed;
+ this.created = new Date();
+ }
+
+ public String getUuid() {
+ return uuid;
+ }
+
+ public long getId() {
+ return id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getExternalId() {
+ return externalId;
+ }
+
+ @Override
+ public long getZoneId() {
+ return zoneId;
+ }
+
+ @Override
+ public boolean isUserDrivenBackupAllowed() {
+ return userDrivenBackupAllowed;
+ }
+
+ public void setUserDrivenBackupAllowed(boolean userDrivenBackupAllowed) {
+ this.userDrivenBackupAllowed = userDrivenBackupAllowed;
+ }
+
+ @Override
+ public String getProvider() {
+ return provider;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public Date getCreated() {
+ return created;
+ }
+}
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/backup/BackupScheduleVO.java b/engine/schema/src/main/java/org/apache/cloudstack/backup/BackupScheduleVO.java
new file mode 100644
index 0000000..ba31dc5
--- /dev/null
+++ b/engine/schema/src/main/java/org/apache/cloudstack/backup/BackupScheduleVO.java
@@ -0,0 +1,124 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.backup;
+
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import com.cloud.utils.DateUtil;
+
+@Entity
+@Table(name = "backup_schedule")
+public class BackupScheduleVO implements BackupSchedule {
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "id")
+ private long id;
+
+ @Column(name = "vm_id")
+ private Long vmId;
+
+ @Column(name = "schedule_type")
+ private Short scheduleType;
+
+ @Column(name = "schedule")
+ String schedule;
+
+ @Column(name = "timezone")
+ String timezone;
+
+ @Column(name = "scheduled_timestamp")
+ @Temporal(value = TemporalType.TIMESTAMP)
+ Date scheduledTimestamp;
+
+ @Column(name = "async_job_id")
+ Long asyncJobId;
+
+ public BackupScheduleVO() {
+ }
+
+ public BackupScheduleVO(Long vmId, DateUtil.IntervalType scheduleType, String schedule, String timezone, Date scheduledTimestamp) {
+ this.vmId = vmId;
+ this.scheduleType = (short) scheduleType.ordinal();
+ this.schedule = schedule;
+ this.timezone = timezone;
+ this.scheduledTimestamp = scheduledTimestamp;
+ }
+
+ @Override
+ public long getId() {
+ return id;
+ }
+
+ public Long getVmId() {
+ return vmId;
+ }
+
+ public void setVmId(Long vmId) {
+ this.vmId = vmId;
+ }
+
+ @Override
+ public DateUtil.IntervalType getScheduleType() {
+ return scheduleType == null ? null : DateUtil.getIntervalType(scheduleType);
+ }
+
+ public void setScheduleType(Short intervalType) {
+ this.scheduleType = intervalType;
+ }
+
+ public String getSchedule() {
+ return schedule;
+ }
+
+ public void setSchedule(String schedule) {
+ this.schedule = schedule;
+ }
+
+ public String getTimezone() {
+ return timezone;
+ }
+
+ public void setTimezone(String timezone) {
+ this.timezone = timezone;
+ }
+
+ public Date getScheduledTimestamp() {
+ return scheduledTimestamp;
+ }
+
+ public void setScheduledTimestamp(Date scheduledTimestamp) {
+ this.scheduledTimestamp = scheduledTimestamp;
+ }
+
+ public Long getAsyncJobId() {
+ return asyncJobId;
+ }
+
+ public void setAsyncJobId(Long asyncJobId) {
+ this.asyncJobId = asyncJobId;
+ }
+}
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/backup/BackupVO.java b/engine/schema/src/main/java/org/apache/cloudstack/backup/BackupVO.java
new file mode 100644
index 0000000..e56f55c
--- /dev/null
+++ b/engine/schema/src/main/java/org/apache/cloudstack/backup/BackupVO.java
@@ -0,0 +1,190 @@
+//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
+//the License. You may obtain a copy of the License at
+//
+//http://www.apache.org/licenses/LICENSE-2.0
+//
+//Unless required by applicable law or agreed to in writing,
+//software distributed under the License is distributed on an
+//"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+//KIND, either express or implied. See the License for the
+//specific language governing permissions and limitations
+//under the License.
+
+package org.apache.cloudstack.backup;
+
+import java.util.UUID;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "backups")
+public class BackupVO implements Backup {
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "id")
+ private long id;
+
+ @Column(name = "uuid")
+ private String uuid;
+
+ @Column(name = "vm_id")
+ private long vmId;
+
+ @Column(name = "external_id")
+ private String externalId;
+
+ @Column(name = "type")
+ private String backupType;
+
+ @Column(name = "date")
+ private String date;
+
+ @Column(name = "size")
+ private Long size;
+
+ @Column(name = "protected_size")
+ private Long protectedSize;
+
+ @Enumerated(value = EnumType.STRING)
+ @Column(name = "status")
+ private Backup.Status status;
+
+ @Column(name = "backup_offering_id")
+ private long backupOfferingId;
+
+ @Column(name = "account_id")
+ private long accountId;
+
+ @Column(name = "domain_id")
+ private long domainId;
+
+ @Column(name = "zone_id")
+ private long zoneId;
+
+ public BackupVO() {
+ this.uuid = UUID.randomUUID().toString();
+ }
+
+ @Override
+ public long getId() {
+ return id;
+ }
+
+ @Override
+ public String getUuid() {
+ return uuid;
+ }
+
+ @Override
+ public long getVmId() {
+ return vmId;
+ }
+
+ public void setVmId(long vmId) {
+ this.vmId = vmId;
+ }
+
+ @Override
+ public String getExternalId() {
+ return externalId;
+ }
+
+ public void setExternalId(String externalId) {
+ this.externalId = externalId;
+ }
+
+ public String getType() {
+ return backupType;
+ }
+
+ public void setType(String type) {
+ this.backupType = type;
+ }
+
+ @Override
+ public String getDate() {
+ return date;
+ }
+
+ public void setDate(String date) {
+ this.date = date;
+ }
+
+ @Override
+ public Long getSize() {
+ return size;
+ }
+
+ public void setSize(Long size) {
+ this.size = size;
+ }
+
+ @Override
+ public Long getProtectedSize() {
+ return protectedSize;
+ }
+
+ public void setProtectedSize(Long protectedSize) {
+ this.protectedSize = protectedSize;
+ }
+
+ @Override
+ public Status getStatus() {
+ return status;
+ }
+
+ public void setStatus(Status status) {
+ this.status = status;
+ }
+
+ public long getBackupOfferingId() {
+ return backupOfferingId;
+ }
+
+ public void setBackupOfferingId(long backupOfferingId) {
+ this.backupOfferingId = backupOfferingId;
+ }
+
+ @Override
+ public long getAccountId() {
+ return accountId;
+ }
+
+ public void setAccountId(long accountId) {
+ this.accountId = accountId;
+ }
+
+ @Override
+ public long getDomainId() {
+ return domainId;
+ }
+
+ public void setDomainId(long domainId) {
+ this.domainId = domainId;
+ }
+
+ public long getZoneId() {
+ return zoneId;
+ }
+
+ public void setZoneId(long zoneId) {
+ this.zoneId = zoneId;
+ }
+
+ @Override
+ public Class<?> getEntityType() {
+ return Backup.class;
+ }
+}
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupDao.java b/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupDao.java
new file mode 100644
index 0000000..5d2f5ac
--- /dev/null
+++ b/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupDao.java
@@ -0,0 +1,40 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.backup.dao;
+
+import java.util.List;
+
+import org.apache.cloudstack.api.response.BackupResponse;
+import org.apache.cloudstack.backup.Backup;
+import org.apache.cloudstack.backup.BackupVO;
+
+import com.cloud.utils.db.GenericDao;
+
+public interface BackupDao extends GenericDao<BackupVO, Long> {
+
+ Backup findByVmId(Long vmId);
+ Backup findByVmIdIncludingRemoved(Long vmId);
+
+ List<Backup> listByVmId(Long zoneId, Long vmId);
+ List<Backup> listByAccountId(Long accountId);
+ List<Backup> listByOfferingId(Long offeringId);
+ List<Backup> syncBackups(Long zoneId, Long vmId, List<Backup> externalBackups);
+ BackupVO getBackupVO(Backup backup);
+
+ BackupResponse newBackupResponse(Backup backup);
+}
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupDaoImpl.java
new file mode 100644
index 0000000..fefbb68
--- /dev/null
+++ b/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupDaoImpl.java
@@ -0,0 +1,172 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.backup.dao;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+
+import org.apache.cloudstack.api.response.BackupResponse;
+import org.apache.cloudstack.backup.Backup;
+import org.apache.cloudstack.backup.BackupOffering;
+import org.apache.cloudstack.backup.BackupVO;
+
+import com.cloud.dc.DataCenterVO;
+import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.domain.DomainVO;
+import com.cloud.domain.dao.DomainDao;
+import com.cloud.user.AccountVO;
+import com.cloud.user.dao.AccountDao;
+import com.cloud.utils.db.GenericDaoBase;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.dao.VMInstanceDao;
+import com.google.gson.Gson;
+
+public class BackupDaoImpl extends GenericDaoBase<BackupVO, Long> implements BackupDao {
+
+ @Inject
+ AccountDao accountDao;
+
+ @Inject
+ DomainDao domainDao;
+
+ @Inject
+ DataCenterDao dataCenterDao;
+
+ @Inject
+ VMInstanceDao vmInstanceDao;
+
+ @Inject
+ BackupOfferingDao backupOfferingDao;
+
+ private SearchBuilder<BackupVO> backupSearch;
+
+ public BackupDaoImpl() {
+ }
+
+ @PostConstruct
+ protected void init() {
+ backupSearch = createSearchBuilder();
+ backupSearch.and("vm_id", backupSearch.entity().getVmId(), SearchCriteria.Op.EQ);
+ backupSearch.and("external_id", backupSearch.entity().getExternalId(), SearchCriteria.Op.EQ);
+ backupSearch.done();
+ }
+
+ @Override
+ public List<Backup> listByAccountId(Long accountId) {
+ SearchCriteria<BackupVO> sc = backupSearch.create();
+ sc.setParameters("account_id", accountId);
+ return new ArrayList<>(listBy(sc));
+ }
+
+ @Override
+ public Backup findByVmId(Long vmId) {
+ SearchCriteria<BackupVO> sc = backupSearch.create();
+ sc.setParameters("vm_id", vmId);
+ return findOneBy(sc);
+ }
+
+ @Override
+ public Backup findByVmIdIncludingRemoved(Long vmId) {
+ SearchCriteria<BackupVO> sc = backupSearch.create();
+ sc.setParameters("vm_id", vmId);
+ return findOneIncludingRemovedBy(sc);
+ }
+
+ @Override
+ public List<Backup> listByVmId(Long zoneId, Long vmId) {
+ SearchCriteria<BackupVO> sc = backupSearch.create();
+ sc.setParameters("vm_id", vmId);
+ if (zoneId != null) {
+ sc.setParameters("zone_id", zoneId);
+ }
+ return new ArrayList<>(listBy(sc));
+ }
+
+ @Override
+ public List<Backup> listByOfferingId(Long offeringId) {
+ SearchCriteria<BackupVO> sc = backupSearch.create();
+ sc.setParameters("offering_id", offeringId);
+ return new ArrayList<>(listBy(sc));
+ }
+
+ private Backup findByExternalId(Long zoneId, String externalId) {
+ SearchCriteria<BackupVO> sc = backupSearch.create();
+ sc.setParameters("external_id", externalId);
+ sc.setParameters("zone_id", zoneId);
+ return findOneBy(sc);
+ }
+
+ public BackupVO getBackupVO(Backup backup) {
+ BackupVO backupVO = new BackupVO();
+ backupVO.setExternalId(backup.getExternalId());
+ backupVO.setVmId(backup.getVmId());
+ return backupVO;
+ }
+
+ public void removeExistingBackups(Long zoneId, Long vmId) {
+ SearchCriteria<BackupVO> sc = backupSearch.create();
+ sc.setParameters("vm_id", vmId);
+ sc.setParameters("zone_id", zoneId);
+ expunge(sc);
+ }
+
+ @Override
+ public List<Backup> syncBackups(Long zoneId, Long vmId, List<Backup> externalBackups) {
+ for (Backup backup : externalBackups) {
+ BackupVO backupVO = getBackupVO(backup);
+ persist(backupVO);
+ }
+ return listByVmId(zoneId, vmId);
+ }
+
+ @Override
+ public BackupResponse newBackupResponse(Backup backup) {
+ VMInstanceVO vm = vmInstanceDao.findByIdIncludingRemoved(backup.getVmId());
+ AccountVO account = accountDao.findByIdIncludingRemoved(vm.getAccountId());
+ DomainVO domain = domainDao.findByIdIncludingRemoved(vm.getDomainId());
+ DataCenterVO zone = dataCenterDao.findByIdIncludingRemoved(vm.getDataCenterId());
+ BackupOffering offering = backupOfferingDao.findByIdIncludingRemoved(vm.getBackupOfferingId());
+
+ BackupResponse response = new BackupResponse();
+ response.setId(backup.getUuid());
+ response.setVmId(vm.getUuid());
+ response.setVmName(vm.getHostName());
+ response.setExternalId(backup.getExternalId());
+ response.setType(backup.getType());
+ response.setDate(backup.getDate());
+ response.setSize(backup.getSize());
+ response.setProtectedSize(backup.getProtectedSize());
+ response.setStatus(backup.getStatus());
+ response.setVolumes(new Gson().toJson(vm.getBackupVolumeList().toArray(), Backup.VolumeInfo[].class));
+ response.setBackupOfferingId(offering.getUuid());
+ response.setBackupOffering(offering.getName());
+ response.setAccountId(account.getUuid());
+ response.setAccount(account.getAccountName());
+ response.setDomainId(domain.getUuid());
+ response.setDomain(domain.getName());
+ response.setZoneId(zone.getUuid());
+ response.setZone(zone.getName());
+ response.setObjectName("backup");
+ return response;
+ }
+}
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupOfferingDao.java b/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupOfferingDao.java
new file mode 100644
index 0000000..d001de8
--- /dev/null
+++ b/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupOfferingDao.java
@@ -0,0 +1,30 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.backup.dao;
+
+import org.apache.cloudstack.api.response.BackupOfferingResponse;
+import org.apache.cloudstack.backup.BackupOffering;
+import org.apache.cloudstack.backup.BackupOfferingVO;
+
+import com.cloud.utils.db.GenericDao;
+
+public interface BackupOfferingDao extends GenericDao<BackupOfferingVO, Long> {
+ BackupOfferingResponse newBackupOfferingResponse(BackupOffering policy);
+ BackupOffering findByExternalId(String externalId, Long zoneId);
+ BackupOffering findByName(String name, Long zoneId);
+}
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupOfferingDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupOfferingDaoImpl.java
new file mode 100644
index 0000000..0568a01
--- /dev/null
+++ b/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupOfferingDaoImpl.java
@@ -0,0 +1,88 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.backup.dao;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+
+import org.apache.cloudstack.api.response.BackupOfferingResponse;
+import org.apache.cloudstack.backup.BackupOffering;
+import org.apache.cloudstack.backup.BackupOfferingVO;
+
+import com.cloud.dc.DataCenterVO;
+import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.utils.db.GenericDaoBase;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
+
+public class BackupOfferingDaoImpl extends GenericDaoBase<BackupOfferingVO, Long> implements BackupOfferingDao {
+
+ @Inject
+ DataCenterDao dataCenterDao;
+
+ private SearchBuilder<BackupOfferingVO> backupPoliciesSearch;
+
+ public BackupOfferingDaoImpl() {
+ }
+
+ @PostConstruct
+ protected void init() {
+ backupPoliciesSearch = createSearchBuilder();
+ backupPoliciesSearch.and("name", backupPoliciesSearch.entity().getName(), SearchCriteria.Op.EQ);
+ backupPoliciesSearch.and("zone_id", backupPoliciesSearch.entity().getZoneId(), SearchCriteria.Op.EQ);
+ backupPoliciesSearch.and("external_id", backupPoliciesSearch.entity().getExternalId(), SearchCriteria.Op.EQ);
+ backupPoliciesSearch.done();
+ }
+
+ @Override
+ public BackupOfferingResponse newBackupOfferingResponse(BackupOffering offering) {
+ DataCenterVO zone = dataCenterDao.findById(offering.getZoneId());
+
+ BackupOfferingResponse response = new BackupOfferingResponse();
+ response.setId(offering.getUuid());
+ response.setName(offering.getName());
+ response.setDescription(offering.getDescription());
+ response.setExternalId(offering.getExternalId());
+ response.setUserDrivenBackups(offering.isUserDrivenBackupAllowed());
+ if (zone != null) {
+ response.setZoneId(zone.getUuid());
+ response.setZoneName(zone.getName());
+ }
+ response.setCreated(offering.getCreated());
+ response.setObjectName("backupoffering");
+ return response;
+ }
+
+ @Override
+ public BackupOffering findByExternalId(String externalId, Long zoneId) {
+ SearchCriteria<BackupOfferingVO> sc = backupPoliciesSearch.create();
+ sc.setParameters("external_id", externalId);
+ if (zoneId != null) {
+ sc.setParameters("zone_id", zoneId);
+ }
+ return findOneBy(sc);
+ }
+
+ @Override
+ public BackupOffering findByName(String name, Long zoneId) {
+ SearchCriteria<BackupOfferingVO> sc = backupPoliciesSearch.create();
+ sc.setParameters("name", name);
+ sc.setParameters("zone_id", zoneId);
+ return findOneBy(sc);
+ }
+}
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupScheduleDao.java b/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupScheduleDao.java
new file mode 100644
index 0000000..516b011
--- /dev/null
+++ b/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupScheduleDao.java
@@ -0,0 +1,35 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.backup.dao;
+
+import java.util.Date;
+import java.util.List;
+
+import org.apache.cloudstack.api.response.BackupScheduleResponse;
+import org.apache.cloudstack.backup.BackupSchedule;
+import org.apache.cloudstack.backup.BackupScheduleVO;
+
+import com.cloud.utils.db.GenericDao;
+
+public interface BackupScheduleDao extends GenericDao<BackupScheduleVO, Long> {
+ BackupScheduleVO findByVM(Long vmId);
+
+ List<BackupScheduleVO> getSchedulesToExecute(Date currentTimestamp);
+
+ BackupScheduleResponse newBackupScheduleResponse(BackupSchedule schedule);
+}
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupScheduleDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupScheduleDaoImpl.java
new file mode 100644
index 0000000..7a58679
--- /dev/null
+++ b/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupScheduleDaoImpl.java
@@ -0,0 +1,86 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.backup.dao;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+
+import org.apache.cloudstack.api.response.BackupScheduleResponse;
+import org.apache.cloudstack.backup.BackupSchedule;
+import org.apache.cloudstack.backup.BackupScheduleVO;
+
+import com.cloud.utils.db.GenericDaoBase;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.dao.VMInstanceDao;
+
+public class BackupScheduleDaoImpl extends GenericDaoBase<BackupScheduleVO, Long> implements BackupScheduleDao {
+
+ @Inject
+ VMInstanceDao vmInstanceDao;
+
+ private SearchBuilder<BackupScheduleVO> backupScheduleSearch;
+ private SearchBuilder<BackupScheduleVO> executableSchedulesSearch;
+
+ public BackupScheduleDaoImpl() {
+ }
+
+ @PostConstruct
+ protected void init() {
+ backupScheduleSearch = createSearchBuilder();
+ backupScheduleSearch.and("vm_id", backupScheduleSearch.entity().getVmId(), SearchCriteria.Op.EQ);
+ backupScheduleSearch.and("async_job_id", backupScheduleSearch.entity().getAsyncJobId(), SearchCriteria.Op.EQ);
+ backupScheduleSearch.done();
+
+ executableSchedulesSearch = createSearchBuilder();
+ executableSchedulesSearch.and("scheduledTimestamp", executableSchedulesSearch.entity().getScheduledTimestamp(), SearchCriteria.Op.LT);
+ executableSchedulesSearch.and("asyncJobId", executableSchedulesSearch.entity().getAsyncJobId(), SearchCriteria.Op.NULL);
+ executableSchedulesSearch.done();
+ }
+
+ @Override
+ public BackupScheduleVO findByVM(Long vmId) {
+ SearchCriteria<BackupScheduleVO> sc = backupScheduleSearch.create();
+ sc.setParameters("vm_id", vmId);
+ return findOneBy(sc);
+ }
+
+ @Override
+ public List<BackupScheduleVO> getSchedulesToExecute(Date currentTimestamp) {
+ SearchCriteria<BackupScheduleVO> sc = executableSchedulesSearch.create();
+ sc.setParameters("scheduledTimestamp", currentTimestamp);
+ return listBy(sc);
+ }
+
+ @Override
+ public BackupScheduleResponse newBackupScheduleResponse(BackupSchedule schedule) {
+ VMInstanceVO vm = vmInstanceDao.findByIdIncludingRemoved(schedule.getVmId());
+ BackupScheduleResponse response = new BackupScheduleResponse();
+ response.setVmId(vm.getUuid());
+ response.setVmName(vm.getHostName());
+ response.setIntervalType(schedule.getScheduleType());
+ response.setSchedule(schedule.getSchedule());
+ response.setTimezone(schedule.getTimezone());
+ response.setObjectName("backupschedule");
+ return response;
+ }
+}
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java b/engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java
index cdb80fe..4ab5f42 100644
--- a/engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java
+++ b/engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java
@@ -16,13 +16,12 @@
// under the License.
package org.apache.cloudstack.engine.cloud.entity.api.db;
-import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.utils.db.Encrypt;
-import com.cloud.utils.db.GenericDao;
-import com.cloud.utils.db.StateMachine;
-import com.cloud.utils.fsm.FiniteStateObject;
-import com.cloud.vm.VirtualMachine;
-import com.cloud.vm.VirtualMachine.State;
+import java.security.SecureRandom;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
import javax.persistence.Column;
import javax.persistence.DiscriminatorColumn;
@@ -38,11 +37,17 @@
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Transient;
-import java.security.SecureRandom;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+
+import org.apache.cloudstack.backup.Backup;
+
+import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.utils.db.Encrypt;
+import com.cloud.utils.db.GenericDao;
+import com.cloud.utils.db.StateMachine;
+import com.cloud.utils.fsm.FiniteStateObject;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.VirtualMachine.State;
+import com.google.gson.Gson;
@Entity
@Table(name = "vm_instance")
@@ -175,6 +180,15 @@
@Column(name = "display_vm", updatable = true, nullable = false)
protected boolean display = true;
+ @Column(name = "backup_offering_id")
+ protected Long backupOfferingId;
+
+ @Column(name = "backup_external_id")
+ private String backupExternalId;
+
+ @Column(name = "backup_volumes")
+ private String backupVolumes;
+
@Transient
private VMReservationVO vmReservation;
@@ -555,4 +569,19 @@
public PartitionType partitionType() {
return PartitionType.VM;
}
+
+ @Override
+ public Long getBackupOfferingId() {
+ return backupOfferingId;
+ }
+
+ @Override
+ public String getBackupExternalId() {
+ return backupExternalId;
+ }
+
+ @Override
+ public List<Backup.VolumeInfo> getBackupVolumeList() {
+ return Arrays.asList(new Gson().fromJson(this.backupVolumes, Backup.VolumeInfo[].class));
+ }
}
diff --git a/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml b/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
index 3e0d67b..7faf85c 100644
--- a/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
+++ b/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
@@ -218,6 +218,7 @@
<bean id="usageVPNUserDaoImpl" class="com.cloud.usage.dao.UsageVPNUserDaoImpl" />
<bean id="usageVolumeDaoImpl" class="com.cloud.usage.dao.UsageVolumeDaoImpl" />
<bean id="usageVmDiskDaoImpl" class="com.cloud.usage.dao.UsageVmDiskDaoImpl" />
+ <bean id="usageBackupDaoImpl" class="com.cloud.usage.dao.UsageBackupDaoImpl" />
<bean id="userAccountDaoImpl" class="com.cloud.user.dao.UserAccountDaoImpl" />
<bean id="userAccountJoinDaoImpl" class="com.cloud.api.query.dao.UserAccountJoinDaoImpl" />
<bean id="userIpv6AddressDaoImpl" class="com.cloud.network.dao.UserIpv6AddressDaoImpl" />
@@ -285,7 +286,11 @@
<bean id="outOfBandManagementDaoImpl" class="org.apache.cloudstack.outofbandmanagement.dao.OutOfBandManagementDaoImpl" />
<bean id="GuestOsDetailsDaoImpl" class="org.apache.cloudstack.resourcedetail.dao.GuestOsDetailsDaoImpl" />
<bean id="annotationDaoImpl" class="org.apache.cloudstack.annotation.dao.AnnotationDaoImpl" />
+ <bean id="backupOfferingDaoImpl" class="org.apache.cloudstack.backup.dao.BackupOfferingDaoImpl" />
+ <bean id="backupScheduleDaoImpl" class="org.apache.cloudstack.backup.dao.BackupScheduleDaoImpl" />
+ <bean id="backupDaoImpl" class="org.apache.cloudstack.backup.dao.BackupDaoImpl" />
<bean id="directDownloadCertificateDaoImpl" class="org.apache.cloudstack.direct.download.DirectDownloadCertificateDaoImpl" />
<bean id="directDownloadCertificateHostMapDaoImpl" class="org.apache.cloudstack.direct.download.DirectDownloadCertificateHostMapDaoImpl" />
<bean id="templateOVFPropertiesDaoImpl" class="com.cloud.storage.dao.TemplateOVFPropertiesDaoImpl" />
+ <bean id="routerHealthCheckResultsDaoImpl" class="com.cloud.network.dao.RouterHealthCheckResultDaoImpl" />
</beans>
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41310to41400-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-41310to41400-cleanup.sql
new file mode 100644
index 0000000..3199e8b
--- /dev/null
+++ b/engine/schema/src/main/resources/META-INF/db/schema-41310to41400-cleanup.sql
@@ -0,0 +1,28 @@
+-- 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.
+
+--;
+-- Schema upgrade cleanup from 4.13.1.0 to 4.14.0.0
+--;
+
+DELETE FROM `cloud`.`configuration` WHERE name = 'host.maintenance.retries';
+
+-- Stop asking user (in the upgraded documentation) to remove a trailing slash for local KVM pool
+UPDATE `cloud`.`storage_pool` SET path="/var/lib/libvirt/images" WHERE path="/var/lib/libvirt/images/";
+
+-- remove (one of) duplicate unique indexes from Region table
+ALTER TABLE `region` DROP INDEX `id_3`;
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41310to41400.sql b/engine/schema/src/main/resources/META-INF/db/schema-41310to41400.sql
new file mode 100644
index 0000000..baa7bcf
--- /dev/null
+++ b/engine/schema/src/main/resources/META-INF/db/schema-41310to41400.sql
@@ -0,0 +1,381 @@
+-- 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.
+
+--;
+-- Schema upgrade from 4.13.1.0 to 4.14.0.0
+--;
+
+-- Update the description to indicate this only works with KVM + Ceph
+-- (not implemented properly atm for KVM+NFS/local, and it accidentaly works with XS + NFS. Not applicable for VMware)
+UPDATE `cloud`.`configuration` SET `description`='Indicates whether to always backup primary storage snapshot to secondary storage. Keeping snapshots only on Primary storage is applicable for KVM + Ceph only.' WHERE `name`='snapshot.backup.to.secondary';
+
+-- KVM: enable storage data motion on KVM hypervisor_capabilities
+UPDATE `cloud`.`hypervisor_capabilities` SET `storage_motion_supported` = 1 WHERE `hypervisor_capabilities`.`hypervisor_type` = 'KVM';
+
+-- Use 'Other Linux 64-bit' as guest os for the default systemvmtemplate for XenServer
+UPDATE `cloud`.`vm_template` SET guest_os_id=99 WHERE id=1;
+
+-- #3659 Fix typo: the past tense of shutdown is shutdown, not shutdowned
+UPDATE `cloud`.`vm_instance` SET state='Shutdown' WHERE state='Shutdowned';
+
+-- Backup and Recovery
+
+CREATE TABLE IF NOT EXISTS `cloud`.`backup_offering` (
+ `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+ `uuid` varchar(40) NOT NULL UNIQUE,
+ `name` varchar(255) NOT NULL COMMENT 'backup offering name',
+ `description` varchar(255) NOT NULL COMMENT 'backup offering description',
+ `external_id` varchar(255) DEFAULT NULL COMMENT 'external ID on provider side',
+ `user_driven_backup` tinyint(1) unsigned NOT NULL DEFAULT 0 COMMENT 'whether user can do adhoc backups and backup schedules allowed, default false',
+ `zone_id` bigint(20) unsigned NOT NULL COMMENT 'zone id',
+ `provider` varchar(255) NOT NULL COMMENT 'backup provider',
+ `created` datetime DEFAULT NULL,
+ `removed` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ CONSTRAINT `fk_backup_offering__zone_id` FOREIGN KEY (`zone_id`) REFERENCES `data_center` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+ALTER TABLE `cloud`.`vm_instance` ADD COLUMN `backup_offering_id` bigint unsigned DEFAULT NULL COMMENT 'ID of backup offering';
+ALTER TABLE `cloud`.`vm_instance` ADD COLUMN `backup_external_id` varchar(255) DEFAULT NULL COMMENT 'ID of external backup job or container if any';
+ALTER TABLE `cloud`.`vm_instance` ADD COLUMN `backup_volumes` text DEFAULT NULL COMMENT 'details of backedup volumes';
+
+CREATE TABLE IF NOT EXISTS `cloud`.`backups` (
+ `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+ `uuid` varchar(40) NOT NULL UNIQUE,
+ `vm_id` bigint(20) unsigned NOT NULL,
+ `external_id` varchar(255) DEFAULT NULL COMMENT 'external ID',
+ `type` varchar(255) NOT NULL COMMENT 'backup type',
+ `date` varchar(255) NOT NULL COMMENT 'backup date',
+ `size` bigint(20) DEFAULT 0 COMMENT 'size of the backup',
+ `protected_size` bigint(20) DEFAULT 0,
+ `status` varchar(32) DEFAULT NULL,
+ `backup_offering_id` bigint(20) unsigned NOT NULL,
+ `account_id` bigint(20) unsigned NOT NULL,
+ `domain_id` bigint(20) unsigned NOT NULL,
+ `zone_id` bigint(20) unsigned NOT NULL,
+ `removed` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ CONSTRAINT `fk_backup__vm_id` FOREIGN KEY (`vm_id`) REFERENCES `vm_instance` (`id`) ON DELETE CASCADE,
+ CONSTRAINT `fk_backup__account_id` FOREIGN KEY (`account_id`) REFERENCES `account` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `cloud`.`backup_schedule` (
+ `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+ `vm_id` bigint(20) unsigned NOT NULL UNIQUE,
+ `schedule_type` int(4) DEFAULT NULL COMMENT 'backup schedulet type e.g. hourly, daily, etc.',
+ `schedule` varchar(100) DEFAULT NULL COMMENT 'schedule time of execution',
+ `timezone` varchar(100) DEFAULT NULL COMMENT 'the timezone in which the schedule time is specified',
+ `scheduled_timestamp` datetime DEFAULT NULL COMMENT 'Time at which the backup was scheduled for execution',
+ `async_job_id` bigint(20) unsigned DEFAULT NULL COMMENT 'If this schedule is being executed, it is the id of the create aysnc_job. Before that it is null',
+ PRIMARY KEY (`id`),
+ CONSTRAINT `fk_backup_schedule__vm_id` FOREIGN KEY (`vm_id`) REFERENCES `vm_instance` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `cloud_usage`.`usage_backup` (
+ `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+ `zone_id` bigint(20) unsigned NOT NULL,
+ `account_id` bigint(20) unsigned NOT NULL,
+ `domain_id` bigint(20) unsigned NOT NULL,
+ `vm_id` bigint(20) unsigned NOT NULL,
+ `backup_offering_id` bigint(20) unsigned NOT NULL,
+ `size` bigint(20) DEFAULT 0,
+ `protected_size` bigint(20) DEFAULT 0,
+ `created` datetime NOT NULL,
+ `removed` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ INDEX `i_usage_backup` (`zone_id`,`account_id`,`vm_id`,`created`)
+) ENGINE=InnoDB CHARSET=utf8;
+
+DROP VIEW IF EXISTS `cloud`.`user_vm_view`;
+CREATE
+VIEW `user_vm_view` AS
+ SELECT
+ `vm_instance`.`id` AS `id`,
+ `vm_instance`.`name` AS `name`,
+ `user_vm`.`display_name` AS `display_name`,
+ `user_vm`.`user_data` AS `user_data`,
+ `account`.`id` AS `account_id`,
+ `account`.`uuid` AS `account_uuid`,
+ `account`.`account_name` AS `account_name`,
+ `account`.`type` AS `account_type`,
+ `domain`.`id` AS `domain_id`,
+ `domain`.`uuid` AS `domain_uuid`,
+ `domain`.`name` AS `domain_name`,
+ `domain`.`path` AS `domain_path`,
+ `projects`.`id` AS `project_id`,
+ `projects`.`uuid` AS `project_uuid`,
+ `projects`.`name` AS `project_name`,
+ `instance_group`.`id` AS `instance_group_id`,
+ `instance_group`.`uuid` AS `instance_group_uuid`,
+ `instance_group`.`name` AS `instance_group_name`,
+ `vm_instance`.`uuid` AS `uuid`,
+ `vm_instance`.`user_id` AS `user_id`,
+ `vm_instance`.`last_host_id` AS `last_host_id`,
+ `vm_instance`.`vm_type` AS `type`,
+ `vm_instance`.`limit_cpu_use` AS `limit_cpu_use`,
+ `vm_instance`.`created` AS `created`,
+ `vm_instance`.`state` AS `state`,
+ `vm_instance`.`removed` AS `removed`,
+ `vm_instance`.`ha_enabled` AS `ha_enabled`,
+ `vm_instance`.`hypervisor_type` AS `hypervisor_type`,
+ `vm_instance`.`instance_name` AS `instance_name`,
+ `vm_instance`.`guest_os_id` AS `guest_os_id`,
+ `vm_instance`.`display_vm` AS `display_vm`,
+ `guest_os`.`uuid` AS `guest_os_uuid`,
+ `vm_instance`.`pod_id` AS `pod_id`,
+ `host_pod_ref`.`uuid` AS `pod_uuid`,
+ `vm_instance`.`private_ip_address` AS `private_ip_address`,
+ `vm_instance`.`private_mac_address` AS `private_mac_address`,
+ `vm_instance`.`vm_type` AS `vm_type`,
+ `data_center`.`id` AS `data_center_id`,
+ `data_center`.`uuid` AS `data_center_uuid`,
+ `data_center`.`name` AS `data_center_name`,
+ `data_center`.`is_security_group_enabled` AS `security_group_enabled`,
+ `data_center`.`networktype` AS `data_center_type`,
+ `host`.`id` AS `host_id`,
+ `host`.`uuid` AS `host_uuid`,
+ `host`.`name` AS `host_name`,
+ `vm_template`.`id` AS `template_id`,
+ `vm_template`.`uuid` AS `template_uuid`,
+ `vm_template`.`name` AS `template_name`,
+ `vm_template`.`display_text` AS `template_display_text`,
+ `vm_template`.`enable_password` AS `password_enabled`,
+ `iso`.`id` AS `iso_id`,
+ `iso`.`uuid` AS `iso_uuid`,
+ `iso`.`name` AS `iso_name`,
+ `iso`.`display_text` AS `iso_display_text`,
+ `service_offering`.`id` AS `service_offering_id`,
+ `svc_disk_offering`.`uuid` AS `service_offering_uuid`,
+ `disk_offering`.`uuid` AS `disk_offering_uuid`,
+ `disk_offering`.`id` AS `disk_offering_id`,
+ (CASE
+ WHEN ISNULL(`service_offering`.`cpu`) THEN `custom_cpu`.`value`
+ ELSE `service_offering`.`cpu`
+ END) AS `cpu`,
+ (CASE
+ WHEN ISNULL(`service_offering`.`speed`) THEN `custom_speed`.`value`
+ ELSE `service_offering`.`speed`
+ END) AS `speed`,
+ (CASE
+ WHEN ISNULL(`service_offering`.`ram_size`) THEN `custom_ram_size`.`value`
+ ELSE `service_offering`.`ram_size`
+ END) AS `ram_size`,
+ `backup_offering`.`uuid` AS `backup_offering_uuid`,
+ `backup_offering`.`id` AS `backup_offering_id`,
+ `svc_disk_offering`.`name` AS `service_offering_name`,
+ `disk_offering`.`name` AS `disk_offering_name`,
+ `backup_offering`.`name` AS `backup_offering_name`,
+ `storage_pool`.`id` AS `pool_id`,
+ `storage_pool`.`uuid` AS `pool_uuid`,
+ `storage_pool`.`pool_type` AS `pool_type`,
+ `volumes`.`id` AS `volume_id`,
+ `volumes`.`uuid` AS `volume_uuid`,
+ `volumes`.`device_id` AS `volume_device_id`,
+ `volumes`.`volume_type` AS `volume_type`,
+ `security_group`.`id` AS `security_group_id`,
+ `security_group`.`uuid` AS `security_group_uuid`,
+ `security_group`.`name` AS `security_group_name`,
+ `security_group`.`description` AS `security_group_description`,
+ `nics`.`id` AS `nic_id`,
+ `nics`.`uuid` AS `nic_uuid`,
+ `nics`.`network_id` AS `network_id`,
+ `nics`.`ip4_address` AS `ip_address`,
+ `nics`.`ip6_address` AS `ip6_address`,
+ `nics`.`ip6_gateway` AS `ip6_gateway`,
+ `nics`.`ip6_cidr` AS `ip6_cidr`,
+ `nics`.`default_nic` AS `is_default_nic`,
+ `nics`.`gateway` AS `gateway`,
+ `nics`.`netmask` AS `netmask`,
+ `nics`.`mac_address` AS `mac_address`,
+ `nics`.`broadcast_uri` AS `broadcast_uri`,
+ `nics`.`isolation_uri` AS `isolation_uri`,
+ `vpc`.`id` AS `vpc_id`,
+ `vpc`.`uuid` AS `vpc_uuid`,
+ `networks`.`uuid` AS `network_uuid`,
+ `networks`.`name` AS `network_name`,
+ `networks`.`traffic_type` AS `traffic_type`,
+ `networks`.`guest_type` AS `guest_type`,
+ `user_ip_address`.`id` AS `public_ip_id`,
+ `user_ip_address`.`uuid` AS `public_ip_uuid`,
+ `user_ip_address`.`public_ip_address` AS `public_ip_address`,
+ `ssh_keypairs`.`keypair_name` AS `keypair_name`,
+ `resource_tags`.`id` AS `tag_id`,
+ `resource_tags`.`uuid` AS `tag_uuid`,
+ `resource_tags`.`key` AS `tag_key`,
+ `resource_tags`.`value` AS `tag_value`,
+ `resource_tags`.`domain_id` AS `tag_domain_id`,
+ `domain`.`uuid` AS `tag_domain_uuid`,
+ `domain`.`name` AS `tag_domain_name`,
+ `resource_tags`.`account_id` AS `tag_account_id`,
+ `account`.`account_name` AS `tag_account_name`,
+ `resource_tags`.`resource_id` AS `tag_resource_id`,
+ `resource_tags`.`resource_uuid` AS `tag_resource_uuid`,
+ `resource_tags`.`resource_type` AS `tag_resource_type`,
+ `resource_tags`.`customer` AS `tag_customer`,
+ `async_job`.`id` AS `job_id`,
+ `async_job`.`uuid` AS `job_uuid`,
+ `async_job`.`job_status` AS `job_status`,
+ `async_job`.`account_id` AS `job_account_id`,
+ `affinity_group`.`id` AS `affinity_group_id`,
+ `affinity_group`.`uuid` AS `affinity_group_uuid`,
+ `affinity_group`.`name` AS `affinity_group_name`,
+ `affinity_group`.`description` AS `affinity_group_description`,
+ `vm_instance`.`dynamically_scalable` AS `dynamically_scalable`
+ FROM
+ (((((((((((((((((((((((((((((((((`user_vm`
+ JOIN `vm_instance` ON (((`vm_instance`.`id` = `user_vm`.`id`)
+ AND ISNULL(`vm_instance`.`removed`))))
+ JOIN `account` ON ((`vm_instance`.`account_id` = `account`.`id`)))
+ JOIN `domain` ON ((`vm_instance`.`domain_id` = `domain`.`id`)))
+ LEFT JOIN `guest_os` ON ((`vm_instance`.`guest_os_id` = `guest_os`.`id`)))
+ LEFT JOIN `host_pod_ref` ON ((`vm_instance`.`pod_id` = `host_pod_ref`.`id`)))
+ LEFT JOIN `projects` ON ((`projects`.`project_account_id` = `account`.`id`)))
+ LEFT JOIN `instance_group_vm_map` ON ((`vm_instance`.`id` = `instance_group_vm_map`.`instance_id`)))
+ LEFT JOIN `instance_group` ON ((`instance_group_vm_map`.`group_id` = `instance_group`.`id`)))
+ LEFT JOIN `data_center` ON ((`vm_instance`.`data_center_id` = `data_center`.`id`)))
+ LEFT JOIN `host` ON ((`vm_instance`.`host_id` = `host`.`id`)))
+ LEFT JOIN `vm_template` ON ((`vm_instance`.`vm_template_id` = `vm_template`.`id`)))
+ LEFT JOIN `vm_template` `iso` ON ((`iso`.`id` = `user_vm`.`iso_id`)))
+ LEFT JOIN `service_offering` ON ((`vm_instance`.`service_offering_id` = `service_offering`.`id`)))
+ LEFT JOIN `disk_offering` `svc_disk_offering` ON ((`vm_instance`.`service_offering_id` = `svc_disk_offering`.`id`)))
+ LEFT JOIN `disk_offering` ON ((`vm_instance`.`disk_offering_id` = `disk_offering`.`id`)))
+ LEFT JOIN `backup_offering` ON ((`vm_instance`.`backup_offering_id` = `backup_offering`.`id`)))
+ LEFT JOIN `volumes` ON ((`vm_instance`.`id` = `volumes`.`instance_id`)))
+ LEFT JOIN `storage_pool` ON ((`volumes`.`pool_id` = `storage_pool`.`id`)))
+ LEFT JOIN `security_group_vm_map` ON ((`vm_instance`.`id` = `security_group_vm_map`.`instance_id`)))
+ LEFT JOIN `security_group` ON ((`security_group_vm_map`.`security_group_id` = `security_group`.`id`)))
+ LEFT JOIN `nics` ON (((`vm_instance`.`id` = `nics`.`instance_id`)
+ AND ISNULL(`nics`.`removed`))))
+ LEFT JOIN `networks` ON ((`nics`.`network_id` = `networks`.`id`)))
+ LEFT JOIN `vpc` ON (((`networks`.`vpc_id` = `vpc`.`id`)
+ AND ISNULL(`vpc`.`removed`))))
+ LEFT JOIN `user_ip_address` ON ((`user_ip_address`.`vm_id` = `vm_instance`.`id`)))
+ LEFT JOIN `user_vm_details` `ssh_details` ON (((`ssh_details`.`vm_id` = `vm_instance`.`id`)
+ AND (`ssh_details`.`name` = 'SSH.PublicKey'))))
+ LEFT JOIN `ssh_keypairs` ON (((`ssh_keypairs`.`public_key` = `ssh_details`.`value`)
+ AND (`ssh_keypairs`.`account_id` = `account`.`id`))))
+ LEFT JOIN `resource_tags` ON (((`resource_tags`.`resource_id` = `vm_instance`.`id`)
+ AND (`resource_tags`.`resource_type` = 'UserVm'))))
+ LEFT JOIN `async_job` ON (((`async_job`.`instance_id` = `vm_instance`.`id`)
+ AND (`async_job`.`instance_type` = 'VirtualMachine')
+ AND (`async_job`.`job_status` = 0))))
+ LEFT JOIN `affinity_group_vm_map` ON ((`vm_instance`.`id` = `affinity_group_vm_map`.`instance_id`)))
+ LEFT JOIN `affinity_group` ON ((`affinity_group_vm_map`.`affinity_group_id` = `affinity_group`.`id`)))
+ LEFT JOIN `user_vm_details` `custom_cpu` ON (((`custom_cpu`.`vm_id` = `vm_instance`.`id`)
+ AND (`custom_cpu`.`name` = 'CpuNumber'))))
+ LEFT JOIN `user_vm_details` `custom_speed` ON (((`custom_speed`.`vm_id` = `vm_instance`.`id`)
+ AND (`custom_speed`.`name` = 'CpuSpeed'))))
+ LEFT JOIN `user_vm_details` `custom_ram_size` ON (((`custom_ram_size`.`vm_id` = `vm_instance`.`id`)
+ AND (`custom_ram_size`.`name` = 'memory'))));
+
+-- Fix OS category for some Ubuntu and RedHat OS-es
+UPDATE `cloud`.`guest_os` SET `category_id`='10' WHERE `id`=277 AND display_name="Ubuntu 17.04";
+UPDATE `cloud`.`guest_os` SET `category_id`='10' WHERE `id`=278 AND display_name="Ubuntu 17.10";
+UPDATE `cloud`.`guest_os` SET `category_id`='10' WHERE `id`=279 AND display_name="Ubuntu 18.04 LTS";
+UPDATE `cloud`.`guest_os` SET `category_id`='10' WHERE `id`=280 AND display_name="Ubuntu 18.10";
+UPDATE `cloud`.`guest_os` SET `category_id`='10' WHERE `id`=281 AND display_name="Ubuntu 19.04";
+UPDATE `cloud`.`guest_os` SET `category_id`='4' WHERE `id`=282 AND display_name="Red Hat Enterprise Linux 7.3";
+UPDATE `cloud`.`guest_os` SET `category_id`='4' WHERE `id`=283 AND display_name="Red Hat Enterprise Linux 7.4";
+UPDATE `cloud`.`guest_os` SET `category_id`='4' WHERE `id`=284 AND display_name="Red Hat Enterprise Linux 7.5";
+UPDATE `cloud`.`guest_os` SET `category_id`='4' WHERE `id`=285 AND display_name="Red Hat Enterprise Linux 7.6";
+UPDATE `cloud`.`guest_os` SET `category_id`='4' WHERE `id`=286 AND display_name="Red Hat Enterprise Linux 8.0";
+
+-- Create table for router health checks. We only save last check result for each.
+CREATE TABLE `cloud`.`router_health_check` (
+ `id` bigint unsigned NOT NULL auto_increment,
+ `router_id` bigint unsigned NOT NULL COMMENT 'router id',
+ `check_name` varchar(255) NOT NULL COMMENT 'name of the health check',
+ `check_type` varchar(255) NOT NULL COMMENT 'type of the health check',
+ `last_update` DATETIME NULL COMMENT 'last check update time',
+ `check_result` boolean NOT NULL COMMENT 'check executions success or failure',
+ `check_details` BLOB NULL COMMENT 'check result detailed message',
+ PRIMARY KEY (`id`),
+ CONSTRAINT `fk_router_health_checks__router_id` FOREIGN KEY (`router_id`) REFERENCES `domain_router`(`id`) ON DELETE CASCADE,
+ UNIQUE `i_router_health_checks__router_id__check_name__check_type`(`router_id`, `check_name`, `check_type`),
+ INDEX `i_router_health_checks__router_id`(`router_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
+
+-- Kubernetes service
+CREATE TABLE IF NOT EXISTS `cloud`.`kubernetes_supported_version` (
+ `id` bigint unsigned NOT NULL auto_increment,
+ `uuid` varchar(40) DEFAULT NULL,
+ `name` varchar(255) NOT NULL COMMENT 'the name of this Kubernetes version',
+ `semantic_version` varchar(32) NOT NULL COMMENT 'the semantic version for this Kubernetes version',
+ `iso_id` bigint unsigned NOT NULL COMMENT 'the ID of the binaries ISO for this Kubernetes version',
+ `zone_id` bigint unsigned DEFAULT NULL COMMENT 'the ID of the zone for which this Kubernetes version is made available',
+ `state` char(32) DEFAULT NULL COMMENT 'the enabled or disabled state for this Kubernetes version',
+ `min_cpu` int(10) unsigned NOT NULL COMMENT 'the minimum CPU needed by cluster nodes for using this Kubernetes version',
+ `min_ram_size` bigint(20) unsigned NOT NULL COMMENT 'the minimum RAM in MB needed by cluster nodes for this Kubernetes version',
+ `created` datetime NOT NULL COMMENT 'date created',
+ `removed` datetime COMMENT 'date removed or null, if still present',
+
+ PRIMARY KEY(`id`),
+ CONSTRAINT `fk_kubernetes_supported_version__iso_id` FOREIGN KEY `fk_kubernetes_supported_version__iso_id`(`iso_id`) REFERENCES `vm_template`(`id`) ON DELETE CASCADE,
+ CONSTRAINT `fk_kubernetes_supported_version__zone_id` FOREIGN KEY `fk_kubernetes_supported_version__zone_id`(`zone_id`) REFERENCES `data_center` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `cloud`.`kubernetes_cluster` (
+ `id` bigint unsigned NOT NULL auto_increment,
+ `uuid` varchar(40) DEFAULT NULL,
+ `name` varchar(255) NOT NULL,
+ `description` varchar(4096) COMMENT 'display text for this Kubernetes cluster',
+ `zone_id` bigint unsigned NOT NULL COMMENT 'the ID of the zone in which this Kubernetes cluster is deployed',
+ `kubernetes_version_id` bigint unsigned NOT NULL COMMENT 'the ID of the Kubernetes version of this Kubernetes cluster',
+ `service_offering_id` bigint unsigned COMMENT 'service offering id for the cluster VM',
+ `template_id` bigint unsigned COMMENT 'the ID of the template used by this Kubernetes cluster',
+ `network_id` bigint unsigned COMMENT 'the ID of the network used by this Kubernetes cluster',
+ `master_node_count` bigint NOT NULL default '0' COMMENT 'the number of the master nodes deployed for this Kubernetes cluster',
+ `node_count` bigint NOT NULL default '0' COMMENT 'the number of the worker nodes deployed for this Kubernetes cluster',
+ `account_id` bigint unsigned NOT NULL COMMENT 'the ID of owner account of this Kubernetes cluster',
+ `domain_id` bigint unsigned NOT NULL COMMENT 'the ID of the domain of this cluster',
+ `state` char(32) NOT NULL COMMENT 'the current state of this Kubernetes cluster',
+ `key_pair` varchar(40),
+ `cores` bigint unsigned NOT NULL COMMENT 'total number of CPU cores used by this Kubernetes cluster',
+ `memory` bigint unsigned NOT NULL COMMENT 'total memory used by this Kubernetes cluster',
+ `node_root_disk_size` bigint(20) unsigned DEFAULT 0 COMMENT 'root disk size of root disk for each node',
+ `endpoint` varchar(255) COMMENT 'url endpoint of the Kubernetes cluster manager api access',
+ `created` datetime NOT NULL COMMENT 'date created',
+ `removed` datetime COMMENT 'date removed or null, if still present',
+ `gc` tinyint unsigned NOT NULL DEFAULT 1 COMMENT 'gc this Kubernetes cluster or not',
+
+ PRIMARY KEY(`id`),
+ CONSTRAINT `fk_cluster__zone_id` FOREIGN KEY `fk_cluster__zone_id`(`zone_id`) REFERENCES `data_center` (`id`) ON DELETE CASCADE,
+ CONSTRAINT `fk_cluster__kubernetes_version_id` FOREIGN KEY `fk_cluster__kubernetes_version_id`(`kubernetes_version_id`) REFERENCES `kubernetes_supported_version` (`id`) ON DELETE CASCADE,
+ CONSTRAINT `fk_cluster__service_offering_id` FOREIGN KEY `fk_cluster__service_offering_id`(`service_offering_id`) REFERENCES `service_offering`(`id`) ON DELETE CASCADE,
+ CONSTRAINT `fk_cluster__template_id` FOREIGN KEY `fk_cluster__template_id`(`template_id`) REFERENCES `vm_template`(`id`) ON DELETE CASCADE,
+ CONSTRAINT `fk_cluster__network_id` FOREIGN KEY `fk_cluster__network_id`(`network_id`) REFERENCES `networks`(`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `cloud`.`kubernetes_cluster_vm_map` (
+ `id` bigint unsigned NOT NULL auto_increment,
+ `cluster_id` bigint unsigned NOT NULL COMMENT 'the ID of the Kubernetes cluster',
+ `vm_id` bigint unsigned NOT NULL COMMENT 'the ID of the VM',
+
+ PRIMARY KEY(`id`),
+ CONSTRAINT `fk_kubernetes_cluster_vm_map__cluster_id` FOREIGN KEY `fk_kubernetes_cluster_vm_map__cluster_id`(`cluster_id`) REFERENCES `kubernetes_cluster`(`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `cloud`.`kubernetes_cluster_details` (
+ `id` bigint unsigned NOT NULL auto_increment,
+ `cluster_id` bigint unsigned NOT NULL COMMENT 'the ID of the Kubernetes cluster',
+ `name` varchar(255) NOT NULL,
+ `value` varchar(10240) NOT NULL,
+ `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user else false',
+
+ PRIMARY KEY(`id`),
+ CONSTRAINT `fk_kubernetes_cluster_details__cluster_id` FOREIGN KEY `fk_kubernetes_cluster_details__cluster_id`(`cluster_id`) REFERENCES `kubernetes_cluster`(`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/engine/schema/src/test/java/com/cloud/storage/dao/DiskOfferingDaoImplTest.java b/engine/schema/src/test/java/com/cloud/storage/dao/DiskOfferingDaoImplTest.java
new file mode 100644
index 0000000..3dc36d6
--- /dev/null
+++ b/engine/schema/src/test/java/com/cloud/storage/dao/DiskOfferingDaoImplTest.java
@@ -0,0 +1,56 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.storage.dao;
+
+import com.cloud.utils.exception.CloudRuntimeException;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class DiskOfferingDaoImplTest {
+
+ private final DiskOfferingDaoImpl dao = new DiskOfferingDaoImpl();
+
+ @Test(expected = CloudRuntimeException.class)
+ public void testGetClosestDiskSizeInGBNegativeSize() {
+ long size = -4 * DiskOfferingDaoImpl.GB_UNIT_BYTES;
+ dao.getClosestDiskSizeInGB(size);
+ }
+
+ @Test
+ public void testGetClosestDiskSizeInGBSizeGB() {
+ int gbUnits = 5;
+ long size = gbUnits * DiskOfferingDaoImpl.GB_UNIT_BYTES;
+ long sizeInGB = dao.getClosestDiskSizeInGB(size);
+ Assert.assertEquals(gbUnits, sizeInGB);
+ }
+
+ @Test
+ public void testGetClosestDiskSizeInGBSizeGBRest() {
+ int gbUnits = 5;
+ long size = gbUnits * DiskOfferingDaoImpl.GB_UNIT_BYTES + 12345;
+ long sizeInGB = dao.getClosestDiskSizeInGB(size);
+ Assert.assertEquals(gbUnits + 1, sizeInGB);
+ }
+
+ @Test
+ public void testGetClosestDiskSizeInGBSizeLessOneGB() {
+ int gbUnits = 1;
+ long size = gbUnits * DiskOfferingDaoImpl.GB_UNIT_BYTES - 12345;
+ long sizeInGB = dao.getClosestDiskSizeInGB(size);
+ Assert.assertEquals(gbUnits, sizeInGB);
+ }
+}
diff --git a/engine/schema/src/test/java/com/cloud/upgrade/dao/DatabaseAccessObjectTest.java b/engine/schema/src/test/java/com/cloud/upgrade/dao/DatabaseAccessObjectTest.java
index 9a2115e..2b8b2bd 100644
--- a/engine/schema/src/test/java/com/cloud/upgrade/dao/DatabaseAccessObjectTest.java
+++ b/engine/schema/src/test/java/com/cloud/upgrade/dao/DatabaseAccessObjectTest.java
@@ -34,8 +34,8 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.internal.util.reflection.Whitebox;
import org.mockito.runners.MockitoJUnitRunner;
+import org.powermock.reflect.Whitebox;
@RunWith(MockitoJUnitRunner.class)
public class DatabaseAccessObjectTest {
@@ -53,7 +53,7 @@
@Before
public void setup() {
- Whitebox.setInternalState(dao, "s_logger", loggerMock);
+ Whitebox.setInternalState(dao.getClass(), "s_logger", loggerMock);
}
@Test
diff --git a/engine/schema/src/test/java/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImplTest.java b/engine/schema/src/test/java/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImplTest.java
index 2d195af..471fc52 100755
--- a/engine/schema/src/test/java/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImplTest.java
+++ b/engine/schema/src/test/java/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImplTest.java
@@ -16,9 +16,12 @@
// under the License.
package org.apache.cloudstack.storage.datastore.db;
+import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
+import java.io.IOException;
+import java.sql.SQLException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@@ -29,9 +32,9 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Spy;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.modules.junit4.PowerMockRunner;
import com.cloud.storage.ScopeType;
@@ -41,6 +44,7 @@
import junit.framework.TestCase;
@RunWith(PowerMockRunner.class)
+@PowerMockIgnore("javax.management.*")
public class PrimaryDataStoreDaoImplTest extends TestCase {
@Mock
@@ -77,12 +81,13 @@
private static final Long CLUSTER_ID = null;
private static final ScopeType SCOPE = ScopeType.ZONE;
+
@Before
- public void setup() {
+ public void setup() throws IOException, ClassNotFoundException, SQLException {
STORAGE_POOL_DETAILS.put(DETAIL_KEY, DETAIL_VALUE);
doReturn(Arrays.asList(storagePoolVO)).when(primaryDataStoreDao).
- searchStoragePoolsPreparedStatement(Matchers.anyString(), Matchers.anyLong(), Matchers.anyLong(), Matchers.anyLong(),
- Matchers.any(ScopeType.class), Matchers.anyInt());
+ searchStoragePoolsPreparedStatement(nullable(String.class), nullable(Long.class), nullable(Long.class), nullable(Long.class),
+ nullable(ScopeType.class), nullable(Integer.class));
}
@Test
diff --git a/engine/service/pom.xml b/engine/service/pom.xml
index 779f560..f5d848a 100644
--- a/engine/service/pom.xml
+++ b/engine/service/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
</parent>
<artifactId>cloud-engine-service</artifactId>
<packaging>war</packaging>
diff --git a/engine/storage/cache/pom.xml b/engine/storage/cache/pom.xml
index 826ea81..20fac63 100644
--- a/engine/storage/cache/pom.xml
+++ b/engine/storage/cache/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/engine/storage/configdrive/pom.xml b/engine/storage/configdrive/pom.xml
index 5e514b1..245b56f 100644
--- a/engine/storage/configdrive/pom.xml
+++ b/engine/storage/configdrive/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/engine/storage/configdrive/src/test/java/org/apache/cloudstack/storage/configdrive/ConfigDriveBuilderTest.java b/engine/storage/configdrive/src/test/java/org/apache/cloudstack/storage/configdrive/ConfigDriveBuilderTest.java
index 9603273..50cab35 100644
--- a/engine/storage/configdrive/src/test/java/org/apache/cloudstack/storage/configdrive/ConfigDriveBuilderTest.java
+++ b/engine/storage/configdrive/src/test/java/org/apache/cloudstack/storage/configdrive/ConfigDriveBuilderTest.java
@@ -17,6 +17,9 @@
package org.apache.cloudstack.storage.configdrive;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.times;
import java.io.File;
@@ -53,7 +56,7 @@
ConfigDriveBuilder.writeFile(new File("folder"), "subfolder", "content");
- PowerMockito.verifyStatic();
+ PowerMockito.verifyStatic(FileUtils.class);
FileUtils.write(Mockito.any(File.class), Mockito.anyString(), Mockito.any(Charset.class), Mockito.eq(false));
}
@@ -130,8 +133,10 @@
public void buildConfigDriveTestIoException() throws Exception {
PowerMockito.mockStatic(ConfigDriveBuilder.class);
+ Method method1 = ReflectionUtils.getMethods(ConfigDriveBuilder.class, ReflectionUtils.withName("writeFile")).iterator().next();
Method method = ReflectionUtils.getMethods(ConfigDriveBuilder.class, ReflectionUtils.withName("writeVendorAndNetworkEmptyJsonFile")).iterator().next();
- PowerMockito.when(ConfigDriveBuilder.class, method).withArguments(Mockito.any(File.class)).thenThrow(IOException.class);
+
+ PowerMockito.when(ConfigDriveBuilder.class, method).withArguments(nullable(File.class)).thenThrow(CloudRuntimeException.class);
//This is odd, but it was necessary to allow us to check if we catch the IOexception and re-throw as a CloudRuntimeException
//We are mocking the class being tested; therefore, we needed to force the execution of the real method we want to test.
@@ -165,7 +170,7 @@
Assert.assertEquals("mockIsoDataBase64", returnedIsoData);
- PowerMockito.verifyStatic();
+ PowerMockito.verifyStatic(ConfigDriveBuilder.class);
ConfigDriveBuilder.writeVendorAndNetworkEmptyJsonFile(Mockito.any(File.class));
ConfigDriveBuilder.writeVmMetadata(Mockito.anyListOf(String[].class), Mockito.anyString(), Mockito.any(File.class));
ConfigDriveBuilder.linkUserData(Mockito.anyString());
@@ -211,7 +216,7 @@
Mockito.verify(folderFileMock).exists();
Mockito.verify(folderFileMock).mkdirs();
- PowerMockito.verifyStatic();
+ PowerMockito.verifyStatic(ConfigDriveBuilder.class);
ConfigDriveBuilder.writeFile(Mockito.any(File.class), Mockito.eq("vendor_data.json"), Mockito.eq("{}"));
ConfigDriveBuilder.writeFile(Mockito.any(File.class), Mockito.eq("network_data.json"), Mockito.eq("{}"));
}
@@ -228,15 +233,20 @@
PowerMockito.mockStatic(ConfigDriveBuilder.class);
Method method = getWriteVmMetadataMethod();
- PowerMockito.when(ConfigDriveBuilder.class, method).withArguments(new ArrayList<>(), "metadataFile", new File("folder")).thenCallRealMethod();
+ PowerMockito.when(ConfigDriveBuilder.class, method).withArguments(Mockito.anyListOf(String[].class), anyString(), any(File.class)).thenCallRealMethod();
Method createJsonObjectWithVmDataMethod = ReflectionUtils.getMethods(ConfigDriveBuilder.class, ReflectionUtils.withName("createJsonObjectWithVmData")).iterator().next();
- PowerMockito.when(ConfigDriveBuilder.class, createJsonObjectWithVmDataMethod).withArguments(Mockito.anyListOf(String[].class), Mockito.any(File.class)).thenReturn(new JsonObject());
- ConfigDriveBuilder.writeVmMetadata(new ArrayList<>(), "metadataFile", new File("folder"));
+ PowerMockito.when(ConfigDriveBuilder.class, createJsonObjectWithVmDataMethod).withArguments(Mockito.anyListOf(String[].class), Mockito.anyString()).thenReturn(new JsonObject());
- PowerMockito.verifyStatic();
- ConfigDriveBuilder.createJsonObjectWithVmData(Mockito.anyListOf(String[].class), Mockito.anyString());
+ List<String[]> vmData = new ArrayList<>();
+ vmData.add(new String[] {"dataType", "fileName", "content"});
+ vmData.add(new String[] {"dataType2", "fileName2", "content2"});
+
+ ConfigDriveBuilder.writeVmMetadata(vmData, "metadataFile", new File("folder"));
+
+ PowerMockito.verifyStatic(ConfigDriveBuilder.class);
+ ConfigDriveBuilder.createJsonObjectWithVmData(vmData, "metadataFile");
ConfigDriveBuilder.writeFile(Mockito.any(File.class), Mockito.eq("meta_data.json"), Mockito.eq("{}"));
}
@@ -306,7 +316,7 @@
Mockito.doReturn("scriptMessage").when(scriptMock).execute();
Method method = ReflectionUtils.getMethods(ConfigDriveBuilder.class, ReflectionUtils.withName("generateAndRetrieveIsoAsBase64Iso")).iterator().next();
- PowerMockito.when(ConfigDriveBuilder.class, method).withArguments(Mockito.any(File.class), Mockito.any(File.class), Mockito.any(File.class)).thenCallRealMethod();
+ PowerMockito.when(ConfigDriveBuilder.class, method).withArguments(nullable(String.class), nullable(String.class), nullable(String.class)).thenCallRealMethod();
Method getProgramToGenerateIsoMethod = ReflectionUtils.getMethods(ConfigDriveBuilder.class, ReflectionUtils.withName("getProgramToGenerateIso")).iterator().next();
PowerMockito.when(ConfigDriveBuilder.class, getProgramToGenerateIsoMethod).withNoArguments().thenReturn("/usr/bin/genisoimage");
@@ -330,7 +340,7 @@
Mockito.doReturn(64L * 1024L * 1024L + 1l).when(fileMock).length();
Method method = ReflectionUtils.getMethods(ConfigDriveBuilder.class, ReflectionUtils.withName("generateAndRetrieveIsoAsBase64Iso")).iterator().next();
- PowerMockito.when(ConfigDriveBuilder.class, method).withArguments(Mockito.any(File.class), Mockito.any(File.class), Mockito.any(File.class)).thenCallRealMethod();
+ PowerMockito.when(ConfigDriveBuilder.class, method).withArguments(nullable(String.class), nullable(String.class), nullable(String.class)).thenCallRealMethod();
Method getProgramToGenerateIsoMethod = ReflectionUtils.getMethods(ConfigDriveBuilder.class, ReflectionUtils.withName("getProgramToGenerateIso")).iterator().next();
PowerMockito.when(ConfigDriveBuilder.class, getProgramToGenerateIsoMethod).withNoArguments().thenReturn("/usr/bin/genisoimage");
@@ -355,7 +365,7 @@
Mockito.doReturn(64L * 1024L * 1024L).when(fileMock).length();
Method method = ReflectionUtils.getMethods(ConfigDriveBuilder.class, ReflectionUtils.withName("generateAndRetrieveIsoAsBase64Iso")).iterator().next();
- PowerMockito.when(ConfigDriveBuilder.class, method).withArguments(Mockito.any(File.class), Mockito.any(File.class), Mockito.any(File.class)).thenCallRealMethod();
+ PowerMockito.when(ConfigDriveBuilder.class, method).withArguments(nullable(String.class), nullable(String.class), nullable(String.class)).thenCallRealMethod();
Method getProgramToGenerateIsoMethod = ReflectionUtils.getMethods(ConfigDriveBuilder.class, ReflectionUtils.withName("getProgramToGenerateIso")).iterator().next();
PowerMockito.when(ConfigDriveBuilder.class, getProgramToGenerateIsoMethod).withNoArguments().thenReturn("/usr/bin/genisoimage");
@@ -376,8 +386,8 @@
inOrder.verify(scriptMock).add("tempDirName");
inOrder.verify(scriptMock).execute();
- PowerMockito.verifyStatic();
- ConfigDriveBuilder.fileToBase64String(Mockito.any(File.class));
+ PowerMockito.verifyStatic(ConfigDriveBuilder.class);
+ ConfigDriveBuilder.fileToBase64String(nullable(File.class));
}
@@ -396,7 +406,7 @@
ConfigDriveBuilder.createJsonObjectWithVmData(vmData, "tempDirName");
- PowerMockito.verifyStatic(Mockito.times(1));
+ PowerMockito.verifyStatic(ConfigDriveBuilder.class, Mockito.times(1));
ConfigDriveBuilder.createFileInTempDirAnAppendOpenStackMetadataToJsonObject(Mockito.eq("tempDirName"), Mockito.any(JsonObject.class), Mockito.eq("dataType"), Mockito.eq("fileName"),
Mockito.eq("content"));
ConfigDriveBuilder.createFileInTempDirAnAppendOpenStackMetadataToJsonObject(Mockito.eq("tempDirName"), Mockito.any(JsonObject.class), Mockito.eq("dataType2"), Mockito.eq("fileName2"),
@@ -494,4 +504,4 @@
Mockito.verify(mkIsoProgramInMacOsFileMock, Mockito.times(1)).canExecute();
Mockito.verify(mkIsoProgramInMacOsFileMock, Mockito.times(1)).getCanonicalPath();
}
-}
\ No newline at end of file
+}
diff --git a/engine/storage/datamotion/pom.xml b/engine/storage/datamotion/pom.xml
index cdbdb5f..ee8830b 100644
--- a/engine/storage/datamotion/pom.xml
+++ b/engine/storage/datamotion/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
index a5b01c7..7c930fb 100644
--- a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
+++ b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
@@ -325,7 +325,25 @@
Scope destScope = getZoneScope(destData.getDataStore().getScope());
DataStore cacheStore = cacheMgr.getCacheStorage(destScope);
+ boolean bypassSecondaryStorage = false;
+ if (srcData instanceof VolumeInfo && ((VolumeInfo)srcData).isDirectDownload()) {
+ bypassSecondaryStorage = true;
+ }
+
if (cacheStore == null) {
+ if (bypassSecondaryStorage) {
+ CopyCommand cmd = new CopyCommand(srcData.getTO(), destData.getTO(), _copyvolumewait, VirtualMachineManager.ExecuteInSequence.value());
+ EndPoint ep = selector.select(srcData, destData);
+ Answer answer = null;
+ if (ep == null) {
+ String errMsg = "No remote endpoint to send command, check if host or ssvm is down?";
+ s_logger.error(errMsg);
+ answer = new Answer(cmd, false, errMsg);
+ } else {
+ answer = ep.sendMessage(cmd);
+ }
+ return answer;
+ }
// need to find a nfs or cifs image store, assuming that can't copy volume
// directly to s3
ImageStoreEntity imageStore = (ImageStoreEntity)dataStoreMgr.getImageStoreWithFreeCapacity(destScope.getScopeId());
diff --git a/engine/storage/datamotion/src/test/java/org/apache/cloudstack/storage/motion/KvmNonManagedStorageSystemDataMotionTest.java b/engine/storage/datamotion/src/test/java/org/apache/cloudstack/storage/motion/KvmNonManagedStorageSystemDataMotionTest.java
index 3dfc4af..6971444 100644
--- a/engine/storage/datamotion/src/test/java/org/apache/cloudstack/storage/motion/KvmNonManagedStorageSystemDataMotionTest.java
+++ b/engine/storage/datamotion/src/test/java/org/apache/cloudstack/storage/motion/KvmNonManagedStorageSystemDataMotionTest.java
@@ -19,6 +19,7 @@
package org.apache.cloudstack.storage.motion;
import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.when;
import java.util.HashMap;
@@ -270,7 +271,7 @@
sourceTemplate.setId(0l);
TemplateObjectTO destTemplate = new TemplateObjectTO();
ImageStoreVO dataStoreVO = Mockito.mock(ImageStoreVO.class);
- Mockito.when(dataStoreVO.getId()).thenReturn(0l);
+ Mockito.lenient().when(dataStoreVO.getId()).thenReturn(0l);
ImageStoreEntity destDataStore = Mockito.mock(ImageStoreImpl.class);
Mockito.doReturn(0l).when(destDataStore).getId();
@@ -299,7 +300,7 @@
@Test
public void copyTemplateToTargetStorageIfNeededTestTemplateAlreadyOnTargetHost() throws AgentUnavailableException, OperationTimedoutException {
Answer copyCommandAnswer = Mockito.mock(Answer.class);
- Mockito.when(copyCommandAnswer.getResult()).thenReturn(true);
+ Mockito.lenient().when(copyCommandAnswer.getResult()).thenReturn(true);
configureAndTestcopyTemplateToTargetStorageIfNeeded(new VMTemplateStoragePoolVO(0l, 0l), StoragePoolType.Filesystem, 0);
}
@@ -329,14 +330,14 @@
StoragePool srcStoragePool = Mockito.mock(StoragePool.class);
VolumeInfo destVolumeInfo = Mockito.mock(VolumeInfo.class);
- Mockito.when(volumeDataFactory.getVolume(Mockito.anyLong(), Mockito.any(DataStore.class))).thenReturn(destVolumeInfo);
+ Mockito.lenient().when(volumeDataFactory.getVolume(Mockito.anyLong(), Mockito.any(DataStore.class))).thenReturn(destVolumeInfo);
StoragePool destStoragePool = Mockito.mock(StoragePool.class);
Mockito.when(destStoragePool.getId()).thenReturn(0l);
Mockito.when(destStoragePool.getPoolType()).thenReturn(storagePoolType);
DataStore sourceTemplateDataStore = Mockito.mock(DataStore.class);
- Mockito.when(sourceTemplateDataStore.getName()).thenReturn("sourceTemplateName");
+ Mockito.lenient().when(sourceTemplateDataStore.getName()).thenReturn("sourceTemplateName");
TemplateInfo sourceTemplateInfo = Mockito.mock(TemplateInfo.class);
Mockito.when(sourceTemplateInfo.getInstallPath()).thenReturn("installPath");
@@ -357,7 +358,7 @@
Mockito.when(templateDataFactory.getTemplate(Mockito.anyLong(), Mockito.eq(sourceTemplateDataStore))).thenReturn(sourceTemplateInfo);
Mockito.when(templateDataFactory.getTemplate(Mockito.anyLong(), Mockito.eq(destDataStore))).thenReturn(sourceTemplateInfo);
kvmNonManagedStorageDataMotionStrategy.copyTemplateToTargetFilesystemStorageIfNeeded(srcVolumeInfo, srcStoragePool, destDataStore, destStoragePool, destHost);
- Mockito.doNothing().when(kvmNonManagedStorageDataMotionStrategy).updateTemplateReferenceIfSuccessfulCopy(Mockito.any(VolumeInfo.class), Mockito.any(StoragePool.class),
+ Mockito.lenient().doNothing().when(kvmNonManagedStorageDataMotionStrategy).updateTemplateReferenceIfSuccessfulCopy(Mockito.any(VolumeInfo.class), Mockito.any(StoragePool.class),
Mockito.any(TemplateInfo.class), Mockito.any(DataStore.class));
InOrder verifyInOrder = Mockito.inOrder(vmTemplatePoolDao, dataStoreManagerImpl, templateDataFactory, kvmNonManagedStorageDataMotionStrategy);
@@ -384,23 +385,23 @@
when(volumeInfo1.getDataStore()).thenReturn(dataStore1);
when(volumeInfo2.getPoolId()).thenReturn(POOL_1_ID);
- when(volumeInfo2.getDataStore()).thenReturn(dataStore1);
+ lenient().when(volumeInfo2.getDataStore()).thenReturn(dataStore1);
- when(dataStore1.getId()).thenReturn(POOL_1_ID);
+ lenient().when(dataStore1.getId()).thenReturn(POOL_1_ID);
when(pool1.getPoolType()).thenReturn(Storage.StoragePoolType.NetworkFilesystem);
when(pool2.getPoolType()).thenReturn(Storage.StoragePoolType.NetworkFilesystem);
when(pool2.getScope()).thenReturn(ScopeType.CLUSTER);
- when(dataStore3.getId()).thenReturn(POOL_3_ID);
- when(primaryDataStoreDao.findById(POOL_3_ID)).thenReturn(pool3);
- when(pool3.getPoolType()).thenReturn(Storage.StoragePoolType.NetworkFilesystem);
- when(pool3.getScope()).thenReturn(ScopeType.CLUSTER);
+ lenient().when(dataStore3.getId()).thenReturn(POOL_3_ID);
+ lenient().when(primaryDataStoreDao.findById(POOL_3_ID)).thenReturn(pool3);
+ lenient().when(pool3.getPoolType()).thenReturn(Storage.StoragePoolType.NetworkFilesystem);
+ lenient().when(pool3.getScope()).thenReturn(ScopeType.CLUSTER);
when(host1.getId()).thenReturn(HOST_1_ID);
when(host1.getClusterId()).thenReturn(CLUSTER_ID);
- when(host1.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.KVM);
+ lenient().when(host1.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.KVM);
when(host2.getId()).thenReturn(HOST_2_ID);
when(host2.getClusterId()).thenReturn(CLUSTER_ID);
- when(host2.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.KVM);
+ lenient().when(host2.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.KVM);
}
@Test
@@ -424,7 +425,7 @@
@Test
public void canHandleKVMLiveStorageMigrationMultipleSources() {
- when(volumeInfo1.getDataStore()).thenReturn(dataStore2);
+ lenient().when(volumeInfo1.getDataStore()).thenReturn(dataStore2);
StrategyPriority priority = kvmNonManagedStorageDataMotionStrategy.canHandleKVMNonManagedLiveNFSStorageMigration(migrationMap, host1, host2);
assertEquals(StrategyPriority.HYPERVISOR, priority);
}
@@ -438,7 +439,7 @@
@Test
public void testCanHandleLiveMigrationUnmanagedStorage() {
- when(pool2.isManaged()).thenReturn(false);
+ lenient().when(pool2.isManaged()).thenReturn(false);
StrategyPriority priority = kvmNonManagedStorageDataMotionStrategy.canHandleKVMNonManagedLiveNFSStorageMigration(migrationMap, host1, host2);
assertEquals(StrategyPriority.HYPERVISOR, priority);
}
@@ -463,7 +464,7 @@
@Test(expected = CloudRuntimeException.class)
public void testVerifyLiveMigrationMapForKVMMixedManagedUnmagedStorage() {
when(pool1.isManaged()).thenReturn(true);
- when(pool2.isManaged()).thenReturn(false);
+ lenient().when(pool2.isManaged()).thenReturn(false);
kvmNonManagedStorageDataMotionStrategy.verifyLiveMigrationForKVM(migrationMap, host2);
}
}
diff --git a/engine/storage/datamotion/src/test/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategyTest.java b/engine/storage/datamotion/src/test/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategyTest.java
index 288243c..4e62c94 100644
--- a/engine/storage/datamotion/src/test/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategyTest.java
+++ b/engine/storage/datamotion/src/test/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategyTest.java
@@ -20,6 +20,7 @@
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.mock;
import static org.mockito.MockitoAnnotations.initMocks;
@@ -85,9 +86,9 @@
@Test
public void cantHandleSecondary() {
- doReturn(sourceStore).when(volumeObjectSource).getDataStore();
+ lenient().doReturn(sourceStore).when(volumeObjectSource).getDataStore();
doReturn(DataStoreRole.Primary).when(sourceStore).getRole();
- doReturn(destinationStore).when(dataObjectDestination).getDataStore();
+ lenient().doReturn(destinationStore).when(dataObjectDestination).getDataStore();
doReturn(DataStoreRole.Image).when((DataStore)destinationStore).getRole();
doReturn(sourceStore).when(volumeObjectSource).getDataStore();
doReturn(destinationStore).when(dataObjectDestination).getDataStore();
@@ -199,7 +200,7 @@
StoragePoolVO destStoragePool = new StoragePoolVO();
StoragePoolType[] storagePoolTypes = StoragePoolType.values();
for (int i = 0; i < storagePoolTypes.length; i++) {
- Mockito.doReturn(storagePoolTypes[i]).when(sourceStoragePool).getPoolType();
+ Mockito.lenient().doReturn(storagePoolTypes[i]).when(sourceStoragePool).getPoolType();
boolean result = strategy.shouldMigrateVolume(sourceStoragePool, destHost, destStoragePool);
Assert.assertTrue(result);
}
@@ -244,7 +245,7 @@
private void configureAndVerifyIsSourceAndDestinationPoolTypeOfNfs(StoragePoolType destStoragePoolType, StoragePoolType sourceStoragePoolType, boolean expected) {
VolumeInfo srcVolumeInfo = Mockito.mock(VolumeObject.class);
- Mockito.when(srcVolumeInfo.getId()).thenReturn(0l);
+ Mockito.lenient().when(srcVolumeInfo.getId()).thenReturn(0l);
DataStore destDataStore = Mockito.mock(PrimaryDataStoreImpl.class);
Mockito.when(destDataStore.getId()).thenReturn(1l);
diff --git a/engine/storage/image/pom.xml b/engine/storage/image/pom.xml
index 75689cb..ac96bb6 100644
--- a/engine/storage/image/pom.xml
+++ b/engine/storage/image/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
index 97ac7c9..edf8244 100644
--- a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
+++ b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
@@ -264,13 +264,13 @@
List<VMTemplateVO> defaultBuiltin = _templateDao.listDefaultBuiltinTemplates();
for (VMTemplateVO rtngTmplt : rtngTmplts) {
- if (rtngTmplt.getHypervisorType() == hostHyper) {
+ if (rtngTmplt.getHypervisorType() == hostHyper && !rtngTmplt.isDirectDownload()) {
toBeDownloaded.add(rtngTmplt);
}
}
for (VMTemplateVO builtinTmplt : defaultBuiltin) {
- if (builtinTmplt.getHypervisorType() == hostHyper) {
+ if (builtinTmplt.getHypervisorType() == hostHyper && !builtinTmplt.isDirectDownload()) {
toBeDownloaded.add(builtinTmplt);
}
}
@@ -1201,6 +1201,9 @@
for (VMTemplateVO tmplt : rtngTmplts) {
TemplateDataStoreVO tmpltStore = _vmTemplateStoreDao.findByStoreTemplate(storeId, tmplt.getId());
if (tmpltStore == null) {
+ if (_vmTemplateStoreDao.isTemplateMarkedForDirectDownload(tmplt.getId())) {
+ continue;
+ }
tmpltStore =
new TemplateDataStoreVO(storeId, tmplt.getId(), new Date(), 100, Status.DOWNLOADED, null, null, null,
TemplateConstants.DEFAULT_SYSTEM_VM_TEMPLATE_PATH + tmplt.getId() + '/', tmplt.getUrl());
diff --git a/engine/storage/integration-test/pom.xml b/engine/storage/integration-test/pom.xml
index b5e3f2d..734a27f 100644
--- a/engine/storage/integration-test/pom.xml
+++ b/engine/storage/integration-test/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/engine/storage/pom.xml b/engine/storage/pom.xml
index 53b2f6d..04b648f 100644
--- a/engine/storage/pom.xml
+++ b/engine/storage/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/engine/storage/snapshot/pom.xml b/engine/storage/snapshot/pom.xml
index cfac770..99ab9b3 100644
--- a/engine/storage/snapshot/pom.xml
+++ b/engine/storage/snapshot/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/CephSnapshotStrategy.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/CephSnapshotStrategy.java
index 59ce3ec..87f9e10 100644
--- a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/CephSnapshotStrategy.java
+++ b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/CephSnapshotStrategy.java
@@ -56,9 +56,18 @@
return StrategyPriority.CANT_HANDLE;
}
- if (SnapshotOperation.REVERT.equals(op) && isSnapshotStoredOnRbdStoragePool(snapshot)) {
+ if (!isSnapshotStoredOnRbdStoragePool(snapshot)) {
+ return StrategyPriority.CANT_HANDLE;
+ }
+
+ if (SnapshotOperation.REVERT.equals(op)) {
return StrategyPriority.HIGHEST;
}
+
+ if (SnapshotOperation.DELETE.equals(op)) {
+ return StrategyPriority.HIGHEST;
+ }
+
return StrategyPriority.CANT_HANDLE;
}
diff --git a/engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/snapshot/CephSnapshotStrategyTest.java b/engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/snapshot/CephSnapshotStrategyTest.java
index a4c4867..260a21d 100644
--- a/engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/snapshot/CephSnapshotStrategyTest.java
+++ b/engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/snapshot/CephSnapshotStrategyTest.java
@@ -81,12 +81,14 @@
VolumeVO volumeVO = Mockito.mock(VolumeVO.class);
Mockito.when(volumeVO.getRemoved()).thenReturn(removed);
Mockito.when(volumeDao.findByIdIncludingRemoved(Mockito.anyLong())).thenReturn(volumeVO);
- Mockito.doReturn(isSnapshotStoredOnRbdStoragePool).when(cephSnapshotStrategy).isSnapshotStoredOnRbdStoragePool(Mockito.any());
+ Mockito.lenient().doReturn(isSnapshotStoredOnRbdStoragePool).when(cephSnapshotStrategy).isSnapshotStoredOnRbdStoragePool(Mockito.any());
for (int i = 0; i < snapshotOps.length - 1; i++) {
StrategyPriority strategyPriority = cephSnapshotStrategy.canHandle(snapshot, snapshotOps[i]);
if (snapshotOps[i] == SnapshotOperation.REVERT && isSnapshotStoredOnRbdStoragePool) {
Assert.assertEquals(StrategyPriority.HIGHEST, strategyPriority);
+ } else if (snapshotOps[i] == SnapshotOperation.DELETE && isSnapshotStoredOnRbdStoragePool) {
+ Assert.assertEquals(StrategyPriority.HIGHEST, strategyPriority);
} else {
Assert.assertEquals(StrategyPriority.CANT_HANDLE, strategyPriority);
}
@@ -103,7 +105,7 @@
VolumeInfo volumeInfo = Mockito.mock(VolumeInfo.class);
Mockito.when(snapshotInfo.getBaseVolume()).thenReturn(volumeInfo);
Mockito.when(volumeInfo.getFormat()).thenReturn(imageFormatValues[i]);
- Mockito.doNothing().when(cephSnapshotStrategy).executeRevertSnapshot(Mockito.any(), Mockito.any());
+ Mockito.lenient().doNothing().when(cephSnapshotStrategy).executeRevertSnapshot(Mockito.any(), Mockito.any());
boolean revertResult = cephSnapshotStrategy.revertSnapshot(snapshotInfo);
diff --git a/engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/snapshot/SnapshotDataFactoryImplTest.java b/engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/snapshot/SnapshotDataFactoryImplTest.java
index aad339b..25de9cd 100644
--- a/engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/snapshot/SnapshotDataFactoryImplTest.java
+++ b/engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/snapshot/SnapshotDataFactoryImplTest.java
@@ -104,7 +104,7 @@
Assert.assertEquals(dataStoreMock, snapshotInfo.getDataStore());
Assert.assertEquals(snapshotVoMock, ((SnapshotObject)snapshotInfo).getSnapshotVO());
- PowerMockito.verifyStatic();
+ PowerMockito.verifyStatic(ComponentContext.class);
ComponentContext.inject(SnapshotObject.class);
}
}
diff --git a/engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
index 292ef43..6e8bdaf 100644
--- a/engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
+++ b/engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
@@ -84,6 +84,12 @@
}
}
+ private boolean moveBetweenPrimaryDirectDownload(DataStore srcStore, DataStore destStore) {
+ DataStoreRole srcRole = srcStore.getRole();
+ DataStoreRole destRole = destStore.getRole();
+ return srcRole == DataStoreRole.Primary && destRole == DataStoreRole.Primary;
+ }
+
protected boolean moveBetweenCacheAndImage(DataStore srcStore, DataStore destStore) {
DataStoreRole srcRole = srcStore.getRole();
DataStoreRole destRole = destStore.getRole();
@@ -182,6 +188,8 @@
DataStore destStore = destData.getDataStore();
if (moveBetweenPrimaryImage(srcStore, destStore)) {
return findEndPointForImageMove(srcStore, destStore);
+ } else if (moveBetweenPrimaryDirectDownload(srcStore, destStore)) {
+ return findEndPointForImageMove(srcStore, destStore);
} else if (moveBetweenCacheAndImage(srcStore, destStore)) {
// pick ssvm based on image cache dc
DataStore selectedStore = null;
@@ -263,6 +271,7 @@
}
sc.and(sc.entity().getStatus(), Op.IN, Status.Up, Status.Connecting);
sc.and(sc.entity().getType(), Op.EQ, Host.Type.SecondaryStorageVM);
+ sc.and(sc.entity().getRemoved(), Op.NULL);
return sc.list();
}
diff --git a/engine/storage/volume/pom.xml b/engine/storage/volume/pom.xml
index 4409a70..bbea8af 100644
--- a/engine/storage/volume/pom.xml
+++ b/engine/storage/volume/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeDataFactoryImpl.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeDataFactoryImpl.java
index 692f3cc..53fa21f 100644
--- a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeDataFactoryImpl.java
+++ b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeDataFactoryImpl.java
@@ -23,6 +23,8 @@
import javax.inject.Inject;
+import com.cloud.storage.VMTemplateVO;
+import com.cloud.storage.dao.VMTemplateDao;
import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
@@ -42,6 +44,8 @@
VolumeDataStoreDao volumeStoreDao;
@Inject
DataStoreManager storeMgr;
+ @Inject
+ VMTemplateDao templateDao;
@Override
public VolumeInfo getVolume(long volumeId, DataStore store) {
@@ -90,6 +94,12 @@
DataStore store = storeMgr.getDataStore(volumeVO.getPoolId(), DataStoreRole.Primary);
vol = VolumeObject.getVolumeObject(store, volumeVO);
}
+ if (vol.getTemplateId() != null) {
+ VMTemplateVO template = templateDao.findById(vol.getTemplateId());
+ if (template != null) {
+ vol.setDirectDownload(template.isDirectDownload());
+ }
+ }
return vol;
}
diff --git a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java
index d62a0ba..690a112 100644
--- a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java
+++ b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java
@@ -74,6 +74,7 @@
DiskOfferingDao diskOfferingDao;
private Object payload;
private MigrationOptions migrationOptions;
+ private boolean directDownload;
public VolumeObject() {
_volStateMachine = Volume.State.getStateMachine();
@@ -327,6 +328,16 @@
this.migrationOptions = migrationOptions;
}
+ @Override
+ public boolean isDirectDownload() {
+ return directDownload;
+ }
+
+ @Override
+ public void setDirectDownload(boolean directDownload) {
+ this.directDownload = directDownload;
+ }
+
public void update() {
volumeDao.update(volumeVO.getId(), volumeVO);
volumeVO = volumeDao.findById(volumeVO.getId());
diff --git a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
index 2a642f0..92c8a93 100644
--- a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
+++ b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@ -119,6 +119,7 @@
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GlobalLock;
import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.VirtualMachine;
@Component
public class VolumeServiceImpl implements VolumeService {
@@ -325,7 +326,10 @@
VolumeDataStoreVO volumeStore = _volumeStoreDao.findByVolume(volume.getId());
if (volumeStore != null) {
if (volumeStore.getDownloadState() == VMTemplateStorageResourceAssoc.Status.DOWNLOAD_IN_PROGRESS) {
- s_logger.debug("Volume: " + volume.getName() + " is currently being uploaded; cant' delete it.");
+ String msg = "Volume: " + volume.getName() + " is currently being uploaded; cant' delete it.";
+ s_logger.debug(msg);
+ result.setSuccess(false);
+ result.setResult(msg);
future.complete(result);
return future;
}
@@ -1213,6 +1217,12 @@
snapshotMgr.deletePoliciesForVolume(volumeId);
vol.stateTransit(Volume.Event.OperationSucceeded);
+
+ if (vol.getAttachedVM() == null || vol.getAttachedVM().getType() == VirtualMachine.Type.User) {
+ // Decrement the resource count for volumes and primary storage belonging user VM's only
+ _resourceLimitMgr.decrementResourceCount(vol.getAccountId(), ResourceType.volume, vol.isDisplay());
+ _resourceLimitMgr.decrementResourceCount(vol.getAccountId(), ResourceType.primary_storage, vol.isDisplay(), new Long(vol.getSize()));
+ }
}
@Override
diff --git a/framework/agent-lb/pom.xml b/framework/agent-lb/pom.xml
index eeebe09..abedb98 100644
--- a/framework/agent-lb/pom.xml
+++ b/framework/agent-lb/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>cloudstack-framework</artifactId>
<groupId>org.apache.cloudstack</groupId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
</project>
diff --git a/framework/ca/pom.xml b/framework/ca/pom.xml
index ba7884b..d19a17c 100644
--- a/framework/ca/pom.xml
+++ b/framework/ca/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-framework</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
</project>
diff --git a/framework/cluster/pom.xml b/framework/cluster/pom.xml
index f6260ec..a003248 100644
--- a/framework/cluster/pom.xml
+++ b/framework/cluster/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-framework</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/framework/config/pom.xml b/framework/config/pom.xml
index 3cece45..3dfbfde 100644
--- a/framework/config/pom.xml
+++ b/framework/config/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-framework</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/framework/db/pom.xml b/framework/db/pom.xml
index 0124cb7..38f6e39 100644
--- a/framework/db/pom.xml
+++ b/framework/db/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-framework</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/framework/db/src/main/java/com/cloud/utils/db/DriverLoader.java b/framework/db/src/main/java/com/cloud/utils/db/DriverLoader.java
index 06c8da5..14bd286 100644
--- a/framework/db/src/main/java/com/cloud/utils/db/DriverLoader.java
+++ b/framework/db/src/main/java/com/cloud/utils/db/DriverLoader.java
@@ -16,14 +16,15 @@
// under the License.
package com.cloud.utils.db;
-import com.cloud.utils.exception.CloudRuntimeException;
-import org.apache.log4j.Logger;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.log4j.Logger;
+
+import com.cloud.utils.exception.CloudRuntimeException;
+
public class DriverLoader {
private static final Logger LOGGER = Logger.getLogger(DriverLoader.class.getName());
@@ -32,7 +33,7 @@
static {
DRIVERS = new HashMap<String, String>();
- DRIVERS.put("jdbc:mysql", "com.mysql.jdbc.Driver");
+ DRIVERS.put("jdbc:mysql", "com.mysql.cj.jdbc.Driver");
DRIVERS.put("jdbc:postgresql", "org.postgresql.Driver");
DRIVERS.put("jdbc:h2", "org.h2.Driver");
diff --git a/framework/db/src/main/java/com/cloud/utils/db/GenericDao.java b/framework/db/src/main/java/com/cloud/utils/db/GenericDao.java
index 04c0882..38f9d9f 100644
--- a/framework/db/src/main/java/com/cloud/utils/db/GenericDao.java
+++ b/framework/db/src/main/java/com/cloud/utils/db/GenericDao.java
@@ -234,6 +234,8 @@
*/
void expunge();
+ boolean unremove(ID id);
+
public <K> K getNextInSequence(Class<K> clazz, String name);
/**
diff --git a/framework/db/src/main/java/com/cloud/utils/db/GenericDaoBase.java b/framework/db/src/main/java/com/cloud/utils/db/GenericDaoBase.java
index 32b1984..f34b8ed 100644
--- a/framework/db/src/main/java/com/cloud/utils/db/GenericDaoBase.java
+++ b/framework/db/src/main/java/com/cloud/utils/db/GenericDaoBase.java
@@ -22,6 +22,7 @@
import java.lang.reflect.Field;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
+import java.math.BigInteger;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
@@ -1421,7 +1422,11 @@
try {
if (_idField != null) {
if (id != null) {
- _idField.set(entity, id);
+ if (id instanceof BigInteger) {
+ _idField.set(entity, ((BigInteger) id).longValue());
+ } else {
+ _idField.set(entity, id);
+ }
} else {
id = (ID)_idField.get(entity);
}
@@ -1780,6 +1785,34 @@
}
}
+ @Override
+ public boolean unremove(ID id) {
+ if (_removed == null) {
+ return false;
+ }
+
+ final TransactionLegacy txn = TransactionLegacy.currentTxn();
+ PreparedStatement pstmt = null;
+ try {
+ txn.start();
+ pstmt = txn.prepareAutoCloseStatement(_removeSql.first());
+ final Attribute[] attrs = _removeSql.second();
+ pstmt.setObject(1, null);
+ for (int i = 0; i < attrs.length - 1; i++) {
+ prepareAttribute(i + 2, pstmt, attrs[i], id);
+ }
+
+ final int result = pstmt.executeUpdate();
+ txn.commit();
+ if (_cache != null) {
+ _cache.remove(id);
+ }
+ return result > 0;
+ } catch (final SQLException e) {
+ throw new CloudRuntimeException("DB Exception on: " + pstmt, e);
+ }
+ }
+
@DB()
protected void setField(final Object entity, final ResultSet rs, ResultSetMetaData meta, final int index) throws SQLException {
Attribute attr = _allColumns.get(new Pair<String, String>(meta.getTableName(index), meta.getColumnName(index)));
diff --git a/framework/db/src/main/java/com/cloud/utils/db/TransactionLegacy.java b/framework/db/src/main/java/com/cloud/utils/db/TransactionLegacy.java
index 6777077..2dde302 100644
--- a/framework/db/src/main/java/com/cloud/utils/db/TransactionLegacy.java
+++ b/framework/db/src/main/java/com/cloud/utils/db/TransactionLegacy.java
@@ -150,30 +150,28 @@
public static TransactionLegacy open(final String name, final short databaseId, final boolean forceDbChange) {
TransactionLegacy txn = tls.get();
- boolean isNew = false;
if (txn == null) {
if (s_logger.isTraceEnabled()) {
s_logger.trace("Creating the transaction: " + name);
}
txn = new TransactionLegacy(name, false, databaseId);
tls.set(txn);
- isNew = true;
+ s_mbean.addTransaction(txn);
} else if (forceDbChange) {
final short currentDbId = txn.getDatabaseId();
if (currentDbId != databaseId) {
// we need to end the current transaction and switch databases
- txn.close(txn.getName());
+ if (txn.close(txn.getName()) && txn.getCurrentConnection() == null) {
+ s_mbean.removeTransaction(txn);
+ }
txn = new TransactionLegacy(name, false, databaseId);
tls.set(txn);
- isNew = true;
+ s_mbean.addTransaction(txn);
}
}
txn.checkConnection();
txn.takeOver(name, false);
- if (isNew) {
- s_mbean.addTransaction(txn);
- }
return txn;
}
@@ -762,8 +760,8 @@
}
_conn.close();
_conn = null;
+ s_mbean.removeTransaction(this);
}
-
} catch (final SQLException e) {
s_logger.warn("Unable to close connection", e);
}
diff --git a/framework/direct-download/pom.xml b/framework/direct-download/pom.xml
index e7ac15f..b61b178 100644
--- a/framework/direct-download/pom.xml
+++ b/framework/direct-download/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>cloudstack-framework</artifactId>
<groupId>org.apache.cloudstack</groupId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
</project>
\ No newline at end of file
diff --git a/framework/events/pom.xml b/framework/events/pom.xml
index 8024802..f4e3123 100644
--- a/framework/events/pom.xml
+++ b/framework/events/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-framework</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/framework/ipc/pom.xml b/framework/ipc/pom.xml
index af12376..2ba7b92 100644
--- a/framework/ipc/pom.xml
+++ b/framework/ipc/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-framework</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/framework/ipc/src/main/java/org/apache/cloudstack/framework/serializer/OnwireClassRegistry.java b/framework/ipc/src/main/java/org/apache/cloudstack/framework/serializer/OnwireClassRegistry.java
index de75587..24ccfe4 100644
--- a/framework/ipc/src/main/java/org/apache/cloudstack/framework/serializer/OnwireClassRegistry.java
+++ b/framework/ipc/src/main/java/org/apache/cloudstack/framework/serializer/OnwireClassRegistry.java
@@ -109,7 +109,7 @@
if (filePath != null) {
// WINDOWS HACK
if (filePath.indexOf("%20") > 0)
- filePath = filePath.replaceAll("%20", " ");
+ filePath = filePath.replace("%20", " ");
if ((filePath.indexOf("!") > 0) && (filePath.indexOf(".jar") > 0)) {
String jarPath = filePath.substring(0, filePath.indexOf("!")).substring(filePath.indexOf(":") + 1);
// WINDOWS HACK
@@ -183,4 +183,4 @@
static String stripFilenameExtension(String file) {
return file.substring(0, file.lastIndexOf('.'));
}
-}
\ No newline at end of file
+}
diff --git a/framework/jobs/pom.xml b/framework/jobs/pom.xml
index 0877077..27c92fa 100644
--- a/framework/jobs/pom.xml
+++ b/framework/jobs/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-framework</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
index abc9e66..cb04d22 100644
--- a/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
+++ b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
@@ -855,7 +855,7 @@
public void reallyRun() {
try {
- s_logger.info("Begin cleanup expired async-jobs");
+ s_logger.trace("Begin cleanup expired async-jobs");
// forcefully cancel blocking queue items if they've been staying there for too long
List<SyncQueueItemVO> blockItems = _queueMgr.getBlockedQueueItems(JobCancelThresholdMinutes.value() * 60000, false);
@@ -905,7 +905,7 @@
}
}
- s_logger.info("End cleanup expired async-jobs");
+ s_logger.trace("End cleanup expired async-jobs");
} catch (Throwable e) {
s_logger.error("Unexpected exception when trying to execute queue item, ", e);
}
diff --git a/framework/managed-context/pom.xml b/framework/managed-context/pom.xml
index a8c3d93..0d76821 100644
--- a/framework/managed-context/pom.xml
+++ b/framework/managed-context/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/framework/pom.xml b/framework/pom.xml
index 1084847..9545b0f 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
</parent>
<build>
<plugins>
diff --git a/framework/quota/pom.xml b/framework/quota/pom.xml
index cdda3eb..7241d97 100644
--- a/framework/quota/pom.xml
+++ b/framework/quota/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-framework</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaManagerImpl.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaManagerImpl.java
index 769f9ae..3eb949f 100644
--- a/framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaManagerImpl.java
+++ b/framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaManagerImpl.java
@@ -158,6 +158,7 @@
case QuotaTypes.ISO:
case QuotaTypes.VOLUME:
case QuotaTypes.VM_SNAPSHOT:
+ case QuotaTypes.BACKUP:
qu = updateQuotaDiskUsage(usageRecord, aggregationRatio, usageRecord.getUsageType());
if (qu != null) {
quotaListForAccount.add(qu);
diff --git a/framework/quota/src/main/java/org/apache/cloudstack/quota/constant/QuotaTypes.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/constant/QuotaTypes.java
index 13788f7..babb4ed 100644
--- a/framework/quota/src/main/java/org/apache/cloudstack/quota/constant/QuotaTypes.java
+++ b/framework/quota/src/main/java/org/apache/cloudstack/quota/constant/QuotaTypes.java
@@ -16,12 +16,12 @@
// under the License.
package org.apache.cloudstack.quota.constant;
-import org.apache.cloudstack.usage.UsageTypes;
-
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.apache.cloudstack.usage.UsageTypes;
+
public class QuotaTypes extends UsageTypes {
public static final int CPU_CLOCK_RATE = 15;
public static final int CPU_NUMBER = 16;
@@ -57,6 +57,7 @@
quotaTypeList.put(VM_SNAPSHOT, new QuotaTypes(VM_SNAPSHOT, "VM_SNAPSHOT", "GB-Month", "VM Snapshot storage usage"));
quotaTypeList.put(VOLUME_SECONDARY, new QuotaTypes(VOLUME_SECONDARY, "VOLUME_SECONDARY", "GB-Month", "Volume secondary storage usage"));
quotaTypeList.put(VM_SNAPSHOT_ON_PRIMARY, new QuotaTypes(VM_SNAPSHOT_ON_PRIMARY, "VM_SNAPSHOT_ON_PRIMARY", "GB-Month", "VM Snapshot primary storage usage"));
+ quotaTypeList.put(BACKUP, new QuotaTypes(BACKUP, "BACKUP", "GB-Month", "Backup storage usage"));
quotaTypeList.put(CPU_CLOCK_RATE, new QuotaTypes(CPU_CLOCK_RATE, "CPU_CLOCK_RATE", "Compute-Month", "Quota tariff for using 1 CPU of clock rate 100MHz"));
quotaTypeList.put(CPU_NUMBER, new QuotaTypes(CPU_NUMBER, "CPU_NUMBER", "Compute-Month", "Quota tariff for running VM that has 1vCPU"));
quotaTypeList.put(MEMORY, new QuotaTypes(MEMORY, "MEMORY", "Compute-Month", "Quota tariff for using 1MB of RAM"));
diff --git a/framework/quota/src/test/java/org/apache/cloudstack/quota/QuotaAlertManagerImplTest.java b/framework/quota/src/test/java/org/apache/cloudstack/quota/QuotaAlertManagerImplTest.java
index bf7f126..88485b9 100644
--- a/framework/quota/src/test/java/org/apache/cloudstack/quota/QuotaAlertManagerImplTest.java
+++ b/framework/quota/src/test/java/org/apache/cloudstack/quota/QuotaAlertManagerImplTest.java
@@ -101,7 +101,7 @@
// Don't test sendQuotaAlert yet
Mockito.doNothing().when(quotaAlertManager).sendQuotaAlert(Mockito.any(QuotaAlertManagerImpl.DeferredQuotaEmail.class));
- Mockito.doReturn(true).when(quotaAlertManager).lockAccount(Mockito.anyLong());
+ Mockito.lenient().doReturn(true).when(quotaAlertManager).lockAccount(Mockito.anyLong());
// call real method on send monthly statement
Mockito.doCallRealMethod().when(quotaAlertManager).checkAndSendQuotaAlertEmails();
diff --git a/framework/quota/src/test/java/org/apache/cloudstack/quota/QuotaManagerImplTest.java b/framework/quota/src/test/java/org/apache/cloudstack/quota/QuotaManagerImplTest.java
index c9f6dcd..0253fc4 100644
--- a/framework/quota/src/test/java/org/apache/cloudstack/quota/QuotaManagerImplTest.java
+++ b/framework/quota/src/test/java/org/apache/cloudstack/quota/QuotaManagerImplTest.java
@@ -16,14 +16,18 @@
// under the License.
package org.apache.cloudstack.quota;
-import com.cloud.usage.UsageVO;
-import com.cloud.usage.dao.UsageDao;
-import com.cloud.user.Account;
-import com.cloud.user.AccountVO;
-import com.cloud.user.dao.AccountDao;
-import com.cloud.utils.Pair;
-import com.cloud.utils.db.TransactionLegacy;
-import junit.framework.TestCase;
+import static org.mockito.ArgumentMatchers.nullable;
+
+import java.lang.reflect.Field;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.naming.ConfigurationException;
+
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.quota.dao.QuotaAccountDao;
import org.apache.cloudstack.quota.dao.QuotaBalanceDao;
@@ -42,14 +46,15 @@
import org.mockito.Spy;
import org.mockito.runners.MockitoJUnitRunner;
-import javax.naming.ConfigurationException;
-import java.lang.reflect.Field;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import com.cloud.usage.UsageVO;
+import com.cloud.usage.dao.UsageDao;
+import com.cloud.user.Account;
+import com.cloud.user.AccountVO;
+import com.cloud.user.dao.AccountDao;
+import com.cloud.utils.Pair;
+import com.cloud.utils.db.TransactionLegacy;
+
+import junit.framework.TestCase;
@RunWith(MockitoJUnitRunner.class)
public class QuotaManagerImplTest extends TestCase {
@@ -163,7 +168,7 @@
QuotaTariffVO tariffVO = new QuotaTariffVO();
tariffVO.setCurrencyValue(new BigDecimal(1));
- Mockito.when(quotaTariffDao.findTariffPlanByUsageType(Mockito.anyInt(), Mockito.any(Date.class))).thenReturn(tariffVO);
+ Mockito.when(quotaTariffDao.findTariffPlanByUsageType(nullable(Integer.class), nullable(Date.class))).thenReturn(tariffVO);
QuotaUsageVO qu = quotaManager.updateQuotaNetwork(usageVO, UsageTypes.NETWORK_BYTES_SENT);
assertTrue(qu.getQuotaUsed().compareTo(BigDecimal.ZERO) > 0);
diff --git a/framework/quota/src/test/java/org/apache/cloudstack/quota/QuotaStatementTest.java b/framework/quota/src/test/java/org/apache/cloudstack/quota/QuotaStatementTest.java
index e2b5a0a..1b28f66 100644
--- a/framework/quota/src/test/java/org/apache/cloudstack/quota/QuotaStatementTest.java
+++ b/framework/quota/src/test/java/org/apache/cloudstack/quota/QuotaStatementTest.java
@@ -16,10 +16,17 @@
// under the License.
package org.apache.cloudstack.quota;
-import com.cloud.user.AccountVO;
-import com.cloud.user.dao.AccountDao;
-import com.cloud.utils.db.TransactionLegacy;
-import junit.framework.TestCase;
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Field;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+import javax.mail.MessagingException;
+import javax.naming.ConfigurationException;
+
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.quota.QuotaStatementImpl.QuotaStatementPeriods;
import org.apache.cloudstack.quota.dao.QuotaAccountDao;
@@ -33,16 +40,11 @@
import org.mockito.Spy;
import org.mockito.runners.MockitoJUnitRunner;
-import javax.mail.MessagingException;
-import javax.naming.ConfigurationException;
+import com.cloud.user.AccountVO;
+import com.cloud.user.dao.AccountDao;
+import com.cloud.utils.db.TransactionLegacy;
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.Field;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import junit.framework.TestCase;
@RunWith(MockitoJUnitRunner.class)
public class QuotaStatementTest extends TestCase {
@@ -230,16 +232,16 @@
AccountVO accountVO = new AccountVO();
accountVO.setId(2L);
accountVO.setDomainId(1L);
- Mockito.when(accountDao.findById(Mockito.anyLong())).thenReturn(accountVO);
+ Mockito.lenient().when(accountDao.findById(Mockito.anyLong())).thenReturn(accountVO);
QuotaAccountVO acc = new QuotaAccountVO(2L);
acc.setQuotaBalance(new BigDecimal(404));
acc.setLastStatementDate(null);
List<QuotaAccountVO> accounts = new ArrayList<>();
accounts.add(acc);
- Mockito.when(quotaAcc.listAllQuotaAccount()).thenReturn(accounts);
+ Mockito.lenient().when(quotaAcc.listAllQuotaAccount()).thenReturn(accounts);
- Mockito.when(quotaUsage.findTotalQuotaUsage(Mockito.anyLong(), Mockito.anyLong(), Mockito.anyInt(), Mockito.any(Date.class), Mockito.any(Date.class)))
+ Mockito.lenient().when(quotaUsage.findTotalQuotaUsage(Mockito.anyLong(), Mockito.anyLong(), Mockito.anyInt(), Mockito.any(Date.class), Mockito.any(Date.class)))
.thenReturn(new BigDecimal(100));
// call real method on send monthly statement
diff --git a/framework/rest/pom.xml b/framework/rest/pom.xml
index e1fc878..31a55bf 100644
--- a/framework/rest/pom.xml
+++ b/framework/rest/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-framework</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>cloud-framework-rest</artifactId>
@@ -56,6 +56,21 @@
<version>${cs.jackson.version}</version>
</dependency>
<dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${cs.jaxb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>${cs.jaxb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${cs.jaxb.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cs.cxf.version}</version>
diff --git a/framework/security/pom.xml b/framework/security/pom.xml
index 786e5a1..e02ac25 100644
--- a/framework/security/pom.xml
+++ b/framework/security/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-framework</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/framework/spring/lifecycle/pom.xml b/framework/spring/lifecycle/pom.xml
index 5045ac0..d3a23c8 100644
--- a/framework/spring/lifecycle/pom.xml
+++ b/framework/spring/lifecycle/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/framework/spring/module/pom.xml b/framework/spring/module/pom.xml
index e3231bd..1d546d6 100644
--- a/framework/spring/module/pom.xml
+++ b/framework/spring/module/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/packaging/README.md b/packaging/README.md
index abfd420..9c54ea6 100644
--- a/packaging/README.md
+++ b/packaging/README.md
@@ -6,9 +6,9 @@
# Requirements
The RPM and DEB packages have dependencies on versions of specific libraries. Due to these dependencies the following distributions and their versions are supported by the packages.
-* CentOS / RHEL: 6 and 7
+* CentOS / RHEL: 7
* Debian 7 (Wheezy) and 8 (Jessy) (untested!)
-* Ubuntu: 14.04 (Trusty) and 16.04 (Xenial)
+* Ubuntu: 16.04 (Xenial) and 18.04 (Bionic)
# Building
Using the scripts in the *packaging* directory the RPM and DEB packages can be build.
diff --git a/packaging/centos63/cloud-agent.rc b/packaging/centos63/cloud-agent.rc
deleted file mode 100755
index 8fa6de2..0000000
--- a/packaging/centos63/cloud-agent.rc
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/bash
-
-# chkconfig: 35 99 10
-# description: Cloud Agent
-# pidfile: /var/run/cloudstack-agent.pid
-
-# 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.
-
-# WARNING: if this script is changed, then all other initscripts MUST BE changed to match it as well
-
-. /etc/rc.d/init.d/functions
-
-# set environment variables
-
-TMP=/usr/share/cloudstack-agent/tmp
-SHORTNAME=$(basename $0 | sed -e 's/^[SK][0-9][0-9]//')
-PIDFILE=/var/run/"$SHORTNAME".pid
-LOCKFILE=/var/lock/subsys/"$SHORTNAME"
-LOGDIR=/var/log/cloudstack/agent
-LOGFILE=${LOGDIR}/agent.log
-PROGNAME="Cloud Agent"
-CLASS="com.cloud.agent.AgentShell"
-JSVC=`which jsvc 2>/dev/null`;
-
-# exit if we don't find jsvc
-if [ -z "$JSVC" ]; then
- echo no jsvc found in path;
- exit 1;
-fi
-
-# create java tmp dir if not found
-mkdir -m 0755 -p "$TMP"
-
-unset OPTIONS
-[ -r /etc/sysconfig/"$SHORTNAME" ] && source /etc/sysconfig/"$SHORTNAME"
-
-# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/jre /usr/lib/jvm/java-1.8.0 /usr/lib/jvm/java-8-openjdk /usr/lib/jvm/java-8-openjdk-i386 /usr/lib/jvm/java-8-openjdk-amd64"
-
-for jdir in $JDK_DIRS; do
- if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
- JAVA_HOME="$jdir"
- fi
-done
-export JAVA_HOME
-
-ACP=`ls /usr/share/cloudstack-agent/lib/*.jar | tr '\n' ':' | sed s'/.$//'`
-PCP=`ls /usr/share/cloudstack-agent/plugins/*.jar 2>/dev/null | tr '\n' ':' | sed s'/.$//'`
-
-# We need to append the JSVC daemon JAR to the classpath
-# AgentShell implements the JSVC daemon methods
-export CLASSPATH="/usr/share/java/commons-daemon.jar:$ACP:$PCP:/etc/cloudstack/agent:/usr/share/cloudstack-common/scripts"
-
-start() {
- echo -n $"Starting $PROGNAME: "
- if hostname --fqdn >/dev/null 2>&1 ; then
- $JSVC -Djava.io.tmpdir="$TMP" -Xms256m -Xmx2048m -cp "$CLASSPATH" -pidfile "$PIDFILE" \
- -errfile $LOGDIR/cloudstack-agent.err -outfile $LOGDIR/cloudstack-agent.out $CLASS
- RETVAL=$?
- echo
- else
- failure
- echo
- echo The host name does not resolve properly to an IP address. Cannot start "$PROGNAME". > /dev/stderr
- RETVAL=9
- fi
- [ $RETVAL = 0 ] && touch ${LOCKFILE}
- return $RETVAL
-}
-
-stop() {
- echo -n $"Stopping $PROGNAME: "
- $JSVC -pidfile "$PIDFILE" -stop $CLASS
- RETVAL=$?
- echo
- [ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE}
-}
-
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- status)
- status -p ${PIDFILE} $SHORTNAME
- RETVAL=$?
- ;;
- restart)
- stop
- sleep 3
- start
- ;;
- condrestart)
- if status -p ${PIDFILE} $SHORTNAME >&/dev/null; then
- stop
- sleep 3
- start
- fi
- ;;
- *)
- echo $"Usage: $SHORTNAME {start|stop|restart|condrestart|status|help}"
- RETVAL=3
-esac
-
-exit $RETVAL
diff --git a/packaging/centos63/cloud-ipallocator.rc b/packaging/centos63/cloud-ipallocator.rc
deleted file mode 100755
index d3eadec..0000000
--- a/packaging/centos63/cloud-ipallocator.rc
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/bash
-# 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.
-
-# chkconfig: 35 99 10
-# description: Cloud Agent
-
-# WARNING: if this script is changed, then all other initscripts MUST BE changed to match it as well
-
-. /etc/rc.d/init.d/functions
-
-# set environment variables
-
-SHORTNAME="$(basename $(readlink -f $0))"
-PIDFILE=/var/run/"$SHORTNAME".pid
-LOCKFILE=/var/lock/subsys/"$SHORTNAME"
-LOGFILE=/var/log/cloudstack/ipallocator/ipallocator.log
-PROGNAME="External IPAllocator"
-
-unset OPTIONS
-[ -r /etc/sysconfig/"$SHORTNAME" ] && source /etc/sysconfig/"$SHORTNAME"
-DAEMONIZE=/usr/bin/cloud-daemonize
-PROG=/usr/bin/cloud-external-ipallocator.py
-OPTIONS=8083
-
-start() {
- echo -n $"Starting $PROGNAME: "
- if hostname --fqdn >/dev/null 2>&1 ; then
- daemon --check=$SHORTNAME --pidfile=${PIDFILE} "$DAEMONIZE" \
- -n "$SHORTNAME" -p "$PIDFILE" -l "$LOGFILE" "$PROG" $OPTIONS
- RETVAL=$?
- echo
- else
- failure
- echo
- echo The host name does not resolve properly to an IP address. Cannot start "$PROGNAME". > /dev/stderr
- RETVAL=9
- fi
- [ $RETVAL = 0 ] && touch ${LOCKFILE}
- return $RETVAL
-}
-
-stop() {
- echo -n $"Stopping $PROGNAME: "
- killproc -p ${PIDFILE} $SHORTNAME # -d 10 $SHORTNAME
- RETVAL=$?
- echo
- [ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE}
-}
-
-
-# See how we were called.
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- status)
- status -p ${PIDFILE} $SHORTNAME
- RETVAL=$?
- ;;
- restart)
- stop
- sleep 3
- start
- ;;
- condrestart)
- if status -p ${PIDFILE} $SHORTNAME >&/dev/null; then
- stop
- sleep 3
- start
- fi
- ;;
- *)
- echo $"Usage: $SHORTNAME {start|stop|restart|condrestart|status|help}"
- RETVAL=3
-esac
-
-exit $RETVAL
-
diff --git a/packaging/centos63/cloud-management.rc b/packaging/centos63/cloud-management.rc
deleted file mode 100755
index 8dcd7aa..0000000
--- a/packaging/centos63/cloud-management.rc
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/bin/bash
-
-### BEGIN INIT INFO
-# Provides: cloudstack-management
-# Required-Start: $network $local_fs
-# Required-Stop: $network $local_fs
-# Default-Start: 3 4 5
-# Default-Stop: 0 1 2 6
-# Short-Description: Start/stop Apache CloudStack Usage Monitor
-# Description: This scripts Starts/Stops the Apache CloudStack Management Server
-### END INIT INFO
-
-# 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.
-
-. /etc/rc.d/init.d/functions
-
-SHORTNAME="cloudstack-management"
-PIDFILE=/var/run/"$SHORTNAME".pid
-LOCKFILE=/var/lock/subsys/"$SHORTNAME"
-LOGDIR=/var/log/cloudstack/management
-PROGNAME="CloudStack Management Server"
-CLASS="org.apache.cloudstack.ServerDaemon"
-PROG="jsvc"
-DAEMON="/usr/bin/jsvc"
-USER=cloud
-
-export HOME="/var/cloudstack/management"
-
-unset OPTIONS
-[ -r /etc/default/"$SHORTNAME" ] && source /etc/default/"$SHORTNAME"
-
-setJavaHome() {
- # use $JAVA_HOME if defined
- if [ -n "$JAVA_HOME" ] ; then
- return
- fi
-
- # try java first
- java=$(which java 2>/dev/null || :)
-
- # try javac if java is not found
- if [ -z "$java" ] ; then
- java=$(which javac 2>/dev/null || :)
- fi
-
- if [ -n "$java" ] ; then
- JAVA_HOME=$(dirname $(dirname $(readlink -e $java)))
- export JAVA_HOME
- return
- fi
-
- # didnt find java home. exiting with error
- exit 1
-}
-
-setJavaHome
-
-JARS=$(ls /usr/share/cloudstack-management/lib/*.jar | tr '\n' ':' | sed s'/.$//')
-CLASSPATH="$JARS:$CLASSPATH:/usr/share/java/commons-daemon.jar"
-
-start() {
- if [ -s "$PIDFILE" ] && kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
- echo "$PROGNAME apparently already running"
- exit 0
- fi
-
- if hostname --fqdn >/dev/null 2>&1 ; then
- true
- else
- echo "The host name does not resolve properly to an IP address. Cannot start $PROGNAME"
- exit 1
- fi
-
- echo -n "Starting $PROGNAME" "$SHORTNAME"
-
- if daemon --pidfile $PIDFILE $DAEMON $JAVA_DEBUG -home "$JAVA_HOME" -cp "$CLASSPATH" -pidfile "$PIDFILE" -user "$USER" \
- -errfile $LOGDIR/cloudstack-management.err $JAVA_OPTS $CLASS
- RETVAL=$?
- then
- rc=0
- sleep 1
- if ! kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
- failure
- rc=1
- fi
- else
- rc=1
- fi
-
- if [ $rc -eq 0 ]; then
- success
- else
- failure
- rm -f "$PIDFILE"
- fi
- echo
-}
-
-stop() {
- echo -n "Stopping $PROGNAME" "$SHORTNAME"
- killproc -p $PIDFILE $DAEMON
- if [ "$?" -eq 0 ]; then
- success
- else
- failure
- fi
- rm -f "$PIDFILE"
- echo
-}
-
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- status)
- status -p $PIDFILE $SHORTNAME
- RETVAL=$?
- ;;
- restart | force-reload)
- stop
- sleep 3
- start
- ;;
- *)
- echo "Usage: $0 {start|stop|restart|force-reload|status}"
- RETVAL=3
-esac
-
-exit $RETVAL
diff --git a/packaging/centos63/cloud-usage.rc b/packaging/centos63/cloud-usage.rc
deleted file mode 100755
index 15e9ee5..0000000
--- a/packaging/centos63/cloud-usage.rc
+++ /dev/null
@@ -1,156 +0,0 @@
-#!/bin/bash
-
-### BEGIN INIT INFO
-# Provides: cloudstack-usage
-# Required-Start: $network $local_fs
-# Required-Stop: $network $local_fs
-# Default-Start: 3 4 5
-# Default-Stop: 0 1 2 6
-# Short-Description: Start/stop Apache CloudStack Usage Monitor
-# Description: This scripts Starts/Stops the Apache CloudStack Usage Monitor
-## The CloudStack Usage Monitor is a part of the Apache CloudStack project and is used
-## for storing usage statistics from instances.
-## JSVC (Java daemonizing) is used for starting and stopping the usage monitor.
-### END INIT INFO
-
-# 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.
-
-. /etc/rc.d/init.d/functions
-
-SHORTNAME="cloudstack-usage"
-PIDFILE=/var/run/"$SHORTNAME".pid
-LOCKFILE=/var/lock/subsys/"$SHORTNAME"
-LOGDIR=/var/log/cloudstack/usage
-LOGFILE=${LOGDIR}/usage.log
-PROGNAME="CloudStack Usage Monitor"
-CLASS="com.cloud.usage.UsageServer"
-PROG="jsvc"
-DAEMON="/usr/bin/jsvc"
-USER=cloud
-
-unset OPTIONS
-[ -r /etc/sysconfig/default/"$SHORTNAME" ] && source /etc/sysconfig/default/"$SHORTNAME"
-
-setJavaHome() {
- # use $JAVA_HOME if defined
- if [ -n "$JAVA_HOME" ] ; then
- return
- fi
-
- # try java first
- java=$(which java 2>/dev/null || :)
-
- # try javac if java is not found
- if [ -z "$java" ] ; then
- java=$(which javac 2>/dev/null || :)
- fi
-
- if [ -n "$java" ] ; then
- JAVA_HOME=$(dirname $(dirname $(readlink -e $java)))
- export JAVA_HOME
- return
- fi
-
- # didnt find java home. exiting with error
- exit 1
-}
-
-setJavaHome
-
-SCP=""
-DCP=""
-UCP=`ls /usr/share/cloudstack-usage/cloud-usage-*.jar`":"`ls /usr/share/cloudstack-usage/lib/*.jar | tr '\n' ':'`
-JCP="/usr/share/java/commons-daemon.jar":"/usr/share/java/mysql-connector-java.jar"
-
-# We need to append the JSVC daemon and mysql-connector JAR to the classpath
-# AgentShell implements the JSVC daemon methods
-export CLASSPATH="$SCP:$DCP:$UCP:$JCP:/etc/cloudstack/usage"
-
-start() {
- if [ -s "$PIDFILE" ] && kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
- echo "$PROGNAME apparently already running"
- exit 0
- fi
-
- if hostname --fqdn >/dev/null 2>&1 ; then
- true
- else
- echo "The host name does not resolve properly to an IP address. Cannot start $PROGNAME"
- exit 1
- fi
-
- echo -n "Starting $PROGNAME" "$SHORTNAME"
-
- if daemon --pidfile $PIDFILE $DAEMON $JAVA_DEBUG -home "$JAVA_HOME" -cp "$CLASSPATH" -pidfile "$PIDFILE" -user "$USER" \
- -errfile $LOGDIR/cloudstack-usage.err -outfile $LOGDIR/cloudstack-usage.out -Dpid=$$ $CLASS
- RETVAL=$?
- then
- rc=0
- sleep 1
- if ! kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
- failure
- rc=1
- fi
- else
- rc=1
- fi
-
- if [ $rc -eq 0 ]; then
- success
- else
- failure
- rm -f "$PIDFILE"
- fi
- echo
-}
-
-stop() {
- echo -n "Stopping $PROGNAME" "$SHORTNAME"
- killproc -p $PIDFILE $DAEMON
- if [ "$?" -eq 0 ]; then
- success
- else
- failure
- fi
- rm -f "$PIDFILE"
- echo
-}
-
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- status)
- status -p $PIDFILE $SHORTNAME
- RETVAL=$?
- ;;
- restart | force-reload)
- stop
- sleep 3
- start
- ;;
- *)
- echo "Usage: $0 {start|stop|restart|force-reload|status}"
- RETVAL=3
-esac
-
-exit $RETVAL
-
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
deleted file mode 100644
index 05575e0..0000000
--- a/packaging/centos63/cloud.spec
+++ /dev/null
@@ -1,635 +0,0 @@
-# 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.
-
-%define __os_install_post %{nil}
-%global debug_package %{nil}
-
-# DISABLE the post-percentinstall java repacking and line number stripping
-# we need to find a way to just disable the java repacking and line number stripping, but not the autodeps
-
-Name: cloudstack
-Summary: CloudStack IaaS Platform
-#http://fedoraproject.org/wiki/PackageNamingGuidelines#Pre-Release_packages
-%define _maventag %{_fullver}
-Release: %{_rel}%{dist}
-
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-
-Version: %{_ver}
-License: ASL 2.0
-Vendor: Apache CloudStack <dev@cloudstack.apache.org>
-Packager: Apache CloudStack <dev@cloudstack.apache.org>
-Group: System Environment/Libraries
-# FIXME do groups for every single one of the subpackages
-Source0: %{name}-%{_maventag}.tgz
-BuildRoot: %{_tmppath}/%{name}-%{_maventag}-%{release}-build
-
-BuildRequires: java-1.8.0-openjdk-devel
-BuildRequires: ws-commons-util
-BuildRequires: jpackage-utils
-BuildRequires: gcc
-BuildRequires: glibc-devel
-BuildRequires: /usr/bin/mkisofs
-BuildRequires: mysql-connector-python
-#BuildRequires: maven => 3.0.0
-
-%description
-CloudStack is a highly-scalable elastic, open source,
-intelligent IaaS cloud implementation.
-
-%package management
-Summary: CloudStack management server UI
-Requires: java-1.8.0-openjdk
-Requires: jsvc
-Requires: jakarta-commons-daemon
-Requires: jakarta-commons-daemon-jsvc
-Requires: python
-Requires: bash
-Requires: bzip2
-Requires: gzip
-Requires: unzip
-Requires: /sbin/mount.nfs
-Requires: openssh-clients
-Requires: nfs-utils
-Requires: wget
-Requires: mysql
-Requires: mysql-connector-java
-Requires: sudo
-Requires: /sbin/service
-Requires: /sbin/chkconfig
-Requires: /usr/bin/ssh-keygen
-Requires: mkisofs
-Requires: mysql-connector-python
-Requires: python-paramiko
-Requires: ipmitool
-Requires: %{name}-common = %{_ver}
-Obsoletes: cloud-client < 4.1.0
-Obsoletes: cloud-client-ui < 4.1.0
-Obsoletes: cloud-server < 4.1.0
-Obsoletes: cloud-test < 4.1.0
-Provides: cloud-client
-Group: System Environment/Libraries
-%description management
-The CloudStack management server is the central point of coordination,
-management, and intelligence in CloudStack.
-
-%package common
-Summary: Apache CloudStack common files and scripts
-Requires: python
-Requires: python-argparse
-Requires: python-netaddr
-Obsoletes: cloud-test < 4.1.0
-Obsoletes: cloud-scripts < 4.1.0
-Obsoletes: cloud-utils < 4.1.0
-Obsoletes: cloud-core < 4.1.0
-Obsoletes: cloud-deps < 4.1.0
-Obsoletes: cloud-python < 4.1.0
-Obsoletes: cloud-setup < 4.1.0
-Obsoletes: cloud-cli < 4.1.0
-Obsoletes: cloud-daemonize < 4.1.0
-Group: System Environment/Libraries
-%description common
-The Apache CloudStack files shared between agent and management server
-%global __requires_exclude ^libuuid\\.so\\.1$
-
-%package agent
-Summary: CloudStack Agent for KVM hypervisors
-Requires: openssh-clients
-Requires: java-1.8.0-openjdk
-Requires: %{name}-common = %{_ver}
-Requires: libvirt
-Requires: bridge-utils
-Requires: ebtables
-Requires: iptables
-Requires: ethtool
-Requires: vconfig
-Requires: ipset
-Requires: jsvc
-Requires: jakarta-commons-daemon
-Requires: jakarta-commons-daemon-jsvc
-Requires: net-tools
-Requires: perl
-Requires: libvirt-python
-Requires: qemu-img
-Requires: qemu-kvm
-Provides: cloud-agent
-Obsoletes: cloud-agent < 4.1.0
-Obsoletes: cloud-agent-libs < 4.1.0
-Obsoletes: cloud-test < 4.1.0
-Group: System Environment/Libraries
-%description agent
-The CloudStack agent for KVM hypervisors
-
-%package baremetal-agent
-Summary: CloudStack baremetal agent
-Requires: tftp-server
-Requires: xinetd
-Requires: syslinux
-Requires: chkconfig
-Requires: dhcp
-Requires: httpd
-Group: System Environment/Libraries
-%description baremetal-agent
-The CloudStack baremetal agent
-
-%package usage
-Summary: CloudStack Usage calculation server
-Requires: java-1.8.0-openjdk
-Requires: jsvc
-Requires: jakarta-commons-daemon
-Requires: jakarta-commons-daemon-jsvc
-Group: System Environment/Libraries
-Obsoletes: cloud-usage < 4.1.0
-Provides: cloud-usage
-%description usage
-The CloudStack usage calculation service
-
-%package cli
-Summary: Apache CloudStack CLI
-Provides: python-marvin
-Group: System Environment/Libraries
-%description cli
-Apache CloudStack command line interface
-
-%package marvin
-Summary: Apache CloudStack Marvin library
-Requires: python-pip
-Requires: gcc
-Requires: python-devel
-Requires: libffi-devel
-Requires: openssl-devel
-Group: System Environment/Libraries
-%description marvin
-Apache CloudStack Marvin library
-
-%package integration-tests
-Summary: Apache CloudStack Marvin integration tests
-Requires: %{name}-marvin = %{_ver}
-Group: System Environment/Libraries
-%description integration-tests
-Apache CloudStack Marvin integration tests
-
-%if "%{_ossnoss}" == "noredist"
-%package mysql-ha
-Summary: Apache CloudStack Balancing Strategy for MySQL
-Requires: mysql-connector-java
-Group: System Environmnet/Libraries
-%description mysql-ha
-Apache CloudStack Balancing Strategy for MySQL
-
-%endif
-
-%prep
-echo Doing CloudStack build
-
-%setup -q -n %{name}-%{_maventag}
-
-%build
-
-cp packaging/centos63/replace.properties build/replace.properties
-echo VERSION=%{_maventag} >> build/replace.properties
-echo PACKAGE=%{name} >> build/replace.properties
-touch build/gitrev.txt
-echo $(git rev-parse HEAD) > build/gitrev.txt
-
-if [ "%{_ossnoss}" == "NOREDIST" -o "%{_ossnoss}" == "noredist" ] ; then
- echo "Executing mvn packaging with non-redistributable libraries"
- if [ "%{_sim}" == "SIMULATOR" -o "%{_sim}" == "simulator" ] ; then
- echo "Executing mvn noredist packaging with simulator ..."
- mvn -Psystemvm,developer -Dnoredist -Dsimulator clean package
- else
- echo "Executing mvn noredist packaging without simulator..."
- mvn -Psystemvm,developer -Dnoredist clean package
- fi
-else
- if [ "%{_sim}" == "SIMULATOR" -o "%{_sim}" == "simulator" ] ; then
- echo "Executing mvn default packaging simulator ..."
- mvn -Psystemvm,developer -Dsimulator clean package
- else
- echo "Executing mvn default packaging without simulator ..."
- mvn -Psystemvm,developer clean package
- fi
-fi
-
-%install
-[ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT}
-# Common directories
-mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
-mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/agent
-mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/ipallocator
-mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/cache/%{name}/management/work
-mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/cache/%{name}/management/temp
-mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/%{name}/mnt
-mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/%{name}/management
-mkdir -p ${RPM_BUILD_ROOT}%{_initrddir}
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/default
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/profile.d
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sudoers.d
-
-# Common
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/scripts
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/vms
-mkdir -p ${RPM_BUILD_ROOT}%{python_sitearch}/
-mkdir -p ${RPM_BUILD_ROOT}/usr/bin
-cp -r scripts/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/scripts
-install -D systemvm/dist/systemvm.iso ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/vms/systemvm.iso
-install python/lib/cloud_utils.py ${RPM_BUILD_ROOT}%{python_sitearch}/cloud_utils.py
-cp -r python/lib/cloudutils ${RPM_BUILD_ROOT}%{python_sitearch}/
-python -m py_compile ${RPM_BUILD_ROOT}%{python_sitearch}/cloud_utils.py
-python -m compileall ${RPM_BUILD_ROOT}%{python_sitearch}/cloudutils
-cp build/gitrev.txt ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/scripts
-cp packaging/centos63/cloudstack-sccs ${RPM_BUILD_ROOT}/usr/bin
-
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/scripts/network/cisco
-cp -r plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/scripts/network/cisco
-
-# Management
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup
-mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/management
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management
-
-ln -sf /etc/%{name}/management ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/conf
-ln -sf /var/log/%{name}/management ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/logs
-
-install -D client/target/utilities/bin/cloud-migrate-databases ${RPM_BUILD_ROOT}%{_bindir}/%{name}-migrate-databases
-install -D client/target/utilities/bin/cloud-set-guest-password ${RPM_BUILD_ROOT}%{_bindir}/%{name}-set-guest-password
-install -D client/target/utilities/bin/cloud-set-guest-sshkey ${RPM_BUILD_ROOT}%{_bindir}/%{name}-set-guest-sshkey
-install -D client/target/utilities/bin/cloud-setup-databases ${RPM_BUILD_ROOT}%{_bindir}/%{name}-setup-databases
-install -D client/target/utilities/bin/cloud-setup-encryption ${RPM_BUILD_ROOT}%{_bindir}/%{name}-setup-encryption
-install -D client/target/utilities/bin/cloud-setup-management ${RPM_BUILD_ROOT}%{_bindir}/%{name}-setup-management
-install -D client/target/utilities/bin/cloud-setup-baremetal ${RPM_BUILD_ROOT}%{_bindir}/%{name}-setup-baremetal
-install -D client/target/utilities/bin/cloud-sysvmadm ${RPM_BUILD_ROOT}%{_bindir}/%{name}-sysvmadm
-install -D client/target/utilities/bin/cloud-update-xenserver-licenses ${RPM_BUILD_ROOT}%{_bindir}/%{name}-update-xenserver-licenses
-
-cp -r client/target/utilities/scripts/db/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup
-cp -r client/target/classes/META-INF/webapp ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapp
-cp client/target/cloud-client-ui-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib/cloudstack-%{_maventag}.jar
-cp client/target/lib/*jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib/
-
-# Don't package the scripts in the management webapp
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/scripts
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/vms
-
-for name in db.properties server.properties log4j-cloud.xml commons-logging.properties environment.properties java.security.ciphers
-do
- cp client/target/conf/$name ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
-done
-
-ln -sf log4j-cloud.xml ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/log4j.xml
-
-install python/bindir/cloud-external-ipallocator.py ${RPM_BUILD_ROOT}%{_bindir}/%{name}-external-ipallocator.py
-install -D client/target/pythonlibs/jasypt-1.9.2.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/lib/jasypt-1.9.2.jar
-
-install -D packaging/centos63/cloud-ipallocator.rc ${RPM_BUILD_ROOT}%{_initrddir}/%{name}-ipallocator
-install -D packaging/centos63/cloud-management.rc ${RPM_BUILD_ROOT}%{_initrddir}/%{name}-management
-install -D server/target/conf/cloudstack-sudoers ${RPM_BUILD_ROOT}%{_sysconfdir}/sudoers.d/%{name}-management
-install -D packaging/systemd/cloudstack-management.default ${RPM_BUILD_ROOT}%{_sysconfdir}/default/%{name}-management
-#install -D server/target/conf/cloudstack-catalina.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}-catalina
-
-chmod 440 ${RPM_BUILD_ROOT}%{_sysconfdir}/sudoers.d/%{name}-management
-chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/%{name}/mnt
-chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/%{name}/management
-chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/management
-chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/agent
-
-# KVM Agent
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/agent
-mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/agent
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-agent/lib
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-agent/plugins
-install -D packaging/centos63/cloud-agent.rc ${RPM_BUILD_ROOT}%{_sysconfdir}/init.d/%{name}-agent
-install -D agent/target/transformed/agent.properties ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/agent/agent.properties
-install -D agent/target/transformed/environment.properties ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/agent/environment.properties
-install -D agent/target/transformed/log4j-cloud.xml ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/agent/log4j-cloud.xml
-install -D agent/target/transformed/cloud-setup-agent ${RPM_BUILD_ROOT}%{_bindir}/%{name}-setup-agent
-install -D agent/target/transformed/cloudstack-agent-upgrade ${RPM_BUILD_ROOT}%{_bindir}/%{name}-agent-upgrade
-install -D agent/target/transformed/libvirtqemuhook ${RPM_BUILD_ROOT}%{_datadir}/%{name}-agent/lib/libvirtqemuhook
-install -D agent/target/transformed/cloud-ssh ${RPM_BUILD_ROOT}%{_bindir}/%{name}-ssh
-install -D agent/target/transformed/cloudstack-agent-profile.sh ${RPM_BUILD_ROOT}%{_sysconfdir}/profile.d/%{name}-agent-profile.sh
-install -D agent/target/transformed/cloudstack-agent.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}-agent
-install -D plugins/hypervisors/kvm/target/cloud-plugin-hypervisor-kvm-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%name-agent/lib/cloud-plugin-hypervisor-kvm-%{_maventag}.jar
-cp plugins/hypervisors/kvm/target/dependencies/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-agent/lib
-
-# Usage server
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/usage
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-usage/lib
-install -D usage/target/cloud-usage-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-usage/cloud-usage-%{_maventag}.jar
-install -D usage/target/transformed/db.properties ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/usage/db.properties
-install -D usage/target/transformed/log4j-cloud_usage.xml ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/usage/log4j-cloud.xml
-cp usage/target/dependencies/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-usage/lib/
-install -D packaging/centos63/cloud-usage.rc ${RPM_BUILD_ROOT}/%{_sysconfdir}/init.d/%{name}-usage
-mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/usage/
-
-# CLI
-cp -r cloud-cli/cloudtool ${RPM_BUILD_ROOT}%{python_sitearch}/
-install cloud-cli/cloudapis/cloud.py ${RPM_BUILD_ROOT}%{python_sitearch}/cloudapis.py
-
-# Marvin
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-marvin
-cp tools/marvin/dist/Marvin-*.tar.gz ${RPM_BUILD_ROOT}%{_datadir}/%{name}-marvin/
-
-# integration-tests
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-integration-tests
-cp -r test/integration/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-integration-tests/
-
-# MYSQL HA
-if [ "x%{_ossnoss}" == "xnoredist" ] ; then
- mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib
- cp -r plugins/database/mysql-ha/target/cloud-plugin-database-mysqlha-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib
-fi
-
-#License files from whisker
-install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-management-%{version}/NOTICE
-install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-management-%{version}/LICENSE
-install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-common-%{version}/NOTICE
-install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-common-%{version}/LICENSE
-install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-agent-%{version}/NOTICE
-install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-agent-%{version}/LICENSE
-install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/NOTICE
-install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/LICENSE
-install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE
-install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/LICENSE
-install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-marvin-%{version}/NOTICE
-install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-marvin-%{version}/LICENSE
-install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-integration-tests-%{version}/NOTICE
-install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-integration-tests-%{version}/LICENSE
-
-%clean
-[ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT}
-
-%preun management
-/sbin/service cloudstack-management stop || true
-if [ "$1" == "0" ] ; then
- /sbin/chkconfig --del cloudstack-management > /dev/null 2>&1 || true
- /sbin/service cloudstack-management stop > /dev/null 2>&1 || true
-fi
-
-%pre management
-id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -c "CloudStack unprivileged user" \
- -r -s /bin/sh -d %{_localstatedir}/cloudstack/management cloud|| true
-
-# set max file descriptors for cloud user to 4096
-sed -i /"cloud hard nofile"/d /etc/security/limits.conf
-sed -i /"cloud soft nofile"/d /etc/security/limits.conf
-echo "cloud hard nofile 4096" >> /etc/security/limits.conf
-echo "cloud soft nofile 4096" >> /etc/security/limits.conf
-rm -rf %{_localstatedir}/cache/cloud
-rm -rf %{_localstatedir}/cache/cloudstack
-# user harcoded here, also hardcoded on wscript
-
-# save old configs if they exist (for upgrade). Otherwise we may lose them
-# when the old packages are erased. There are a lot of properties files here.
-if [ -d "%{_sysconfdir}/cloud" ] ; then
- mv %{_sysconfdir}/cloud %{_sysconfdir}/cloud.rpmsave
-fi
-
-# in case of upgrade to 4.9+ copy commands.properties if not exists in /etc/cloudstack/management/
-if [ "$1" == "2" ] ; then
- if [ -f "%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/commands.properties" ] && [ ! -f "%{_sysconfdir}/%{name}/management/commands.properties" ] ; then
- cp -p %{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/commands.properties %{_sysconfdir}/%{name}/management/commands.properties
- fi
-fi
-
-# Remove old tomcat symlinks and env config file
-if [ -L "%{_datadir}/%{name}-management/lib" ]
-then
- rm -f %{_datadir}/%{name}-management/bin
- rm -f %{_datadir}/%{name}-management/lib
- rm -f %{_datadir}/%{name}-management/temp
- rm -f %{_datadir}/%{name}-management/work
- rm -f %{_sysconfdir}/default/%{name}-management
-fi
-
-%post management
-/sbin/chkconfig --add cloudstack-management > /dev/null 2>&1 || true
-/sbin/chkconfig --level 345 cloudstack-management on > /dev/null 2>&1 || true
-
-grep -s -q "db.cloud.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e "\$adb.cloud.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
-grep -s -q "db.usage.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e "\$adb.usage.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
-grep -s -q "db.simulator.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e "\$adb.simulator.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
-
-if [ ! -f %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util ] ; then
- echo Please download vhd-util from http://download.cloudstack.org/tools/vhd-util and put it in
- echo %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/
-fi
-
-# change cloud user's home to 4.1+ version if needed. Would do this via 'usermod', but it
-# requires that cloud user not be in use, so RPM could not be installed while management is running
-if getent passwd cloud | grep -q /var/lib/cloud; then
- sed -i 's/\/var\/lib\/cloud\/management/\/var\/cloudstack\/management/g' /etc/passwd
-fi
-
-# if saved configs from upgrade exist, copy them over
-if [ -f "%{_sysconfdir}/cloud.rpmsave/management/db.properties" ]; then
- mv %{_sysconfdir}/%{name}/management/db.properties %{_sysconfdir}/%{name}/management/db.properties.rpmnew
- cp -p %{_sysconfdir}/cloud.rpmsave/management/db.properties %{_sysconfdir}/%{name}/management
- if [ -f "%{_sysconfdir}/cloud.rpmsave/management/key" ]; then
- cp -p %{_sysconfdir}/cloud.rpmsave/management/key %{_sysconfdir}/%{name}/management
- fi
- # make sure we only do this on the first install of this RPM, don't want to overwrite on a reinstall
- mv %{_sysconfdir}/cloud.rpmsave/management/db.properties %{_sysconfdir}/cloud.rpmsave/management/db.properties.rpmsave
-fi
-
-if [ -f %{_sysconfdir}/sysconfig/%{name}-management ] ; then
- rm -f %{_sysconfdir}/sysconfig/%{name}-management
-fi
-
-chown -R cloud:cloud /var/log/cloudstack/management
-
-%preun agent
-/sbin/service cloudstack-agent stop || true
-if [ "$1" == "0" ] ; then
- /sbin/chkconfig --del cloudstack-agent > /dev/null 2>&1 || true
- /sbin/service cloudstack-agent stop > /dev/null 2>&1 || true
-fi
-
-%pre agent
-
-# save old configs if they exist (for upgrade). Otherwise we may lose them
-# when the old packages are erased. There are a lot of properties files here.
-if [ -d "%{_sysconfdir}/cloud" ] ; then
- mv %{_sysconfdir}/cloud %{_sysconfdir}/cloud.rpmsave
-fi
-
-%post agent
-if [ "$1" == "2" ] ; then
- echo "Running %{_bindir}/%{name}-agent-upgrade to update bridge name for upgrade from CloudStack 4.0.x (and before) to CloudStack 4.1 (and later)"
- %{_bindir}/%{name}-agent-upgrade
-fi
-
-if [ ! -d %{_sysconfdir}/libvirt/hooks ] ; then
- mkdir %{_sysconfdir}/libvirt/hooks
-fi
-cp -a ${RPM_BUILD_ROOT}%{_datadir}/%{name}-agent/lib/libvirtqemuhook %{_sysconfdir}/libvirt/hooks/qemu
-/sbin/service libvirtd restart
-/sbin/chkconfig --add cloudstack-agent > /dev/null 2>&1 || true
-/sbin/chkconfig --level 345 cloudstack-agent on > /dev/null 2>&1 || true
-
-# if saved configs from upgrade exist, copy them over
-if [ -f "%{_sysconfdir}/cloud.rpmsave/agent/agent.properties" ]; then
- mv %{_sysconfdir}/%{name}/agent/agent.properties %{_sysconfdir}/%{name}/agent/agent.properties.rpmnew
- cp -p %{_sysconfdir}/cloud.rpmsave/agent/agent.properties %{_sysconfdir}/%{name}/agent
- # make sure we only do this on the first install of this RPM, don't want to overwrite on a reinstall
- mv %{_sysconfdir}/cloud.rpmsave/agent/agent.properties %{_sysconfdir}/cloud.rpmsave/agent/agent.properties.rpmsave
-fi
-
-%preun usage
-/sbin/service cloudstack-usage stop || true
-if [ "$1" == "0" ] ; then
- /sbin/chkconfig --del cloudstack-usage > /dev/null 2>&1 || true
- /sbin/service cloudstack-usage stop > /dev/null 2>&1 || true
-fi
-
-%post usage
-if [ -f "%{_sysconfdir}/%{name}/management/db.properties" ]; then
- echo Replacing db.properties with management server db.properties
- rm -f %{_sysconfdir}/%{name}/usage/db.properties
- ln -s %{_sysconfdir}/%{name}/management/db.properties %{_sysconfdir}/%{name}/usage/db.properties
- /sbin/chkconfig --add cloudstack-usage > /dev/null 2>&1 || true
- /sbin/chkconfig --level 345 cloudstack-usage on > /dev/null 2>&1 || true
-fi
-
-if [ -f "%{_sysconfdir}/%{name}/management/key" ]; then
- echo Replacing key with management server key
- rm -f %{_sysconfdir}/%{name}/usage/key
- ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key
-fi
-
-if [ ! -f "%{_sysconfdir}/%{name}/usage/key" ]; then
- ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key
-fi
-
-%post marvin
-pip install --upgrade http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-2.0.4.zip#md5=3df394d89300db95163f17c843ef49df
-pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
-
-#No default permission as the permission setup is complex
-%files management
-%defattr(-,root,root,-)
-%dir %{_datadir}/%{name}-management
-%dir %attr(0770,root,cloud) %{_localstatedir}/%{name}/mnt
-%dir %attr(0770,cloud,cloud) %{_localstatedir}/%{name}/management
-%dir %attr(0770,root,cloud) %{_localstatedir}/cache/%{name}/management
-%dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/management
-%config(noreplace) %{_sysconfdir}/default/%{name}-management
-%config(noreplace) %{_sysconfdir}/sudoers.d/%{name}-management
-%config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/management/db.properties
-%config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/management/server.properties
-%config(noreplace) %{_sysconfdir}/%{name}/management/log4j-cloud.xml
-%config(noreplace) %{_sysconfdir}/%{name}/management/log4j.xml
-%config(noreplace) %{_sysconfdir}/%{name}/management/environment.properties
-%config(noreplace) %{_sysconfdir}/%{name}/management/java.security.ciphers
-%config(noreplace) %{_sysconfdir}/%{name}/management/commons-logging.properties
-%attr(0755,root,root) %{_initrddir}/%{name}-management
-%attr(0755,root,root) %{_bindir}/%{name}-setup-management
-%attr(0755,root,root) %{_bindir}/%{name}-update-xenserver-licenses
-%{_datadir}/%{name}-management/conf
-%{_datadir}/%{name}-management/lib/*.jar
-%{_datadir}/%{name}-management/logs
-%attr(0755,root,root) %{_bindir}/%{name}-setup-databases
-%attr(0755,root,root) %{_bindir}/%{name}-migrate-databases
-%attr(0755,root,root) %{_bindir}/%{name}-set-guest-password
-%attr(0755,root,root) %{_bindir}/%{name}-set-guest-sshkey
-%attr(0755,root,root) %{_bindir}/%{name}-sysvmadm
-%attr(0755,root,root) %{_bindir}/%{name}-setup-encryption
-%{_datadir}/%{name}-management/setup/*.sql
-%{_datadir}/%{name}-management/setup/*.sh
-%{_datadir}/%{name}-management/setup/server-setup.xml
-%{_datadir}/%{name}-management/webapp/*
-%attr(0755,root,root) %{_bindir}/%{name}-external-ipallocator.py
-%attr(0755,root,root) %{_initrddir}/%{name}-ipallocator
-%dir %attr(0770,root,root) %{_localstatedir}/log/%{name}/ipallocator
-%{_defaultdocdir}/%{name}-management-%{version}/LICENSE
-%{_defaultdocdir}/%{name}-management-%{version}/NOTICE
-#%attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name}-catalina
-
-%files agent
-%attr(0755,root,root) %{_bindir}/%{name}-setup-agent
-%attr(0755,root,root) %{_bindir}/%{name}-agent-upgrade
-%attr(0755,root,root) %{_bindir}/%{name}-ssh
-%attr(0755,root,root) %{_sysconfdir}/init.d/%{name}-agent
-%attr(0644,root,root) %{_sysconfdir}/profile.d/%{name}-agent-profile.sh
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-agent
-%attr(0755,root,root) %{_datadir}/%{name}-common/scripts/network/cisco
-%config(noreplace) %{_sysconfdir}/%{name}/agent
-%dir %{_localstatedir}/log/%{name}/agent
-%attr(0644,root,root) %{_datadir}/%{name}-agent/lib/*.jar
-%attr(0755,root,root) %{_datadir}/%{name}-agent/lib/libvirtqemuhook
-%dir %{_datadir}/%{name}-agent/plugins
-%{_defaultdocdir}/%{name}-agent-%{version}/LICENSE
-%{_defaultdocdir}/%{name}-agent-%{version}/NOTICE
-
-%files common
-%dir %attr(0755,root,root) %{python_sitearch}/cloudutils
-%dir %attr(0755,root,root) %{_datadir}/%{name}-common/vms
-%attr(0755,root,root) %{_datadir}/%{name}-common/scripts
-%attr(0755,root,root) /usr/bin/cloudstack-sccs
-%attr(0644, root, root) %{_datadir}/%{name}-common/vms/systemvm.iso
-%attr(0644,root,root) %{python_sitearch}/cloud_utils.py
-%attr(0644,root,root) %{python_sitearch}/cloud_utils.pyc
-%attr(0644,root,root) %{python_sitearch}/cloudutils/*
-%attr(0644, root, root) %{_datadir}/%{name}-common/lib/jasypt-1.9.2.jar
-%{_defaultdocdir}/%{name}-common-%{version}/LICENSE
-%{_defaultdocdir}/%{name}-common-%{version}/NOTICE
-
-%files usage
-%attr(0755,root,root) %{_sysconfdir}/init.d/%{name}-usage
-%attr(0644,root,root) %{_datadir}/%{name}-usage/*.jar
-%attr(0644,root,root) %{_datadir}/%{name}-usage/lib/*.jar
-%dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/usage
-%attr(0644,root,root) %{_sysconfdir}/%{name}/usage/db.properties
-%attr(0644,root,root) %{_sysconfdir}/%{name}/usage/log4j-cloud.xml
-%{_defaultdocdir}/%{name}-usage-%{version}/LICENSE
-%{_defaultdocdir}/%{name}-usage-%{version}/NOTICE
-
-%files cli
-%attr(0644,root,root) %{python_sitearch}/cloudapis.py
-%attr(0644,root,root) %{python_sitearch}/cloudtool/__init__.py
-%attr(0644,root,root) %{python_sitearch}/cloudtool/utils.py
-%{_defaultdocdir}/%{name}-cli-%{version}/LICENSE
-%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE
-
-%files marvin
-%attr(0644,root,root) %{_datadir}/%{name}-marvin/Marvin*.tar.gz
-%{_defaultdocdir}/%{name}-marvin-%{version}/LICENSE
-%{_defaultdocdir}/%{name}-marvin-%{version}/NOTICE
-
-%files integration-tests
-%attr(0755,root,root) %{_datadir}/%{name}-integration-tests/*
-%{_defaultdocdir}/%{name}-integration-tests-%{version}/LICENSE
-%{_defaultdocdir}/%{name}-integration-tests-%{version}/NOTICE
-
-%if "%{_ossnoss}" == "noredist"
-%files mysql-ha
-%defattr(0644,cloud,cloud,0755)
-%attr(0644,root,root) %{_datadir}/%{name}-management/lib/*mysqlha*jar
-%endif
-
-%files baremetal-agent
-%attr(0755,root,root) %{_bindir}/cloudstack-setup-baremetal
-
-%changelog
-* Thu Apr 30 2015 Rohit Yadav <bhaisaab@apache.org> 4.6.0
-- Remove awsapi package
-
-* Fri Jul 04 2014 Hugo Trippaers <hugo@apache.org> 4.5.0
-- Add a package for the mysql ha module
-
-* Wed Oct 03 2012 Hugo Trippaers <hugo@apache.org> 4.1.0
-- new style spec file
diff --git a/packaging/centos63/replace.properties b/packaging/centos63/replace.properties
deleted file mode 100644
index bdf6e22..0000000
--- a/packaging/centos63/replace.properties
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.
-
-DBUSER=cloud
-DBPW=cloud
-DBROOTPW=
-MSLOG=vmops.log
-APISERVERLOG=api.log
-DBHOST=localhost
-DBDRIVER=jdbc:mysql
-COMPONENTS-SPEC=components-premium.xml
-REMOTEHOST=localhost
-AGENTCLASSPATH=
-AGENTLOG=/var/log/cloudstack/agent/agent.log
-AGENTLOGDIR=/var/log/cloudstack/agent/
-AGENTSYSCONFDIR=/etc/cloudstack/agent
-APISERVERLOG=/var/log/cloudstack/management/apilog.log
-BINDIR=/usr/bin
-COMMONLIBDIR=/usr/share/cloudstack-common
-CONFIGUREVARS=
-DEPSCLASSPATH=
-DOCDIR=
-IPALOCATORLOG=/var/log/cloudstack/management/ipallocator.log
-JAVADIR=/usr/share/java
-LIBEXECDIR=/usr/libexec
-LOCKDIR=/var/lock
-MSCLASSPATH=
-MSCONF=/etc/cloudstack/management
-MSENVIRON=/usr/share/cloudstack-management
-MSLOG=/var/log/cloudstack/management/management-server.log
-MSLOGDIR=/var/log/cloudstack/management/
-MSMNTDIR=/var/cloudstack/mnt
-MSUSER=cloud
-PIDDIR=/var/run
-PLUGINJAVADIR=/usr/share/cloudstack-management/plugin
-PREMIUMJAVADIR=/usr/share/cloudstack-management/premium
-PYTHONDIR=/usr/lib/python2.6/site-packages/
-SERVERSYSCONFDIR=/etc/sysconfig
-SETUPDATADIR=/usr/share/cloudstack-management/setup
-SYSCONFDIR=/etc/sysconfig
-SYSTEMCLASSPATH=
-SYSTEMJARS=
-USAGECLASSPATH=
-USAGELOG=/var/log/cloudstack/usage/usage.log
-USAGESYSCONFDIR=/etc/sysconfig
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index 65f3fce..8b26086 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -38,7 +38,7 @@
Source0: %{name}-%{_maventag}.tgz
BuildRoot: %{_tmppath}/%{name}-%{_maventag}-%{release}-build
-BuildRequires: java-1.8.0-openjdk-devel
+BuildRequires: java-11-openjdk-devel
BuildRequires: ws-commons-util
BuildRequires: jpackage-utils
BuildRequires: gcc
@@ -46,6 +46,7 @@
BuildRequires: /usr/bin/mkisofs
BuildRequires: mysql-connector-python
BuildRequires: maven => 3.0.0
+BuildRequires: python-setuptools
%description
CloudStack is a highly-scalable elastic, open source,
@@ -53,18 +54,20 @@
%package management
Summary: CloudStack management server UI
-Requires: java-1.8.0-openjdk
+Requires: java-11-openjdk
Requires: python
+Requires: python3
Requires: bash
+Requires: gawk
Requires: bzip2
Requires: gzip
Requires: unzip
Requires: /sbin/mount.nfs
Requires: openssh-clients
Requires: nfs-utils
+Requires: iproute
Requires: wget
Requires: mysql
-Requires: mysql-connector-java
Requires: sudo
Requires: /sbin/service
Requires: /sbin/chkconfig
@@ -84,6 +87,7 @@
%package common
Summary: Apache CloudStack common files and scripts
Requires: python
+Requires: python3
Requires: python-argparse
Requires: python-netaddr
Group: System Environment/Libraries
@@ -94,7 +98,7 @@
%package agent
Summary: CloudStack Agent for KVM hypervisors
Requires: openssh-clients
-Requires: java-1.8.0-openjdk
+Requires: java-11-openjdk
Requires: %{name}-common = %{_ver}
Requires: libvirt
Requires: bridge-utils
@@ -106,6 +110,7 @@
Requires: ipset
Requires: perl
Requires: libvirt-python
+Requires: python36-libvirt
Requires: qemu-img
Requires: qemu-kvm
Provides: cloud-agent
@@ -127,8 +132,7 @@
%package usage
Summary: CloudStack Usage calculation server
-Requires: java-1.8.0-openjdk
-Requires: mysql-connector-java
+Requires: java-11-openjdk
Group: System Environment/Libraries
%description usage
The CloudStack usage calculation service
@@ -161,7 +165,6 @@
%if "%{_ossnoss}" == "noredist"
%package mysql-ha
Summary: Apache CloudStack Balancing Strategy for MySQL
-Requires: mysql-connector-java
Group: System Environmnet/Libraries
%description mysql-ha
Apache CloudStack Balancing Strategy for MySQL
@@ -266,7 +269,7 @@
ln -sf log4j-cloud.xml ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/log4j.xml
install python/bindir/cloud-external-ipallocator.py ${RPM_BUILD_ROOT}%{_bindir}/%{name}-external-ipallocator.py
-install -D client/target/pythonlibs/jasypt-1.9.2.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/lib/jasypt-1.9.2.jar
+install -D client/target/pythonlibs/jasypt-1.9.3.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/lib/jasypt-1.9.3.jar
install -D packaging/centos7/cloud-ipallocator.rc ${RPM_BUILD_ROOT}%{_initrddir}/%{name}-ipallocator
install -D packaging/centos7/cloud.limits ${RPM_BUILD_ROOT}%{_sysconfdir}/security/limits.d/cloud
@@ -290,13 +293,16 @@
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-agent/lib
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-agent/plugins
install -D packaging/systemd/cloudstack-agent.service ${RPM_BUILD_ROOT}%{_unitdir}/%{name}-agent.service
+install -D packaging/systemd/cloudstack-rolling-maintenance@.service ${RPM_BUILD_ROOT}%{_unitdir}/%{name}-rolling-maintenance@.service
install -D packaging/systemd/cloudstack-agent.default ${RPM_BUILD_ROOT}%{_sysconfdir}/default/%{name}-agent
install -D agent/target/transformed/agent.properties ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/agent/agent.properties
install -D agent/target/transformed/environment.properties ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/agent/environment.properties
install -D agent/target/transformed/log4j-cloud.xml ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/agent/log4j-cloud.xml
install -D agent/target/transformed/cloud-setup-agent ${RPM_BUILD_ROOT}%{_bindir}/%{name}-setup-agent
install -D agent/target/transformed/cloudstack-agent-upgrade ${RPM_BUILD_ROOT}%{_bindir}/%{name}-agent-upgrade
+install -D agent/target/transformed/cloud-guest-tool ${RPM_BUILD_ROOT}%{_bindir}/%{name}-guest-tool
install -D agent/target/transformed/libvirtqemuhook ${RPM_BUILD_ROOT}%{_datadir}/%{name}-agent/lib/libvirtqemuhook
+install -D agent/target/transformed/rolling-maintenance ${RPM_BUILD_ROOT}%{_datadir}/%{name}-agent/lib/rolling-maintenance
install -D agent/target/transformed/cloud-ssh ${RPM_BUILD_ROOT}%{_bindir}/%{name}-ssh
install -D agent/target/transformed/cloudstack-agent-profile.sh ${RPM_BUILD_ROOT}%{_sysconfdir}/profile.d/%{name}-agent-profile.sh
install -D agent/target/transformed/cloudstack-agent.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}-agent
@@ -310,6 +316,7 @@
install -D usage/target/transformed/db.properties ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/usage/db.properties
install -D usage/target/transformed/log4j-cloud_usage.xml ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/usage/log4j-cloud.xml
cp usage/target/dependencies/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-usage/lib/
+cp client/target/lib/mysql*jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-usage/lib/
install -D packaging/systemd/cloudstack-usage.service ${RPM_BUILD_ROOT}%{_unitdir}/%{name}-usage.service
install -D packaging/systemd/cloudstack-usage.default ${RPM_BUILD_ROOT}%{_sysconfdir}/default/%{name}-usage
mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/usage/
@@ -424,6 +431,7 @@
mkdir -m 0755 -p /usr/share/cloudstack-agent/tmp
/sbin/service libvirtd restart
/sbin/systemctl enable cloudstack-agent > /dev/null 2>&1 || true
+/sbin/systemctl enable cloudstack-rolling-maintenance@p > /dev/null 2>&1 || true
# if saved configs from upgrade exist, copy them over
if [ -f "%{_sysconfdir}/cloud.rpmsave/agent/agent.properties" ]; then
@@ -512,8 +520,10 @@
%files agent
%attr(0755,root,root) %{_bindir}/%{name}-setup-agent
%attr(0755,root,root) %{_bindir}/%{name}-agent-upgrade
+%attr(0755,root,root) %{_bindir}/%{name}-guest-tool
%attr(0755,root,root) %{_bindir}/%{name}-ssh
%attr(0644,root,root) %{_unitdir}/%{name}-agent.service
+%attr(0644,root,root) %{_unitdir}/%{name}-rolling-maintenance@.service
%config(noreplace) %{_sysconfdir}/default/%{name}-agent
%attr(0644,root,root) %{_sysconfdir}/profile.d/%{name}-agent-profile.sh
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name}-agent
@@ -522,6 +532,7 @@
%dir %{_localstatedir}/log/%{name}/agent
%attr(0644,root,root) %{_datadir}/%{name}-agent/lib/*.jar
%attr(0755,root,root) %{_datadir}/%{name}-agent/lib/libvirtqemuhook
+%attr(0755,root,root) %{_datadir}/%{name}-agent/lib/rolling-maintenance
%dir %{_datadir}/%{name}-agent/plugins
%{_defaultdocdir}/%{name}-agent-%{version}/LICENSE
%{_defaultdocdir}/%{name}-agent-%{version}/NOTICE
@@ -535,7 +546,7 @@
%attr(0644,root,root) %{python_sitearch}/cloud_utils.py
%attr(0644,root,root) %{python_sitearch}/cloud_utils.pyc
%attr(0644,root,root) %{python_sitearch}/cloudutils/*
-%attr(0644, root, root) %{_datadir}/%{name}-common/lib/jasypt-1.9.2.jar
+%attr(0644, root, root) %{_datadir}/%{name}-common/lib/jasypt-1.9.3.jar
%{_defaultdocdir}/%{name}-common-%{version}/LICENSE
%{_defaultdocdir}/%{name}-common-%{version}/NOTICE
diff --git a/packaging/package.sh b/packaging/package.sh
index fe96eac8..380908b 100755
--- a/packaging/package.sh
+++ b/packaging/package.sh
@@ -26,7 +26,7 @@
note that you can override/provide "branding" string with "-b, --brand" flag as well.
Mandatory arguments:
- -d, --distribution string Build package for specified distribution ("centos7"|"centos63")
+ -d, --distribution string Build package for specified distribution ("centos7")
Optional arguments:
-p, --pack string Define which type of libraries to package ("oss"|"OSS"|"noredist"|"NOREDIST") (default "oss")
diff --git a/packaging/centos63/cloudstack-agent.te b/packaging/systemd/cloudstack-rolling-maintenance@.service
similarity index 69%
rename from packaging/centos63/cloudstack-agent.te
rename to packaging/systemd/cloudstack-rolling-maintenance@.service
index 4259e17..8c793a7 100644
--- a/packaging/centos63/cloudstack-agent.te
+++ b/packaging/systemd/cloudstack-rolling-maintenance@.service
@@ -5,9 +5,9 @@
# 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
@@ -15,19 +15,17 @@
# specific language governing permissions and limitations
# under the License.
-module cloudstack-agent 1.0;
+# Systemd unit file for CloudStack Rolling Maintenance
-require {
- type nfs_t;
- type system_conf_t;
- type mount_t;
- type qemu_t;
- class file unlink;
- class filesystem getattr;
-}
+[Unit]
+Description=Rolling maintenance executor %I
+After=network.target local-fs.target
-#============= mount_t ==============
-allow mount_t system_conf_t:file unlink;
+[Install]
+WantedBy=multi-user.target
-#============= qemu_t ==============
-allow qemu_t nfs_t:filesystem getattr;
+[Service]
+Type=simple
+WorkingDirectory=/usr/share/cloudstack-agent/lib/
+ExecStart=/usr/share/cloudstack-agent/lib/rolling-maintenance %I
+Restart=no
diff --git a/plugins/acl/dynamic-role-based/pom.xml b/plugins/acl/dynamic-role-based/pom.xml
index 9f70878..fdc8a8c 100644
--- a/plugins/acl/dynamic-role-based/pom.xml
+++ b/plugins/acl/dynamic-role-based/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/acl/static-role-based/pom.xml b/plugins/acl/static-role-based/pom.xml
index 07ceae5..4638a15 100644
--- a/plugins/acl/static-role-based/pom.xml
+++ b/plugins/acl/static-role-based/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/affinity-group-processors/explicit-dedication/pom.xml b/plugins/affinity-group-processors/explicit-dedication/pom.xml
index d39935e..75a6b2a7 100644
--- a/plugins/affinity-group-processors/explicit-dedication/pom.xml
+++ b/plugins/affinity-group-processors/explicit-dedication/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/affinity-group-processors/host-affinity/pom.xml b/plugins/affinity-group-processors/host-affinity/pom.xml
index afb4b0c..3fd40aa 100644
--- a/plugins/affinity-group-processors/host-affinity/pom.xml
+++ b/plugins/affinity-group-processors/host-affinity/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/affinity-group-processors/host-anti-affinity/pom.xml b/plugins/affinity-group-processors/host-anti-affinity/pom.xml
index 0887834..35db098 100644
--- a/plugins/affinity-group-processors/host-anti-affinity/pom.xml
+++ b/plugins/affinity-group-processors/host-anti-affinity/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/alert-handlers/snmp-alerts/pom.xml b/plugins/alert-handlers/snmp-alerts/pom.xml
index 25d4c19..1466e04 100644
--- a/plugins/alert-handlers/snmp-alerts/pom.xml
+++ b/plugins/alert-handlers/snmp-alerts/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>cloudstack-plugins</artifactId>
<groupId>org.apache.cloudstack</groupId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/alert-handlers/syslog-alerts/pom.xml b/plugins/alert-handlers/syslog-alerts/pom.xml
index 01054c2..bcb96a0 100644
--- a/plugins/alert-handlers/syslog-alerts/pom.xml
+++ b/plugins/alert-handlers/syslog-alerts/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>cloudstack-plugins</artifactId>
<groupId>org.apache.cloudstack</groupId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/api/discovery/pom.xml b/plugins/api/discovery/pom.xml
index 2544068..7545b98 100644
--- a/plugins/api/discovery/pom.xml
+++ b/plugins/api/discovery/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/api/rate-limit/pom.xml b/plugins/api/rate-limit/pom.xml
index 48ac703..2cae815 100644
--- a/plugins/api/rate-limit/pom.xml
+++ b/plugins/api/rate-limit/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<build>
diff --git a/plugins/api/rate-limit/src/test/java/org/apache/cloudstack/ratelimit/integration/APITest.java b/plugins/api/rate-limit/src/test/java/org/apache/cloudstack/ratelimit/integration/APITest.java
index bfe3468..efe8c53 100644
--- a/plugins/api/rate-limit/src/test/java/org/apache/cloudstack/ratelimit/integration/APITest.java
+++ b/plugins/api/rate-limit/src/test/java/org/apache/cloudstack/ratelimit/integration/APITest.java
@@ -28,12 +28,11 @@
import java.util.HashMap;
import java.util.Iterator;
-import com.google.gson.Gson;
-
import org.apache.cloudstack.api.response.SuccessResponse;
import com.cloud.api.ApiGsonHelper;
import com.cloud.utils.exception.CloudRuntimeException;
+import com.google.gson.Gson;
/**
* Base class for API Test
diff --git a/plugins/api/solidfire-intg-test/pom.xml b/plugins/api/solidfire-intg-test/pom.xml
index 84057d5..405d49c 100644
--- a/plugins/api/solidfire-intg-test/pom.xml
+++ b/plugins/api/solidfire-intg-test/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/api/vmware-sioc/pom.xml b/plugins/api/vmware-sioc/pom.xml
index c126768..9c21d88 100644
--- a/plugins/api/vmware-sioc/pom.xml
+++ b/plugins/api/vmware-sioc/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
@@ -33,6 +33,12 @@
<artifactId>cloud-plugin-hypervisor-vmware</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-ri</artifactId>
+ <version>${cs.jaxws.version}</version>
+ <type>pom</type>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/plugins/backup/dummy/pom.xml b/plugins/backup/dummy/pom.xml
new file mode 100644
index 0000000..990c366
--- /dev/null
+++ b/plugins/backup/dummy/pom.xml
@@ -0,0 +1,41 @@
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>cloud-plugin-backup-dummy</artifactId>
+ <name>Apache CloudStack Plugin - Dummy Backup and Recovery Plugin</name>
+ <parent>
+ <artifactId>cloudstack-plugins</artifactId>
+ <groupId>org.apache.cloudstack</groupId>
+ <version>4.14.1.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-utils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/plugins/backup/dummy/src/main/java/org/apache/cloudstack/backup/DummyBackupProvider.java b/plugins/backup/dummy/src/main/java/org/apache/cloudstack/backup/DummyBackupProvider.java
new file mode 100644
index 0000000..3139da8
--- /dev/null
+++ b/plugins/backup/dummy/src/main/java/org/apache/cloudstack/backup/DummyBackupProvider.java
@@ -0,0 +1,139 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.backup;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.backup.dao.BackupDao;
+import org.apache.log4j.Logger;
+
+import com.cloud.utils.Pair;
+import com.cloud.utils.component.AdapterBase;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.VirtualMachine;
+
+public class DummyBackupProvider extends AdapterBase implements BackupProvider {
+
+ private static final Logger s_logger = Logger.getLogger(DummyBackupProvider.class);
+
+ @Inject
+ private BackupDao backupDao;
+
+ @Override
+ public String getName() {
+ return "dummy";
+ }
+
+ @Override
+ public String getDescription() {
+ return "Dummy Backup Plugin";
+ }
+
+ @Override
+ public List<BackupOffering> listBackupOfferings(Long zoneId) {
+ s_logger.debug("Listing backup policies on Dummy B&R Plugin");
+ BackupOffering policy1 = new BackupOfferingVO(1, "gold-policy", "dummy", "Golden Policy", "Gold description", true);
+ BackupOffering policy2 = new BackupOfferingVO(1, "silver-policy", "dummy", "Silver Policy", "Silver description", true);
+ return Arrays.asList(policy1, policy2);
+ }
+
+ @Override
+ public boolean isValidProviderOffering(Long zoneId, String uuid) {
+ s_logger.debug("Checking if backup offering exists on the Dummy Backup Provider");
+ return true;
+ }
+
+ @Override
+ public boolean assignVMToBackupOffering(VirtualMachine vm, BackupOffering backupOffering) {
+ s_logger.debug("Creating VM backup for VM " + vm.getInstanceName() + " from backup offering " + backupOffering.getName());
+ ((VMInstanceVO) vm).setBackupExternalId("dummy-external-backup-id");
+ return true;
+ }
+
+ @Override
+ public boolean restoreVMFromBackup(VirtualMachine vm, Backup backup) {
+ s_logger.debug("Restoring vm " + vm.getUuid() + "from backup " + backup.getUuid() + " on the Dummy Backup Provider");
+ return true;
+ }
+
+ @Override
+ public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, String volumeUuid, String hostIp, String dataStoreUuid) {
+ s_logger.debug("Restoring volume " + volumeUuid + "from backup " + backup.getUuid() + " on the Dummy Backup Provider");
+ throw new CloudRuntimeException("Dummy plugin does not support this feature");
+ }
+
+ @Override
+ public Map<VirtualMachine, Backup.Metric> getBackupMetrics(Long zoneId, List<VirtualMachine> vms) {
+ final Map<VirtualMachine, Backup.Metric> metrics = new HashMap<>();
+ final Backup.Metric metric = new Backup.Metric(1000L, 100L);
+ if (vms == null || vms.isEmpty()) {
+ return metrics;
+ }
+ for (VirtualMachine vm : vms) {
+ if (vm != null) {
+ metrics.put(vm, metric);
+ }
+ }
+ return metrics;
+ }
+
+ @Override
+ public boolean removeVMFromBackupOffering(VirtualMachine vm) {
+ s_logger.debug("Removing VM ID " + vm.getUuid() + " from backup offering by the Dummy Backup Provider");
+ return true;
+ }
+
+ @Override
+ public boolean willDeleteBackupsOnOfferingRemoval() {
+ return true;
+ }
+
+ @Override
+ public boolean takeBackup(VirtualMachine vm) {
+ s_logger.debug("Starting backup for VM ID " + vm.getUuid() + " on Dummy provider");
+
+ BackupVO backup = new BackupVO();
+ backup.setVmId(vm.getId());
+ backup.setExternalId("dummy-external-id");
+ backup.setType("FULL");
+ backup.setDate(new Date().toString());
+ backup.setSize(1024L);
+ backup.setProtectedSize(1024000L);
+ backup.setStatus(Backup.Status.BackedUp);
+ backup.setBackupOfferingId(vm.getBackupOfferingId());
+ backup.setAccountId(vm.getAccountId());
+ backup.setDomainId(vm.getDomainId());
+ backup.setZoneId(vm.getDataCenterId());
+ return backupDao.persist(backup) != null;
+ }
+
+ @Override
+ public boolean deleteBackup(Backup backup) {
+ return true;
+ }
+
+ @Override
+ public void syncBackups(VirtualMachine vm, Backup.Metric metric) {
+ }
+}
diff --git a/packaging/centos63/rhel7/cloudstack-management.conf b/plugins/backup/dummy/src/main/resources/META-INF/cloudstack/dummy-backup/module.properties
similarity index 92%
rename from packaging/centos63/rhel7/cloudstack-management.conf
rename to plugins/backup/dummy/src/main/resources/META-INF/cloudstack/dummy-backup/module.properties
index 881af1a..5969fb2 100644
--- a/packaging/centos63/rhel7/cloudstack-management.conf
+++ b/plugins/backup/dummy/src/main/resources/META-INF/cloudstack/dummy-backup/module.properties
@@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-
-f /var/run/cloudstack-management.pid 0644 cloud cloud -
\ No newline at end of file
+name=dummy-backup
+parent=backup
diff --git a/plugins/backup/dummy/src/main/resources/META-INF/cloudstack/dummy-backup/spring-backup-dummy-context.xml b/plugins/backup/dummy/src/main/resources/META-INF/cloudstack/dummy-backup/spring-backup-dummy-context.xml
new file mode 100644
index 0000000..e154f9f
--- /dev/null
+++ b/plugins/backup/dummy/src/main/resources/META-INF/cloudstack/dummy-backup/spring-backup-dummy-context.xml
@@ -0,0 +1,27 @@
+<!--
+ 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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"
+>
+ <bean id="dummyBackupRecoveryDriver" class="org.apache.cloudstack.backup.DummyBackupProvider">
+ <property name="name" value="dummy" />
+ </bean>
+</beans>
diff --git a/plugins/backup/veeam/pom.xml b/plugins/backup/veeam/pom.xml
new file mode 100644
index 0000000..6ce3e63
--- /dev/null
+++ b/plugins/backup/veeam/pom.xml
@@ -0,0 +1,54 @@
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>cloud-plugin-backup-veeam</artifactId>
+ <name>Apache CloudStack Plugin - Veeam Backup and Recovery Plugin</name>
+ <parent>
+ <artifactId>cloudstack-plugins</artifactId>
+ <groupId>org.apache.cloudstack</groupId>
+ <version>4.14.1.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-plugin-hypervisor-vmware</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
+ <version>${cs.jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${cs.commons-lang3.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.tomakehurst</groupId>
+ <artifactId>wiremock-standalone</artifactId>
+ <version>${cs.wiremock.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/VeeamBackupProvider.java b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/VeeamBackupProvider.java
new file mode 100644
index 0000000..0b532a5
--- /dev/null
+++ b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/VeeamBackupProvider.java
@@ -0,0 +1,313 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.backup;
+
+import java.net.URISyntaxException;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.api.InternalIdentity;
+import org.apache.cloudstack.backup.dao.BackupDao;
+import org.apache.cloudstack.backup.veeam.VeeamClient;
+import org.apache.cloudstack.backup.veeam.api.Job;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.Configurable;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.log4j.Logger;
+
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.hypervisor.vmware.VmwareDatacenter;
+import com.cloud.hypervisor.vmware.VmwareDatacenterZoneMap;
+import com.cloud.hypervisor.vmware.dao.VmwareDatacenterDao;
+import com.cloud.hypervisor.vmware.dao.VmwareDatacenterZoneMapDao;
+import com.cloud.utils.Pair;
+import com.cloud.utils.component.AdapterBase;
+import com.cloud.utils.db.Transaction;
+import com.cloud.utils.db.TransactionCallbackNoReturn;
+import com.cloud.utils.db.TransactionStatus;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.VirtualMachine;
+
+public class VeeamBackupProvider extends AdapterBase implements BackupProvider, Configurable {
+
+ private static final Logger LOG = Logger.getLogger(VeeamBackupProvider.class);
+ public static final String BACKUP_IDENTIFIER = "-CSBKP-";
+
+ public ConfigKey<String> VeeamUrl = new ConfigKey<>("Advanced", String.class,
+ "backup.plugin.veeam.url", "https://localhost:9398/api/",
+ "The Veeam backup and recovery URL.", true, ConfigKey.Scope.Zone);
+
+ private ConfigKey<String> VeeamUsername = new ConfigKey<>("Advanced", String.class,
+ "backup.plugin.veeam.username", "administrator",
+ "The Veeam backup and recovery username.", true, ConfigKey.Scope.Zone);
+
+ private ConfigKey<String> VeeamPassword = new ConfigKey<>("Secure", String.class,
+ "backup.plugin.veeam.password", "",
+ "The Veeam backup and recovery password.", true, ConfigKey.Scope.Zone);
+
+ private ConfigKey<Boolean> VeeamValidateSSLSecurity = new ConfigKey<>("Advanced", Boolean.class, "backup.plugin.veeam.validate.ssl", "false",
+ "When set to true, this will validate the SSL certificate when connecting to https/ssl enabled Veeam API service.", true, ConfigKey.Scope.Zone);
+
+ private ConfigKey<Integer> VeeamApiRequestTimeout = new ConfigKey<>("Advanced", Integer.class, "backup.plugin.veeam.request.timeout", "300",
+ "The Veeam B&R API request timeout in seconds.", true, ConfigKey.Scope.Zone);
+
+ @Inject
+ private VmwareDatacenterZoneMapDao vmwareDatacenterZoneMapDao;
+ @Inject
+ private VmwareDatacenterDao vmwareDatacenterDao;
+ @Inject
+ private BackupDao backupDao;
+
+ private VeeamClient getClient(final Long zoneId) {
+ try {
+ return new VeeamClient(VeeamUrl.valueIn(zoneId), VeeamUsername.valueIn(zoneId), VeeamPassword.valueIn(zoneId),
+ VeeamValidateSSLSecurity.valueIn(zoneId), VeeamApiRequestTimeout.valueIn(zoneId));
+ } catch (URISyntaxException e) {
+ throw new CloudRuntimeException("Failed to parse Veeam API URL: " + e.getMessage());
+ } catch (NoSuchAlgorithmException | KeyManagementException e) {
+ LOG.error("Failed to build Veeam API client due to: ", e);
+ }
+ throw new CloudRuntimeException("Failed to build Veeam API client");
+ }
+
+ public List<BackupOffering> listBackupOfferings(final Long zoneId) {
+ List<BackupOffering> policies = new ArrayList<>();
+ for (final BackupOffering policy : getClient(zoneId).listJobs()) {
+ if (!policy.getName().contains(BACKUP_IDENTIFIER)) {
+ policies.add(policy);
+ }
+ }
+ return policies;
+ }
+
+ @Override
+ public boolean isValidProviderOffering(final Long zoneId, final String uuid) {
+ List<BackupOffering> policies = listBackupOfferings(zoneId);
+ if (CollectionUtils.isEmpty(policies)) {
+ return false;
+ }
+ for (final BackupOffering policy : policies) {
+ if (policy.getExternalId().equals(uuid)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private VmwareDatacenter findVmwareDatacenterForVM(final VirtualMachine vm) {
+ if (vm == null || vm.getHypervisorType() != Hypervisor.HypervisorType.VMware) {
+ throw new CloudRuntimeException("The Veeam backup provider is only applicable for VMware VMs");
+ }
+ final VmwareDatacenterZoneMap zoneMap = vmwareDatacenterZoneMapDao.findByZoneId(vm.getDataCenterId());
+ if (zoneMap == null) {
+ throw new CloudRuntimeException("Failed to find a mapped VMware datacenter for zone id:" + vm.getDataCenterId());
+ }
+ final VmwareDatacenter vmwareDatacenter = vmwareDatacenterDao.findById(zoneMap.getVmwareDcId());
+ if (vmwareDatacenter == null) {
+ throw new CloudRuntimeException("Failed to find a valid VMware datacenter mapped for zone id:" + vm.getDataCenterId());
+ }
+ return vmwareDatacenter;
+ }
+
+ private String getGuestBackupName(final String instanceName, final String uuid) {
+ return String.format("%s%s%s", instanceName, BACKUP_IDENTIFIER, uuid);
+ }
+
+ @Override
+ public boolean assignVMToBackupOffering(final VirtualMachine vm, final BackupOffering backupOffering) {
+ final VeeamClient client = getClient(vm.getDataCenterId());
+ final Job parentJob = client.listJob(backupOffering.getExternalId());
+ final String clonedJobName = getGuestBackupName(vm.getInstanceName(), vm.getUuid());
+
+ if (!client.cloneVeeamJob(parentJob, clonedJobName)) {
+ LOG.error("Failed to clone pre-defined Veeam job (backup offering) for backup offering ID: " + backupOffering.getExternalId() + " but will check the list of jobs again if it was eventually succeeded.");
+ }
+
+ for (final BackupOffering job : client.listJobs()) {
+ if (job.getName().equals(clonedJobName)) {
+ final Job clonedJob = client.listJob(job.getExternalId());
+ if (clonedJob.getScheduleConfigured() && !clonedJob.getScheduleEnabled()) {
+ client.toggleJobSchedule(clonedJob.getId());
+ }
+ LOG.debug("Veeam job (backup offering) for backup offering ID: " + backupOffering.getExternalId() + " found, now trying to assign the VM to the job.");
+ final VmwareDatacenter vmwareDC = findVmwareDatacenterForVM(vm);
+ if (client.addVMToVeeamJob(job.getExternalId(), vm.getInstanceName(), vmwareDC.getVcenterHost())) {
+ ((VMInstanceVO) vm).setBackupExternalId(job.getExternalId());
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public boolean removeVMFromBackupOffering(final VirtualMachine vm) {
+ final VeeamClient client = getClient(vm.getDataCenterId());
+ final VmwareDatacenter vmwareDC = findVmwareDatacenterForVM(vm);
+ try {
+ if (!client.removeVMFromVeeamJob(vm.getBackupExternalId(), vm.getInstanceName(), vmwareDC.getVcenterHost())) {
+ LOG.warn("Failed to remove VM from Veeam Job id: " + vm.getBackupExternalId());
+ }
+ } catch (Exception e) {
+ LOG.debug("VM was removed from the job so could not remove again, trying to delete the veeam job now.", e);
+ }
+
+ final String clonedJobName = getGuestBackupName(vm.getInstanceName(), vm.getUuid());
+ if (!client.deleteJobAndBackup(clonedJobName)) {
+ LOG.warn("Failed to remove Veeam job and backup for job: " + clonedJobName);
+ throw new CloudRuntimeException("Failed to delete Veeam B&R job and backup, an operation may be in progress. Please try again after some time.");
+ }
+ return true;
+ }
+
+ @Override
+ public boolean willDeleteBackupsOnOfferingRemoval() {
+ return true;
+ }
+
+ @Override
+ public boolean takeBackup(final VirtualMachine vm) {
+ final VeeamClient client = getClient(vm.getDataCenterId());
+ return client.startBackupJob(vm.getBackupExternalId());
+ }
+
+ @Override
+ public boolean deleteBackup(Backup backup) {
+ // Veeam does not support removal of a restore point or point-in-time backup
+ throw new CloudRuntimeException("Veeam B&R plugin does not allow removal of backup restore point, to delete the backup chain remove VM from the backup offering");
+ }
+
+ @Override
+ public boolean restoreVMFromBackup(VirtualMachine vm, Backup backup) {
+ final String restorePointId = backup.getExternalId();
+ return getClient(vm.getDataCenterId()).restoreFullVM(vm.getInstanceName(), restorePointId);
+ }
+
+ @Override
+ public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, String volumeUuid, String hostIp, String dataStoreUuid) {
+ final Long zoneId = backup.getZoneId();
+ final String restorePointId = backup.getExternalId();
+ return getClient(zoneId).restoreVMToDifferentLocation(restorePointId, hostIp, dataStoreUuid);
+ }
+
+ @Override
+ public Map<VirtualMachine, Backup.Metric> getBackupMetrics(final Long zoneId, final List<VirtualMachine> vms) {
+ final Map<VirtualMachine, Backup.Metric> metrics = new HashMap<>();
+ if (vms == null || vms.isEmpty()) {
+ return metrics;
+ }
+ final Map<String, Backup.Metric> backendMetrics = getClient(zoneId).getBackupMetrics();
+ for (final VirtualMachine vm : vms) {
+ if (vm == null || !backendMetrics.containsKey(vm.getUuid())) {
+ continue;
+ }
+ metrics.put(vm, backendMetrics.get(vm.getUuid()));
+ }
+ return metrics;
+ }
+
+ private List<Backup.RestorePoint> listRestorePoints(VirtualMachine vm) {
+ String backupName = getGuestBackupName(vm.getInstanceName(), vm.getUuid());
+ return getClient(vm.getDataCenterId()).listRestorePoints(backupName, vm.getInstanceName());
+ }
+
+ @Override
+ public void syncBackups(VirtualMachine vm, Backup.Metric metric) {
+ List<Backup.RestorePoint> restorePoints = listRestorePoints(vm);
+ if (restorePoints == null || restorePoints.isEmpty()) {
+ return;
+ }
+ Transaction.execute(new TransactionCallbackNoReturn() {
+ @Override
+ public void doInTransactionWithoutResult(TransactionStatus status) {
+ final List<Backup> backupsInDb = backupDao.listByVmId(null, vm.getId());
+ final List<Long> removeList = backupsInDb.stream().map(InternalIdentity::getId).collect(Collectors.toList());
+ for (final Backup.RestorePoint restorePoint : restorePoints) {
+ boolean backupExists = false;
+ for (final Backup backup : backupsInDb) {
+ if (restorePoint.getId().equals(backup.getExternalId())) {
+ backupExists = true;
+ removeList.remove(backup.getId());
+ if (metric != null) {
+ ((BackupVO) backup).setSize(metric.getBackupSize());
+ ((BackupVO) backup).setProtectedSize(metric.getDataSize());
+ backupDao.update(backup.getId(), ((BackupVO) backup));
+ }
+ break;
+ }
+ }
+ if (backupExists) {
+ continue;
+ }
+ BackupVO backup = new BackupVO();
+ backup.setVmId(vm.getId());
+ backup.setExternalId(restorePoint.getId());
+ backup.setType(restorePoint.getType());
+ backup.setDate(restorePoint.getCreated());
+ backup.setStatus(Backup.Status.BackedUp);
+ if (metric != null) {
+ backup.setSize(metric.getBackupSize());
+ backup.setProtectedSize(metric.getDataSize());
+ }
+ backup.setBackupOfferingId(vm.getBackupOfferingId());
+ backup.setAccountId(vm.getAccountId());
+ backup.setDomainId(vm.getDomainId());
+ backup.setZoneId(vm.getDataCenterId());
+ backupDao.persist(backup);
+ }
+ for (final Long backupIdToRemove : removeList) {
+ backupDao.remove(backupIdToRemove);
+ }
+ }
+ });
+ }
+
+ @Override
+ public String getConfigComponentName() {
+ return BackupService.class.getSimpleName();
+ }
+
+ @Override
+ public ConfigKey<?>[] getConfigKeys() {
+ return new ConfigKey[]{
+ VeeamUrl,
+ VeeamUsername,
+ VeeamPassword,
+ VeeamValidateSSLSecurity,
+ VeeamApiRequestTimeout
+ };
+ }
+
+ @Override
+ public String getName() {
+ return "veeam";
+ }
+
+ @Override
+ public String getDescription() {
+ return "Veeam Backup Plugin";
+ }
+}
diff --git a/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/VeeamBackupOffering.java b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/VeeamBackupOffering.java
new file mode 100644
index 0000000..9b1e7b0
--- /dev/null
+++ b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/VeeamBackupOffering.java
@@ -0,0 +1,78 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.backup.veeam;
+
+import java.util.Date;
+
+import org.apache.cloudstack.backup.BackupOffering;
+
+public class VeeamBackupOffering implements BackupOffering {
+
+ private String name;
+ private String uid;
+
+ public VeeamBackupOffering(String name, String uid) {
+ this.name = name;
+ this.uid = uid;
+ }
+
+ @Override
+ public String getExternalId() {
+ return uid;
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public String getDescription() {
+ return "Veeam Backup Offering (Job)";
+ }
+
+ @Override
+ public long getZoneId() {
+ return -1;
+ }
+
+ @Override
+ public boolean isUserDrivenBackupAllowed() {
+ return false;
+ }
+
+ @Override
+ public String getProvider() {
+ return "veeam";
+ }
+
+ @Override
+ public Date getCreated() {
+ return null;
+ }
+
+ @Override
+ public String getUuid() {
+ return uid;
+ }
+
+ @Override
+ public long getId() {
+ return -1;
+ }
+}
diff --git a/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/VeeamClient.java b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/VeeamClient.java
new file mode 100644
index 0000000..1c0cc72
--- /dev/null
+++ b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/VeeamClient.java
@@ -0,0 +1,654 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.backup.veeam;
+
+import static org.apache.cloudstack.backup.VeeamBackupProvider.BACKUP_IDENTIFIER;
+
+import java.io.IOException;
+import java.net.SocketTimeoutException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.StringJoiner;
+import java.util.UUID;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.X509TrustManager;
+
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.backup.Backup;
+import org.apache.cloudstack.backup.BackupOffering;
+import org.apache.cloudstack.backup.veeam.api.BackupJobCloneInfo;
+import org.apache.cloudstack.backup.veeam.api.CreateObjectInJobSpec;
+import org.apache.cloudstack.backup.veeam.api.EntityReferences;
+import org.apache.cloudstack.backup.veeam.api.HierarchyItem;
+import org.apache.cloudstack.backup.veeam.api.HierarchyItems;
+import org.apache.cloudstack.backup.veeam.api.Job;
+import org.apache.cloudstack.backup.veeam.api.JobCloneSpec;
+import org.apache.cloudstack.backup.veeam.api.Link;
+import org.apache.cloudstack.backup.veeam.api.ObjectInJob;
+import org.apache.cloudstack.backup.veeam.api.ObjectsInJob;
+import org.apache.cloudstack.backup.veeam.api.Ref;
+import org.apache.cloudstack.backup.veeam.api.RestoreSession;
+import org.apache.cloudstack.backup.veeam.api.Task;
+import org.apache.cloudstack.utils.security.SSLUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.http.HttpHeaders;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.HttpDelete;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.ConnectTimeoutException;
+import org.apache.http.conn.ssl.NoopHostnameVerifier;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.log4j.Logger;
+
+import com.cloud.utils.Pair;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.nio.TrustAllManager;
+import com.cloud.utils.ssh.SshHelper;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator;
+import com.google.common.base.Strings;
+
+public class VeeamClient {
+ private static final Logger LOG = Logger.getLogger(VeeamClient.class);
+
+ private final URI apiURI;
+
+ private final HttpClient httpClient;
+ private static final String RESTORE_VM_SUFFIX = "CS-RSTR-";
+ private static final String SESSION_HEADER = "X-RestSvcSessionId";
+
+ private String veeamServerIp;
+ private String veeamServerUsername;
+ private String veeamServerPassword;
+ private String veeamSessionId = null;
+ private final int veeamServerPort = 22;
+
+ public VeeamClient(final String url, final String username, final String password, final boolean validateCertificate, final int timeout) throws URISyntaxException, NoSuchAlgorithmException, KeyManagementException {
+ this.apiURI = new URI(url);
+
+ final RequestConfig config = RequestConfig.custom()
+ .setConnectTimeout(timeout * 1000)
+ .setConnectionRequestTimeout(timeout * 1000)
+ .setSocketTimeout(timeout * 1000)
+ .build();
+
+ if (!validateCertificate) {
+ final SSLContext sslcontext = SSLUtils.getSSLContext();
+ sslcontext.init(null, new X509TrustManager[]{new TrustAllManager()}, new SecureRandom());
+ final SSLConnectionSocketFactory factory = new SSLConnectionSocketFactory(sslcontext, NoopHostnameVerifier.INSTANCE);
+ this.httpClient = HttpClientBuilder.create()
+ .setDefaultRequestConfig(config)
+ .setSSLSocketFactory(factory)
+ .build();
+ } else {
+ this.httpClient = HttpClientBuilder.create()
+ .setDefaultRequestConfig(config)
+ .build();
+ }
+
+ authenticate(username, password);
+ setVeeamSshCredentials(this.apiURI.getHost(), username, password);
+ }
+
+ protected void setVeeamSshCredentials(String hostIp, String username, String password) {
+ this.veeamServerIp = hostIp;
+ this.veeamServerUsername = username;
+ this.veeamServerPassword = password;
+ }
+
+ private void authenticate(final String username, final String password) {
+ // https://helpcenter.veeam.com/docs/backup/rest/http_authentication.html?ver=95u4
+ final HttpPost request = new HttpPost(apiURI.toString() + "/sessionMngr/?v=v1_4");
+ request.setHeader(HttpHeaders.AUTHORIZATION, "Basic " + Base64.getEncoder().encodeToString((username + ":" + password).getBytes()));
+ try {
+ final HttpResponse response = httpClient.execute(request);
+ checkAuthFailure(response);
+ veeamSessionId = response.getFirstHeader(SESSION_HEADER).getValue();
+ if (Strings.isNullOrEmpty(veeamSessionId)) {
+ throw new CloudRuntimeException("Veeam Session ID is not available to perform API requests");
+ }
+ if (response.getStatusLine().getStatusCode() != HttpStatus.SC_CREATED) {
+ throw new CloudRuntimeException("Failed to create and authenticate Veeam API client, please check the settings.");
+ }
+ } catch (final IOException e) {
+ throw new CloudRuntimeException("Failed to authenticate Veeam API service due to:" + e.getMessage());
+ }
+ }
+
+ private void checkAuthFailure(final HttpResponse response) {
+ if (response != null && response.getStatusLine().getStatusCode() == HttpStatus.SC_UNAUTHORIZED) {
+ throw new ServerApiException(ApiErrorCode.UNAUTHORIZED, "Veeam B&R API call unauthorized, please ask your administrator to fix integration issues.");
+ }
+ }
+
+ private void checkResponseOK(final HttpResponse response) {
+ if (response.getStatusLine().getStatusCode() == HttpStatus.SC_NO_CONTENT) {
+ LOG.debug("Requested Veeam resource does not exist");
+ return;
+ }
+ if (!(response.getStatusLine().getStatusCode() == HttpStatus.SC_OK ||
+ response.getStatusLine().getStatusCode() == HttpStatus.SC_ACCEPTED) &&
+ response.getStatusLine().getStatusCode() != HttpStatus.SC_NO_CONTENT) {
+ LOG.debug("HTTP request failed, status code is " + response.getStatusLine().getStatusCode() + ", response is: " + response.toString());
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Got invalid API status code returned by the Veeam server");
+ }
+ }
+
+ private void checkResponseTimeOut(final Exception e) {
+ if (e instanceof ConnectTimeoutException || e instanceof SocketTimeoutException) {
+ throw new ServerApiException(ApiErrorCode.RESOURCE_UNAVAILABLE_ERROR, "Veeam API operation timed out, please try again.");
+ }
+ }
+
+ private HttpResponse get(final String path) throws IOException {
+ final HttpGet request = new HttpGet(apiURI.toString() + path);
+ request.setHeader(SESSION_HEADER, veeamSessionId);
+ final HttpResponse response = httpClient.execute(request);
+ checkAuthFailure(response);
+ return response;
+ }
+
+ private HttpResponse post(final String path, final Object obj) throws IOException {
+ String xml = null;
+ if (obj != null) {
+ XmlMapper xmlMapper = new XmlMapper();
+ xml = xmlMapper.writer()
+ .with(ToXmlGenerator.Feature.WRITE_XML_DECLARATION)
+ .writeValueAsString(obj);
+ // Remove invalid/empty xmlns
+ xml = xml.replace(" xmlns=\"\"", "");
+ }
+
+ final HttpPost request = new HttpPost(apiURI.toString() + path);
+ request.setHeader(SESSION_HEADER, veeamSessionId);
+ request.setHeader("Content-type", "application/xml");
+ if (StringUtils.isNotBlank(xml)) {
+ request.setEntity(new StringEntity(xml));
+ }
+
+ final HttpResponse response = httpClient.execute(request);
+ checkAuthFailure(response);
+ return response;
+ }
+
+ private HttpResponse delete(final String path) throws IOException {
+ final HttpDelete request = new HttpDelete(apiURI.toString() + path);
+ request.setHeader(SESSION_HEADER, veeamSessionId);
+ final HttpResponse response = httpClient.execute(request);
+ checkAuthFailure(response);
+ return response;
+ }
+
+ ///////////////////////////////////////////////////////////////////
+ //////////////// Private Veeam Helper Methods /////////////////////
+ ///////////////////////////////////////////////////////////////////
+
+ private String findDCHierarchy(final String vmwareDcName) {
+ LOG.debug("Trying to find hierarchy ID for vmware datacenter: " + vmwareDcName);
+
+ try {
+ final HttpResponse response = get("/hierarchyRoots");
+ checkResponseOK(response);
+ final ObjectMapper objectMapper = new XmlMapper();
+ final EntityReferences references = objectMapper.readValue(response.getEntity().getContent(), EntityReferences.class);
+ for (final Ref ref : references.getRefs()) {
+ if (ref.getName().equals(vmwareDcName) && ref.getType().equals("HierarchyRootReference")) {
+ return ref.getUid();
+ }
+ }
+ } catch (final IOException e) {
+ LOG.error("Failed to list Veeam jobs due to:", e);
+ checkResponseTimeOut(e);
+ }
+ throw new CloudRuntimeException("Failed to find hierarchy reference for VMware datacenter " + vmwareDcName + " in Veeam, please ask administrator to check Veeam B&R manager configuration");
+ }
+
+ private String lookupVM(final String hierarchyId, final String vmName) {
+ LOG.debug("Trying to lookup VM from veeam hierarchy:" + hierarchyId + " for vm name:" + vmName);
+
+ try {
+ final HttpResponse response = get(String.format("/lookup?host=%s&type=Vm&name=%s", hierarchyId, vmName));
+ checkResponseOK(response);
+ final ObjectMapper objectMapper = new XmlMapper();
+ final HierarchyItems items = objectMapper.readValue(response.getEntity().getContent(), HierarchyItems.class);
+ if (items == null || items.getItems() == null || items.getItems().isEmpty()) {
+ throw new CloudRuntimeException("Could not find VM " + vmName + " in Veeam, please ask administrator to check Veeam B&R manager");
+ }
+ for (final HierarchyItem item : items.getItems()) {
+ if (item.getObjectName().equals(vmName) && item.getObjectType().equals("Vm")) {
+ return item.getObjectRef();
+ }
+ }
+ } catch (final IOException e) {
+ LOG.error("Failed to list Veeam jobs due to:", e);
+ checkResponseTimeOut(e);
+ }
+ throw new CloudRuntimeException("Failed to lookup VM " + vmName + " in Veeam, please ask administrator to check Veeam B&R manager configuration");
+ }
+
+ private Task parseTaskResponse(HttpResponse response) throws IOException {
+ checkResponseOK(response);
+ final ObjectMapper objectMapper = new XmlMapper();
+ return objectMapper.readValue(response.getEntity().getContent(), Task.class);
+ }
+
+ private RestoreSession parseRestoreSessionResponse(HttpResponse response) throws IOException {
+ checkResponseOK(response);
+ final ObjectMapper objectMapper = new XmlMapper();
+ return objectMapper.readValue(response.getEntity().getContent(), RestoreSession.class);
+ }
+
+ private boolean checkTaskStatus(final HttpResponse response) throws IOException {
+ final Task task = parseTaskResponse(response);
+ for (int i = 0; i < 120; i++) {
+ final HttpResponse taskResponse = get("/tasks/" + task.getTaskId());
+ final Task polledTask = parseTaskResponse(taskResponse);
+ if (polledTask.getState().equals("Finished")) {
+ final HttpResponse taskDeleteResponse = delete("/tasks/" + task.getTaskId());
+ if (taskDeleteResponse.getStatusLine().getStatusCode() != HttpStatus.SC_NO_CONTENT) {
+ LOG.warn("Operation failed for veeam task id=" + task.getTaskId());
+ }
+ if (polledTask.getResult().getSuccess().equals("true")) {
+ Pair<String, String> pair = getRelatedLinkPair(polledTask.getLink());
+ if (pair != null) {
+ String url = pair.first();
+ String type = pair.second();
+ String path = url.replace(apiURI.toString(), "");
+ if (type.equals("RestoreSession")) {
+ for (int j = 0; j < 120; j++) {
+ HttpResponse relatedResponse = get(path);
+ RestoreSession session = parseRestoreSessionResponse(relatedResponse);
+ if (session.getResult().equals("Success")) {
+ return true;
+ }
+ try {
+ Thread.sleep(5000);
+ } catch (InterruptedException ignored) {
+ }
+ }
+ throw new CloudRuntimeException("Related job type: " + type + " was not successful");
+ }
+ }
+ return true;
+ }
+ throw new CloudRuntimeException("Failed to assign VM to backup offering due to: " + polledTask.getResult().getMessage());
+ }
+ try {
+ Thread.sleep(5000);
+ } catch (InterruptedException e) {
+ LOG.debug("Failed to sleep while polling for Veeam task status due to: ", e);
+ }
+ }
+ return false;
+ }
+
+ private Pair<String, String> getRelatedLinkPair(List<Link> links) {
+ for (Link link : links) {
+ if (link.getRel().equals("Related")) {
+ return new Pair<>(link.getHref(), link.getType());
+ }
+ }
+ return null;
+ }
+
+ ////////////////////////////////////////////////////////
+ //////////////// Public Veeam APIs /////////////////////
+ ////////////////////////////////////////////////////////
+
+ public Ref listBackupRepository(final String backupServerId) {
+ LOG.debug("Trying to list backup repository for backup server id: " + backupServerId);
+ try {
+ final HttpResponse response = get(String.format("/backupServers/%s/repositories", backupServerId));
+ checkResponseOK(response);
+ final ObjectMapper objectMapper = new XmlMapper();
+ final EntityReferences references = objectMapper.readValue(response.getEntity().getContent(), EntityReferences.class);
+ for (final Ref ref : references.getRefs()) {
+ if (ref.getType().equals("RepositoryReference")) {
+ return ref;
+ }
+ }
+ } catch (final IOException e) {
+ LOG.error("Failed to list Veeam jobs due to:", e);
+ checkResponseTimeOut(e);
+ }
+ return null;
+ }
+
+ public void listAllBackups() {
+ LOG.debug("Trying to list Veeam backups");
+ try {
+ final HttpResponse response = get("/backups");
+ checkResponseOK(response);
+ final ObjectMapper objectMapper = new XmlMapper();
+ final EntityReferences entityReferences = objectMapper.readValue(response.getEntity().getContent(), EntityReferences.class);
+ for (final Ref ref : entityReferences.getRefs()) {
+ LOG.debug("Veeam Backup found, name: " + ref.getName() + ", uid: " + ref.getUid() + ", type: " + ref.getType());
+ }
+ } catch (final IOException e) {
+ LOG.error("Failed to list Veeam backups due to:", e);
+ checkResponseTimeOut(e);
+ }
+ }
+
+ public List<BackupOffering> listJobs() {
+ LOG.debug("Trying to list backup policies that are Veeam jobs");
+ try {
+ final HttpResponse response = get("/jobs");
+ checkResponseOK(response);
+ final ObjectMapper objectMapper = new XmlMapper();
+ final EntityReferences entityReferences = objectMapper.readValue(response.getEntity().getContent(), EntityReferences.class);
+ final List<BackupOffering> policies = new ArrayList<>();
+ if (entityReferences == null || entityReferences.getRefs() == null) {
+ return policies;
+ }
+ for (final Ref ref : entityReferences.getRefs()) {
+ policies.add(new VeeamBackupOffering(ref.getName(), ref.getUid()));
+ }
+ return policies;
+ } catch (final IOException e) {
+ LOG.error("Failed to list Veeam jobs due to:", e);
+ checkResponseTimeOut(e);
+ }
+ return new ArrayList<>();
+ }
+
+ public Job listJob(final String jobId) {
+ LOG.debug("Trying to list veeam job id: " + jobId);
+ try {
+ final HttpResponse response = get(String.format("/jobs/%s?format=Entity",
+ jobId.replace("urn:veeam:Job:", "")));
+ checkResponseOK(response);
+ final ObjectMapper objectMapper = new XmlMapper();
+ objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+ return objectMapper.readValue(response.getEntity().getContent(), Job.class);
+ } catch (final IOException e) {
+ LOG.error("Failed to list Veeam jobs due to:", e);
+ checkResponseTimeOut(e);
+ } catch (final ServerApiException e) {
+ LOG.error(e);
+ }
+ return null;
+ }
+
+ public boolean toggleJobSchedule(final String jobId) {
+ LOG.debug("Trying to toggle schedule for Veeam job: " + jobId);
+ try {
+ final HttpResponse response = post(String.format("/jobs/%s?action=toggleScheduleEnabled", jobId), null);
+ return checkTaskStatus(response);
+ } catch (final IOException e) {
+ LOG.error("Failed to toggle Veeam job schedule due to:", e);
+ checkResponseTimeOut(e);
+ }
+ return false;
+ }
+
+ public boolean startBackupJob(final String jobId) {
+ LOG.debug("Trying to start ad-hoc backup for Veeam job: " + jobId);
+ try {
+ final HttpResponse response = post(String.format("/jobs/%s?action=start", jobId), null);
+ return checkTaskStatus(response);
+ } catch (final IOException e) {
+ LOG.error("Failed to list Veeam jobs due to:", e);
+ checkResponseTimeOut(e);
+ }
+ return false;
+ }
+
+ public boolean cloneVeeamJob(final Job parentJob, final String clonedJobName) {
+ LOG.debug("Trying to clone veeam job: " + parentJob.getUid() + " with backup uuid: " + clonedJobName);
+ try {
+ final Ref repositoryRef = listBackupRepository(parentJob.getBackupServerId());
+ final BackupJobCloneInfo cloneInfo = new BackupJobCloneInfo();
+ cloneInfo.setJobName(clonedJobName);
+ cloneInfo.setFolderName(clonedJobName);
+ cloneInfo.setRepositoryUid(repositoryRef.getUid());
+ final JobCloneSpec cloneSpec = new JobCloneSpec(cloneInfo);
+ final HttpResponse response = post(String.format("/jobs/%s?action=clone", parentJob.getId()), cloneSpec);
+ return checkTaskStatus(response);
+ } catch (final Exception e) {
+ LOG.warn("Exception caught while trying to clone Veeam job:", e);
+ }
+ return false;
+ }
+
+ public boolean addVMToVeeamJob(final String jobId, final String vmwareInstanceName, final String vmwareDcName) {
+ LOG.debug("Trying to add VM to backup offering that is Veeam job: " + jobId);
+ try {
+ final String heirarchyId = findDCHierarchy(vmwareDcName);
+ final String veeamVmRefId = lookupVM(heirarchyId, vmwareInstanceName);
+ final CreateObjectInJobSpec vmToBackupJob = new CreateObjectInJobSpec();
+ vmToBackupJob.setObjName(vmwareInstanceName);
+ vmToBackupJob.setObjRef(veeamVmRefId);
+ final HttpResponse response = post(String.format("/jobs/%s/includes", jobId), vmToBackupJob);
+ return checkTaskStatus(response);
+ } catch (final IOException e) {
+ LOG.error("Failed to add VM to Veeam job due to:", e);
+ checkResponseTimeOut(e);
+ }
+ throw new CloudRuntimeException("Failed to add VM to backup offering likely due to timeout, please check Veeam tasks");
+ }
+
+ public boolean removeVMFromVeeamJob(final String jobId, final String vmwareInstanceName, final String vmwareDcName) {
+ LOG.debug("Trying to remove VM from backup offering that is a Veeam job: " + jobId);
+ try {
+ final String hierarchyId = findDCHierarchy(vmwareDcName);
+ final String veeamVmRefId = lookupVM(hierarchyId, vmwareInstanceName);
+ final HttpResponse response = get(String.format("/jobs/%s/includes", jobId));
+ checkResponseOK(response);
+ final ObjectMapper objectMapper = new XmlMapper();
+ objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+ final ObjectsInJob jobObjects = objectMapper.readValue(response.getEntity().getContent(), ObjectsInJob.class);
+ if (jobObjects == null || jobObjects.getObjects() == null) {
+ LOG.warn("No objects found in the Veeam job " + jobId);
+ return false;
+ }
+ for (final ObjectInJob jobObject : jobObjects.getObjects()) {
+ if (jobObject.getName().equals(vmwareInstanceName) && jobObject.getHierarchyObjRef().equals(veeamVmRefId)) {
+ final HttpResponse deleteResponse = delete(String.format("/jobs/%s/includes/%s", jobId, jobObject.getObjectInJobId()));
+ return checkTaskStatus(deleteResponse);
+ }
+ }
+ LOG.warn(vmwareInstanceName + " VM was not found to be attached to Veaam job (backup offering): " + jobId);
+ return false;
+ } catch (final IOException e) {
+ LOG.error("Failed to list Veeam jobs due to:", e);
+ checkResponseTimeOut(e);
+ }
+ return false;
+ }
+
+ public boolean restoreFullVM(final String vmwareInstanceName, final String restorePointId) {
+ LOG.debug("Trying to restore full VM: " + vmwareInstanceName + " from backup");
+ try {
+ final HttpResponse response = post(String.format("/vmRestorePoints/%s?action=restore", restorePointId), null);
+ return checkTaskStatus(response);
+ } catch (final IOException e) {
+ LOG.error("Failed to restore full VM due to: ", e);
+ checkResponseTimeOut(e);
+ }
+ throw new CloudRuntimeException("Failed to restore full VM from backup");
+ }
+
+ /////////////////////////////////////////////////////////////////
+ //////////////// Public Veeam PS based APIs /////////////////////
+ /////////////////////////////////////////////////////////////////
+
+ /**
+ * Generate a single command to be passed through SSH
+ */
+ protected String transformPowerShellCommandList(List<String> cmds) {
+ StringJoiner joiner = new StringJoiner(";");
+ joiner.add("PowerShell Add-PSSnapin VeeamPSSnapin");
+ for (String cmd : cmds) {
+ joiner.add(cmd);
+ }
+ return joiner.toString();
+ }
+
+ /**
+ * Execute a list of commands in a single call on PowerShell through SSH
+ */
+ protected Pair<Boolean, String> executePowerShellCommands(List<String> cmds) {
+ try {
+ Pair<Boolean, String> pairResult = SshHelper.sshExecute(veeamServerIp, veeamServerPort,
+ veeamServerUsername, null, veeamServerPassword,
+ transformPowerShellCommandList(cmds),
+ 120000, 120000, 3600000);
+ return pairResult;
+ } catch (Exception e) {
+ throw new CloudRuntimeException("Error while executing PowerShell commands due to: " + e.getMessage());
+ }
+ }
+
+ public boolean setJobSchedule(final String jobName) {
+ Pair<Boolean, String> result = executePowerShellCommands(Arrays.asList(
+ String.format("$job = Get-VBRJob -Name \"%s\"", jobName),
+ "if ($job) { Set-VBRJobSchedule -Job $job -Daily -At \"11:00\" -DailyKind Weekdays }"
+ ));
+ return result.first() && !result.second().isEmpty() && !result.second().contains("Failed to delete");
+ }
+
+ public boolean deleteJobAndBackup(final String jobName) {
+ Pair<Boolean, String> result = executePowerShellCommands(Arrays.asList(
+ String.format("$job = Get-VBRJob -Name \"%s\"", jobName),
+ "if ($job) { Remove-VBRJob -Job $job -Confirm:$false }",
+ String.format("$backup = Get-VBRBackup -Name \"%s\"", jobName),
+ "if ($backup) { Remove-VBRBackup -Backup $backup -FromDisk -Confirm:$false }",
+ "$repo = Get-VBRBackupRepository",
+ "Sync-VBRBackupRepository -Repository $repo"
+ ));
+ return result.first() && !result.second().contains("Failed to delete");
+ }
+
+ public Map<String, Backup.Metric> getBackupMetrics() {
+ final String separator = "=====";
+ final List<String> cmds = Arrays.asList(
+ "$backups = Get-VBRBackup",
+ "foreach ($backup in $backups) {" +
+ "$backup.JobName;" +
+ "$storageGroups = $backup.GetStorageGroups();" +
+ "foreach ($group in $storageGroups) {" +
+ "$usedSize = 0;" +
+ "$dataSize = 0;" +
+ "$sizePerStorage = $group.GetStorages().Stats.BackupSize;" +
+ "$dataPerStorage = $group.GetStorages().Stats.DataSize;" +
+ "foreach ($size in $sizePerStorage) {" +
+ "$usedSize += $size;" +
+ "}" +
+ "foreach ($size in $dataPerStorage) {" +
+ "$dataSize += $size;" +
+ "}" +
+ "$usedSize;" +
+ "$dataSize;" +
+ "}" +
+ "echo \"" + separator + "\"" +
+ "}"
+ );
+ Pair<Boolean, String> response = executePowerShellCommands(cmds);
+ final Map<String, Backup.Metric> sizes = new HashMap<>();
+ for (final String block : response.second().split(separator + "\r\n")) {
+ final String[] parts = block.split("\r\n");
+ if (parts.length != 3) {
+ continue;
+ }
+ final String backupName = parts[0];
+ if (backupName != null && backupName.contains(BACKUP_IDENTIFIER)) {
+ final String[] names = backupName.split(BACKUP_IDENTIFIER);
+ sizes.put(names[names.length - 1], new Backup.Metric(Long.valueOf(parts[1]), Long.valueOf(parts[2])));
+ }
+ }
+ return sizes;
+ }
+
+ private Backup.RestorePoint getRestorePointFromBlock(String[] parts) {
+ String id = null;
+ String created = null;
+ String type = null;
+ for (String part : parts) {
+ if (part.matches("Id(\\s)+:(.)*")) {
+ String[] split = part.split(":");
+ id = split[1].trim();
+ } else if (part.matches("CreationTime(\\s)+:(.)*")) {
+ String [] split = part.split(":", 2);
+ created = split[1].trim();
+ } else if (part.matches("Type(\\s)+:(.)*")) {
+ String [] split = part.split(":");
+ type = split[1].trim();
+ }
+ }
+ return new Backup.RestorePoint(id, created, type);
+ }
+
+ public List<Backup.RestorePoint> listRestorePoints(String backupName, String vmInternalName) {
+ final List<String> cmds = Arrays.asList(
+ String.format("$backup = Get-VBRBackup -Name \"%s\"", backupName),
+ String.format("if ($backup) { (Get-VBRRestorePoint -Backup:$backup -Name \"%s\" ^| Where-Object {$_.IsConsistent -eq $true}) }", vmInternalName)
+ );
+ Pair<Boolean, String> response = executePowerShellCommands(cmds);
+ final List<Backup.RestorePoint> restorePoints = new ArrayList<>();
+ if (response == null || !response.first()) {
+ LOG.debug("Veeam restore point listing failed due to: " + (response != null ? response.second() : "no powershell output returned"));
+ return restorePoints;
+ }
+ for (final String block : response.second().split("\r\n\r\n")) {
+ if (block.isEmpty()) {
+ continue;
+ }
+ final String[] parts = block.split("\r\n");
+ restorePoints.add(getRestorePointFromBlock(parts));
+ }
+ return restorePoints;
+ }
+
+ public Pair<Boolean, String> restoreVMToDifferentLocation(String restorePointId, String hostIp, String dataStoreUuid) {
+ final String restoreLocation = RESTORE_VM_SUFFIX + UUID.randomUUID().toString();
+ final String datastoreId = dataStoreUuid.replace("-","");
+ final List<String> cmds = Arrays.asList(
+ "$points = Get-VBRRestorePoint",
+ String.format("foreach($point in $points) { if ($point.Id -eq '%s') { break; } }", restorePointId),
+ String.format("$server = Get-VBRServer -Name \"%s\"", hostIp),
+ String.format("$ds = Find-VBRViDatastore -Server:$server -Name \"%s\"", datastoreId),
+ String.format("$job = Start-VBRRestoreVM -RestorePoint:$point -Server:$server -Datastore:$ds -VMName \"%s\" -RunAsync", restoreLocation),
+ "while (-not (Get-VBRRestoreSession -Id $job.Id).IsCompleted) { Start-Sleep -Seconds 10 }"
+ );
+ Pair<Boolean, String> result = executePowerShellCommands(cmds);
+ if (result == null || !result.first()) {
+ throw new CloudRuntimeException("Failed to restore VM to location " + restoreLocation);
+ }
+ return new Pair<>(result.first(), restoreLocation);
+ }
+}
diff --git a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/VeeamObject.java
similarity index 60%
copy from agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
copy to plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/VeeamObject.java
index b244d02..6ecf080 100644
--- a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
+++ b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/VeeamObject.java
@@ -1,4 +1,3 @@
-//
// 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
@@ -15,22 +14,15 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-//
-package com.cloud.agent.direct.download;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+package org.apache.cloudstack.backup.veeam;
-@RunWith(MockitoJUnitRunner.class)
-public class DirectTemplateDownloaderImplTest {
+import java.util.List;
- private static final Long templateId = 202l;
-
- @Test
- public void testGetDirectDownloadTempPath() {
- String path = DirectTemplateDownloaderImpl.getDirectDownloadTempPath(templateId);
- Assert.assertEquals("template/2/202", path);
- }
+public interface VeeamObject {
+ String getUuid();
+ String getName();
+ String getHref();
+ String getType();
+ List<VeeamObject> getLinks();
}
diff --git a/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/BackupJobCloneInfo.java b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/BackupJobCloneInfo.java
new file mode 100644
index 0000000..fdb6081
--- /dev/null
+++ b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/BackupJobCloneInfo.java
@@ -0,0 +1,58 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.backup.veeam.api;
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+@JacksonXmlRootElement(localName = "BackupJobCloneInfo")
+public class BackupJobCloneInfo {
+
+ @JacksonXmlProperty(localName = "JobName")
+ private String jobName;
+
+ @JacksonXmlProperty(localName = "FolderName")
+ private String folderName;
+
+ @JacksonXmlProperty(localName = "RepositoryUid")
+ private String repositoryUid;
+
+ public String getJobName() {
+ return jobName;
+ }
+
+ public void setJobName(String jobName) {
+ this.jobName = jobName;
+ }
+
+ public String getFolderName() {
+ return folderName;
+ }
+
+ public void setFolderName(String folderName) {
+ this.folderName = folderName;
+ }
+
+ public String getRepositoryUid() {
+ return repositoryUid;
+ }
+
+ public void setRepositoryUid(String repositoryUid) {
+ this.repositoryUid = repositoryUid;
+ }
+}
diff --git a/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/CreateObjectInJobSpec.java b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/CreateObjectInJobSpec.java
new file mode 100644
index 0000000..16de447
--- /dev/null
+++ b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/CreateObjectInJobSpec.java
@@ -0,0 +1,46 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.backup.veeam.api;
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+@JacksonXmlRootElement(localName = "CreateObjectInJobSpec", namespace = "http://www.veeam.com/ent/v1.0")
+public class CreateObjectInJobSpec {
+ @JacksonXmlProperty(localName = "HierarchyObjRef")
+ String objRef;
+
+ @JacksonXmlProperty(localName = "HierarchyObjName")
+ String objName;
+
+ public String getObjRef() {
+ return objRef;
+ }
+
+ public void setObjRef(String objRef) {
+ this.objRef = objRef;
+ }
+
+ public String getObjName() {
+ return objName;
+ }
+
+ public void setObjName(String objName) {
+ this.objName = objName;
+ }
+}
diff --git a/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/EntityReferences.java b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/EntityReferences.java
new file mode 100644
index 0000000..928e0da
--- /dev/null
+++ b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/EntityReferences.java
@@ -0,0 +1,39 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.backup.veeam.api;
+
+import java.util.List;
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+@JacksonXmlRootElement(localName = "EntityReferences")
+public class EntityReferences {
+ @JacksonXmlProperty(localName = "Ref")
+ @JacksonXmlElementWrapper(localName = "Ref", useWrapping = false)
+ private List<Ref> refs;
+
+ public List<Ref> getRefs() {
+ return refs;
+ }
+
+ public void setRefs(List<Ref> refs) {
+ this.refs = refs;
+ }
+}
diff --git a/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/HierarchyItem.java b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/HierarchyItem.java
new file mode 100644
index 0000000..46f0e5e
--- /dev/null
+++ b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/HierarchyItem.java
@@ -0,0 +1,68 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.backup.veeam.api;
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+@JacksonXmlRootElement(localName = "HierarchyItem")
+public class HierarchyItem {
+ @JacksonXmlProperty(localName = "Type", isAttribute = true)
+ private String type;
+
+ @JacksonXmlProperty(localName = "ObjectRef")
+ private String objectRef;
+
+ @JacksonXmlProperty(localName = "ObjectType")
+ private String objectType;
+
+ @JacksonXmlProperty(localName = "ObjectName")
+ private String objectName;
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getObjectRef() {
+ return objectRef;
+ }
+
+ public void setObjectRef(String objectRef) {
+ this.objectRef = objectRef;
+ }
+
+ public String getObjectType() {
+ return objectType;
+ }
+
+ public void setObjectType(String objectType) {
+ this.objectType = objectType;
+ }
+
+ public String getObjectName() {
+ return objectName;
+ }
+
+ public void setObjectName(String objectName) {
+ this.objectName = objectName;
+ }
+}
diff --git a/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/HierarchyItems.java b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/HierarchyItems.java
new file mode 100644
index 0000000..a87c6b0
--- /dev/null
+++ b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/HierarchyItems.java
@@ -0,0 +1,39 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.backup.veeam.api;
+
+import java.util.List;
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+@JacksonXmlRootElement(localName = "HierarchyItems")
+public class HierarchyItems {
+ @JacksonXmlProperty(localName = "HierarchyItem")
+ @JacksonXmlElementWrapper(localName = "HierarchyItem", useWrapping = false)
+ private List<HierarchyItem> items;
+
+ public List<HierarchyItem> getItems() {
+ return items;
+ }
+
+ public void setItems(List<HierarchyItem> items) {
+ this.items = items;
+ }
+}
diff --git a/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/Job.java b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/Job.java
new file mode 100644
index 0000000..e42ecf0
--- /dev/null
+++ b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/Job.java
@@ -0,0 +1,163 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.backup.veeam.api;
+
+import java.util.List;
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+@JacksonXmlRootElement(localName = "Job")
+public class Job {
+
+ @JacksonXmlProperty(localName = "Name", isAttribute = true)
+ private String name;
+
+ @JacksonXmlProperty(localName = "Href", isAttribute = true)
+ private String href;
+
+ @JacksonXmlProperty(localName = "Type", isAttribute = true)
+ private String type;
+
+ @JacksonXmlProperty(localName = "UID", isAttribute = true)
+ private String uid;
+
+ @JacksonXmlProperty(localName = "Link")
+ @JacksonXmlElementWrapper(localName = "Links")
+ private List<Link> link;
+
+ @JacksonXmlProperty(localName = "Platform")
+ private String platform;
+
+ @JacksonXmlProperty(localName = "Description")
+ private String description;
+
+ @JacksonXmlProperty(localName = "NextRun")
+ private String nextRun;
+
+ @JacksonXmlProperty(localName = "JobType")
+ private String jobType;
+
+ @JacksonXmlProperty(localName = "ScheduleEnabled")
+ private Boolean scheduleEnabled;
+
+ @JacksonXmlProperty(localName = "ScheduleConfigured")
+ private Boolean scheduleConfigured;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getHref() {
+ return href;
+ }
+
+ public void setHref(String href) {
+ this.href = href;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getUid() {
+ return uid;
+ }
+
+ public String getId() {
+ return uid.replace("urn:veeam:Job:", "");
+ }
+
+ public void setUid(String uid) {
+ this.uid = uid;
+ }
+
+ public List<Link> getLink() {
+ return link;
+ }
+
+ public void setLink(List<Link> link) {
+ this.link = link;
+ }
+
+ public String getPlatform() {
+ return platform;
+ }
+
+ public void setPlatform(String platform) {
+ this.platform = platform;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getNextRun() {
+ return nextRun;
+ }
+
+ public void setNextRun(String nextRun) {
+ this.nextRun = nextRun;
+ }
+
+ public String getJobType() {
+ return jobType;
+ }
+
+ public void setJobType(String jobType) {
+ this.jobType = jobType;
+ }
+
+ public String getBackupServerId() {
+ for (final Link l : link) {
+ if (l.getType().equals("BackupServerReference")) {
+ return "" + l.getHref().split("backupServers/")[1];
+ }
+ }
+ return null;
+ }
+
+ public Boolean getScheduleEnabled() {
+ return scheduleEnabled;
+ }
+
+ public void setScheduleEnabled(String scheduleEnabled) {
+ this.scheduleEnabled = Boolean.valueOf(scheduleEnabled);
+ }
+
+ public Boolean getScheduleConfigured() {
+ return scheduleConfigured;
+ }
+
+ public void setScheduleConfigured(String scheduleConfigured) {
+ this.scheduleConfigured = Boolean.valueOf(scheduleConfigured);
+ }
+}
diff --git a/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/JobCloneSpec.java b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/JobCloneSpec.java
new file mode 100644
index 0000000..fd1bdfb
--- /dev/null
+++ b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/JobCloneSpec.java
@@ -0,0 +1,41 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.backup.veeam.api;
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+@JacksonXmlRootElement(localName = "JobCloneSpec", namespace = "http://www.veeam.com/ent/v1.0")
+public class JobCloneSpec {
+ @JacksonXmlProperty(localName = "BackupJobCloneInfo")
+ @JacksonXmlElementWrapper(localName = "BackupJobCloneInfo", useWrapping = false)
+ BackupJobCloneInfo jobCloneInfo;
+
+ public JobCloneSpec(final BackupJobCloneInfo jobCloneInfo) {
+ this.jobCloneInfo = jobCloneInfo;
+ }
+
+ public BackupJobCloneInfo getJobCloneInfo() {
+ return jobCloneInfo;
+ }
+
+ public void setJobCloneInfo(BackupJobCloneInfo jobCloneInfo) {
+ this.jobCloneInfo = jobCloneInfo;
+ }
+}
diff --git a/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/Link.java b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/Link.java
new file mode 100644
index 0000000..b89d77f
--- /dev/null
+++ b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/Link.java
@@ -0,0 +1,69 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.backup.veeam.api;
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+@JacksonXmlRootElement(localName = "Link")
+public class Link {
+
+ @JacksonXmlProperty(localName = "Name", isAttribute = true)
+ private String name;
+
+ @JacksonXmlProperty(localName = "Href", isAttribute = true)
+ private String href;
+
+ @JacksonXmlProperty(localName = "Type", isAttribute = true)
+ private String type;
+
+ @JacksonXmlProperty(localName = "Rel", isAttribute = true)
+ private String rel;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getHref() {
+ return href;
+ }
+
+ public void setHref(String href) {
+ this.href = href;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getRel() {
+ return rel;
+ }
+
+ public void setRel(String rel) {
+ this.rel = rel;
+ }
+}
diff --git a/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/ObjectInJob.java b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/ObjectInJob.java
new file mode 100644
index 0000000..987176e
--- /dev/null
+++ b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/ObjectInJob.java
@@ -0,0 +1,94 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.backup.veeam.api;
+
+import java.util.List;
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+@JacksonXmlRootElement(localName = "ObjectInJob")
+public class ObjectInJob {
+ @JacksonXmlProperty(localName = "Href", isAttribute = true)
+ private String href;
+
+ @JacksonXmlProperty(localName = "Type", isAttribute = true)
+ private String type;
+
+ @JacksonXmlProperty(localName = "Link")
+ @JacksonXmlElementWrapper(localName = "Links")
+ private List<Link> link;
+
+ @JacksonXmlProperty(localName = "ObjectInJobId", isAttribute = true)
+ private String objectInJobId;
+
+ @JacksonXmlProperty(localName = "HierarchyObjRef", isAttribute = true)
+ private String hierarchyObjRef;
+
+ @JacksonXmlProperty(localName = "Name", isAttribute = true)
+ private String name;
+
+ public String getHref() {
+ return href;
+ }
+
+ public void setHref(String href) {
+ this.href = href;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public List<Link> getLink() {
+ return link;
+ }
+
+ public void setLink(List<Link> link) {
+ this.link = link;
+ }
+
+ public String getObjectInJobId() {
+ return objectInJobId;
+ }
+
+ public void setObjectInJobId(String objectInJobId) {
+ this.objectInJobId = objectInJobId;
+ }
+
+ public String getHierarchyObjRef() {
+ return hierarchyObjRef;
+ }
+
+ public void setHierarchyObjRef(String hierarchyObjRef) {
+ this.hierarchyObjRef = hierarchyObjRef;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
diff --git a/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/ObjectsInJob.java b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/ObjectsInJob.java
new file mode 100644
index 0000000..982dae5
--- /dev/null
+++ b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/ObjectsInJob.java
@@ -0,0 +1,39 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.backup.veeam.api;
+
+import java.util.List;
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+@JacksonXmlRootElement(localName = "ObjectsInJob")
+public class ObjectsInJob {
+ @JacksonXmlProperty(localName = "ObjectInJob")
+ @JacksonXmlElementWrapper(localName = "ObjectInJob", useWrapping = false)
+ private List<ObjectInJob> objects;
+
+ public List<ObjectInJob> getObjects() {
+ return objects;
+ }
+
+ public void setObjects(List<ObjectInJob> objects) {
+ this.objects = objects;
+ }
+}
diff --git a/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/Ref.java b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/Ref.java
new file mode 100644
index 0000000..683fd37
--- /dev/null
+++ b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/Ref.java
@@ -0,0 +1,83 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.backup.veeam.api;
+
+import java.util.List;
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+@JacksonXmlRootElement(localName = "Ref")
+public class Ref {
+ @JacksonXmlProperty(localName = "UID", isAttribute = true)
+ private String uid;
+
+ @JacksonXmlProperty(localName = "Name", isAttribute = true)
+ private String name;
+
+ @JacksonXmlProperty(localName = "Href", isAttribute = true)
+ private String href;
+
+ @JacksonXmlProperty(localName = "Type", isAttribute = true)
+ private String type;
+
+ @JacksonXmlProperty(localName = "Link")
+ @JacksonXmlElementWrapper(localName = "Links")
+ private List<Link> link;
+
+ public List<Link> getLink() {
+ return link;
+ }
+
+ public void setLink(List<Link> link) {
+ this.link = link;
+ }
+
+ public String getUid() {
+ return uid;
+ }
+
+ public void setUid(String uid) {
+ this.uid = uid;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getHref() {
+ return href;
+ }
+
+ public void setHref(String href) {
+ this.href = href;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+}
diff --git a/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/RestoreSession.java b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/RestoreSession.java
new file mode 100644
index 0000000..0675e49
--- /dev/null
+++ b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/RestoreSession.java
@@ -0,0 +1,120 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.backup.veeam.api;
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+import java.util.List;
+
+@JacksonXmlRootElement(localName = "RestoreSession")
+public class RestoreSession {
+
+ @JacksonXmlProperty(localName = "Type", isAttribute = true)
+ private String type;
+
+ @JacksonXmlProperty(localName = "Href", isAttribute = true)
+ private String href;
+
+ @JacksonXmlProperty(localName = "Name", isAttribute = true)
+ private String name;
+
+ @JacksonXmlProperty(localName = "UID", isAttribute = true)
+ private String uid;
+
+ @JacksonXmlProperty(localName = "VmDisplayName", isAttribute = true)
+ private String vmDisplayName;
+
+ @JacksonXmlProperty(localName = "Link")
+ @JacksonXmlElementWrapper(localName = "Links")
+ private List<Link> link;
+
+ @JacksonXmlProperty(localName = "JobType")
+ private String jobType;
+
+ @JacksonXmlProperty(localName = "CreationTimeUTC")
+ private String creationTimeUTC;
+
+ @JacksonXmlProperty(localName = "EndTimeUTC")
+ private String endTimeUTC;
+
+ @JacksonXmlProperty(localName = "State")
+ private String state;
+
+ @JacksonXmlProperty(localName = "Result")
+ private String result;
+
+ @JacksonXmlProperty(localName = "Progress")
+ private String progress;
+
+ @JacksonXmlProperty(localName = "RestoredObjRef")
+ private String restoredObjRef;
+
+ public List<Link> getLink() {
+ return link;
+ }
+
+ public String getJobType() {
+ return jobType;
+ }
+
+ public String getState() {
+ return state;
+ }
+
+ public String getResult() {
+ return result;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public String getHref() {
+ return href;
+ }
+
+ public String getVmDisplayName() {
+ return vmDisplayName;
+ }
+
+ public String getCreationTimeUTC() {
+ return creationTimeUTC;
+ }
+
+ public String getEndTimeUTC() {
+ return endTimeUTC;
+ }
+
+ public String getProgress() {
+ return progress;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getUid() {
+ return uid;
+ }
+
+ public String getRestoredObjRef() {
+ return restoredObjRef;
+ }
+}
diff --git a/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/Result.java b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/Result.java
new file mode 100644
index 0000000..26fc863
--- /dev/null
+++ b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/Result.java
@@ -0,0 +1,47 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.backup.veeam.api;
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+@JacksonXmlRootElement(localName = "Result")
+public class Result {
+
+ @JacksonXmlProperty(localName = "Success", isAttribute = true)
+ private String success;
+
+ @JacksonXmlProperty(localName = "Message")
+ private String message;
+
+ public String getSuccess() {
+ return success;
+ }
+
+ public void setSuccess(String success) {
+ this.success = success;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+}
diff --git a/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/Task.java b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/Task.java
new file mode 100644
index 0000000..e8d14e5
--- /dev/null
+++ b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/Task.java
@@ -0,0 +1,106 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.backup.veeam.api;
+
+import java.util.List;
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+@JacksonXmlRootElement(localName = "CreateObjectInJobSpec")
+public class Task {
+ @JacksonXmlProperty(localName = "Type", isAttribute = true)
+ private String type;
+
+ @JacksonXmlProperty(localName = "Href", isAttribute = true)
+ private String href;
+
+ @JacksonXmlProperty(localName = "Link")
+ @JacksonXmlElementWrapper(localName = "Links")
+ private List<Link> link;
+
+ @JacksonXmlProperty(localName = "TaskId")
+ private String taskId;
+
+ @JacksonXmlProperty(localName = "State")
+ private String state;
+
+ @JacksonXmlProperty(localName = "Operation")
+ private String operation;
+
+ @JacksonXmlProperty(localName = "Result")
+ @JacksonXmlElementWrapper(localName = "Result", useWrapping = false)
+ private Result result;
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getHref() {
+ return href;
+ }
+
+ public void setHref(String href) {
+ this.href = href;
+ }
+
+ public List<Link> getLink() {
+ return link;
+ }
+
+ public void setLink(List<Link> link) {
+ this.link = link;
+ }
+
+ public String getTaskId() {
+ return taskId;
+ }
+
+ public void setTaskId(String taskId) {
+ this.taskId = taskId;
+ }
+
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ public String getOperation() {
+ return operation;
+ }
+
+ public void setOperation(String operation) {
+ this.operation = operation;
+ }
+
+ public Result getResult() {
+ return result;
+ }
+
+ public void setResult(Result result) {
+ this.result = result;
+ }
+}
diff --git a/packaging/centos63/rhel7/cloudstack-management.conf b/plugins/backup/veeam/src/main/resources/META-INF/cloudstack/veeam/module.properties
similarity index 92%
copy from packaging/centos63/rhel7/cloudstack-management.conf
copy to plugins/backup/veeam/src/main/resources/META-INF/cloudstack/veeam/module.properties
index 881af1a..ee40b21 100644
--- a/packaging/centos63/rhel7/cloudstack-management.conf
+++ b/plugins/backup/veeam/src/main/resources/META-INF/cloudstack/veeam/module.properties
@@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-
-f /var/run/cloudstack-management.pid 0644 cloud cloud -
\ No newline at end of file
+name=veeam
+parent=backup
diff --git a/plugins/backup/veeam/src/main/resources/META-INF/cloudstack/veeam/spring-backup-veeam-context.xml b/plugins/backup/veeam/src/main/resources/META-INF/cloudstack/veeam/spring-backup-veeam-context.xml
new file mode 100644
index 0000000..f2403cf
--- /dev/null
+++ b/plugins/backup/veeam/src/main/resources/META-INF/cloudstack/veeam/spring-backup-veeam-context.xml
@@ -0,0 +1,27 @@
+<!--
+ 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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+
+ <bean id="veeamBackupProvider" class="org.apache.cloudstack.backup.VeeamBackupProvider">
+ <property name="name" value="veeam" />
+ </bean>
+</beans>
diff --git a/plugins/backup/veeam/src/test/java/org/apache/cloudstack/backup/veeam/VeeamClientTest.java b/plugins/backup/veeam/src/test/java/org/apache/cloudstack/backup/veeam/VeeamClientTest.java
new file mode 100644
index 0000000..3af81d0
--- /dev/null
+++ b/plugins/backup/veeam/src/test/java/org/apache/cloudstack/backup/veeam/VeeamClientTest.java
@@ -0,0 +1,85 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.backup.veeam;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
+import static com.github.tomakehurst.wiremock.client.WireMock.verify;
+
+import java.util.List;
+
+import org.apache.cloudstack.backup.BackupOffering;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import com.github.tomakehurst.wiremock.client.BasicCredentials;
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
+
+public class VeeamClientTest {
+
+ private String adminUsername = "administrator";
+ private String adminPassword = "password";
+ private VeeamClient client;
+
+ @Rule
+ public WireMockRule wireMockRule = new WireMockRule(9399);
+
+ @Before
+ public void setUp() throws Exception {
+ wireMockRule.stubFor(post(urlMatching(".*/sessionMngr/.*"))
+ .willReturn(aResponse()
+ .withStatus(201)
+ .withHeader("X-RestSvcSessionId", "some-session-auth-id")
+ .withBody("")));
+ client = new VeeamClient("http://localhost:9399/api/", adminUsername, adminPassword, true, 60);
+ }
+
+ @Test
+ public void testBasicAuth() {
+ verify(postRequestedFor(urlMatching(".*/sessionMngr/.*"))
+ .withBasicAuth(new BasicCredentials(adminUsername, adminPassword)));
+ }
+
+ @Test
+ public void testVeeamJobs() {
+ wireMockRule.stubFor(get(urlMatching(".*/jobs"))
+ .willReturn(aResponse()
+ .withHeader("Content-Type", "application/xml")
+ .withStatus(200)
+ .withBody("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
+ "<EntityReferences xmlns=\"http://www.veeam.com/ent/v1.0\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n" +
+ " <Ref UID=\"urn:veeam:Job:8acac50d-3711-4c99-bf7b-76fe9c7e39c3\" Name=\"ZONE1-GOLD\" Href=\"http://10.1.1.10:9399/api/jobs/8acac50d-3711-4c99-bf7b-76fe9c7e39c3\" Type=\"JobReference\">\n" +
+ " <Links>\n" +
+ " <Link Href=\"http://10.1.1.10:9399/api/backupServers/1efaeae4-d23c-46cd-84a1-8798f68bdb78\" Name=\"10.1.1.10\" Type=\"BackupServerReference\" Rel=\"Up\"/>\n" +
+ " <Link Href=\"http://10.1.1.10:9399/api/jobs/8acac50d-3711-4c99-bf7b-76fe9c7e39c3?format=Entity\" Name=\"ZONE1-GOLD\" Type=\"Job\" Rel=\"Alternate\"/>\n" +
+ " <Link Href=\"http://10.1.1.10:9399/api/jobs/8acac50d-3711-4c99-bf7b-76fe9c7e39c3/backupSessions\" Type=\"BackupJobSessionReferenceList\" Rel=\"Down\"/>\n" +
+ " </Links>\n" +
+ " </Ref>\n" +
+ "</EntityReferences>")));
+ List<BackupOffering> policies = client.listJobs();
+ verify(getRequestedFor(urlMatching(".*/jobs")));
+ Assert.assertEquals(policies.size(), 1);
+ Assert.assertEquals(policies.get(0).getName(), "ZONE1-GOLD");
+ }
+}
\ No newline at end of file
diff --git a/plugins/ca/root-ca/pom.xml b/plugins/ca/root-ca/pom.xml
index 05a0b1c..c4ffa6c 100644
--- a/plugins/ca/root-ca/pom.xml
+++ b/plugins/ca/root-ca/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/ca/root-ca/src/test/java/org/apache/cloudstack/ca/provider/RootCAProviderTest.java b/plugins/ca/root-ca/src/test/java/org/apache/cloudstack/ca/provider/RootCAProviderTest.java
index d5d6428..305d18f 100644
--- a/plugins/ca/root-ca/src/test/java/org/apache/cloudstack/ca/provider/RootCAProviderTest.java
+++ b/plugins/ca/root-ca/src/test/java/org/apache/cloudstack/ca/provider/RootCAProviderTest.java
@@ -41,7 +41,7 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
public class RootCAProviderTest {
@@ -135,7 +135,7 @@
public void testCreateSSLEngineWithoutAuthStrictness() throws Exception {
overrideDefaultConfigValue(RootCAProvider.rootCAAuthStrictness, "_defaultValue", "false");
final SSLEngine e = provider.createSSLEngine(SSLUtils.getSSLContext(), "/1.2.3.4:5678", null);
- Assert.assertFalse(e.getUseClientMode());
+ Assert.assertTrue(e.getUseClientMode());
Assert.assertFalse(e.getNeedClientAuth());
}
@@ -143,7 +143,7 @@
public void testCreateSSLEngineWithAuthStrictness() throws Exception {
overrideDefaultConfigValue(RootCAProvider.rootCAAuthStrictness, "_defaultValue", "true");
final SSLEngine e = provider.createSSLEngine(SSLUtils.getSSLContext(), "/1.2.3.4:5678", null);
- Assert.assertFalse(e.getUseClientMode());
+ Assert.assertTrue(e.getUseClientMode());
Assert.assertTrue(e.getNeedClientAuth());
}
diff --git a/plugins/database/mysql-ha/pom.xml b/plugins/database/mysql-ha/pom.xml
index c1bd85f..3ecae3f 100644
--- a/plugins/database/mysql-ha/pom.xml
+++ b/plugins/database/mysql-ha/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/database/mysql-ha/src/main/java/com/cloud/utils/db/StaticStrategy.java b/plugins/database/mysql-ha/src/main/java/com/cloud/utils/db/StaticStrategy.java
index 6b0cb24..b353652 100644
--- a/plugins/database/mysql-ha/src/main/java/com/cloud/utils/db/StaticStrategy.java
+++ b/plugins/database/mysql-ha/src/main/java/com/cloud/utils/db/StaticStrategy.java
@@ -16,20 +16,20 @@
// under the License.
package com.cloud.utils.db;
+import java.lang.reflect.InvocationHandler;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
import org.apache.log4j.Logger;
-import com.mysql.jdbc.BalanceStrategy;
-import com.mysql.jdbc.Connection;
-import com.mysql.jdbc.ConnectionImpl;
-import com.mysql.jdbc.LoadBalancingConnectionProxy;
-import com.mysql.jdbc.SQLError;
+import com.mysql.cj.jdbc.ConnectionImpl;
+import com.mysql.cj.jdbc.JdbcConnection;
+import com.mysql.cj.jdbc.exceptions.SQLError;
+import com.mysql.cj.jdbc.ha.BalanceStrategy;
+import com.mysql.cj.jdbc.ha.LoadBalancedConnectionProxy;
public class StaticStrategy implements BalanceStrategy {
private static final Logger s_logger = Logger.getLogger(StaticStrategy.class);
@@ -38,18 +38,8 @@
}
@Override
- public void destroy() {
- // we don't have anything to clean up
- }
-
- @Override
- public void init(Connection conn, Properties props) throws SQLException {
- // we don't have anything to initialize
- }
-
- @Override
- public ConnectionImpl pickConnection(LoadBalancingConnectionProxy proxy, List<String> configuredHosts, Map<String, ConnectionImpl> liveConnections,
- long[] responseTimes, int numRetries) throws SQLException {
+ public JdbcConnection pickConnection(InvocationHandler proxy, List<String> configuredHosts, Map<String, JdbcConnection> liveConnections,
+ long[] responseTimes, int numRetries) throws SQLException {
int numHosts = configuredHosts.size();
SQLException ex = null;
@@ -57,7 +47,7 @@
List<String> whiteList = new ArrayList<String>(numHosts);
whiteList.addAll(configuredHosts);
- Map<String, Long> blackList = proxy.getGlobalBlacklist();
+ Map<String, Long> blackList = ((LoadBalancedConnectionProxy) proxy).getGlobalBlacklist();
whiteList.removeAll(blackList.keySet());
@@ -70,15 +60,15 @@
String hostPortSpec = whiteList.get(0); //Always take the first host
- ConnectionImpl conn = liveConnections.get(hostPortSpec);
+ ConnectionImpl conn = (ConnectionImpl) liveConnections.get(hostPortSpec);
if (conn == null) {
try {
- conn = proxy.createConnectionForHost(hostPortSpec);
+ conn = ((LoadBalancedConnectionProxy) proxy).createConnectionForHost(hostPortSpec);
} catch (SQLException sqlEx) {
ex = sqlEx;
- if (proxy.shouldExceptionTriggerFailover(sqlEx)) {
+ if (((LoadBalancedConnectionProxy) proxy).shouldExceptionTriggerFailover(sqlEx)) {
Integer whiteListIndex = whiteListMap.get(hostPortSpec);
@@ -87,7 +77,7 @@
whiteList.remove(whiteListIndex.intValue());
whiteListMap = this.getArrayIndexMap(whiteList);
}
- proxy.addToGlobalBlacklist(hostPortSpec);
+ ((LoadBalancedConnectionProxy) proxy).addToGlobalBlacklist(hostPortSpec);
if (whiteList.size() == 0) {
attempts++;
@@ -100,7 +90,7 @@
// start fresh
whiteListMap = new HashMap<String, Integer>(numHosts);
whiteList.addAll(configuredHosts);
- blackList = proxy.getGlobalBlacklist();
+ blackList = ((LoadBalancedConnectionProxy) proxy).getGlobalBlacklist();
whiteList.removeAll(blackList.keySet());
whiteListMap = this.getArrayIndexMap(whiteList);
@@ -126,10 +116,9 @@
private Map<String, Integer> getArrayIndexMap(List<String> l) {
Map<String, Integer> m = new HashMap<String, Integer>(l.size());
for (int i = 0; i < l.size(); i++) {
- m.put(l.get(i), Integer.valueOf(i));
+ m.put(l.get(i), i);
}
return m;
}
-
}
\ No newline at end of file
diff --git a/plugins/database/quota/pom.xml b/plugins/database/quota/pom.xml
index 4d3c635..1dbddfa 100644
--- a/plugins/database/quota/pom.xml
+++ b/plugins/database/quota/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/database/quota/src/test/java/org/apache/cloudstack/api/command/QuotaBalanceCmdTest.java b/plugins/database/quota/src/test/java/org/apache/cloudstack/api/command/QuotaBalanceCmdTest.java
index 4369a8c..07181c1 100644
--- a/plugins/database/quota/src/test/java/org/apache/cloudstack/api/command/QuotaBalanceCmdTest.java
+++ b/plugins/database/quota/src/test/java/org/apache/cloudstack/api/command/QuotaBalanceCmdTest.java
@@ -16,7 +16,11 @@
// under the License.
package org.apache.cloudstack.api.command;
-import junit.framework.TestCase;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
import org.apache.cloudstack.api.response.QuotaBalanceResponse;
import org.apache.cloudstack.api.response.QuotaResponseBuilder;
import org.apache.cloudstack.quota.vo.QuotaBalanceVO;
@@ -26,10 +30,7 @@
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import junit.framework.TestCase;
@RunWith(MockitoJUnitRunner.class)
public class QuotaBalanceCmdTest extends TestCase {
@@ -48,7 +49,7 @@
Mockito.when(responseBuilder.getQuotaBalance(Mockito.any(cmd.getClass()))).thenReturn(quotaBalanceVOList);
Mockito.when(responseBuilder.createQuotaLastBalanceResponse(Mockito.eq(quotaBalanceVOList), Mockito.any(Date.class))).thenReturn(new QuotaBalanceResponse());
Mockito.when(responseBuilder.createQuotaBalanceResponse(Mockito.eq(quotaBalanceVOList), Mockito.any(Date.class), Mockito.any(Date.class))).thenReturn(new QuotaBalanceResponse());
- Mockito.when(responseBuilder.startOfNextDay(Mockito.any(Date.class))).thenReturn(new Date());
+ Mockito.lenient().when(responseBuilder.startOfNextDay(Mockito.any(Date.class))).thenReturn(new Date());
// end date not specified
cmd.setStartDate(new Date());
diff --git a/plugins/database/quota/src/test/java/org/apache/cloudstack/api/command/QuotaCreditsCmdTest.java b/plugins/database/quota/src/test/java/org/apache/cloudstack/api/command/QuotaCreditsCmdTest.java
index 1f22508..06dd57a 100644
--- a/plugins/database/quota/src/test/java/org/apache/cloudstack/api/command/QuotaCreditsCmdTest.java
+++ b/plugins/database/quota/src/test/java/org/apache/cloudstack/api/command/QuotaCreditsCmdTest.java
@@ -16,10 +16,12 @@
// under the License.
package org.apache.cloudstack.api.command;
-import com.cloud.user.AccountService;
-import com.cloud.user.AccountVO;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyDouble;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.nullable;
-import junit.framework.TestCase;
+import java.lang.reflect.Field;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseCmd;
@@ -27,13 +29,17 @@
import org.apache.cloudstack.api.response.QuotaCreditsResponse;
import org.apache.cloudstack.api.response.QuotaResponseBuilder;
import org.apache.cloudstack.quota.QuotaService;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
-import java.lang.reflect.Field;
+import com.cloud.user.AccountService;
+import com.cloud.user.AccountVO;
+
+import junit.framework.TestCase;
@RunWith(MockitoJUnitRunner.class)
public class QuotaCreditsCmdTest extends TestCase {
@@ -44,9 +50,16 @@
@Mock
AccountService accountService;
+ private QuotaCreditsCmd cmd;
+
+ @Override
+ @Before
+ public void setUp() {
+ cmd = new QuotaCreditsCmd();
+ }
+
@Test
public void testQuotaCreditsCmd() throws NoSuchFieldException, IllegalAccessException {
- QuotaCreditsCmd cmd = new QuotaCreditsCmd();
cmd.setAccountName("admin");
cmd.setMinBalance(200.0);
@@ -64,8 +77,10 @@
AccountVO acc = new AccountVO();
acc.setId(2L);
- Mockito.when(accountService.getActiveAccountByName(Mockito.anyString(), Mockito.anyLong())).thenReturn(acc);
- Mockito.when(responseBuilder.addQuotaCredits(Mockito.anyLong(), Mockito.anyLong(), Mockito.anyDouble(), Mockito.anyLong(), Mockito.anyBoolean())).thenReturn(new QuotaCreditsResponse());
+
+ Mockito.when(accountService.getActiveAccountByName(nullable(String.class), nullable(Long.class))).thenReturn(acc);
+
+ Mockito.when(responseBuilder.addQuotaCredits(nullable(Long.class), nullable(Long.class), nullable(Double.class), nullable(Long.class), nullable(Boolean.class))).thenReturn(new QuotaCreditsResponse());
// No value provided test
try {
@@ -77,11 +92,9 @@
// With value provided test
cmd.setValue(11.80);
cmd.execute();
- Mockito.verify(quotaService, Mockito.times(0)).setLockAccount(Mockito.anyLong(), Mockito.anyBoolean());
- Mockito.verify(quotaService, Mockito.times(1)).setMinBalance(Mockito.anyLong(), Mockito.anyDouble());
- Mockito.verify(responseBuilder, Mockito.times(1)).addQuotaCredits(Mockito.anyLong(), Mockito.anyLong(), Mockito.anyDouble(), Mockito.anyLong(), Mockito.anyBoolean());
-
-
+ Mockito.verify(quotaService, Mockito.times(0)).setLockAccount(anyLong(), anyBoolean());
+ Mockito.verify(quotaService, Mockito.times(1)).setMinBalance(anyLong(), anyDouble());
+ Mockito.verify(responseBuilder, Mockito.times(1)).addQuotaCredits(nullable(Long.class), nullable(Long.class), nullable(Double.class), nullable(Long.class), nullable(Boolean.class));
}
}
diff --git a/plugins/database/quota/src/test/java/org/apache/cloudstack/api/response/QuotaResponseBuilderImplTest.java b/plugins/database/quota/src/test/java/org/apache/cloudstack/api/response/QuotaResponseBuilderImplTest.java
index de961f6..7c304f0 100644
--- a/plugins/database/quota/src/test/java/org/apache/cloudstack/api/response/QuotaResponseBuilderImplTest.java
+++ b/plugins/database/quota/src/test/java/org/apache/cloudstack/api/response/QuotaResponseBuilderImplTest.java
@@ -217,7 +217,7 @@
entry.setCreditBalance(new BigDecimal(100));
quotaBalance.add(entry);
quotaBalance.add(entry);
- Mockito.when(quotaService.computeAdjustedTime(Mockito.any(Date.class))).thenReturn(new Date());
+ Mockito.lenient().when(quotaService.computeAdjustedTime(Mockito.any(Date.class))).thenReturn(new Date());
QuotaBalanceResponse resp = quotaResponseBuilder.createQuotaLastBalanceResponse(quotaBalance, null);
assertTrue(resp.getStartQuota().compareTo(new BigDecimal(200)) == 0);
}
diff --git a/plugins/dedicated-resources/pom.xml b/plugins/dedicated-resources/pom.xml
index 81801a4..c4a9442 100644
--- a/plugins/dedicated-resources/pom.xml
+++ b/plugins/dedicated-resources/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/dedicated-resources/src/test/java/org/apache/cloudstack/dedicated/manager/DedicatedApiUnitTest.java b/plugins/dedicated-resources/src/test/java/org/apache/cloudstack/dedicated/manager/DedicatedApiUnitTest.java
index 12e71ba..c8fb258 100644
--- a/plugins/dedicated-resources/src/test/java/org/apache/cloudstack/dedicated/manager/DedicatedApiUnitTest.java
+++ b/plugins/dedicated-resources/src/test/java/org/apache/cloudstack/dedicated/manager/DedicatedApiUnitTest.java
@@ -16,9 +16,9 @@
// under the License.
package org.apache.cloudstack.dedicated.manager;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.when;
import java.io.IOException;
@@ -26,10 +26,11 @@
import javax.inject.Inject;
-import com.cloud.user.User;
-import junit.framework.Assert;
-
+import org.apache.cloudstack.affinity.AffinityGroupService;
+import org.apache.cloudstack.affinity.dao.AffinityGroupDao;
+import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.dedicated.DedicatedResourceManagerImpl;
+import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.test.utils.SpringUtils;
import org.apache.log4j.Logger;
import org.junit.After;
@@ -49,11 +50,6 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.support.AnnotationConfigContextLoader;
-import org.apache.cloudstack.affinity.AffinityGroupService;
-import org.apache.cloudstack.affinity.dao.AffinityGroupDao;
-import org.apache.cloudstack.context.CallContext;
-import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
-
import com.cloud.dc.DedicatedResourceVO;
import com.cloud.dc.dao.ClusterDao;
import com.cloud.dc.dao.DataCenterDao;
@@ -66,12 +62,15 @@
import com.cloud.user.Account;
import com.cloud.user.AccountManager;
import com.cloud.user.AccountVO;
+import com.cloud.user.User;
import com.cloud.user.UserVO;
import com.cloud.user.dao.AccountDao;
import com.cloud.utils.component.ComponentContext;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.dao.UserVmDao;
+import junit.framework.Assert;
+
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(loader = AnnotationConfigContextLoader.class)
public class DedicatedApiUnitTest {
@@ -122,7 +121,7 @@
UserVO user = new UserVO(1, "testuser", "password", "firstname", "lastName", "email", "timezone", UUID.randomUUID().toString(), User.Source.UNKNOWN);
CallContext.register(user, account);
- when(_acctMgr.finalizeOwner((Account)anyObject(), anyString(), anyLong(), anyLong())).thenReturn(account);
+ when(_acctMgr.finalizeOwner(any(Account.class), nullable(String.class), nullable(Long.class), nullable(Long.class))).thenReturn(account);
when(_accountDao.findByIdIncludingRemoved(0L)).thenReturn(account);
when(_accountDao.findById(anyLong())).thenReturn(account);
when(_domainDao.findById(domainId)).thenReturn(domain);
diff --git a/plugins/deployment-planners/implicit-dedication/pom.xml b/plugins/deployment-planners/implicit-dedication/pom.xml
index 59329f0..3ad5895 100644
--- a/plugins/deployment-planners/implicit-dedication/pom.xml
+++ b/plugins/deployment-planners/implicit-dedication/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/deployment-planners/implicit-dedication/src/test/java/org/apache/cloudstack/implicitplanner/ImplicitPlannerTest.java b/plugins/deployment-planners/implicit-dedication/src/test/java/org/apache/cloudstack/implicitplanner/ImplicitPlannerTest.java
index 79cb1b4..1a3aed0 100644
--- a/plugins/deployment-planners/implicit-dedication/src/test/java/org/apache/cloudstack/implicitplanner/ImplicitPlannerTest.java
+++ b/plugins/deployment-planners/implicit-dedication/src/test/java/org/apache/cloudstack/implicitplanner/ImplicitPlannerTest.java
@@ -73,6 +73,7 @@
import com.cloud.gpu.dao.HostGpuGroupsDao;
import com.cloud.host.HostVO;
import com.cloud.host.dao.HostDao;
+import com.cloud.host.dao.HostDetailsDao;
import com.cloud.host.dao.HostTagsDao;
import com.cloud.resource.ResourceManager;
import com.cloud.service.ServiceOfferingVO;
@@ -574,6 +575,10 @@
}
@Bean
+ public HostDetailsDao hostDetailsDao() { return Mockito.mock(HostDetailsDao.class); }
+
+
+ @Bean
public ClusterDetailsDao clusterDetailsDao() {
return Mockito.mock(ClusterDetailsDao.class);
}
diff --git a/plugins/deployment-planners/user-concentrated-pod/pom.xml b/plugins/deployment-planners/user-concentrated-pod/pom.xml
index 570209b..09fc38c 100644
--- a/plugins/deployment-planners/user-concentrated-pod/pom.xml
+++ b/plugins/deployment-planners/user-concentrated-pod/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/deployment-planners/user-dispersing/pom.xml b/plugins/deployment-planners/user-dispersing/pom.xml
index cb36619..85959a0 100644
--- a/plugins/deployment-planners/user-dispersing/pom.xml
+++ b/plugins/deployment-planners/user-dispersing/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/event-bus/inmemory/pom.xml b/plugins/event-bus/inmemory/pom.xml
index e38715f..21b4a70 100644
--- a/plugins/event-bus/inmemory/pom.xml
+++ b/plugins/event-bus/inmemory/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/event-bus/kafka/pom.xml b/plugins/event-bus/kafka/pom.xml
index aaa54f8..31749db 100644
--- a/plugins/event-bus/kafka/pom.xml
+++ b/plugins/event-bus/kafka/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/event-bus/rabbitmq/pom.xml b/plugins/event-bus/rabbitmq/pom.xml
index 0983c57..035b419 100644
--- a/plugins/event-bus/rabbitmq/pom.xml
+++ b/plugins/event-bus/rabbitmq/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/ha-planners/skip-heurestics/pom.xml b/plugins/ha-planners/skip-heurestics/pom.xml
index 2a04718..76503f8 100644
--- a/plugins/ha-planners/skip-heurestics/pom.xml
+++ b/plugins/ha-planners/skip-heurestics/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/host-allocators/random/pom.xml b/plugins/host-allocators/random/pom.xml
index d31cef8..dd8c73a 100644
--- a/plugins/host-allocators/random/pom.xml
+++ b/plugins/host-allocators/random/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/hypervisors/baremetal/pom.xml b/plugins/hypervisors/baremetal/pom.xml
index 37bea1d..e4e7c7c 100755
--- a/plugins/hypervisors/baremetal/pom.xml
+++ b/plugins/hypervisors/baremetal/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>cloud-plugin-hypervisor-baremetal</artifactId>
@@ -32,5 +32,20 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${cs.jaxb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>${cs.jaxb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${cs.jaxb.version}</version>
+ </dependency>
</dependencies>
</project>
diff --git a/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BareMetalResourceBase.java b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BareMetalResourceBase.java
index 65fea09..74360fe 100644
--- a/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BareMetalResourceBase.java
+++ b/plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BareMetalResourceBase.java
@@ -22,6 +22,17 @@
// Automatically generated by addcopyright.py at 04/03/2012
package com.cloud.baremetal.networkservice;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import javax.naming.ConfigurationException;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.log4j.Logger;
+
import com.cloud.agent.IAgentControl;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.CheckNetworkAnswer;
@@ -70,15 +81,6 @@
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachine.PowerState;
import com.cloud.vm.dao.VMInstanceDao;
-import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
-import org.apache.log4j.Logger;
-
-import javax.naming.ConfigurationException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
public class BareMetalResourceBase extends ManagerBase implements ServerResource {
private static final Logger s_logger = Logger.getLogger(BareMetalResourceBase.class);
diff --git a/plugins/hypervisors/hyperv/pom.xml b/plugins/hypervisors/hyperv/pom.xml
index 64537c2..e6e7dfc 100644
--- a/plugins/hypervisors/hyperv/pom.xml
+++ b/plugins/hypervisors/hyperv/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<properties>
diff --git a/plugins/hypervisors/hyperv/src/main/java/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java b/plugins/hypervisors/hyperv/src/main/java/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
index 979be73..038661b 100644
--- a/plugins/hypervisors/hyperv/src/main/java/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
+++ b/plugins/hypervisors/hyperv/src/main/java/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
@@ -2085,6 +2085,11 @@
final String controlIp = getRouterSshControlIp(cmd);
final String config = cmd.getConfiguration();
+ if (org.apache.commons.lang.StringUtils.isBlank(config)) {
+ s_logger.error("SetMonitorServiceCommand should have config for this case");
+ return new Answer(cmd, false, "SetMonitorServiceCommand failed due to missing config");
+ }
+
final String args = String.format(" %s %s", "-c", config);
final String command = String.format("%s%s %s", "/opt/cloud/bin/", VRScripts.MONITOR_SERVICE, args);
diff --git a/plugins/hypervisors/hyperv/src/test/java/com/cloud/hypervisor/hyperv/test/HypervDirectConnectResourceTest.java b/plugins/hypervisors/hyperv/src/test/java/com/cloud/hypervisor/hyperv/test/HypervDirectConnectResourceTest.java
index 75a864b..bf06918 100644
--- a/plugins/hypervisors/hyperv/src/test/java/com/cloud/hypervisor/hyperv/test/HypervDirectConnectResourceTest.java
+++ b/plugins/hypervisors/hyperv/src/test/java/com/cloud/hypervisor/hyperv/test/HypervDirectConnectResourceTest.java
@@ -29,7 +29,6 @@
import java.nio.channels.Channels;
import java.nio.channels.ReadableByteChannel;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -57,7 +56,6 @@
import com.cloud.agent.api.GetStorageStatsCommand;
import com.cloud.agent.api.GetVmStatsAnswer;
import com.cloud.agent.api.GetVmStatsCommand;
-import com.cloud.agent.api.HostVmStateReportEntry;
import com.cloud.agent.api.ModifyStoragePoolCommand;
import com.cloud.agent.api.StartAnswer;
import com.cloud.agent.api.StartCommand;
diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml
index 8ffe5a5..c6a25fc 100644
--- a/plugins/hypervisors/kvm/pom.xml
+++ b/plugins/hypervisors/kvm/pom.xml
@@ -24,11 +24,16 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
<dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>${cs.groovy.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
index d7bb763..8ff265e 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
@@ -273,12 +273,12 @@
@Override
public void attach(LibvirtVMDef.InterfaceDef iface) {
- Script.runSimpleBashScript("brctl addif " + iface.getBrName() + " " + iface.getDevName());
+ Script.runSimpleBashScript("ip link set " + iface.getDevName() + " master " + iface.getBrName());
}
@Override
public void detach(LibvirtVMDef.InterfaceDef iface) {
- Script.runSimpleBashScript("test -d /sys/class/net/" + iface.getBrName() + "/brif/" + iface.getDevName() + " && brctl delif " + iface.getBrName() + " " + iface.getDevName());
+ Script.runSimpleBashScript("test -d /sys/class/net/" + iface.getBrName() + "/brif/" + iface.getDevName() + " && ip link set " + iface.getDevName() + " nomaster");
}
private String generateVnetBrName(String pifName, String vnetId) {
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java
index 857a360..5f7066a 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java
@@ -282,7 +282,7 @@
public void createControlNetwork(String privBrName) {
deleteExitingLinkLocalRouteTable(privBrName);
if (!isBridgeExists(privBrName)) {
- Script.runSimpleBashScript("brctl addbr " + privBrName + "; ip link set " + privBrName + " up");
+ Script.runSimpleBashScript("ip link add " + privBrName + " type bridge; ip link set " + privBrName + " up");
Script.runSimpleBashScript("ip address add " + NetUtils.getLinkLocalAddressFromCIDR(_controlCidr) + " dev " + privBrName, _timeout);
}
}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtCapXMLParser.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtCapXMLParser.java
index 2f12d21..358fafa 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtCapXMLParser.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtCapXMLParser.java
@@ -80,7 +80,8 @@
}
} else if (qName.equalsIgnoreCase("arch")) {
for (int i = 0; i < attributes.getLength(); i++) {
- if (attributes.getQName(i).equalsIgnoreCase("name") && attributes.getValue(i).equalsIgnoreCase("x86_64")) {
+ if (attributes.getQName(i).equalsIgnoreCase("name") &&
+ (attributes.getValue(i).equalsIgnoreCase("x86_64") || attributes.getValue(i).equalsIgnoreCase("aarch64"))) {
_archTypex8664 = true;
}
}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 950dffa..79958ef 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -46,9 +46,9 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import com.cloud.hypervisor.kvm.dpdk.DpdkHelper;
-import com.cloud.resource.RequestWrapper;
-import com.cloud.hypervisor.kvm.storage.IscsiStorageCleanupMonitor;
+import com.cloud.hypervisor.kvm.resource.rolling.maintenance.RollingMaintenanceAgentExecutor;
+import com.cloud.hypervisor.kvm.resource.rolling.maintenance.RollingMaintenanceExecutor;
+import com.cloud.hypervisor.kvm.resource.rolling.maintenance.RollingMaintenanceServiceExecutor;
import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
import org.apache.cloudstack.storage.to.TemplateObjectTO;
import org.apache.cloudstack.storage.to.VolumeObjectTO;
@@ -110,10 +110,12 @@
import com.cloud.agent.resource.virtualnetwork.VRScripts;
import com.cloud.agent.resource.virtualnetwork.VirtualRouterDeployer;
import com.cloud.agent.resource.virtualnetwork.VirtualRoutingResource;
+import com.cloud.agent.api.SecurityGroupRulesCmd;
import com.cloud.dc.Vlan;
import com.cloud.exception.InternalErrorException;
import com.cloud.host.Host.Type;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.hypervisor.kvm.dpdk.DpdkHelper;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.ChannelDef;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.ClockDef;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.ConsoleDef;
@@ -143,13 +145,16 @@
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.WatchDogDef.WatchDogModel;
import com.cloud.hypervisor.kvm.resource.wrapper.LibvirtRequestWrapper;
import com.cloud.hypervisor.kvm.resource.wrapper.LibvirtUtilitiesHelper;
+import com.cloud.hypervisor.kvm.storage.IscsiStorageCleanupMonitor;
import com.cloud.hypervisor.kvm.storage.KVMPhysicalDisk;
import com.cloud.hypervisor.kvm.storage.KVMStoragePool;
import com.cloud.hypervisor.kvm.storage.KVMStoragePoolManager;
import com.cloud.hypervisor.kvm.storage.KVMStorageProcessor;
import com.cloud.network.Networks.BroadcastDomainType;
+import com.cloud.network.Networks.IsolationType;
import com.cloud.network.Networks.RouterPrivateIpStrategy;
import com.cloud.network.Networks.TrafficType;
+import com.cloud.resource.RequestWrapper;
import com.cloud.resource.ServerResource;
import com.cloud.resource.ServerResourceBase;
import com.cloud.storage.JavaStorageLayer;
@@ -219,6 +224,7 @@
private String _dcId;
private String _pod;
private String _clusterId;
+ private final Properties _uefiProperties = new Properties();
private long _hvVersion;
private Duration _timeout;
@@ -228,6 +234,7 @@
public static final String SSHKEYSPATH = "/root/.ssh";
public static final String SSHPRVKEYPATH = SSHKEYSPATH + File.separator + "id_rsa.cloud";
public static final String SSHPUBKEYPATH = SSHKEYSPATH + File.separator + "id_rsa.pub.cloud";
+ public static final String DEFAULTDOMRSSHPORT = "3922";
public static final String BASH_SCRIPT_PATH = "/bin/bash";
@@ -262,6 +269,7 @@
protected String _localStoragePath;
protected String _localStorageUUID;
protected boolean _noMemBalloon = false;
+ protected String _guestCpuArch;
protected String _guestCpuMode;
protected String _guestCpuModel;
protected boolean _noKvmClock;
@@ -272,6 +280,7 @@
protected int _migrateDowntime;
protected int _migratePauseAfter;
protected boolean _diskActivityCheckEnabled;
+ protected RollingMaintenanceExecutor rollingMaintenanceExecutor;
protected long _diskActivityCheckFileSizeMin = 10485760; // 10MB
protected int _diskActivityCheckTimeoutSeconds = 120; // 120s
protected long _diskActivityInactiveThresholdMilliseconds = 30000; // 30s
@@ -280,6 +289,18 @@
protected String _rngPath = "/dev/random";
protected int _rngRatePeriod = 1000;
protected int _rngRateBytes = 2048;
+ protected String _agentHooksBasedir = "/etc/cloudstack/agent/hooks";
+
+ protected String _agentHooksLibvirtXmlScript = "libvirt-vm-xml-transformer.groovy";
+ protected String _agentHooksLibvirtXmlMethod = "transform";
+
+ protected String _agentHooksVmOnStartScript = "libvirt-vm-state-change.groovy";
+ protected String _agentHooksVmOnStartMethod = "onStart";
+
+ protected String _agentHooksVmOnStopScript = "libvirt-vm-state-change.groovy";
+ protected String _agentHooksVmOnStopMethod = "onStop";
+
+
protected File _qemuSocketsPath;
private final String _qemuGuestAgentSocketName = "org.qemu.guest_agent.0";
protected WatchDogAction _watchDogAction = WatchDogAction.NONE;
@@ -382,6 +403,18 @@
return new ExecutionResult(true, null);
}
+ public LibvirtKvmAgentHook getTransformer() throws IOException {
+ return new LibvirtKvmAgentHook(_agentHooksBasedir, _agentHooksLibvirtXmlScript, _agentHooksLibvirtXmlMethod);
+ }
+
+ public LibvirtKvmAgentHook getStartHook() throws IOException {
+ return new LibvirtKvmAgentHook(_agentHooksBasedir, _agentHooksVmOnStartScript, _agentHooksVmOnStartMethod);
+ }
+
+ public LibvirtKvmAgentHook getStopHook() throws IOException {
+ return new LibvirtKvmAgentHook(_agentHooksBasedir, _agentHooksVmOnStopScript, _agentHooksVmOnStopMethod);
+ }
+
public LibvirtUtilitiesHelper getLibvirtUtilitiesHelper() {
return libvirtUtilitiesHelper;
}
@@ -422,6 +455,10 @@
return _migrateSpeed;
}
+ public RollingMaintenanceExecutor getRollingMaintenanceExecutor() {
+ return rollingMaintenanceExecutor;
+ }
+
public String getPingTestPath() {
return _pingTestPath;
}
@@ -474,6 +511,10 @@
return _ovsPvlanVmPath;
}
+ public String getDirectDownloadTemporaryDownloadPath() {
+ return directDownloadTemporaryDownloadPath;
+ }
+
public String getResizeVolumePath() {
return _resizeVolumePath;
}
@@ -481,7 +522,6 @@
public StorageSubsystemCommandHandler getStorageHandler() {
return storageHandler;
}
-
private static final class KeyValueInterpreter extends OutputInterpreter {
private final Map<String, String> map = new HashMap<String, String>();
@@ -526,6 +566,7 @@
protected boolean dpdkSupport = false;
protected String dpdkOvsPath;
+ protected String directDownloadTemporaryDownloadPath;
private String getEndIpFromStartIp(final String startIp, final int numIps) {
final String[] tokens = startIp.split("[.]");
@@ -573,6 +614,10 @@
}
}
+ private String getDefaultDirectDownloadTemporaryPath() {
+ return "/var/lib/libvirt/images";
+ }
+
protected String getDefaultNetworkScriptsDir() {
return "scripts/vm/network/vnet";
}
@@ -607,6 +652,11 @@
if (!success) {
return false;
}
+ try {
+ loadUefiProperties();
+ } catch (FileNotFoundException e) {
+ s_logger.error("uefi properties file not found due to: " + e.getLocalizedMessage());
+ }
_storage = new JavaStorageLayer();
_storage.configure("StorageLayer", params);
@@ -652,6 +702,11 @@
}
}
+ directDownloadTemporaryDownloadPath = (String) params.get("direct.download.temporary.download.location");
+ if (org.apache.commons.lang.StringUtils.isBlank(directDownloadTemporaryDownloadPath)) {
+ directDownloadTemporaryDownloadPath = getDefaultDirectDownloadTemporaryPath();
+ }
+
params.put("domr.scripts.dir", domrScriptsDir);
_virtRouterResource = new VirtualRoutingResource(this);
@@ -772,6 +827,11 @@
_hypervisorType = HypervisorType.KVM;
}
+ String hooksDir = (String)params.get("rolling.maintenance.hooks.dir");
+ value = (String) params.get("rolling.maintenance.service.executor.disabled");
+ rollingMaintenanceExecutor = Boolean.parseBoolean(value) ? new RollingMaintenanceAgentExecutor(hooksDir) :
+ new RollingMaintenanceServiceExecutor(hooksDir);
+
_hypervisorURI = (String)params.get("hypervisor.uri");
if (_hypervisorURI == null) {
_hypervisorURI = LibvirtConnection.getHypervisorURI(_hypervisorType.toString());
@@ -957,6 +1017,12 @@
s_logger.trace("Ignoring libvirt error.", e);
}
+ final String cpuArchOverride = (String)params.get("guest.cpu.arch");
+ if (!Strings.isNullOrEmpty(cpuArchOverride)) {
+ _guestCpuArch = cpuArchOverride;
+ s_logger.info("Using guest CPU architecture: " + _guestCpuArch);
+ }
+
_guestCpuMode = (String)params.get("guest.cpu.mode");
if (_guestCpuMode != null) {
_guestCpuModel = (String)params.get("guest.cpu.model");
@@ -1055,6 +1121,8 @@
value = (String) params.get("vm.migrate.pauseafter");
_migratePauseAfter = NumbersUtil.parseInt(value, -1);
+ configureAgentHooks(params);
+
value = (String)params.get("vm.migrate.speed");
_migrateSpeed = NumbersUtil.parseInt(value, -1);
if (_migrateSpeed == -1) {
@@ -1113,6 +1181,75 @@
return true;
}
+ private void configureAgentHooks(final Map<String, Object> params) {
+ String value = (String) params.get("agent.hooks.basedir");
+ if (null != value) {
+ _agentHooksBasedir = value;
+ }
+ s_logger.debug("agent.hooks.basedir is " + _agentHooksBasedir);
+
+ value = (String) params.get("agent.hooks.libvirt_vm_xml_transformer.script");
+ if (null != value) {
+ _agentHooksLibvirtXmlScript = value;
+ }
+ s_logger.debug("agent.hooks.libvirt_vm_xml_transformer.script is " + _agentHooksLibvirtXmlScript);
+
+ value = (String) params.get("agent.hooks.libvirt_vm_xml_transformer.method");
+ if (null != value) {
+ _agentHooksLibvirtXmlMethod = value;
+ }
+ s_logger.debug("agent.hooks.libvirt_vm_xml_transformer.method is " + _agentHooksLibvirtXmlMethod);
+
+ value = (String) params.get("agent.hooks.libvirt_vm_on_start.script");
+ if (null != value) {
+ _agentHooksVmOnStartScript = value;
+ }
+ s_logger.debug("agent.hooks.libvirt_vm_on_start.script is " + _agentHooksVmOnStartScript);
+
+ value = (String) params.get("agent.hooks.libvirt_vm_on_start.method");
+ if (null != value) {
+ _agentHooksVmOnStartMethod = value;
+ }
+ s_logger.debug("agent.hooks.libvirt_vm_on_start.method is " + _agentHooksVmOnStartMethod);
+
+ value = (String) params.get("agent.hooks.libvirt_vm_on_stop.script");
+ if (null != value) {
+ _agentHooksVmOnStopScript = value;
+ }
+ s_logger.debug("agent.hooks.libvirt_vm_on_stop.script is " + _agentHooksVmOnStopScript);
+
+ value = (String) params.get("agent.hooks.libvirt_vm_on_stop.method");
+ if (null != value) {
+ _agentHooksVmOnStopMethod = value;
+ }
+ s_logger.debug("agent.hooks.libvirt_vm_on_stop.method is " + _agentHooksVmOnStopMethod);
+ }
+
+ private void loadUefiProperties() throws FileNotFoundException {
+
+ if (_uefiProperties != null && _uefiProperties.getProperty("guest.loader.legacy") != null) {
+ return;
+ }
+ final File file = PropertiesUtil.findConfigFile("uefi.properties");
+ if (file == null) {
+ throw new FileNotFoundException("Unable to find file uefi.properties.");
+ }
+
+ s_logger.info("uefi.properties file found at " + file.getAbsolutePath());
+ try {
+ PropertiesUtil.loadFromFile(_uefiProperties, file);
+ s_logger.info("guest.nvram.template.legacy = " + _uefiProperties.getProperty("guest.nvram.template.legacy"));
+ s_logger.info("guest.loader.legacy = " + _uefiProperties.getProperty("guest.loader.legacy"));
+ s_logger.info("guest.nvram.template.secure = " + _uefiProperties.getProperty("guest.nvram.template.secure"));
+ s_logger.info("guest.loader.secure =" + _uefiProperties.getProperty("guest.loader.secure"));
+ s_logger.info("guest.nvram.path = " + _uefiProperties.getProperty("guest.nvram.path"));
+ } catch (final FileNotFoundException ex) {
+ throw new CloudRuntimeException("Cannot find the file: " + file.getAbsolutePath(), ex);
+ } catch (final IOException ex) {
+ throw new CloudRuntimeException("IOException in reading " + file.getAbsolutePath(), ex);
+ }
+ }
+
protected void configureDiskActivityChecks(final Map<String, Object> params) {
_diskActivityCheckEnabled = Boolean.parseBoolean((String)params.get("vm.diskactivity.checkenabled"));
if (_diskActivityCheckEnabled) {
@@ -2069,6 +2206,18 @@
vm.setDomDescription(vmTO.getOs());
vm.setPlatformEmulator(vmTO.getPlatformEmulator());
+ Map<String, String> customParams = vmTO.getDetails();
+ boolean isUefiEnabled = false;
+ boolean isSecureBoot = false;
+ String bootMode =null;
+ if (MapUtils.isNotEmpty(customParams) && customParams.containsKey(GuestDef.BootType.UEFI.toString())) {
+ isUefiEnabled = true;
+ bootMode = customParams.get(GuestDef.BootType.UEFI.toString());
+ if (StringUtils.isNotBlank(bootMode) && "secure".equalsIgnoreCase(bootMode)) {
+ isSecureBoot = true;
+ }
+ }
+
Map<String, String> extraConfig = vmTO.getExtraConfig();
if (dpdkSupport && (!extraConfig.containsKey(DpdkHelper.DPDK_NUMA) || !extraConfig.containsKey(DpdkHelper.DPDK_HUGE_PAGES))) {
s_logger.info("DPDK is enabled but it needs extra configurations for CPU NUMA and Huge Pages for VM deployment");
@@ -2086,13 +2235,46 @@
vm.setLibvirtVersion(_hypervisorLibvirtVersion);
vm.setQemuVersion(_hypervisorQemuVersion);
}
- guest.setGuestArch(vmTO.getArch());
- guest.setMachineType("pc");
+ guest.setGuestArch(_guestCpuArch != null ? _guestCpuArch : vmTO.getArch());
+ guest.setMachineType(_guestCpuArch != null && _guestCpuArch.equals("aarch64") ? "virt" : "pc");
+ guest.setBootType(GuestDef.BootType.BIOS);
+ if (MapUtils.isNotEmpty(customParams) && customParams.containsKey(GuestDef.BootType.UEFI.toString())) {
+ guest.setBootType(GuestDef.BootType.UEFI);
+ guest.setBootMode(GuestDef.BootMode.LEGACY);
+ if (StringUtils.isNotBlank(customParams.get(GuestDef.BootType.UEFI.toString())) && "secure".equalsIgnoreCase(customParams.get(GuestDef.BootType.UEFI.toString()))) {
+ guest.setMachineType("q35");
+ guest.setBootMode(GuestDef.BootMode.SECURE); // setting to secure mode
+ }
+ }
guest.setUuid(uuid);
guest.setBootOrder(GuestDef.BootOrder.CDROM);
guest.setBootOrder(GuestDef.BootOrder.HARDISK);
- vm.addComp(guest);
+ if (isUefiEnabled) {
+ if (_uefiProperties.getProperty(GuestDef.GUEST_LOADER_SECURE) != null && "secure".equalsIgnoreCase(bootMode)) {
+ guest.setLoader(_uefiProperties.getProperty(GuestDef.GUEST_LOADER_SECURE));
+ }
+
+ if (_uefiProperties.getProperty(GuestDef.GUEST_LOADER_LEGACY) != null && "legacy".equalsIgnoreCase(bootMode)) {
+ guest.setLoader(_uefiProperties.getProperty(GuestDef.GUEST_LOADER_LEGACY));
+ }
+
+ if (_uefiProperties.getProperty(GuestDef.GUEST_NVRAM_PATH) != null) {
+ guest.setNvram(_uefiProperties.getProperty(GuestDef.GUEST_NVRAM_PATH));
+ }
+
+ if (isSecureBoot) {
+ if (_uefiProperties.getProperty(GuestDef.GUEST_NVRAM_TEMPLATE_SECURE) != null && "secure".equalsIgnoreCase(bootMode)) {
+ guest.setNvramTemplate(_uefiProperties.getProperty(GuestDef.GUEST_NVRAM_TEMPLATE_SECURE));
+ }
+ } else {
+ if (_uefiProperties.getProperty(GuestDef.GUEST_NVRAM_TEMPLATE_LEGACY) != null) {
+ guest.setNvramTemplate(_uefiProperties.getProperty(GuestDef.GUEST_NVRAM_TEMPLATE_LEGACY));
+ }
+ }
+ }
+
+ vm.addComp(guest);
final GuestResourceDef grd = new GuestResourceDef();
@@ -2152,6 +2334,9 @@
features.addFeatures("pae");
features.addFeatures("apic");
features.addFeatures("acpi");
+ if (isUefiEnabled && isSecureMode(customParams.get(GuestDef.BootType.UEFI.toString()))) {
+ features.addFeatures("smm");
+ }
//KVM hyperv enlightenment features based on OS Type
enlightenWindowsVm(vmTO, features);
@@ -2208,6 +2393,12 @@
final InputDef input = new InputDef("tablet", "usb");
devices.addDevice(input);
+ // Add an explicit USB devices for ARM64
+ if (_guestCpuArch != null && _guestCpuArch.equals("aarch64")) {
+ devices.addDevice(new InputDef("keyboard", "usb"));
+ devices.addDevice(new InputDef("mouse", "usb"));
+ devices.addDevice(new LibvirtVMDef.USBDef((short)0, 0, 5, 0, 0));
+ }
DiskDef.DiskBus busT = getDiskModelFromVMDetail(vmTO);
@@ -2223,7 +2414,11 @@
vm.addComp(devices);
- addExtraConfigComponent(extraConfig, vm);
+ // Add extra configuration to User VM Domain XML before starting
+ if (vmTO.getType().equals(VirtualMachine.Type.User) && MapUtils.isNotEmpty(extraConfig)) {
+ s_logger.info("Appending extra configuration data to guest VM domain XML");
+ addExtraConfigComponent(extraConfig, vm);
+ }
return vm;
}
@@ -2282,7 +2477,10 @@
}
public void createVbd(final Connect conn, final VirtualMachineTO vmSpec, final String vmName, final LibvirtVMDef vm) throws InternalErrorException, LibvirtException, URISyntaxException {
+ final Map<String, String> details = vmSpec.getDetails();
final List<DiskTO> disks = Arrays.asList(vmSpec.getDisks());
+ boolean isSecureBoot = false;
+ boolean isWindowsTemplate = false;
Collections.sort(disks, new Comparator<DiskTO>() {
@Override
public int compare(final DiskTO arg0, final DiskTO arg1) {
@@ -2290,6 +2488,12 @@
}
});
+ if (MapUtils.isNotEmpty(details) && details.containsKey(GuestDef.BootType.UEFI.toString())) {
+ isSecureBoot = isSecureMode(details.get(GuestDef.BootType.UEFI.toString()));
+ }
+ if (vmSpec.getOs().toLowerCase().contains("window")) {
+ isWindowsTemplate =true;
+ }
for (final DiskTO volume : disks) {
KVMPhysicalDisk physicalDisk = null;
KVMStoragePool pool = null;
@@ -2300,18 +2504,20 @@
if (dataStore instanceof NfsTO) {
NfsTO nfsStore = (NfsTO)data.getDataStore();
dataStoreUrl = nfsStore.getUrl();
- } else if (dataStore instanceof PrimaryDataStoreTO && ((PrimaryDataStoreTO) dataStore).getPoolType().equals(StoragePoolType.NetworkFilesystem)) {
+ physicalDisk = getPhysicalDiskFromNfsStore(dataStoreUrl, data);
+ } else if (dataStore instanceof PrimaryDataStoreTO) {
//In order to support directly downloaded ISOs
- String psHost = ((PrimaryDataStoreTO) dataStore).getHost();
- String psPath = ((PrimaryDataStoreTO) dataStore).getPath();
- dataStoreUrl = "nfs://" + psHost + File.separator + psPath;
+ PrimaryDataStoreTO primaryDataStoreTO = (PrimaryDataStoreTO) dataStore;
+ if (primaryDataStoreTO.getPoolType().equals(StoragePoolType.NetworkFilesystem)) {
+ String psHost = primaryDataStoreTO.getHost();
+ String psPath = primaryDataStoreTO.getPath();
+ dataStoreUrl = "nfs://" + psHost + File.separator + psPath;
+ physicalDisk = getPhysicalDiskFromNfsStore(dataStoreUrl, data);
+ } else if (primaryDataStoreTO.getPoolType().equals(StoragePoolType.SharedMountPoint) ||
+ primaryDataStoreTO.getPoolType().equals(StoragePoolType.Filesystem)) {
+ physicalDisk = getPhysicalDiskPrimaryStore(primaryDataStoreTO, data);
+ }
}
- final String volPath = dataStoreUrl + File.separator + data.getPath();
- final int index = volPath.lastIndexOf("/");
- final String volDir = volPath.substring(0, index);
- final String volName = volPath.substring(index + 1);
- final KVMStoragePool secondaryStorage = _storagePoolMgr.getStoragePoolByURI(volDir);
- physicalDisk = secondaryStorage.getPhysicalDisk(volName);
} else if (volume.getType() != Volume.Type.ISO) {
final PrimaryDataStoreTO store = (PrimaryDataStoreTO)data.getDataStore();
physicalDisk = _storagePoolMgr.getPhysicalDisk(store.getPoolType(), store.getUuid(), data.getPath());
@@ -2348,11 +2554,18 @@
int devId = volume.getDiskSeq().intValue();
if (volume.getType() == Volume.Type.ISO) {
if (volPath == null) {
- /* Add iso as placeholder */
- disk.defISODisk(null, devId);
+ if (isSecureBoot) {
+ disk.defISODisk(null, devId,isSecureBoot,isWindowsTemplate);
+ } else {
+ /* Add iso as placeholder */
+ disk.defISODisk(null, devId);
+ }
} else {
disk.defISODisk(volPath, devId);
}
+ if (_guestCpuArch != null && _guestCpuArch.equals("aarch64")) {
+ disk.setBusType(DiskDef.DiskBus.SCSI);
+ }
} else {
if (diskBusType == DiskDef.DiskBus.SCSI ) {
disk.setQemuDriver(true);
@@ -2384,7 +2597,11 @@
if (volume.getType() == Volume.Type.DATADISK) {
disk.defFileBasedDisk(physicalDisk.getPath(), devId, diskBusTypeData, DiskDef.DiskFmtType.QCOW2);
} else {
- disk.defFileBasedDisk(physicalDisk.getPath(), devId, diskBusType, DiskDef.DiskFmtType.QCOW2);
+ if (isSecureBoot) {
+ disk.defFileBasedDisk(physicalDisk.getPath(), devId, DiskDef.DiskFmtType.QCOW2, isWindowsTemplate);
+ } else {
+ disk.defFileBasedDisk(physicalDisk.getPath(), devId, diskBusType, DiskDef.DiskFmtType.QCOW2);
+ }
}
}
@@ -2411,6 +2628,9 @@
if (_sysvmISOPath != null) {
final DiskDef iso = new DiskDef();
iso.defISODisk(_sysvmISOPath);
+ if (_guestCpuArch != null && _guestCpuArch.equals("aarch64")) {
+ iso.setBusType(DiskDef.DiskBus.SCSI);
+ }
vm.getDevices().addDevice(iso);
}
}
@@ -2446,6 +2666,20 @@
}
+ private KVMPhysicalDisk getPhysicalDiskPrimaryStore(PrimaryDataStoreTO primaryDataStoreTO, DataTO data) {
+ KVMStoragePool storagePool = _storagePoolMgr.getStoragePool(primaryDataStoreTO.getPoolType(), primaryDataStoreTO.getUuid());
+ return storagePool.getPhysicalDisk(data.getPath());
+ }
+
+ private KVMPhysicalDisk getPhysicalDiskFromNfsStore(String dataStoreUrl, DataTO data) {
+ final String volPath = dataStoreUrl + File.separator + data.getPath();
+ final int index = volPath.lastIndexOf("/");
+ final String volDir = volPath.substring(0, index);
+ final String volName = volPath.substring(index + 1);
+ final KVMStoragePool storage = _storagePoolMgr.getStoragePoolByURI(volDir);
+ return storage.getPhysicalDisk(volName);
+ }
+
private void setBurstProperties(final VolumeObjectTO volumeObjectTO, final DiskDef disk ) {
if (volumeObjectTO.getBytesReadRate() != null && volumeObjectTO.getBytesReadRate() > 0) {
disk.setBytesReadRate(volumeObjectTO.getBytesReadRate());
@@ -2938,7 +3172,7 @@
return vmStates;
}
- public String rebootVM(final Connect conn, final String vmName) {
+ public String rebootVM(final Connect conn, final String vmName) throws LibvirtException{
Domain dm = null;
String msg = null;
try {
@@ -2955,7 +3189,7 @@
final int vnetId = Integer.parseInt(nic.getBrName().replaceFirst("cloudVirBr", ""));
final String pifName = getPif(_guestBridgeName);
final String newBrName = "br" + pifName + "-" + vnetId;
- vmDef = vmDef.replaceAll("'" + nic.getBrName() + "'", "'" + newBrName + "'");
+ vmDef = vmDef.replace("'" + nic.getBrName() + "'", "'" + newBrName + "'");
s_logger.debug("VM bridge name is changed from " + nic.getBrName() + " to " + newBrName);
} catch (final NumberFormatException e) {
continue;
@@ -3183,6 +3417,10 @@
return null;
}
+ if (_guestCpuArch != null && _guestCpuArch.equals("aarch64")) {
+ return DiskDef.DiskBus.SCSI;
+ }
+
final String rootDiskController = details.get(VmDetailConstants.ROOT_DISK_CONTROLLER);
if (StringUtils.isNotBlank(rootDiskController)) {
s_logger.debug("Passed custom disk bus " + rootDiskController);
@@ -3197,6 +3435,10 @@
}
private DiskDef.DiskBus getGuestDiskModel(final String platformEmulator) {
+ if (_guestCpuArch != null && _guestCpuArch.equals("aarch64")) {
+ return DiskDef.DiskBus.SCSI;
+ }
+
if (platformEmulator == null) {
return DiskDef.DiskBus.IDE;
} else if (platformEmulator.startsWith("Other PV Virtio-SCSI")) {
@@ -3511,7 +3753,117 @@
return true;
}
- public boolean defaultNetworkRules(final Connect conn, final String vmName, final NicTO nic, final Long vmId, final String secIpStr) {
+ /**
+ * Function to destroy the security group rules applied to the nic's
+ * @param conn
+ * @param vmName
+ * @param nic
+ * @return
+ * true : If success
+ * false : If failure
+ */
+ public boolean destroyNetworkRulesForNic(final Connect conn, final String vmName, final NicTO nic) {
+ if (!_canBridgeFirewall) {
+ return false;
+ }
+ final List<String> nicSecIps = nic.getNicSecIps();
+ String secIpsStr;
+ final StringBuilder sb = new StringBuilder();
+ if (nicSecIps != null) {
+ for (final String ip : nicSecIps) {
+ sb.append(ip).append(SecurityGroupRulesCmd.RULE_COMMAND_SEPARATOR);
+ }
+ secIpsStr = sb.toString();
+ } else {
+ secIpsStr = "0" + SecurityGroupRulesCmd.RULE_COMMAND_SEPARATOR;
+ }
+ final List<InterfaceDef> intfs = getInterfaces(conn, vmName);
+ if (intfs.size() == 0 || intfs.size() < nic.getDeviceId()) {
+ return false;
+ }
+
+ final InterfaceDef intf = intfs.get(nic.getDeviceId());
+ final String brname = intf.getBrName();
+ final String vif = intf.getDevName();
+
+ final Script cmd = new Script(_securityGroupPath, _timeout, s_logger);
+ cmd.add("destroy_network_rules_for_vm");
+ cmd.add("--vmname", vmName);
+ if (nic.getIp() != null) {
+ cmd.add("--vmip", nic.getIp());
+ }
+ cmd.add("--vmmac", nic.getMac());
+ cmd.add("--vif", vif);
+ cmd.add("--nicsecips", secIpsStr);
+
+ final String result = cmd.execute();
+ if (result != null) {
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Function to apply default network rules for a VM
+ * @param conn
+ * @param vm
+ * @param checkBeforeApply
+ * @return
+ */
+ public boolean applyDefaultNetworkRules(final Connect conn, final VirtualMachineTO vm, final boolean checkBeforeApply) {
+ NicTO[] nicTOs = new NicTO[] {};
+ if (vm != null && vm.getNics() != null) {
+ s_logger.debug("Checking default network rules for vm " + vm.getName());
+ nicTOs = vm.getNics();
+ }
+ for (NicTO nic : nicTOs) {
+ if (vm.getType() != VirtualMachine.Type.User) {
+ nic.setPxeDisable(true);
+ }
+ }
+ boolean isFirstNic = true;
+ for (final NicTO nic : nicTOs) {
+ if (nic.isSecurityGroupEnabled() || nic.getIsolationUri() != null && nic.getIsolationUri().getScheme().equalsIgnoreCase(IsolationType.Ec2.toString())) {
+ if (vm.getType() != VirtualMachine.Type.User) {
+ configureDefaultNetworkRulesForSystemVm(conn, vm.getName());
+ break;
+ }
+ if (!applyDefaultNetworkRulesOnNic(conn, vm.getName(), vm.getId(), nic, isFirstNic, checkBeforeApply)) {
+ s_logger.error("Unable to apply default network rule for nic " + nic.getName() + " for VM " + vm.getName());
+ return false;
+ }
+ isFirstNic = false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Function to apply default network rules for a NIC
+ * @param conn
+ * @param vmName
+ * @param vmId
+ * @param nic
+ * @param isFirstNic
+ * @param checkBeforeApply
+ * @return
+ */
+ public boolean applyDefaultNetworkRulesOnNic(final Connect conn, final String vmName, final Long vmId, final NicTO nic, boolean isFirstNic, boolean checkBeforeApply) {
+ final List<String> nicSecIps = nic.getNicSecIps();
+ String secIpsStr;
+ final StringBuilder sb = new StringBuilder();
+ if (nicSecIps != null) {
+ for (final String ip : nicSecIps) {
+ sb.append(ip).append(SecurityGroupRulesCmd.RULE_COMMAND_SEPARATOR);
+ }
+ secIpsStr = sb.toString();
+ } else {
+ secIpsStr = "0" + SecurityGroupRulesCmd.RULE_COMMAND_SEPARATOR;
+ }
+ return defaultNetworkRules(conn, vmName, nic, vmId, secIpsStr, isFirstNic, checkBeforeApply);
+ }
+
+ public boolean defaultNetworkRules(final Connect conn, final String vmName, final NicTO nic, final Long vmId, final String secIpStr, final boolean isFirstNic, final boolean checkBeforeApply) {
if (!_canBridgeFirewall) {
return false;
}
@@ -3539,6 +3891,12 @@
cmd.add("--vif", vif);
cmd.add("--brname", brname);
cmd.add("--nicsecips", secIpStr);
+ if (isFirstNic) {
+ cmd.add("--isFirstNic");
+ }
+ if (checkBeforeApply) {
+ cmd.add("--check");
+ }
final String result = cmd.execute();
if (result != null) {
return false;
@@ -3628,7 +3986,7 @@
return true;
}
- public boolean configureNetworkRulesVMSecondaryIP(final Connect conn, final String vmName, final String secIp, final String action) {
+ public boolean configureNetworkRulesVMSecondaryIP(final Connect conn, final String vmName, final String vmMac, final String secIp, final String action) {
if (!_canBridgeFirewall) {
return false;
@@ -3637,6 +3995,7 @@
final Script cmd = new Script(_securityGroupPath, _timeout, s_logger);
cmd.add("network_rules_vmSecondaryIp");
cmd.add("--vmname", vmName);
+ cmd.add("--vmmac", vmMac);
cmd.add("--nicsecips", secIp);
cmd.add("--action=" + action);
@@ -3858,4 +4217,12 @@
}
return true;
}
+
+ public boolean isSecureMode(String bootMode) {
+ if (StringUtils.isNotBlank(bootMode) && "secure".equalsIgnoreCase(bootMode)) {
+ return true;
+ }
+
+ return false;
+ }
}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtKvmAgentHook.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtKvmAgentHook.java
new file mode 100644
index 0000000..3627d6e
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtKvmAgentHook.java
@@ -0,0 +1,76 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.hypervisor.kvm.resource;
+
+import groovy.lang.Binding;
+import groovy.lang.GroovyObject;
+import groovy.util.GroovyScriptEngine;
+import groovy.util.ResourceException;
+import groovy.util.ScriptException;
+import org.apache.log4j.Logger;
+import org.codehaus.groovy.runtime.metaclass.MissingMethodExceptionNoStack;
+
+import java.io.File;
+import java.io.IOException;
+
+public class LibvirtKvmAgentHook {
+ private final String script;
+ private final String method;
+ private final GroovyScriptEngine gse;
+ private final Binding binding = new Binding();
+
+ private static final Logger s_logger = Logger.getLogger(LibvirtKvmAgentHook.class);
+
+ public LibvirtKvmAgentHook(String path, String script, String method) throws IOException {
+ this.script = script;
+ this.method = method;
+ File full_path = new File(path, script);
+ if (!full_path.canRead()) {
+ s_logger.warn("Groovy script '" + full_path.toString() + "' is not available. Transformations will not be applied.");
+ this.gse = null;
+ } else {
+ this.gse = new GroovyScriptEngine(path);
+ }
+ }
+
+ public boolean isInitialized() {
+ return this.gse != null;
+ }
+
+ public Object handle(Object arg) throws ResourceException, ScriptException {
+ if (!isInitialized()) {
+ s_logger.warn("Groovy scripting engine is not initialized. Data transformation skipped.");
+ return arg;
+ }
+
+ GroovyObject cls = (GroovyObject) this.gse.run(this.script, binding);
+ if (null == cls) {
+ s_logger.warn("Groovy object is not received from script '" + this.script + "'.");
+ return arg;
+ } else {
+ Object[] params = {s_logger, arg};
+ try {
+ Object res = cls.invokeMethod(this.method, params);
+ return res;
+ } catch (MissingMethodExceptionNoStack e) {
+ s_logger.error("Error occured when calling method from groovy script, {}", e);
+ return arg;
+ }
+ }
+ }
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
index dab1af5..e2d506c 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
@@ -57,7 +57,39 @@
}
}
+ enum BootType {
+ UEFI("UEFI"), BIOS("BIOS");
+
+ String _type;
+
+ BootType(String type) {
+ _type = type;
+ }
+
+ @Override
+ public String toString() {
+ return _type;
+ }
+ }
+
+ enum BootMode {
+ LEGACY("LEGACY"), SECURE("SECURE");
+
+ String _mode;
+
+ BootMode(String mode) {
+ _mode = mode;
+ }
+
+ @Override
+ public String toString() {
+ return _mode;
+ }
+ }
+
private GuestType _type;
+ private BootType _boottype;
+ private BootMode _bootmode;
private String _arch;
private String _loader;
private String _kernel;
@@ -67,6 +99,14 @@
private String _uuid;
private final List<BootOrder> _bootdevs = new ArrayList<BootOrder>();
private String _machine;
+ private String _nvram;
+ private String _nvramTemplate;
+
+ public static final String GUEST_LOADER_SECURE = "guest.loader.secure";
+ public static final String GUEST_LOADER_LEGACY = "guest.loader.legacy";
+ public static final String GUEST_NVRAM_PATH = "guest.nvram.path";
+ public static final String GUEST_NVRAM_TEMPLATE_SECURE = "guest.nvram.template.secure";
+ public static final String GUEST_NVRAM_TEMPLATE_LEGACY = "guest.nvram.template.legacy";
public void setGuestType(GuestType type) {
_type = type;
@@ -76,6 +116,10 @@
return _type;
}
+ public void setNvram(String nvram) { _nvram = nvram; }
+
+ public void setNvramTemplate(String nvramTemplate) { _nvramTemplate = nvramTemplate; }
+
public void setGuestArch(String arch) {
_arch = arch;
}
@@ -103,6 +147,22 @@
_uuid = uuid;
}
+ public BootType getBootType() {
+ return _boottype;
+ }
+
+ public void setBootType(BootType boottype) {
+ this._boottype = boottype;
+ }
+
+ public BootMode getBootMode() {
+ return _bootmode;
+ }
+
+ public void setBootMode(BootMode bootmode) {
+ this._bootmode = bootmode;
+ }
+
@Override
public String toString() {
if (_type == GuestType.KVM) {
@@ -125,12 +185,35 @@
guestDef.append(" machine='" + _machine + "'");
}
guestDef.append(">hvm</type>\n");
+ if (_arch != null && _arch.equals("aarch64")) {
+ guestDef.append("<loader readonly='yes' type='pflash'>/usr/share/AAVMF/AAVMF_CODE.fd</loader>\n");
+ }
+ if (_loader != null) {
+ if (_bootmode == BootMode.LEGACY) {
+ guestDef.append("<loader readonly='yes' secure='no' type='pflash'>" + _loader + "</loader>\n");
+ } else if (_bootmode == BootMode.SECURE) {
+ guestDef.append("<loader readonly='yes' secure='yes' type='pflash'>" + _loader + "</loader>\n");
+ }
+ }
+ if (_nvram != null) {
+ guestDef.append("<nvram ");
+ if (_nvramTemplate != null) {
+ guestDef.append("template='" + _nvramTemplate + "'>");
+ } else {
+ guestDef.append(">");
+ }
+
+ guestDef.append(_nvram);
+ guestDef.append(_uuid + ".fd</nvram>");
+ }
if (!_bootdevs.isEmpty()) {
for (BootOrder bo : _bootdevs) {
guestDef.append("<boot dev='" + bo + "'/>\n");
}
}
- guestDef.append("<smbios mode='sysinfo'/>\n");
+ if (_arch == null || !_arch.equals("aarch64")) {
+ guestDef.append("<smbios mode='sysinfo'/>\n");
+ }
guestDef.append("</os>\n");
return guestDef.toString();
} else if (_type == GuestType.LXC) {
@@ -271,7 +354,11 @@
StringBuilder feaBuilder = new StringBuilder();
feaBuilder.append("<features>\n");
for (String feature : _features) {
- feaBuilder.append("<" + feature + "/>\n");
+ if (feature.equalsIgnoreCase("smm")) {
+ feaBuilder.append("<" + feature + " state=\'on\' " + "/>\n");
+ } else {
+ feaBuilder.append("<" + feature + "/>\n");
+ }
}
if (hyperVEnlightenmentFeatureDef != null) {
String hpervF = hyperVEnlightenmentFeatureDef.toString();
@@ -503,7 +590,7 @@
}
public enum DiskBus {
- IDE("ide"), SCSI("scsi"), VIRTIO("virtio"), XEN("xen"), USB("usb"), UML("uml"), FDC("fdc");
+ IDE("ide"), SCSI("scsi"), VIRTIO("virtio"), XEN("xen"), USB("usb"), UML("uml"), FDC("fdc"), SATA("sata");
String _bus;
DiskBus(String bus) {
@@ -628,13 +715,17 @@
return "sd" + getDevLabelSuffix(devId);
} else if (bus == DiskBus.VIRTIO) {
return "vd" + getDevLabelSuffix(devId);
+ } else if (bus == DiskBus.SATA){
+ if (!forIso) {
+ return "sda";
+ }
}
if (forIso) {
devId --;
} else if(devId >= 2) {
devId += 2;
}
- return "hd" + getDevLabelSuffix(devId);
+ return (DiskBus.SATA == bus) ? "sdb" : "hd" + getDevLabelSuffix(devId);
}
@@ -666,6 +757,23 @@
}
+ public void defFileBasedDisk(String filePath, int devId, DiskFmtType diskFmtType,boolean isWindowsOS) {
+
+ _diskType = DiskType.FILE;
+ _deviceType = DeviceType.DISK;
+ _diskCacheMode = DiskCacheMode.NONE;
+ _sourcePath = filePath;
+ _diskFmtType = diskFmtType;
+
+ if (isWindowsOS) {
+ _diskLabel = getDevLabel(devId, DiskBus.SATA, false); // Windows Secure VM
+ _bus = DiskBus.SATA;
+ } else {
+ _diskLabel = getDevLabel(devId, DiskBus.VIRTIO, false); // Linux Secure VM
+ _bus = DiskBus.VIRTIO;
+ }
+ }
+
public void defISODisk(String volPath) {
_diskType = DiskType.FILE;
_deviceType = DeviceType.CDROM;
@@ -690,6 +798,26 @@
}
}
+ public void defISODisk(String volPath, Integer devId,boolean isSecure, boolean isWindowOs) {
+ if (!isSecure) {
+ defISODisk(volPath, devId);
+ } else {
+ _diskType = DiskType.FILE;
+ _deviceType = DeviceType.CDROM;
+ _sourcePath = volPath;
+ if (isWindowOs) {
+ _diskLabel = getDevLabel(devId, DiskBus.SATA, true);
+ _bus = DiskBus.SATA;
+ } else {
+ _diskLabel = getDevLabel(devId, DiskBus.SCSI, true);
+ _bus = DiskBus.SCSI;
+ }
+ _diskFmtType = DiskFmtType.RAW;
+ _diskCacheMode = DiskCacheMode.NONE;
+
+ }
+ }
+
public void defBlockBasedDisk(String diskName, int devId, DiskBus bus) {
_diskType = DiskType.BLOCK;
_deviceType = DeviceType.DISK;
@@ -782,6 +910,10 @@
return _bus;
}
+ public void setBusType(DiskBus busType) {
+ _bus = busType;
+ }
+
public DiskFmtType getDiskFormatType() {
return _diskFmtType;
}
@@ -1624,6 +1756,37 @@
}
}
+ public static class USBDef {
+ private short index = 0;
+ private int domain = 0;
+ private int bus = 0;
+ private int slot = 9;
+ private int function = 0;
+
+ public USBDef(short index, int domain, int bus, int slot, int function) {
+ this.index = index;
+ this.domain = domain;
+ this.bus = bus;
+ this.slot = slot;
+ this.function = function;
+ }
+
+ public USBDef() {
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder scsiBuilder = new StringBuilder();
+
+ scsiBuilder.append(String.format("<controller type='usb' index='%d' model='qemu-xhci'>\n", this.index));
+ scsiBuilder.append("<alias name='usb'/>");
+ scsiBuilder.append(String.format("<address type='pci' domain='0x%04X' bus='0x%02X' slot='0x%02X' function='0x%01X'/>\n",
+ this.domain, this.bus, this.slot, this.function ) );
+ scsiBuilder.append("</controller>\n");
+ return scsiBuilder.toString();
+ }
+ }
+
public static class InputDef {
private final String _type; /* tablet, mouse */
private final String _bus; /* ps2, usb, xen */
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/rolling/maintenance/RollingMaintenanceAgentExecutor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/rolling/maintenance/RollingMaintenanceAgentExecutor.java
new file mode 100644
index 0000000..110c4a8
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/rolling/maintenance/RollingMaintenanceAgentExecutor.java
@@ -0,0 +1,88 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.hypervisor.kvm.resource.rolling.maintenance;
+
+import com.cloud.utils.Pair;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.script.OutputInterpreter;
+import com.cloud.utils.script.Script;
+import com.google.common.base.Strings;
+import org.apache.log4j.Logger;
+import org.joda.time.Duration;
+
+import java.io.File;
+
+public class RollingMaintenanceAgentExecutor extends RollingMaintenanceExecutorBase implements RollingMaintenanceExecutor {
+
+ private static final Logger s_logger = Logger.getLogger(RollingMaintenanceAgentExecutor.class);
+
+ private String output;
+ private boolean success;
+
+ public RollingMaintenanceAgentExecutor(String hooksDir) {
+ super(hooksDir);
+ }
+
+ @Override
+ public Pair<Boolean, String> startStageExecution(String stage, File scriptFile, int timeout, String payload) {
+ checkHooksDirectory();
+ Duration duration = Duration.standardSeconds(timeout);
+ final Script script = new Script(scriptFile.getAbsolutePath(), duration, s_logger);
+ final OutputInterpreter.AllLinesParser parser = new OutputInterpreter.AllLinesParser();
+ if (!Strings.isNullOrEmpty(payload)) {
+ script.add(payload);
+ }
+ s_logger.info("Executing stage: " + stage + " script: " + script);
+ output = script.execute(parser) + " " + parser.getLines();
+
+ if (script.isTimeout()) {
+ String msg = "Script " + scriptFile + " timed out";
+ s_logger.error(msg);
+ success = false;
+ return new Pair<>(false, msg);
+ }
+
+ int exitValue = script.getExitValue();
+ if (exitValue == exitValueTerminatedSignal) {
+ throw new CloudRuntimeException("Script " + scriptFile + " terminated");
+ }
+ success = exitValue == 0 || exitValue == exitValueAvoidMaintenance;
+ setAvoidMaintenance(exitValue == exitValueAvoidMaintenance);
+ s_logger.info("Execution finished for stage: " + stage + " script: " + script + ": " + exitValue);
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug(output);
+ s_logger.debug("Stage " + stage + " execution finished: " + exitValue);
+ }
+ return new Pair<>(true, "Stage " + stage + " finished");
+ }
+
+ @Override
+ public String getStageExecutionOutput(String stage, File scriptFile) {
+ return output;
+ }
+
+ @Override
+ public boolean isStageRunning(String stage, File scriptFile, String payload) {
+ // In case of reconnection, it is assumed that the stage is finished
+ return false;
+ }
+
+ @Override
+ public boolean getStageExecutionSuccess(String stage, File scriptFile) {
+ return success;
+ }
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/rolling/maintenance/RollingMaintenanceExecutor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/rolling/maintenance/RollingMaintenanceExecutor.java
new file mode 100644
index 0000000..fe72765
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/rolling/maintenance/RollingMaintenanceExecutor.java
@@ -0,0 +1,31 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.hypervisor.kvm.resource.rolling.maintenance;
+
+import com.cloud.utils.Pair;
+
+import java.io.File;
+
+public interface RollingMaintenanceExecutor {
+
+ File getStageScriptFile(String stage);
+ Pair<Boolean, String> startStageExecution(String stage, File scriptFile, int timeout, String payload);
+ String getStageExecutionOutput(String stage, File scriptFile);
+ boolean isStageRunning(String stage, File scriptFile, String payload);
+ boolean getStageExecutionSuccess(String stage, File scriptFile);
+ boolean getStageAvoidMaintenance(String stage, File scriptFile);
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/rolling/maintenance/RollingMaintenanceExecutorBase.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/rolling/maintenance/RollingMaintenanceExecutorBase.java
new file mode 100644
index 0000000..140b588
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/rolling/maintenance/RollingMaintenanceExecutorBase.java
@@ -0,0 +1,91 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.hypervisor.kvm.resource.rolling.maintenance;
+
+import com.cloud.utils.exception.CloudRuntimeException;
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+
+import java.io.File;
+
+public abstract class RollingMaintenanceExecutorBase implements RollingMaintenanceExecutor {
+
+ private String hooksDir;
+ private int timeout;
+ private boolean avoidMaintenance = false;
+
+ static final int exitValueAvoidMaintenance = 70;
+ static final int exitValueTerminatedSignal = 143;
+ private static final Logger s_logger = Logger.getLogger(RollingMaintenanceExecutor.class);
+
+ void setTimeout(int timeout) {
+ this.timeout = timeout;
+ }
+
+ long getTimeout() {
+ return timeout;
+ }
+
+ private void sanitizeHoooksDirFormat() {
+ if (StringUtils.isNotBlank(this.hooksDir) && !this.hooksDir.endsWith("/")) {
+ this.hooksDir += "/";
+ }
+ }
+
+ RollingMaintenanceExecutorBase(String hooksDir) {
+ this.hooksDir = hooksDir;
+ sanitizeHoooksDirFormat();
+ }
+
+ protected boolean existsAndIsFile(String filepath) {
+ File file = new File(filepath);
+ return file.exists() && file.isFile();
+ }
+
+ public File getStageScriptFile(String stage) {
+ String scriptPath = hooksDir + stage;
+ if (existsAndIsFile(scriptPath)) {
+ return new File(scriptPath);
+ } else if (existsAndIsFile(scriptPath + ".sh")) {
+ return new File(scriptPath + ".sh");
+ } else if (existsAndIsFile(scriptPath + ".py")) {
+ return new File(scriptPath + ".py");
+ } else {
+ String msg = "Unable to locate script for stage: " + stage + " in directory: " + hooksDir;
+ s_logger.warn(msg);
+ return null;
+ }
+ }
+
+ void checkHooksDirectory() {
+ if (StringUtils.isBlank(hooksDir)) {
+ throw new CloudRuntimeException("Hooks directory is empty, please specify it on agent.properties and restart the agent");
+ }
+ }
+
+ String getHooksDir() {
+ return hooksDir;
+ }
+
+ public void setAvoidMaintenance(boolean avoidMaintenance) {
+ this.avoidMaintenance = avoidMaintenance;
+ }
+
+ public boolean getStageAvoidMaintenance(String stage, File scriptFile) {
+ return avoidMaintenance;
+ }
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/rolling/maintenance/RollingMaintenanceServiceExecutor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/rolling/maintenance/RollingMaintenanceServiceExecutor.java
new file mode 100644
index 0000000..6659bf4
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/rolling/maintenance/RollingMaintenanceServiceExecutor.java
@@ -0,0 +1,137 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.hypervisor.kvm.resource.rolling.maintenance;
+
+import com.cloud.utils.Pair;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.script.OutputInterpreter;
+import com.cloud.utils.script.Script;
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.stream.Stream;
+
+public class RollingMaintenanceServiceExecutor extends RollingMaintenanceExecutorBase implements RollingMaintenanceExecutor {
+
+ private static final String servicePrefix = "cloudstack-rolling-maintenance";
+ private static final String resultsFileSuffix = "rolling-maintenance-results";
+ private static final String outputFileSuffix = "rolling-maintenance-output";
+
+ private static final Logger s_logger = Logger.getLogger(RollingMaintenanceServiceExecutor.class);
+
+ public RollingMaintenanceServiceExecutor(String hooksDir) {
+ super(hooksDir);
+ }
+
+ /**
+ * Generate and return escaped instance name to use on systemd service invokation
+ */
+ private String generateInstanceName(String stage, String file, String payload) {
+ String instanceName = String.format("%s,%s,%s,%s,%s", stage, file, getTimeout(),
+ getResultsFilePath(), getOutputFilePath());
+ if (StringUtils.isNotBlank(payload)) {
+ instanceName += "," + payload;
+ }
+ return Script.runSimpleBashScript(String.format("systemd-escape '%s'", instanceName));
+ }
+
+ private String invokeService(String action, String stage, String file, String payload) {
+ s_logger.debug("Invoking rolling maintenance service for stage: " + stage + " and file " + file + " with action: " + action);
+ final OutputInterpreter.AllLinesParser parser = new OutputInterpreter.AllLinesParser();
+ Script command = new Script("/bin/systemctl", s_logger);
+ command.add(action);
+ String service = servicePrefix + "@" + generateInstanceName(stage, file, payload);
+ command.add(service);
+ String result = command.execute(parser);
+ int exitValue = command.getExitValue();
+ s_logger.trace("Execution: " + command.toString() + " - exit code: " + exitValue +
+ ": " + result + (StringUtils.isNotBlank(parser.getLines()) ? parser.getLines() : ""));
+ return StringUtils.isBlank(result) ? parser.getLines().replace("\n", " ") : result;
+ }
+
+ @Override
+ public Pair<Boolean, String> startStageExecution(String stage, File scriptFile, int timeout, String payload) {
+ checkHooksDirectory();
+ setTimeout(timeout);
+ String result = invokeService("start", stage, scriptFile.getAbsolutePath(), payload);
+ if (StringUtils.isNotBlank(result)) {
+ throw new CloudRuntimeException("Error starting stage: " + stage + " execution: " + result);
+ }
+ s_logger.trace("Stage " + stage + "execution started");
+ return new Pair<>(true, "OK");
+ }
+
+ private String getResultsFilePath() {
+ return getHooksDir() + resultsFileSuffix;
+ }
+
+ private String getOutputFilePath() {
+ return getHooksDir() + outputFileSuffix;
+ }
+
+ private String readFromFile(String filePath) {
+ StringBuilder contentBuilder = new StringBuilder();
+
+ try (Stream<String> stream = Files.lines( Paths.get(filePath), StandardCharsets.UTF_8)) {
+ stream.forEach(s -> contentBuilder.append(s).append("\n"));
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ return contentBuilder.toString();
+ }
+
+ @Override
+ public String getStageExecutionOutput(String stage, File scriptFile) {
+ return readFromFile(getOutputFilePath());
+ }
+
+ @Override
+ public boolean isStageRunning(String stage, File scriptFile, String payload) {
+ String result = invokeService("is-active", stage, scriptFile.getAbsolutePath(), payload);
+ if (StringUtils.isNotBlank(result) && result.equals("failed")) {
+ String status = invokeService("status", stage, scriptFile.getAbsolutePath(), payload);
+ String errorMsg = "Stage " + stage + " execution failed, status: " + status;
+ s_logger.error(errorMsg);
+ throw new CloudRuntimeException(errorMsg);
+ }
+ return StringUtils.isNotBlank(result) && result.equals("active");
+ }
+
+ @Override
+ public boolean getStageExecutionSuccess(String stage, File scriptFile) {
+ String fileContent = readFromFile(getResultsFilePath());
+ if (StringUtils.isBlank(fileContent)) {
+ throw new CloudRuntimeException("Empty content in file " + getResultsFilePath());
+ }
+ fileContent = fileContent.replace("\n", "");
+ String[] parts = fileContent.split(",");
+ if (parts.length < 3) {
+ throw new CloudRuntimeException("Results file " + getResultsFilePath() + " unexpected content: " + fileContent);
+ }
+ if (!parts[0].equalsIgnoreCase(stage)) {
+ throw new CloudRuntimeException("Expected stage " + stage + " results but got stage " + parts[0]);
+ }
+ setAvoidMaintenance(Boolean.parseBoolean(parts[2]));
+ return Boolean.parseBoolean(parts[1]);
+ }
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCopyToSecondaryStorageWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCopyToSecondaryStorageWrapper.java
new file mode 100644
index 0000000..a6baa1c
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCopyToSecondaryStorageWrapper.java
@@ -0,0 +1,87 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.hypervisor.kvm.resource.wrapper;
+
+import static org.apache.cloudstack.diagnostics.DiagnosticsHelper.setDirFilePermissions;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.apache.cloudstack.diagnostics.CopyToSecondaryStorageAnswer;
+import org.apache.cloudstack.diagnostics.CopyToSecondaryStorageCommand;
+import org.apache.cloudstack.diagnostics.DiagnosticsService;
+import org.apache.log4j.Logger;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.hypervisor.kvm.storage.KVMStoragePool;
+import com.cloud.hypervisor.kvm.storage.KVMStoragePoolManager;
+import com.cloud.resource.CommandWrapper;
+import com.cloud.resource.ResourceWrapper;
+import com.cloud.utils.ssh.SshHelper;
+
+@ResourceWrapper(handles = CopyToSecondaryStorageCommand.class)
+public class LibvirtCopyToSecondaryStorageWrapper extends CommandWrapper<CopyToSecondaryStorageCommand, Answer, LibvirtComputingResource> {
+ public static final Logger LOGGER = Logger.getLogger(LibvirtCopyToSecondaryStorageWrapper.class);
+
+ @Override
+ public Answer execute(CopyToSecondaryStorageCommand command, LibvirtComputingResource libvirtResource) {
+
+ String diagnosticsZipFile = command.getFileName();
+ String vmSshIp = command.getSystemVmIp();
+ String secondaryStorageUrl = command.getSecondaryStorageUrl();
+
+ KVMStoragePoolManager storagePoolMgr = libvirtResource.getStoragePoolMgr();
+ KVMStoragePool secondaryPool;
+
+ boolean success;
+
+ secondaryPool = storagePoolMgr.getStoragePoolByURI(secondaryStorageUrl);
+ String mountPoint = secondaryPool.getLocalPath();
+
+ // /mnt/SecStorage/uuid/diagnostics_data
+ String dataDirectoryInSecondaryStore = String.format("%s/%s", mountPoint, DiagnosticsService.DIAGNOSTICS_DIRECTORY);
+ try {
+ File dataDirectory = new File(dataDirectoryInSecondaryStore);
+ boolean existsInSecondaryStore = dataDirectory.exists() || dataDirectory.mkdir();
+
+ // Modify directory file permissions
+ Path path = Paths.get(dataDirectory.getAbsolutePath());
+ setDirFilePermissions(path);
+ if (existsInSecondaryStore) {
+ LOGGER.info(String.format("Copying %s from %s to secondary store %s", diagnosticsZipFile, vmSshIp, secondaryStorageUrl));
+ int port = Integer.valueOf(LibvirtComputingResource.DEFAULTDOMRSSHPORT);
+ File permKey = new File(LibvirtComputingResource.SSHPRVKEYPATH);
+ SshHelper.scpFrom(vmSshIp, port, "root", permKey, dataDirectoryInSecondaryStore, diagnosticsZipFile);
+ }
+ // Verify File copy to Secondary Storage
+ File fileInSecondaryStore = new File(dataDirectoryInSecondaryStore + diagnosticsZipFile.replace("/root", ""));
+ if (fileInSecondaryStore.exists()) {
+ return new CopyToSecondaryStorageAnswer(command, true, "File copied to secondary storage successfully");
+ } else {
+ return new CopyToSecondaryStorageAnswer(command, false, "Zip file " + diagnosticsZipFile.replace("/root/", "") + "not found in secondary storage");
+ }
+
+ } catch (Exception e) {
+ return new CopyToSecondaryStorageAnswer(command, false, e.getMessage());
+ } finally {
+ // unmount secondary storage from hypervisor host
+ secondaryPool.delete();
+ }
+ }
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetHostStatsCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetHostStatsCommandWrapper.java
index b04a866..d47b69d 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetHostStatsCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetHostStatsCommandWrapper.java
@@ -42,10 +42,11 @@
MemStat memStat = libvirtComputingResource.getMemStat();
final double cpuUtil = cpuStat.getCpuUsedPercent();
+ final double loadAvg = cpuStat.getCpuLoadAverage();
final Pair<Double, Double> nicStats = libvirtComputingResource.getNicStats(libvirtComputingResource.getPublicBridgeName());
- final HostStatsEntry hostStats = new HostStatsEntry(command.getHostId(), cpuUtil, nicStats.first() / 1024, nicStats.second() / 1024, "host", memStat.getTotal() / 1024, memStat.getAvailable() / 1024, 0, 0);
+ final HostStatsEntry hostStats = new HostStatsEntry(command.getHostId(), cpuUtil, nicStats.first() / 1024, nicStats.second() / 1024, "host", memStat.getTotal() / 1024, memStat.getAvailable() / 1024, 0, loadAvg);
return new GetHostStatsAnswer(command, hostStats);
}
}
\ No newline at end of file
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkRulesVmSecondaryIpCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkRulesVmSecondaryIpCommandWrapper.java
index 1ad5cb4..07c091e 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkRulesVmSecondaryIpCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkRulesVmSecondaryIpCommandWrapper.java
@@ -41,11 +41,11 @@
final LibvirtUtilitiesHelper libvirtUtilitiesHelper = libvirtComputingResource.getLibvirtUtilitiesHelper();
final Connect conn = libvirtUtilitiesHelper.getConnectionByVmName(command.getVmName());
- result = libvirtComputingResource.configureNetworkRulesVMSecondaryIP(conn, command.getVmName(), command.getVmSecIp(), command.getAction());
+ result = libvirtComputingResource.configureNetworkRulesVMSecondaryIP(conn, command.getVmName(), command.getVmMac(), command.getVmSecIp(), command.getAction());
} catch (final LibvirtException e) {
s_logger.debug("Could not configure VM secondary IP! => " + e.getLocalizedMessage());
}
return new Answer(command, result, "");
}
-}
\ No newline at end of file
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPlugNicCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPlugNicCommandWrapper.java
index 1ef32af..553a71a 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPlugNicCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPlugNicCommandWrapper.java
@@ -29,6 +29,7 @@
import com.cloud.hypervisor.kvm.resource.VifDriver;
import com.cloud.resource.CommandWrapper;
import com.cloud.resource.ResourceWrapper;
+import com.cloud.vm.VirtualMachine;
import org.apache.log4j.Logger;
import org.libvirt.Connect;
import org.libvirt.Domain;
@@ -45,6 +46,7 @@
public Answer execute(final PlugNicCommand command, final LibvirtComputingResource libvirtComputingResource) {
final NicTO nic = command.getNic();
final String vmName = command.getVmName();
+ final VirtualMachine.Type vmType = command.getVMType();
Domain vm = null;
try {
final LibvirtUtilitiesHelper libvirtUtilitiesHelper = libvirtComputingResource.getLibvirtUtilitiesHelper();
@@ -64,6 +66,12 @@
final InterfaceDef interfaceDef = vifDriver.plug(nic, "Other PV", "", null);
vm.attachDevice(interfaceDef.toString());
+ // apply default network rules on new nic
+ if (vmType == VirtualMachine.Type.User && nic.isSecurityGroupEnabled()) {
+ final Long vmId = Long.valueOf(vmName.split("-")[2]);
+ libvirtComputingResource.applyDefaultNetworkRulesOnNic(conn, vmName, vmId, nic, false, false);
+ }
+
return new PlugNicAnswer(command, true, "success");
} catch (final LibvirtException e) {
final String msg = " Plug Nic failed due to " + e.toString();
@@ -83,4 +91,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRebootCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRebootCommandWrapper.java
index f54ed6f..15a3be4 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRebootCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRebootCommandWrapper.java
@@ -26,6 +26,7 @@
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.RebootAnswer;
import com.cloud.agent.api.RebootCommand;
+import com.cloud.agent.api.to.VirtualMachineTO;
import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
import com.cloud.resource.CommandWrapper;
import com.cloud.resource.ResourceWrapper;
@@ -38,6 +39,7 @@
@Override
public Answer execute(final RebootCommand command, final LibvirtComputingResource libvirtComputingResource) {
final LibvirtUtilitiesHelper libvirtUtilitiesHelper = libvirtComputingResource.getLibvirtUtilitiesHelper();
+ final VirtualMachineTO vmSpec = command.getVirtualMachine();
try {
final Connect conn = libvirtUtilitiesHelper.getConnectionByVmName(command.getVmName());
@@ -49,7 +51,9 @@
} catch (final LibvirtException e) {
s_logger.trace("Ignoring libvirt error.", e);
}
- libvirtComputingResource.getRuleLogsForVms();
+ if (vmSpec != null) {
+ libvirtComputingResource.applyDefaultNetworkRules(conn, vmSpec, false);
+ }
return new RebootAnswer(command, null, vncPort);
} else {
return new RebootAnswer(command, result, false);
@@ -58,4 +62,4 @@
return new RebootAnswer(command, e.getMessage(), false);
}
}
-}
\ No newline at end of file
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRollingMaintenanceCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRollingMaintenanceCommandWrapper.java
new file mode 100644
index 0000000..a1b1af6
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRollingMaintenanceCommandWrapper.java
@@ -0,0 +1,81 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.hypervisor.kvm.resource.wrapper;
+
+import com.cloud.agent.api.RollingMaintenanceAnswer;
+import com.cloud.agent.api.RollingMaintenanceCommand;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.hypervisor.kvm.resource.rolling.maintenance.RollingMaintenanceAgentExecutor;
+import com.cloud.hypervisor.kvm.resource.rolling.maintenance.RollingMaintenanceExecutor;
+import com.cloud.resource.CommandWrapper;
+import com.cloud.resource.ResourceWrapper;
+import com.cloud.resource.RollingMaintenanceManager;
+import com.cloud.utils.exception.CloudRuntimeException;
+import org.apache.log4j.Logger;
+
+import java.io.File;
+
+@ResourceWrapper(handles = RollingMaintenanceCommand.class)
+public class LibvirtRollingMaintenanceCommandWrapper extends CommandWrapper<RollingMaintenanceCommand, RollingMaintenanceAnswer, LibvirtComputingResource> {
+
+ private static final Logger s_logger = Logger.getLogger(LibvirtRollingMaintenanceCommandWrapper.class);
+
+ @Override
+ public RollingMaintenanceAnswer execute(RollingMaintenanceCommand command, LibvirtComputingResource resource) {
+ RollingMaintenanceExecutor executor = resource.getRollingMaintenanceExecutor();
+ String stage = command.isCheckMaintenanceScript() ? RollingMaintenanceManager.Stage.Maintenance.toString() : command.getStage();
+ int timeout = command.getWait();
+ String payload = command.getPayload();
+
+ try {
+ File scriptFile = executor.getStageScriptFile(stage);
+ if (command.isCheckMaintenanceScript()) {
+ return new RollingMaintenanceAnswer(command, scriptFile != null);
+ } else if (scriptFile == null) {
+ s_logger.info("No script file defined for stage " + stage + ". Skipping stage...");
+ return new RollingMaintenanceAnswer(command, true, "Skipped stage " + stage, true);
+ }
+
+ if (command.isStarted() && executor instanceof RollingMaintenanceAgentExecutor) {
+ String msg = "Stage has been started previously and the agent restarted, setting stage as finished";
+ s_logger.info(msg);
+ return new RollingMaintenanceAnswer(command, true, msg, true);
+ }
+ s_logger.info("Processing stage " + stage);
+ if (!command.isStarted()) {
+ executor.startStageExecution(stage, scriptFile, timeout, payload);
+ }
+ if (executor.isStageRunning(stage, scriptFile, payload)) {
+ return new RollingMaintenanceAnswer(command, true, "Stage " + stage + " still running", false);
+ }
+ boolean success = executor.getStageExecutionSuccess(stage, scriptFile);
+ String output = executor.getStageExecutionOutput(stage, scriptFile);
+ RollingMaintenanceAnswer answer = new RollingMaintenanceAnswer(command, success, output, true);
+ if (executor.getStageAvoidMaintenance(stage, scriptFile)) {
+ s_logger.info("Avoid maintenance flag added to the answer for the stage " + stage);
+ answer.setAvoidMaintenance(true);
+ }
+ s_logger.info("Finished processing stage " + stage);
+ return answer;
+ } catch (CloudRuntimeException e) {
+ return new RollingMaintenanceAnswer(command, false, e.getMessage(), false);
+ }
+ }
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtSecurityGroupRulesCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtSecurityGroupRulesCommandWrapper.java
index ded8ce3..3f8aeba 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtSecurityGroupRulesCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtSecurityGroupRulesCommandWrapper.java
@@ -28,6 +28,7 @@
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.SecurityGroupRuleAnswer;
import com.cloud.agent.api.SecurityGroupRulesCmd;
+import com.cloud.agent.api.to.VirtualMachineTO;
import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.InterfaceDef;
import com.cloud.resource.CommandWrapper;
@@ -50,6 +51,12 @@
vif = nics.get(0).getDevName();
brname = nics.get(0).getBrName();
+
+ final VirtualMachineTO vm = command.getVmTO();
+ if (!libvirtComputingResource.applyDefaultNetworkRules(conn, vm, true)) {
+ s_logger.warn("Failed to program default network rules for vm " + command.getVmName());
+ return new SecurityGroupRuleAnswer(command, false, "programming default network rules failed");
+ }
} catch (final LibvirtException e) {
return new SecurityGroupRuleAnswer(command, false, e.toString());
}
@@ -66,4 +73,4 @@
return new SecurityGroupRuleAnswer(command);
}
}
-}
\ No newline at end of file
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStartCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStartCommandWrapper.java
index 9c97bd4..dbb9571 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStartCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStartCommandWrapper.java
@@ -20,7 +20,6 @@
package com.cloud.hypervisor.kvm.resource.wrapper;
import java.net.URISyntaxException;
-import java.util.List;
import org.apache.log4j.Logger;
import org.libvirt.Connect;
@@ -36,8 +35,8 @@
import com.cloud.exception.InternalErrorException;
import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef;
+import com.cloud.hypervisor.kvm.resource.LibvirtKvmAgentHook;
import com.cloud.hypervisor.kvm.storage.KVMStoragePoolManager;
-import com.cloud.network.Networks.IsolationType;
import com.cloud.network.Networks.TrafficType;
import com.cloud.resource.CommandWrapper;
import com.cloud.resource.ResourceWrapper;
@@ -81,34 +80,17 @@
libvirtComputingResource.createVifs(vmSpec, vm);
s_logger.debug("starting " + vmName + ": " + vm.toString());
- libvirtComputingResource.startVM(conn, vmName, vm.toString());
+ String vmInitialSpecification = vm.toString();
+ String vmFinalSpecification = performXmlTransformHook(vmInitialSpecification, libvirtComputingResource);
+ libvirtComputingResource.startVM(conn, vmName, vmFinalSpecification);
+ performAgentStartHook(vmName, libvirtComputingResource);
- for (final NicTO nic : nics) {
- if (nic.isSecurityGroupEnabled() || nic.getIsolationUri() != null && nic.getIsolationUri().getScheme().equalsIgnoreCase(IsolationType.Ec2.toString())) {
- if (vmSpec.getType() != VirtualMachine.Type.User) {
- libvirtComputingResource.configureDefaultNetworkRulesForSystemVm(conn, vmName);
- break;
- } else {
- final List<String> nicSecIps = nic.getNicSecIps();
- String secIpsStr;
- final StringBuilder sb = new StringBuilder();
- if (nicSecIps != null) {
- for (final String ip : nicSecIps) {
- sb.append(ip).append(";");
- }
- secIpsStr = sb.toString();
- } else {
- secIpsStr = "0;";
- }
- libvirtComputingResource.defaultNetworkRules(conn, vmName, nic, vmSpec.getId(), secIpsStr);
- }
- }
- }
+ libvirtComputingResource.applyDefaultNetworkRules(conn, vmSpec, false);
// pass cmdline info to system vms
if (vmSpec.getType() != VirtualMachine.Type.User) {
String controlIp = null;
- for (final NicTO nic : nics) {
+ for (final NicTO nic : vmSpec.getNics()) {
if (nic.getType() == TrafficType.Control) {
controlIp = nic.getIp();
break;
@@ -158,4 +140,30 @@
}
}
}
+
+ private void performAgentStartHook(String vmName, LibvirtComputingResource libvirtComputingResource) {
+ try {
+ LibvirtKvmAgentHook onStartHook = libvirtComputingResource.getStartHook();
+ onStartHook.handle(vmName);
+ } catch (Exception e) {
+ s_logger.warn("Exception occurred when handling LibVirt VM onStart hook: {}", e);
+ }
+ }
+
+ private String performXmlTransformHook(String vmInitialSpecification, final LibvirtComputingResource libvirtComputingResource) {
+ String vmFinalSpecification;
+ try {
+ // if transformer fails, everything must go as it's just skipped.
+ LibvirtKvmAgentHook t = libvirtComputingResource.getTransformer();
+ vmFinalSpecification = (String) t.handle(vmInitialSpecification);
+ if (null == vmFinalSpecification) {
+ s_logger.warn("Libvirt XML transformer returned NULL, will use XML specification unchanged.");
+ vmFinalSpecification = vmInitialSpecification;
+ }
+ } catch(Exception e) {
+ s_logger.warn("Exception occurred when handling LibVirt XML transformer hook: {}", e);
+ vmFinalSpecification = vmInitialSpecification;
+ }
+ return vmFinalSpecification;
+ }
}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStopCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStopCommandWrapper.java
index ad12971..cb57dbc 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStopCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStopCommandWrapper.java
@@ -24,6 +24,7 @@
import java.util.Map;
import com.cloud.agent.api.to.DpdkTO;
+import com.cloud.hypervisor.kvm.resource.LibvirtKvmAgentHook;
import com.cloud.utils.Pair;
import com.cloud.utils.script.Script;
import com.cloud.utils.ssh.SshHelper;
@@ -92,6 +93,8 @@
libvirtComputingResource.destroyNetworkRulesForVM(conn, vmName);
final String result = libvirtComputingResource.stopVM(conn, vmName, command.isForceStop());
+ performAgentStopHook(vmName, libvirtComputingResource);
+
if (result == null) {
if (disks != null && disks.size() > 0) {
for (final DiskDef disk : disks) {
@@ -147,4 +150,14 @@
return new StopAnswer(command, e.getMessage(), false);
}
}
+
+ private void performAgentStopHook(String vmName, final LibvirtComputingResource libvirtComputingResource) {
+ try {
+ LibvirtKvmAgentHook onStopHook = libvirtComputingResource.getStopHook();
+ onStopHook.handle(vmName);
+ } catch (Exception e) {
+ s_logger.warn("Exception occurred when handling LibVirt VM onStop hook: {}", e);
+ }
+ }
+
}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUnPlugNicCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUnPlugNicCommandWrapper.java
index 57f4083..071352c 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUnPlugNicCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUnPlugNicCommandWrapper.java
@@ -55,6 +55,9 @@
for (final InterfaceDef pluggedNic : pluggedNics) {
if (pluggedNic.getMacAddress().equalsIgnoreCase(nic.getMac())) {
+ if (nic.isSecurityGroupEnabled()) {
+ libvirtComputingResource.destroyNetworkRulesForNic(conn, vmName, nic);
+ }
vm.detachDevice(pluggedNic.toString());
// We don't know which "traffic type" is associated with
// each interface at this point, so inform all vif drivers
@@ -79,4 +82,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/IscsiAdmStorageAdaptor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/IscsiAdmStorageAdaptor.java
index bad0151..0418dbb 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/IscsiAdmStorageAdaptor.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/IscsiAdmStorageAdaptor.java
@@ -445,4 +445,9 @@
public KVMPhysicalDisk createDiskFromTemplateBacking(KVMPhysicalDisk template, String name, PhysicalDiskFormat format, long size, KVMStoragePool destPool, int timeout) {
return null;
}
+
+ @Override
+ public KVMPhysicalDisk createTemplateFromDirectDownloadFile(String templateFilePath, KVMStoragePool destPool, boolean isIso) {
+ return null;
+ }
}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
index c1f73d7..544c47f 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
@@ -405,4 +405,9 @@
return adaptor.createDiskFromTemplateBacking(template, name, format, size, destPool, timeout);
}
+ public KVMPhysicalDisk createPhysicalDiskFromDirectDownloadTemplate(String templateFilePath, KVMStoragePool destPool, boolean isIso) {
+ StorageAdaptor adaptor = getStorageAdaptor(destPool.getType());
+ return adaptor.createTemplateFromDirectDownloadFile(templateFilePath, destPool, isIso);
+ }
+
}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
index 82015eb..1df72de 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
@@ -36,6 +36,7 @@
import javax.naming.ConfigurationException;
+import com.cloud.utils.Pair;
import org.apache.cloudstack.agent.directdownload.DirectDownloadAnswer;
import org.apache.cloudstack.agent.directdownload.DirectDownloadCommand;
import org.apache.cloudstack.agent.directdownload.HttpDirectDownloadCommand;
@@ -89,7 +90,6 @@
import com.cloud.agent.api.to.NfsTO;
import com.cloud.agent.api.to.S3TO;
import com.cloud.agent.direct.download.DirectTemplateDownloader;
-import com.cloud.agent.direct.download.DirectTemplateDownloader.DirectTemplateInformation;
import com.cloud.agent.direct.download.HttpDirectTemplateDownloader;
import com.cloud.agent.direct.download.HttpsDirectTemplateDownloader;
import com.cloud.agent.direct.download.MetalinkDirectTemplateDownloader;
@@ -1005,6 +1005,13 @@
primaryStore.getUuid());
if (state == DomainInfo.DomainState.VIR_DOMAIN_RUNNING && !primaryStorage.isExternalSnapshot()) {
final DomainSnapshot snap = vm.snapshotLookupByName(snapshotName);
+ try {
+ s_logger.info(String.format("Suspending VM '%s' to delete snapshot,", vm.getName()));
+ vm.suspend();
+ } catch (final LibvirtException e) {
+ s_logger.error("Failed to suspend the VM", e);
+ throw e;
+ }
snap.delete(0);
/*
@@ -1182,7 +1189,7 @@
final Long bytesReadRate, final Long bytesReadRateMax, final Long bytesReadRateMaxLength,
final Long bytesWriteRate, final Long bytesWriteRateMax, final Long bytesWriteRateMaxLength,
final Long iopsReadRate, final Long iopsReadRateMax, final Long iopsReadRateMaxLength,
- final Long iopsWriteRate, final Long iopsWriteRateMax, final Long iopsWriteRateMaxLength) throws LibvirtException, InternalErrorException {
+ final Long iopsWriteRate, final Long iopsWriteRateMax, final Long iopsWriteRateMaxLength, final String cacheMode) throws LibvirtException, InternalErrorException {
List<DiskDef> disks = null;
Domain dm = null;
DiskDef diskdef = null;
@@ -1292,6 +1299,9 @@
if ((iopsWriteRateMaxLength != null) && (iopsWriteRateMaxLength > 0)) {
diskdef.setIopsWriteRateMaxLength(iopsWriteRateMaxLength);
}
+ if(cacheMode != null) {
+ diskdef.setCacheMode(DiskDef.DiskCacheMode.valueOf(cacheMode.toUpperCase()));
+ }
}
final String xml = diskdef.toString();
@@ -1316,12 +1326,13 @@
storagePoolMgr.connectPhysicalDisk(primaryStore.getPoolType(), primaryStore.getUuid(), vol.getPath(), disk.getDetails());
final KVMPhysicalDisk phyDisk = storagePoolMgr.getPhysicalDisk(primaryStore.getPoolType(), primaryStore.getUuid(), vol.getPath());
+ final String volCacheMode = vol.getCacheMode() == null ? null : vol.getCacheMode().toString();
attachOrDetachDisk(conn, true, vmName, phyDisk, disk.getDiskSeq().intValue(), serial,
vol.getBytesReadRate(), vol.getBytesReadRateMax(), vol.getBytesReadRateMaxLength(),
vol.getBytesWriteRate(), vol.getBytesWriteRateMax(), vol.getBytesWriteRateMaxLength(),
vol.getIopsReadRate(), vol.getIopsReadRateMax(), vol.getIopsReadRateMaxLength(),
- vol.getIopsWriteRate(), vol.getIopsWriteRateMax(), vol.getIopsWriteRateMaxLength());
+ vol.getIopsWriteRate(), vol.getIopsWriteRateMax(), vol.getIopsWriteRateMaxLength(), volCacheMode);
return new AttachAnswer(disk);
} catch (final LibvirtException e) {
@@ -1345,12 +1356,13 @@
final Connect conn = LibvirtConnection.getConnectionByVmName(vmName);
final KVMPhysicalDisk phyDisk = storagePoolMgr.getPhysicalDisk(primaryStore.getPoolType(), primaryStore.getUuid(), vol.getPath());
+ final String volCacheMode = vol.getCacheMode() == null ? null : vol.getCacheMode().toString();
attachOrDetachDisk(conn, false, vmName, phyDisk, disk.getDiskSeq().intValue(), serial,
vol.getBytesReadRate(), vol.getBytesReadRateMax(), vol.getBytesReadRateMaxLength(),
vol.getBytesWriteRate(), vol.getBytesWriteRateMax(), vol.getBytesWriteRateMaxLength(),
vol.getIopsReadRate(), vol.getIopsReadRateMax(), vol.getIopsReadRateMaxLength(),
- vol.getIopsWriteRate(), vol.getIopsWriteRateMax(), vol.getIopsWriteRateMaxLength());
+ vol.getIopsWriteRate(), vol.getIopsWriteRateMax(), vol.getIopsWriteRateMaxLength(), volCacheMode);
storagePoolMgr.disconnectPhysicalDisk(primaryStore.getPoolType(), primaryStore.getUuid(), vol.getPath());
@@ -1690,15 +1702,20 @@
/**
* Get direct template downloader from direct download command and destination pool
*/
- private DirectTemplateDownloader getDirectTemplateDownloaderFromCommand(DirectDownloadCommand cmd, KVMStoragePool destPool) {
+ private DirectTemplateDownloader getDirectTemplateDownloaderFromCommand(DirectDownloadCommand cmd,
+ KVMStoragePool destPool,
+ String temporaryDownloadPath) {
if (cmd instanceof HttpDirectDownloadCommand) {
- return new HttpDirectTemplateDownloader(cmd.getUrl(), cmd.getTemplateId(), destPool.getLocalPath(), cmd.getChecksum(), cmd.getHeaders());
+ return new HttpDirectTemplateDownloader(cmd.getUrl(), cmd.getTemplateId(), destPool.getLocalPath(), cmd.getChecksum(), cmd.getHeaders(),
+ cmd.getConnectTimeout(), cmd.getSoTimeout(), temporaryDownloadPath);
} else if (cmd instanceof HttpsDirectDownloadCommand) {
- return new HttpsDirectTemplateDownloader(cmd.getUrl(), cmd.getTemplateId(), destPool.getLocalPath(), cmd.getChecksum(), cmd.getHeaders());
+ return new HttpsDirectTemplateDownloader(cmd.getUrl(), cmd.getTemplateId(), destPool.getLocalPath(), cmd.getChecksum(), cmd.getHeaders(),
+ cmd.getConnectTimeout(), cmd.getSoTimeout(), cmd.getConnectionRequestTimeout(), temporaryDownloadPath);
} else if (cmd instanceof NfsDirectDownloadCommand) {
- return new NfsDirectTemplateDownloader(cmd.getUrl(), destPool.getLocalPath(), cmd.getTemplateId(), cmd.getChecksum());
+ return new NfsDirectTemplateDownloader(cmd.getUrl(), destPool.getLocalPath(), cmd.getTemplateId(), cmd.getChecksum(), temporaryDownloadPath);
} else if (cmd instanceof MetalinkDirectDownloadCommand) {
- return new MetalinkDirectTemplateDownloader(cmd.getUrl(), destPool.getLocalPath(), cmd.getTemplateId(), cmd.getChecksum(), cmd.getHeaders());
+ return new MetalinkDirectTemplateDownloader(cmd.getUrl(), destPool.getLocalPath(), cmd.getTemplateId(), cmd.getChecksum(), cmd.getHeaders(),
+ cmd.getConnectTimeout(), cmd.getSoTimeout(), temporaryDownloadPath);
} else {
throw new IllegalArgumentException("Unsupported protocol, please provide HTTP(S), NFS or a metalink");
}
@@ -1707,38 +1724,112 @@
@Override
public Answer handleDownloadTemplateToPrimaryStorage(DirectDownloadCommand cmd) {
final PrimaryDataStoreTO pool = cmd.getDestPool();
- if (!pool.getPoolType().equals(StoragePoolType.NetworkFilesystem)) {
- return new DirectDownloadAnswer(false, "Unsupported pool type " + pool.getPoolType().toString(), true);
- }
- KVMStoragePool destPool = storagePoolMgr.getStoragePool(pool.getPoolType(), pool.getUuid());
DirectTemplateDownloader downloader;
+ KVMPhysicalDisk template;
try {
- downloader = getDirectTemplateDownloaderFromCommand(cmd, destPool);
- } catch (IllegalArgumentException e) {
- return new DirectDownloadAnswer(false, "Unable to create direct downloader: " + e.getMessage(), true);
- }
+ s_logger.debug("Verifying temporary location for downloading the template exists on the host");
+ String temporaryDownloadPath = resource.getDirectDownloadTemporaryDownloadPath();
+ if (!isLocationAccessible(temporaryDownloadPath)) {
+ String msg = "The temporary location path for downloading templates does not exist: " +
+ temporaryDownloadPath + " on this host";
+ s_logger.error(msg);
+ return new DirectDownloadAnswer(false, msg, true);
+ }
- try {
- s_logger.info("Trying to download template");
- if (!downloader.downloadTemplate()) {
+ s_logger.debug("Checking for free space on the host for downloading the template");
+ if (!isEnoughSpaceForDownloadTemplateOnTemporaryLocation(cmd.getTemplateSize())) {
+ String msg = "Not enough space on the defined temporary location to download the template " + cmd.getTemplateId();
+ s_logger.error(msg);
+ return new DirectDownloadAnswer(false, msg, true);
+ }
+
+ KVMStoragePool destPool = storagePoolMgr.getStoragePool(pool.getPoolType(), pool.getUuid());
+ downloader = getDirectTemplateDownloaderFromCommand(cmd, destPool, temporaryDownloadPath);
+ s_logger.debug("Trying to download template");
+ Pair<Boolean, String> result = downloader.downloadTemplate();
+ if (!result.first()) {
s_logger.warn("Couldn't download template");
return new DirectDownloadAnswer(false, "Unable to download template", true);
}
+ String tempFilePath = result.second();
if (!downloader.validateChecksum()) {
s_logger.warn("Couldn't validate template checksum");
return new DirectDownloadAnswer(false, "Checksum validation failed", false);
}
- if (!downloader.extractAndInstallDownloadedTemplate()) {
- s_logger.warn("Couldn't extract and install template");
- return new DirectDownloadAnswer(false, "Extraction and installation failed", false);
- }
+ template = storagePoolMgr.createPhysicalDiskFromDirectDownloadTemplate(tempFilePath, destPool, cmd.isIso());
} catch (CloudRuntimeException e) {
s_logger.warn("Error downloading template " + cmd.getTemplateId() + " due to: " + e.getMessage());
return new DirectDownloadAnswer(false, "Unable to download template: " + e.getMessage(), true);
+ } catch (IllegalArgumentException e) {
+ return new DirectDownloadAnswer(false, "Unable to create direct downloader: " + e.getMessage(), true);
}
- DirectTemplateInformation info = downloader.getTemplateInformation();
- return new DirectDownloadAnswer(true, info.getSize(), info.getInstallPath());
+ return new DirectDownloadAnswer(true, template.getSize(), template.getName());
+ }
+
+ @Override
+ public Answer copyVolumeFromPrimaryToPrimary(CopyCommand cmd) {
+ final DataTO srcData = cmd.getSrcTO();
+ final DataTO destData = cmd.getDestTO();
+ final VolumeObjectTO srcVol = (VolumeObjectTO)srcData;
+ final VolumeObjectTO destVol = (VolumeObjectTO)destData;
+ final ImageFormat srcFormat = srcVol.getFormat();
+ final ImageFormat destFormat = destVol.getFormat();
+ final DataStoreTO srcStore = srcData.getDataStore();
+ final DataStoreTO destStore = destData.getDataStore();
+ final PrimaryDataStoreTO primaryStore = (PrimaryDataStoreTO)srcStore;
+ final PrimaryDataStoreTO primaryStoreDest = (PrimaryDataStoreTO)destStore;
+ final String srcVolumePath = srcData.getPath();
+ final String destVolumePath = destData.getPath();
+ KVMStoragePool destPool = null;
+
+ try {
+ final String volumeName = UUID.randomUUID().toString();
+
+ final String destVolumeName = volumeName + "." + destFormat.getFileExtension();
+ final KVMPhysicalDisk volume = storagePoolMgr.getPhysicalDisk(primaryStore.getPoolType(), primaryStore.getUuid(), srcVolumePath);
+ volume.setFormat(PhysicalDiskFormat.valueOf(srcFormat.toString()));
+
+ destPool = storagePoolMgr.getStoragePool(primaryStoreDest.getPoolType(), primaryStoreDest.getUuid());
+ storagePoolMgr.copyPhysicalDisk(volume, destVolumeName, destPool, cmd.getWaitInMillSeconds());
+ final VolumeObjectTO newVol = new VolumeObjectTO();
+ newVol.setPath(destVolumePath + File.separator + destVolumeName);
+ newVol.setFormat(destFormat);
+ return new CopyCmdAnswer(newVol);
+ } catch (final CloudRuntimeException e) {
+ s_logger.debug("Failed to copyVolumeFromPrimaryToPrimary: ", e);
+ return new CopyCmdAnswer(e.toString());
+ }
+ }
+
+ /**
+ * True if location exists
+ */
+ private boolean isLocationAccessible(String temporaryDownloadPath) {
+ File dir = new File(temporaryDownloadPath);
+ return dir.exists();
+ }
+
+ /**
+ * Perform a free space check on the host for downloading the direct download templates
+ * @param templateSize template size obtained from remote server when registering the template (in bytes)
+ */
+ protected boolean isEnoughSpaceForDownloadTemplateOnTemporaryLocation(Long templateSize) {
+ if (templateSize == null || templateSize == 0L) {
+ s_logger.info("The server did not provide the template size, assuming there is enough space to download it");
+ return true;
+ }
+ String cmd = String.format("df --output=avail %s -B 1 | tail -1", resource.getDirectDownloadTemporaryDownloadPath());
+ String resultInBytes = Script.runSimpleBashScript(cmd);
+ Long availableBytes;
+ try {
+ availableBytes = Long.parseLong(resultInBytes);
+ } catch (NumberFormatException e) {
+ String msg = "Could not parse the output " + resultInBytes + " as a number, therefore not able to check for free space";
+ s_logger.error(msg, e);
+ return false;
+ }
+ return availableBytes >= templateSize;
}
}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
index f858a4f..ce2199c 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
@@ -122,6 +122,64 @@
return disk;
}
+ /**
+ * Checks if downloaded template is extractable
+ * @return true if it should be extracted, false if not
+ */
+ private boolean isTemplateExtractable(String templatePath) {
+ String type = Script.runSimpleBashScript("file " + templatePath + " | awk -F' ' '{print $2}'");
+ return type.equalsIgnoreCase("bzip2") || type.equalsIgnoreCase("gzip") || type.equalsIgnoreCase("zip");
+ }
+
+ /**
+ * Return extract command to execute given downloaded file
+ * @param downloadedTemplateFile
+ * @param templateUuid
+ */
+ private String getExtractCommandForDownloadedFile(String downloadedTemplateFile, String templateUuid) {
+ if (downloadedTemplateFile.endsWith(".zip")) {
+ return "unzip -p " + downloadedTemplateFile + " | cat > " + templateUuid;
+ } else if (downloadedTemplateFile.endsWith(".bz2")) {
+ return "bunzip2 -c " + downloadedTemplateFile + " > " + templateUuid;
+ } else if (downloadedTemplateFile.endsWith(".gz")) {
+ return "gunzip -c " + downloadedTemplateFile + " > " + templateUuid;
+ } else {
+ throw new CloudRuntimeException("Unable to extract template " + downloadedTemplateFile);
+ }
+ }
+
+ /**
+ * Extract downloaded template into installPath, remove compressed file
+ */
+ private void extractDownloadedTemplate(String downloadedTemplateFile, KVMStoragePool destPool, String destinationFile) {
+ String extractCommand = getExtractCommandForDownloadedFile(downloadedTemplateFile, destinationFile);
+ Script.runSimpleBashScript(extractCommand);
+ Script.runSimpleBashScript("rm -f " + downloadedTemplateFile);
+ }
+
+ @Override
+ public KVMPhysicalDisk createTemplateFromDirectDownloadFile(String templateFilePath, KVMStoragePool destPool, boolean isIso) {
+ File sourceFile = new File(templateFilePath);
+ if (!sourceFile.exists()) {
+ throw new CloudRuntimeException("Direct download template file " + sourceFile + " does not exist on this host");
+ }
+ String templateUuid = UUID.randomUUID().toString();
+ if (isIso) {
+ templateUuid += ".iso";
+ }
+ String destinationFile = destPool.getLocalPath() + File.separator + templateUuid;
+
+ if (destPool.getType() == StoragePoolType.NetworkFilesystem || destPool.getType() == StoragePoolType.Filesystem
+ || destPool.getType() == StoragePoolType.SharedMountPoint) {
+ if (!isIso && isTemplateExtractable(templateFilePath)) {
+ extractDownloadedTemplate(templateFilePath, destPool, destinationFile);
+ } else {
+ Script.runSimpleBashScript("mv " + templateFilePath + " " + destinationFile);
+ }
+ }
+ return destPool.getPhysicalDisk(templateUuid);
+ }
+
public StorageVol getVolume(StoragePool pool, String volName) {
StorageVol vol = null;
@@ -1198,7 +1256,7 @@
if (disk.getFormat() == PhysicalDiskFormat.TAR) {
newDisk = destPool.createPhysicalDisk(name, PhysicalDiskFormat.DIR, Storage.ProvisioningType.THIN, disk.getVirtualSize());
} else {
- newDisk = destPool.createPhysicalDisk(name, Storage.ProvisioningType.THIN, disk.getVirtualSize());
+ newDisk = destPool.createPhysicalDisk(name, Storage.ProvisioningType.THIN, disk.getVirtualSize());
}
} else {
newDisk = new KVMPhysicalDisk(destPool.getSourceDir() + "/" + name, name, destPool);
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ManagedNfsStorageAdaptor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ManagedNfsStorageAdaptor.java
index 309308a..1ea4f62 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ManagedNfsStorageAdaptor.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ManagedNfsStorageAdaptor.java
@@ -319,6 +319,11 @@
}
@Override
+ public KVMPhysicalDisk createTemplateFromDirectDownloadFile(String templateFilePath, KVMStoragePool destPool, boolean isIso) {
+ return null;
+ }
+
+ @Override
public KVMPhysicalDisk createPhysicalDisk(String name, KVMStoragePool pool, PhysicalDiskFormat format, ProvisioningType provisioningType, long size) {
return null;
}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java
index a3c1387a..99f2876 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java
@@ -81,4 +81,12 @@
KVMPhysicalDisk createDiskFromTemplateBacking(KVMPhysicalDisk template,
String name, PhysicalDiskFormat format, long size,
KVMStoragePool destPool, int timeout);
+
+ /**
+ * Create physical disk on Primary Storage from direct download template on the host (in temporary location)
+ * @param templateFilePath
+ * @param destPool
+ * @param isIso
+ */
+ KVMPhysicalDisk createTemplateFromDirectDownloadFile(String templateFilePath, KVMStoragePool destPool, boolean isIso);
}
diff --git a/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/linux/CPUStat.java b/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/linux/CPUStat.java
index ce33850..d180d01 100644
--- a/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/linux/CPUStat.java
+++ b/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/linux/CPUStat.java
@@ -30,6 +30,7 @@
private UptimeStats _lastStats;
private final String _sysfsCpuDir = "/sys/devices/system/cpu";
private final String _uptimeFile = "/proc/uptime";
+ private final String _loadavgFile = "/proc/loadavg";
class UptimeStats {
public Double upTime = 0d;
@@ -80,6 +81,17 @@
return _cores;
}
+ public Double getCpuLoadAverage() {
+ File f = new File(_loadavgFile);
+ String[] load = {"0.0"};
+ try (Scanner scanner = new Scanner(f,"UTF-8");) {
+ load = scanner.useDelimiter("\\Z").next().split("\\s+");
+ } catch (FileNotFoundException ex) {
+ s_logger.warn("File " + _uptimeFile + " not found:" + ex.toString());
+ }
+ return Double.parseDouble(load[0]);
+ }
+
public Double getCpuUsedPercent() {
Double cpuUsed = 0d;
if (_cores == null || _cores == 0) {
diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
index d9f8edc..1bf27d0 100644
--- a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
+++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
@@ -19,6 +19,19 @@
package com.cloud.hypervisor.kvm.resource;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
@@ -41,9 +54,11 @@
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
-import com.cloud.agent.api.Command;
-import com.cloud.agent.api.UnsupportedAnswer;
-import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.CpuTuneDef;
+import org.apache.cloudstack.storage.command.AttachAnswer;
+import org.apache.cloudstack.storage.command.AttachCommand;
+import org.apache.cloudstack.utils.linux.CPUStat;
+import org.apache.cloudstack.utils.linux.MemStat;
+import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat;
import org.apache.commons.lang.SystemUtils;
import org.joda.time.Duration;
import org.junit.Assert;
@@ -61,22 +76,17 @@
import org.libvirt.NodeInfo;
import org.libvirt.StorageVol;
import org.libvirt.jna.virDomainMemoryStats;
-import org.mockito.Matchers;
+import org.mockito.BDDMockito;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
-import org.apache.cloudstack.storage.command.AttachAnswer;
-import org.apache.cloudstack.storage.command.AttachCommand;
-import org.apache.cloudstack.utils.linux.CPUStat;
-import org.apache.cloudstack.utils.linux.MemStat;
-import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat;
-
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.AttachIsoCommand;
import com.cloud.agent.api.BackupSnapshotCommand;
@@ -87,6 +97,7 @@
import com.cloud.agent.api.CheckRouterCommand;
import com.cloud.agent.api.CheckVirtualMachineCommand;
import com.cloud.agent.api.CleanupNetworkRulesCmd;
+import com.cloud.agent.api.Command;
import com.cloud.agent.api.CreatePrivateTemplateFromSnapshotCommand;
import com.cloud.agent.api.CreatePrivateTemplateFromVolumeCommand;
import com.cloud.agent.api.CreateStoragePoolCommand;
@@ -129,6 +140,7 @@
import com.cloud.agent.api.StartCommand;
import com.cloud.agent.api.StopCommand;
import com.cloud.agent.api.UnPlugNicCommand;
+import com.cloud.agent.api.UnsupportedAnswer;
import com.cloud.agent.api.UpdateHostPasswordCommand;
import com.cloud.agent.api.UpgradeSnapshotCommand;
import com.cloud.agent.api.VmStatsEntry;
@@ -150,6 +162,7 @@
import com.cloud.exception.InternalErrorException;
import com.cloud.hypervisor.kvm.resource.KVMHABase.NfsStoragePool;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.ChannelDef;
+import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.CpuTuneDef;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DiskDef;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.InterfaceDef;
import com.cloud.hypervisor.kvm.resource.wrapper.LibvirtRequestWrapper;
@@ -177,20 +190,9 @@
import com.cloud.vm.VirtualMachine.PowerState;
import com.cloud.vm.VirtualMachine.Type;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
@RunWith(PowerMockRunner.class)
@PrepareForTest(value = {MemStat.class})
+@PowerMockIgnore({"javax.xml.*", "org.w3c.dom.*", "org.apache.xerces.*"})
public class LibvirtComputingResourceTest {
@Mock
@@ -243,6 +245,7 @@
final VirtualMachineTO to = new VirtualMachineTO(id, name, VirtualMachine.Type.User, cpus, speed, minRam, maxRam, BootloaderType.HVM, os, false, false, vncPassword);
to.setVncAddr(vncAddr);
+ to.setArch("x86_64");
to.setUuid("b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9");
final LibvirtVMDef vm = lcr.createVMFromSpec(to);
@@ -275,6 +278,7 @@
final VirtualMachineTO to = new VirtualMachineTO(id, name, VirtualMachine.Type.User, cpus, minSpeed, maxSpeed, minRam, maxRam, BootloaderType.HVM, os, false, false, vncPassword);
to.setVncAddr(vncAddr);
+ to.setArch("x86_64");
to.setUuid("b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9");
final LibvirtVMDef vm = lcr.createVMFromSpec(to);
@@ -344,6 +348,7 @@
final VirtualMachineTO to =
new VirtualMachineTO(id, name, VirtualMachine.Type.User, cpus, minSpeed, maxSpeed, minRam, maxRam, BootloaderType.HVM, os, false, false, vncPassword);
to.setVncAddr(vncAddr);
+ to.setArch("x86_64");
to.setUuid("b0f0a72d-7efb-3cad-a8ff-70ebf30b3af9");
final LibvirtVMDef vm = lcr.createVMFromSpec(to);
@@ -489,7 +494,8 @@
nodeInfo.model = "Foo processor";
Mockito.when(connect.nodeInfo()).thenReturn(nodeInfo);
// this is testing the interface stats, returns an increasing number of sent and received bytes
- Mockito.when(domain.interfaceStats(Matchers.anyString())).thenAnswer(new org.mockito.stubbing.Answer<DomainInterfaceStats>() {
+
+ Mockito.when(domain.interfaceStats(nullable(String.class))).thenAnswer(new org.mockito.stubbing.Answer<DomainInterfaceStats>() {
// increment with less than a KB, so this should be less than 1 KB
final static int increment = 1000;
int rxBytes = 1000;
@@ -506,7 +512,8 @@
});
- Mockito.when(domain.blockStats(Matchers.anyString())).thenAnswer(new org.mockito.stubbing.Answer<DomainBlockStats>() {
+
+ Mockito.when(domain.blockStats(nullable(String.class))).thenAnswer(new org.mockito.stubbing.Answer<DomainBlockStats>() {
// a little less than a KB
final static int increment = 1000;
@@ -997,7 +1004,7 @@
when(libvirtComputingResource.getCPUStat()).thenReturn(cpuStat);
when(libvirtComputingResource.getMemStat()).thenReturn(memStat);
- when(libvirtComputingResource.getNicStats(Mockito.anyString())).thenReturn(new Pair<Double, Double>(1.0d, 1.0d));
+ when(libvirtComputingResource.getNicStats(nullable(String.class))).thenReturn(new Pair<Double, Double>(1.0d, 1.0d));
when(cpuStat.getCpuUsedPercent()).thenReturn(0.5d);
when(memStat.getAvailable()).thenReturn(1500L);
when(memStat.getTotal()).thenReturn(15000L);
@@ -1244,7 +1251,7 @@
when(vm.getNics()).thenReturn(new NicTO[]{nicTO});
when(nicTO.getType()).thenReturn(TrafficType.Guest);
- when(libvirtComputingResource.getVifDriver(nicTO.getType(), nicTO.getName())).thenThrow(InternalErrorException.class);
+ BDDMockito.given(libvirtComputingResource.getVifDriver(nicTO.getType(), nicTO.getName())).willAnswer(invocationOnMock -> {throw new InternalErrorException("Exception Occurred");});
when(libvirtComputingResource.getStoragePoolMgr()).thenReturn(storagePoolManager);
try {
when(libvirtComputingResource.getVolumePath(conn, volume)).thenReturn("/path");
@@ -1532,7 +1539,7 @@
when(libvirtComputingResource.getLibvirtUtilitiesHelper()).thenReturn(libvirtUtilitiesHelper);
try {
- when(libvirtUtilitiesHelper.getConnectionByVmName(vmName)).thenThrow(URISyntaxException.class);
+ BDDMockito.given(libvirtUtilitiesHelper.getConnectionByVmName(vmName)).willAnswer(invocationOnMock -> {throw new URISyntaxException("Exception trying to get connection by VM name", vmName);});
} catch (final LibvirtException e) {
fail(e.getMessage());
}
@@ -1561,7 +1568,7 @@
when(libvirtComputingResource.getLibvirtUtilitiesHelper()).thenReturn(libvirtUtilitiesHelper);
try {
- when(libvirtUtilitiesHelper.getConnectionByVmName(vmName)).thenThrow(InternalErrorException.class);
+ BDDMockito.given(libvirtUtilitiesHelper.getConnectionByVmName(vmName)).willAnswer(invocationOnMock -> {throw new InternalErrorException("Exception Occurred");});
} catch (final LibvirtException e) {
fail(e.getMessage());
}
@@ -2249,7 +2256,7 @@
}
@SuppressWarnings("unchecked")
- @Test
+ @Test(expected = Exception.class)
public void testOvsVpcPhysicalTopologyConfigCommandFailure() {
final Host[] hosts = null;
final Tier[] tiers = null;
@@ -2293,7 +2300,7 @@
}
@SuppressWarnings("unchecked")
- @Test
+ @Test(expected = Exception.class)
public void testOvsVpcRoutingPolicyConfigCommandFailure() {
final String id = null;
final String cidr = null;
@@ -2406,7 +2413,7 @@
} catch (final LibvirtException e) {
fail(e.getMessage());
}
- when(libvirtComputingResource.configureNetworkRulesVMSecondaryIP(conn, command.getVmName(), command.getVmSecIp(), command.getAction())).thenReturn(true);
+ when(libvirtComputingResource.configureNetworkRulesVMSecondaryIP(conn, command.getVmName(), command.getVmMac(), command.getVmSecIp(), command.getAction())).thenReturn(true);
final LibvirtRequestWrapper wrapper = LibvirtRequestWrapper.getInstance();
assertNotNull(wrapper);
@@ -2420,7 +2427,7 @@
fail(e.getMessage());
}
verify(libvirtComputingResource, times(1)).getLibvirtUtilitiesHelper();
- verify(libvirtComputingResource, times(1)).configureNetworkRulesVMSecondaryIP(conn, command.getVmName(), command.getVmSecIp(), command.getAction());
+ verify(libvirtComputingResource, times(1)).configureNetworkRulesVMSecondaryIP(conn, command.getVmName(), command.getVmMac(), command.getVmSecIp(), command.getAction());
}
@SuppressWarnings("unchecked")
@@ -2699,7 +2706,7 @@
}
@SuppressWarnings("unchecked")
- @Test
+ @Test(expected = Exception.class)
public void testOvsDestroyTunnelCommandFailure2() {
final String networkName = "Test";
final Long networkId = 1l;
@@ -2799,7 +2806,7 @@
}
@SuppressWarnings("unchecked")
- @Test
+ @Test(expected = Exception.class)
public void testOvsCreateTunnelCommandFailure2() {
final String remoteIp = "127.0.0.1";
final Integer key = 1;
@@ -3014,6 +3021,8 @@
cidrs.add("0.0.0.0/0");
final SecurityGroupRulesCmd command = new SecurityGroupRulesCmd(guestIp, guestIp6, guestMac, vmName, vmId, signature, seqNum, ingressRuleSet, egressRuleSet, secIps);
+ final VirtualMachineTO vm = Mockito.mock(VirtualMachineTO.class);
+ command.setVmTO(vm);
final LibvirtUtilitiesHelper libvirtUtilitiesHelper = Mockito.mock(LibvirtUtilitiesHelper.class);
final Connect conn = Mockito.mock(Connect.class);
@@ -3046,6 +3055,7 @@
when(egressRuleSet[0].getEndPort()).thenReturn(22);
when(egressRuleSet[0].getAllowedCidrs()).thenReturn(cidrs);
+ when(libvirtComputingResource.applyDefaultNetworkRules(conn, vm, true)).thenReturn(true);
when(libvirtComputingResource.addNetworkRules(command.getVmName(), Long.toString(command.getVmId()), command.getGuestIp(), command.getGuestIp6(), command.getSignature(),
Long.toString(command.getSeqNum()), command.getGuestMac(), command.stringifyRules(), vif, brname, command.getSecIpsString())).thenReturn(true);
diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtKvmAgentHookTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtKvmAgentHookTest.java
new file mode 100644
index 0000000..1f63914
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtKvmAgentHookTest.java
@@ -0,0 +1,94 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.hypervisor.kvm.resource;
+
+import groovy.util.ResourceException;
+import groovy.util.ScriptException;
+import junit.framework.TestCase;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.UUID;
+
+public class LibvirtKvmAgentHookTest extends TestCase {
+
+ private final String source = "<xml />";
+ private final String dir = "/tmp";
+ private final String script = "xml-transform-test.groovy";
+ private final String method = "transform";
+ private final String methodNull = "transform2";
+ private final String testImpl = "package groovy\n" +
+ "\n" +
+ "class BaseTransform {\n" +
+ " String transform(Object logger, String xml) {\n" +
+ " return xml + xml\n" +
+ " }\n" +
+ " String transform2(Object logger, String xml) {\n" +
+ " return null\n" +
+ " }\n" +
+ "}\n" +
+ "\n" +
+ "new BaseTransform()\n" +
+ "\n";
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ PrintWriter pw = new PrintWriter(new File(dir, script));
+ pw.println(testImpl);
+ pw.close();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ new File(dir, script).delete();
+ super.tearDown();
+ }
+
+ public void testTransform() throws IOException, ResourceException, ScriptException {
+ LibvirtKvmAgentHook t = new LibvirtKvmAgentHook(dir, script, method);
+ assertEquals(t.isInitialized(), true);
+ String result = (String)t.handle(source);
+ assertEquals(result, source + source);
+ }
+
+ public void testWrongMethod() throws IOException, ResourceException, ScriptException {
+ LibvirtKvmAgentHook t = new LibvirtKvmAgentHook(dir, script, "methodX");
+ assertEquals(t.isInitialized(), true);
+ assertEquals(t.handle(source), source);
+ }
+
+ public void testNullMethod() throws IOException, ResourceException, ScriptException {
+ LibvirtKvmAgentHook t = new LibvirtKvmAgentHook(dir, script, methodNull);
+ assertEquals(t.isInitialized(), true);
+ assertEquals(t.handle(source), null);
+ }
+
+ public void testWrongScript() throws IOException, ResourceException, ScriptException {
+ LibvirtKvmAgentHook t = new LibvirtKvmAgentHook(dir, "wrong-script.groovy", method);
+ assertEquals(t.isInitialized(), false);
+ assertEquals(t.handle(source), source);
+ }
+
+ public void testWrongDir() throws IOException, ResourceException, ScriptException {
+ LibvirtKvmAgentHook t = new LibvirtKvmAgentHook("/" + UUID.randomUUID().toString() + "-dir", script, method);
+ assertEquals(t.isInitialized(), false);
+ assertEquals(t.handle(source), source);
+ }
+}
diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapperTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapperTest.java
index 086808d..b5574bf 100644
--- a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapperTest.java
+++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapperTest.java
@@ -22,22 +22,25 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import java.util.Scanner;
-import org.apache.cloudstack.utils.linux.MemStat;
import java.util.Map;
-import org.apache.commons.io.IOUtils;
+import java.util.Scanner;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
+import org.apache.cloudstack.utils.linux.MemStat;
+import org.apache.commons.io.IOUtils;
import org.junit.Assert;
import org.junit.Before;
-import com.cloud.agent.api.to.DpdkTO;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.libvirt.Connect;
@@ -45,8 +48,10 @@
import org.mockito.InOrder;
import org.mockito.Mockito;
import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
+import org.w3c.dom.Document;
import org.xml.sax.SAXException;
import com.cloud.agent.api.MigrateCommand;
@@ -54,19 +59,15 @@
import com.cloud.agent.api.MigrateCommand.MigrateDiskInfo.DiskType;
import com.cloud.agent.api.MigrateCommand.MigrateDiskInfo.DriverType;
import com.cloud.agent.api.MigrateCommand.MigrateDiskInfo.Source;
+import com.cloud.agent.api.to.DpdkTO;
import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
import com.cloud.hypervisor.kvm.resource.LibvirtConnection;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DiskDef;
import com.cloud.utils.exception.CloudRuntimeException;
-import org.w3c.dom.Document;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
@RunWith(PowerMockRunner.class)
@PrepareForTest(value = {LibvirtConnection.class, LibvirtMigrateCommandWrapper.class, MemStat.class})
+@PowerMockIgnore({"javax.xml.*", "org.w3c.dom.*", "org.apache.xerces.*", "org.xml.*"})
public class LibvirtMigrateCommandWrapperTest {
String fullfile =
"<domain type='kvm' id='4'>\n" +
@@ -648,7 +649,7 @@
libvirtMigrateCmdWrapper.deleteLocalVolume("localPath");
- PowerMockito.verifyStatic(Mockito.times(1));
+ PowerMockito.verifyStatic(LibvirtConnection.class, Mockito.times(1));
LibvirtConnection.getConnection();
InOrder inOrder = Mockito.inOrder(conn, storageVolLookupByPath);
inOrder.verify(conn, Mockito.times(1)).storageVolLookupByPath("localPath");
diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkElementCommandWrapperTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkElementCommandWrapperTest.java
index 29fb67b..5a73490 100644
--- a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkElementCommandWrapperTest.java
+++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNetworkElementCommandWrapperTest.java
@@ -19,12 +19,14 @@
package com.cloud.hypervisor.kvm.resource.wrapper;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
+import java.util.Scanner;
+
import org.apache.cloudstack.utils.linux.MemStat;
import org.junit.Before;
import org.junit.Test;
@@ -32,6 +34,10 @@
import org.libvirt.Connect;
import org.libvirt.Domain;
import org.libvirt.LibvirtException;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
import com.cloud.agent.api.routing.IpAssocVpcCommand;
import com.cloud.agent.api.routing.NetworkElementCommand;
@@ -39,14 +45,10 @@
import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
import com.cloud.network.Networks;
import com.cloud.utils.ExecutionResult;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.util.Scanner;
@RunWith(PowerMockRunner.class)
@PrepareForTest(value = {MemStat.class})
+@PowerMockIgnore({"javax.xml.*", "org.w3c.dom.*", "org.apache.xerces.*", "org.xml.*"})
public class LibvirtNetworkElementCommandWrapperTest {
private static final String fullfile = "<domain type='kvm' id='143'>\n"
+ " <name>r-3-VM</name>\n"
@@ -245,8 +247,8 @@
LibvirtUtilitiesHelper helper = mock(LibvirtUtilitiesHelper.class);
when(_domain.getXMLDesc(0)).thenReturn(fullfile);
- when(conn.domainLookupByName(anyString())).thenReturn(_domain);
- when(helper.getConnectionByVmName(anyString())).thenReturn(conn);
+ when(conn.domainLookupByName(nullable(String.class))).thenReturn(_domain);
+ when(helper.getConnectionByVmName(nullable(String.class))).thenReturn(conn);
doReturn(helper).when(res).getLibvirtUtilitiesHelper();
}
diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReplugNicCommandWrapperTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReplugNicCommandWrapperTest.java
index 9d47bfc..2189e2a 100644
--- a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReplugNicCommandWrapperTest.java
+++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReplugNicCommandWrapperTest.java
@@ -26,8 +26,10 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Scanner;
@@ -39,7 +41,10 @@
import org.libvirt.Domain;
import org.libvirt.LibvirtException;
import org.mockito.BDDMockito;
+import org.mockito.Mock;
+import org.mockito.Mockito;
import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
@@ -48,6 +53,7 @@
import com.cloud.agent.api.to.NicTO;
import com.cloud.hypervisor.kvm.resource.BridgeVifDriver;
import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.hypervisor.kvm.resource.LibvirtVMDef;
import com.cloud.hypervisor.kvm.resource.OvsVifDriver;
import com.cloud.network.Networks;
import com.cloud.utils.script.Script;
@@ -55,8 +61,12 @@
@RunWith(PowerMockRunner.class)
@PrepareForTest(value = {Script.class, MemStat.class})
+@PowerMockIgnore({"javax.xml.*", "org.w3c.dom.*", "org.apache.xerces.*", "org.xml.*"})
public class LibvirtReplugNicCommandWrapperTest {
+ @Mock
+ private LibvirtComputingResource libvirtComputingResource;
+
private static final String part_1 =
"<domain type='kvm' id='143'>\n"
+ " <name>i-85-285-VM</name>\n"
@@ -276,6 +286,13 @@
+ "<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>\n"
+ "</interface>\n";
+ final LibvirtVMDef.InterfaceDef interfaceDef = Mockito.mock(LibvirtVMDef.InterfaceDef.class);
+ final List<LibvirtVMDef.InterfaceDef> ifaces = new ArrayList<LibvirtVMDef.InterfaceDef>();
+ ifaces.add(interfaceDef);
+
+ final Connect conn = Mockito.mock(Connect.class);
+
+ when(libvirtComputingResource.getInterfaces(conn, "")).thenReturn(ifaces);
final LibvirtReplugNicCommandWrapper wrapper = new LibvirtReplugNicCommandWrapper();
final NicTO nic = new NicTO();
nic.setType(Networks.TrafficType.Guest);
diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java
index 63d46bc..36d9570 100644
--- a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java
+++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java
@@ -21,13 +21,22 @@
import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
import javax.naming.ConfigurationException;
+import com.cloud.utils.script.Script;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
+import org.mockito.Matchers;
import org.mockito.Mock;
+import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
-import org.mockito.Spy;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+@PrepareForTest({ Script.class })
+@RunWith(PowerMockRunner.class)
public class KVMStorageProcessorTest {
@Mock
@@ -35,26 +44,47 @@
@Mock
LibvirtComputingResource resource;
- private static final Long TEMPLATE_ID = 202l;
- private static final String EXPECTED_DIRECT_DOWNLOAD_DIR = "template/2/202";
-
- @Spy
@InjectMocks
private KVMStorageProcessor storageProcessor;
+ private static final String directDownloadTemporaryPath = "/var/lib/libvirt/images/dd";
+ private static final long templateSize = 80000L;
+
@Before
public void setUp() throws ConfigurationException {
MockitoAnnotations.initMocks(this);
storageProcessor = new KVMStorageProcessor(storagePoolManager, resource);
+ PowerMockito.mockStatic(Script.class);
+ Mockito.when(resource.getDirectDownloadTemporaryDownloadPath()).thenReturn(directDownloadTemporaryPath);
}
@Test
- public void testCloneVolumeFromBaseTemplate() throws Exception {
-
+ public void testIsEnoughSpaceForDownloadTemplateOnTemporaryLocationAssumeEnoughSpaceWhenNotProvided() {
+ boolean result = storageProcessor.isEnoughSpaceForDownloadTemplateOnTemporaryLocation(null);
+ Assert.assertTrue(result);
}
@Test
- public void testCopyVolumeFromImageCacheToPrimary() throws Exception {
+ public void testIsEnoughSpaceForDownloadTemplateOnTemporaryLocationNotEnoughSpace() {
+ String output = String.valueOf(templateSize - 30000L);
+ Mockito.when(Script.runSimpleBashScript(Matchers.anyString())).thenReturn(output);
+ boolean result = storageProcessor.isEnoughSpaceForDownloadTemplateOnTemporaryLocation(templateSize);
+ Assert.assertFalse(result);
+ }
+ @Test
+ public void testIsEnoughSpaceForDownloadTemplateOnTemporaryLocationEnoughSpace() {
+ String output = String.valueOf(templateSize + 30000L);
+ Mockito.when(Script.runSimpleBashScript(Matchers.anyString())).thenReturn(output);
+ boolean result = storageProcessor.isEnoughSpaceForDownloadTemplateOnTemporaryLocation(templateSize);
+ Assert.assertTrue(result);
+ }
+
+ @Test
+ public void testIsEnoughSpaceForDownloadTemplateOnTemporaryLocationNotExistingLocation() {
+ String output = String.format("df: ‘%s’: No such file or directory", directDownloadTemporaryPath);
+ Mockito.when(Script.runSimpleBashScript(Matchers.anyString())).thenReturn(output);
+ boolean result = storageProcessor.isEnoughSpaceForDownloadTemplateOnTemporaryLocation(templateSize);
+ Assert.assertFalse(result);
}
}
diff --git a/plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/kvm/ha/KVMHostHATest.java b/plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/kvm/ha/KVMHostHATest.java
index 26b7e6a..b6b3fb7 100644
--- a/plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/kvm/ha/KVMHostHATest.java
+++ b/plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/kvm/ha/KVMHostHATest.java
@@ -18,10 +18,13 @@
*/
package org.apache.cloudstack.kvm.ha;
-import com.cloud.exception.StorageUnavailableException;
-import com.cloud.host.Host;
-import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.when;
+
import org.apache.cloudstack.ha.provider.HACheckerException;
+import org.joda.time.DateTime;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -29,11 +32,9 @@
import org.mockito.MockitoAnnotations;
import org.mockito.runners.MockitoJUnitRunner;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.when;
-
-import org.joda.time.DateTime;
+import com.cloud.exception.StorageUnavailableException;
+import com.cloud.host.Host;
+import com.cloud.hypervisor.Hypervisor.HypervisorType;
@RunWith(MockitoJUnitRunner.class)
public class KVMHostHATest {
@@ -53,21 +54,21 @@
@Test
public void testHostActivityForHealthyHost() throws HACheckerException, StorageUnavailableException {
- when(host.getHypervisorType()).thenReturn(HypervisorType.KVM);
+ lenient().when(host.getHypervisorType()).thenReturn(HypervisorType.KVM);
when(kvmHostActivityChecker.isHealthy(host)).thenReturn(true);
assertTrue(kvmHAProvider.isHealthy(host));
}
@Test
public void testHostActivityForUnHealthyHost() throws HACheckerException, StorageUnavailableException {
- when(host.getHypervisorType()).thenReturn(HypervisorType.KVM);
+ lenient().when(host.getHypervisorType()).thenReturn(HypervisorType.KVM);
when(kvmHostActivityChecker.isHealthy(host)).thenReturn(false);
assertFalse(kvmHAProvider.isHealthy(host));
}
@Test
public void testHostActivityForActiveHost() throws HACheckerException, StorageUnavailableException {
- when(host.getHypervisorType()).thenReturn(HypervisorType.KVM);
+ lenient().when(host.getHypervisorType()).thenReturn(HypervisorType.KVM);
DateTime dt = new DateTime();
when(kvmHostActivityChecker.isActive(host, dt)).thenReturn(true);
assertTrue(kvmHAProvider.hasActivity(host, dt));
@@ -75,7 +76,7 @@
@Test
public void testHostActivityForDownHost() throws HACheckerException, StorageUnavailableException {
- when(host.getHypervisorType()).thenReturn(HypervisorType.KVM);
+ lenient().when(host.getHypervisorType()).thenReturn(HypervisorType.KVM);
DateTime dt = new DateTime();
when(kvmHostActivityChecker.isActive(host, dt)).thenReturn(false);
assertFalse(kvmHAProvider.hasActivity(host, dt));
diff --git a/plugins/hypervisors/ovm/pom.xml b/plugins/hypervisors/ovm/pom.xml
index 25c91d2..6a7fd5f 100644
--- a/plugins/hypervisors/ovm/pom.xml
+++ b/plugins/hypervisors/ovm/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/hypervisors/ovm3/pom.xml b/plugins/hypervisors/ovm3/pom.xml
index b9af7c0..144512b 100644
--- a/plugins/hypervisors/ovm3/pom.xml
+++ b/plugins/hypervisors/ovm3/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3StorageProcessor.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3StorageProcessor.java
index 5f43c38..7915586 100644
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3StorageProcessor.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3StorageProcessor.java
@@ -826,6 +826,11 @@
return null;
}
+ @Override
+ public Answer copyVolumeFromPrimaryToPrimary(CopyCommand cmd) {
+ return null;
+ }
+
/**
* Attach disks
* @param cmd
diff --git a/plugins/hypervisors/simulator/pom.xml b/plugins/hypervisors/simulator/pom.xml
index b211ceb..972e357 100644
--- a/plugins/hypervisors/simulator/pom.xml
+++ b/plugins/hypervisors/simulator/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>cloud-plugin-hypervisor-simulator</artifactId>
diff --git a/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockStorageManagerImpl.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockStorageManagerImpl.java
index de12f3b..efa9510 100644
--- a/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockStorageManagerImpl.java
+++ b/plugins/hypervisors/simulator/src/main/java/com/cloud/agent/manager/MockStorageManagerImpl.java
@@ -40,7 +40,6 @@
import org.apache.cloudstack.storage.command.UploadStatusAnswer;
import org.apache.cloudstack.storage.command.UploadStatusAnswer.UploadStatus;
import org.apache.cloudstack.storage.command.UploadStatusCommand;
-import org.apache.cloudstack.storage.to.VolumeObjectTO;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.AttachIsoCommand;
@@ -823,12 +822,7 @@
try {
txn.start();
MockVolumeVO template = _mockVolumeDao.findByStoragePathAndType(cmd.getData().getPath());
- if (template == null) {
- if(!((VolumeObjectTO)cmd.getData()).getName().startsWith("ROOT-")) {
- return new Answer(cmd, false, "can't find object to delete:" + cmd.getData()
- .getPath());
- }
- } else {
+ if (template != null) {
_mockVolumeDao.remove(template.getId());
}
txn.commit();
diff --git a/plugins/hypervisors/simulator/src/main/java/com/cloud/resource/SimulatorStorageProcessor.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/resource/SimulatorStorageProcessor.java
index c2dfdbd..e4ef4df 100644
--- a/plugins/hypervisors/simulator/src/main/java/com/cloud/resource/SimulatorStorageProcessor.java
+++ b/plugins/hypervisors/simulator/src/main/java/com/cloud/resource/SimulatorStorageProcessor.java
@@ -264,4 +264,9 @@
// TODO Auto-generated method stub
return null;
}
+
+ @Override
+ public Answer copyVolumeFromPrimaryToPrimary(CopyCommand cmd) {
+ return null;
+ }
}
diff --git a/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/SimulatorGuru.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/SimulatorGuru.java
index 4516c7c..246d86d 100644
--- a/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/SimulatorGuru.java
+++ b/plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/SimulatorGuru.java
@@ -16,22 +16,41 @@
// under the License.
package com.cloud.simulator;
+import java.util.Date;
import java.util.Map;
import javax.inject.Inject;
+import org.apache.cloudstack.backup.Backup;
+
import com.cloud.agent.api.to.VirtualMachineTO;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.hypervisor.HypervisorGuru;
import com.cloud.hypervisor.HypervisorGuruBase;
import com.cloud.storage.GuestOSVO;
+import com.cloud.storage.Volume;
+import com.cloud.storage.VolumeVO;
import com.cloud.storage.dao.GuestOSDao;
+import com.cloud.storage.dao.VolumeDao;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
+import com.cloud.vm.dao.NicDao;
+import com.cloud.vm.dao.VMInstanceDao;
public class SimulatorGuru extends HypervisorGuruBase implements HypervisorGuru {
@Inject
GuestOSDao _guestOsDao;
+ @Inject
+ VMInstanceDao instanceDao;
+
+ @Inject
+ VolumeDao volumeDao;
+
+ @Inject
+ NicDao nicDao;
+
protected SimulatorGuru() {
super();
}
@@ -53,6 +72,25 @@
}
@Override
+ public VirtualMachine importVirtualMachineFromBackup(long zoneId, long domainId, long accountId, long userId,
+ String vmInternalName, Backup backup) {
+ VMInstanceVO vm = instanceDao.findVMByInstanceNameIncludingRemoved(vmInternalName);
+ if (vm.getRemoved() != null) {
+ vm.setState(VirtualMachine.State.Stopped);
+ vm.setPowerState(VirtualMachine.PowerState.PowerOff);
+ instanceDao.update(vm.getId(), vm);
+ instanceDao.unremove(vm.getId());
+ }
+ for (final VolumeVO volume : volumeDao.findIncludingRemovedByInstanceAndType(vm.getId(), null)) {
+ volume.setState(Volume.State.Ready);
+ volume.setAttached(new Date());
+ volumeDao.update(volume.getId(), volume);
+ volumeDao.unremove(volume.getId());
+ }
+ return vm;
+ }
+
+ @Override
public boolean trackVmHostChange() {
return false;
}
diff --git a/plugins/hypervisors/ucs/pom.xml b/plugins/hypervisors/ucs/pom.xml
index 6067803..d58eaca7 100644
--- a/plugins/hypervisors/ucs/pom.xml
+++ b/plugins/hypervisors/ucs/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>cloud-plugin-hypervisor-ucs</artifactId>
diff --git a/plugins/hypervisors/vmware/pom.xml b/plugins/hypervisors/vmware/pom.xml
index c524522..b33e187 100644
--- a/plugins/hypervisors/vmware/pom.xml
+++ b/plugins/hypervisors/vmware/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
@@ -56,6 +56,11 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>com.sun.org.apache.xml.internal</groupId>
+ <artifactId>resolver</artifactId>
+ <version>20050927</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.axis</groupId>
<artifactId>axis</artifactId>
</dependency>
diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java
index 072ab9f..59b27bd 100644
--- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java
+++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java
@@ -19,6 +19,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -27,32 +28,26 @@
import javax.inject.Inject;
-import com.cloud.agent.api.MigrateVmToPoolCommand;
-import com.cloud.agent.api.UnregisterVMCommand;
-import com.cloud.agent.api.storage.OVFPropertyTO;
-import com.cloud.agent.api.to.VolumeTO;
-import com.cloud.dc.ClusterDetailsDao;
-import com.cloud.storage.StoragePool;
-import com.cloud.storage.TemplateOVFPropertyVO;
-import com.cloud.storage.VMTemplateStoragePoolVO;
-import com.cloud.storage.VMTemplateStorageResourceAssoc;
-import com.cloud.storage.dao.TemplateOVFPropertiesDao;
-import com.cloud.storage.dao.VMTemplatePoolDao;
+import org.apache.cloudstack.acl.ControlledEntity;
import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.backup.Backup;
+import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine;
import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStore;
import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory;
import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
import org.apache.cloudstack.framework.config.ConfigKey;
import org.apache.cloudstack.framework.config.Configurable;
import org.apache.cloudstack.storage.command.CopyCommand;
-import org.apache.cloudstack.storage.command.DownloadCommand;
import org.apache.cloudstack.storage.command.DeleteCommand;
+import org.apache.cloudstack.storage.command.DownloadCommand;
import org.apache.cloudstack.storage.command.StorageSubSystemCommand;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
import org.apache.cloudstack.storage.to.VolumeObjectTO;
+import org.apache.cloudstack.utils.volume.VirtualMachineDiskInfo;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import com.cloud.agent.api.BackupSnapshotCommand;
@@ -60,10 +55,13 @@
import com.cloud.agent.api.CreatePrivateTemplateFromSnapshotCommand;
import com.cloud.agent.api.CreatePrivateTemplateFromVolumeCommand;
import com.cloud.agent.api.CreateVolumeFromSnapshotCommand;
+import com.cloud.agent.api.MigrateVmToPoolCommand;
import com.cloud.agent.api.UnregisterNicCommand;
+import com.cloud.agent.api.UnregisterVMCommand;
import com.cloud.agent.api.storage.CopyVolumeCommand;
import com.cloud.agent.api.storage.CreateEntityDownloadURLCommand;
import com.cloud.agent.api.storage.CreateVolumeOVACommand;
+import com.cloud.agent.api.storage.OVFPropertyTO;
import com.cloud.agent.api.storage.PrepareOVAPackingCommand;
import com.cloud.agent.api.to.DataObjectType;
import com.cloud.agent.api.to.DataStoreTO;
@@ -71,8 +69,14 @@
import com.cloud.agent.api.to.DiskTO;
import com.cloud.agent.api.to.NicTO;
import com.cloud.agent.api.to.VirtualMachineTO;
+import com.cloud.agent.api.to.VolumeTO;
import com.cloud.cluster.ClusterManager;
+import com.cloud.configuration.Resource;
+import com.cloud.dc.ClusterDetailsDao;
+import com.cloud.event.EventTypes;
+import com.cloud.event.UsageEventUtils;
import com.cloud.exception.InsufficientAddressCapacityException;
+import com.cloud.exception.InvalidParameterValueException;
import com.cloud.host.Host;
import com.cloud.host.HostVO;
import com.cloud.host.dao.HostDao;
@@ -80,32 +84,61 @@
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.hypervisor.HypervisorGuru;
import com.cloud.hypervisor.HypervisorGuruBase;
+import com.cloud.hypervisor.vmware.VmwareDatacenterVO;
+import com.cloud.hypervisor.vmware.VmwareDatacenterZoneMapVO;
+import com.cloud.hypervisor.vmware.dao.VmwareDatacenterDao;
+import com.cloud.hypervisor.vmware.dao.VmwareDatacenterZoneMapDao;
import com.cloud.hypervisor.vmware.manager.VmwareManager;
+import com.cloud.hypervisor.vmware.mo.DatacenterMO;
import com.cloud.hypervisor.vmware.mo.DiskControllerType;
+import com.cloud.hypervisor.vmware.mo.NetworkMO;
+import com.cloud.hypervisor.vmware.mo.VirtualDiskManagerMO;
import com.cloud.hypervisor.vmware.mo.VirtualEthernetCardType;
+import com.cloud.hypervisor.vmware.mo.VirtualMachineDiskInfoBuilder;
+import com.cloud.hypervisor.vmware.mo.VirtualMachineMO;
+import com.cloud.hypervisor.vmware.resource.VmwareContextFactory;
+import com.cloud.hypervisor.vmware.util.VmwareContext;
+import com.cloud.network.Network;
import com.cloud.network.Network.Provider;
import com.cloud.network.Network.Service;
import com.cloud.network.NetworkModel;
+import com.cloud.network.Networks;
import com.cloud.network.Networks.BroadcastDomainType;
import com.cloud.network.Networks.TrafficType;
import com.cloud.network.dao.NetworkDao;
import com.cloud.network.dao.NetworkVO;
+import com.cloud.network.dao.PhysicalNetworkDao;
import com.cloud.network.dao.PhysicalNetworkTrafficTypeDao;
import com.cloud.network.dao.PhysicalNetworkTrafficTypeVO;
+import com.cloud.network.dao.PhysicalNetworkVO;
import com.cloud.secstorage.CommandExecLogDao;
import com.cloud.secstorage.CommandExecLogVO;
+import com.cloud.service.ServiceOfferingVO;
+import com.cloud.service.dao.ServiceOfferingDao;
import com.cloud.storage.DataStoreRole;
+import com.cloud.storage.DiskOfferingVO;
import com.cloud.storage.GuestOSHypervisorVO;
import com.cloud.storage.GuestOSVO;
import com.cloud.storage.Storage;
+import com.cloud.storage.StoragePool;
+import com.cloud.storage.TemplateOVFPropertyVO;
+import com.cloud.storage.VMTemplateStoragePoolVO;
+import com.cloud.storage.VMTemplateStorageResourceAssoc;
+import com.cloud.storage.VMTemplateVO;
import com.cloud.storage.Volume;
import com.cloud.storage.VolumeVO;
+import com.cloud.storage.dao.DiskOfferingDao;
import com.cloud.storage.dao.GuestOSDao;
import com.cloud.storage.dao.GuestOSHypervisorDao;
+import com.cloud.storage.dao.TemplateOVFPropertiesDao;
+import com.cloud.storage.dao.VMTemplateDao;
+import com.cloud.storage.dao.VMTemplatePoolDao;
import com.cloud.storage.dao.VolumeDao;
import com.cloud.storage.secondary.SecondaryStorageVmManager;
import com.cloud.template.VirtualMachineTemplate.BootloaderType;
+import com.cloud.user.ResourceLimitService;
import com.cloud.utils.Pair;
+import com.cloud.utils.UuidUtils;
import com.cloud.utils.db.DB;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.net.NetUtils;
@@ -113,13 +146,28 @@
import com.cloud.vm.NicProfile;
import com.cloud.vm.NicVO;
import com.cloud.vm.SecondaryStorageVmVO;
+import com.cloud.vm.UserVmVO;
+import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachine.Type;
+import com.cloud.vm.VirtualMachineManager;
import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.VmDetailConstants;
import com.cloud.vm.dao.DomainRouterDao;
import com.cloud.vm.dao.NicDao;
+import com.cloud.vm.dao.UserVmDao;
import com.cloud.vm.dao.VMInstanceDao;
+import com.google.gson.Gson;
+import com.vmware.vim25.ManagedObjectReference;
+import com.vmware.vim25.VirtualDevice;
+import com.vmware.vim25.VirtualDeviceBackingInfo;
+import com.vmware.vim25.VirtualDeviceConnectInfo;
+import com.vmware.vim25.VirtualDisk;
+import com.vmware.vim25.VirtualDiskFlatVer2BackingInfo;
+import com.vmware.vim25.VirtualE1000;
+import com.vmware.vim25.VirtualEthernetCardNetworkBackingInfo;
+import com.vmware.vim25.VirtualMachineConfigSummary;
+import com.vmware.vim25.VirtualMachineRuntimeInfo;
public class VMwareGuru extends HypervisorGuruBase implements HypervisorGuru, Configurable {
private static final Logger s_logger = Logger.getLogger(VMwareGuru.class);
@@ -153,15 +201,33 @@
@Inject
private VMInstanceDao _vmDao;
@Inject
+ private VirtualMachineManager vmManager;
+ @Inject
private ClusterManager _clusterMgr;
@Inject
VolumeDao _volumeDao;
@Inject
+ ResourceLimitService _resourceLimitService;
+ @Inject
PrimaryDataStoreDao _storagePoolDao;
@Inject
VolumeDataFactory _volFactory;
@Inject
- private VMTemplatePoolDao templateSpoolDao;
+ private VmwareDatacenterDao vmwareDatacenterDao;
+ @Inject
+ private VmwareDatacenterZoneMapDao vmwareDatacenterZoneMapDao;
+ @Inject
+ private ServiceOfferingDao serviceOfferingDao;
+ @Inject
+ private VMTemplatePoolDao templateStoragePoolDao;
+ @Inject
+ private VMTemplateDao vmTemplateDao;
+ @Inject
+ private UserVmDao userVmDao;
+ @Inject
+ private DiskOfferingDao diskOfferingDao;
+ @Inject
+ private PhysicalNetworkDao physicalNetworkDao;
@Inject
private TemplateOVFPropertiesDao templateOVFPropertiesDao;
@@ -228,6 +294,7 @@
}
}
+ details.put(VmDetailConstants.BOOT_MODE, to.getBootMode());
String diskDeviceType = details.get(VmDetailConstants.ROOT_DISK_CONTROLLER);
if (userVm) {
if (diskDeviceType == null) {
@@ -398,7 +465,7 @@
long dataCenterId = storagePoolVO.getDataCenterId();
List<StoragePoolVO> pools = _storagePoolDao.listByDataCenterId(dataCenterId);
for (StoragePoolVO pool : pools) {
- VMTemplateStoragePoolVO ref = templateSpoolDao.findByPoolTemplate(pool.getId(), vm.getTemplateId());
+ VMTemplateStoragePoolVO ref = templateStoragePoolDao.findByPoolTemplate(pool.getId(), vm.getTemplateId());
if (ref != null && ref.getDownloadState() == VMTemplateStorageResourceAssoc.Status.DOWNLOADED) {
templateInstallPath = ref.getInstallPath();
break;
@@ -718,6 +785,671 @@
return details;
}
+ /**
+ * Get vmware datacenter mapped to the zoneId
+ */
+ private VmwareDatacenterVO getVmwareDatacenter(long zoneId) {
+ VmwareDatacenterZoneMapVO zoneMap = vmwareDatacenterZoneMapDao.findByZoneId(zoneId);
+ long vmwareDcId = zoneMap.getVmwareDcId();
+ return vmwareDatacenterDao.findById(vmwareDcId);
+ }
+
+ /**
+ * Get Vmware datacenter MO
+ */
+ private DatacenterMO getDatacenterMO(long zoneId) throws Exception {
+ VmwareDatacenterVO vmwareDatacenter = getVmwareDatacenter(zoneId);
+ VmwareContext context = VmwareContextFactory.getContext(vmwareDatacenter.getVcenterHost(),
+ vmwareDatacenter.getUser(), vmwareDatacenter.getPassword());
+ DatacenterMO dcMo = new DatacenterMO(context, vmwareDatacenter.getVmwareDatacenterName());
+ ManagedObjectReference dcMor = dcMo.getMor();
+ if (dcMor == null) {
+ String msg = "Error while getting Vmware datacenter " + vmwareDatacenter.getVmwareDatacenterName();
+ s_logger.error(msg);
+ throw new InvalidParameterValueException(msg);
+ }
+ return dcMo;
+ }
+
+ /**
+ * Get guest OS ID for VM being imported.
+ * If it cannot be found it is mapped to: "Other (64-bit)" ID
+ */
+ private Long getImportingVMGuestOs(VirtualMachineConfigSummary configSummary) {
+ String guestFullName = configSummary.getGuestFullName();
+ GuestOSVO os = _guestOsDao.listByDisplayName(guestFullName);
+ return os != null ? os.getId() : _guestOsDao.listByDisplayName("Other (64-bit)").getId();
+ }
+
+ /**
+ * Create and persist service offering
+ */
+ private ServiceOfferingVO createServiceOfferingForVMImporting(Integer cpus, Integer memory, Integer maxCpuUsage) {
+ String name = "Imported-" + cpus + "-" + memory;
+ ServiceOfferingVO vo = new ServiceOfferingVO(name, cpus, memory, maxCpuUsage, null, null,
+ false, name, Storage.ProvisioningType.THIN, false, false,
+ null, false, Type.User, false);
+ return serviceOfferingDao.persist(vo);
+ }
+
+ /**
+ * Get service offering ID for VM being imported.
+ * If it cannot be found it creates one and returns its ID
+ */
+ private Long getImportingVMServiceOffering(VirtualMachineConfigSummary configSummary,
+ VirtualMachineRuntimeInfo runtimeInfo) {
+ Integer numCpu = configSummary.getNumCpu();
+ Integer memorySizeMB = configSummary.getMemorySizeMB();
+ Integer maxCpuUsage = runtimeInfo.getMaxCpuUsage();
+ List<ServiceOfferingVO> offerings = serviceOfferingDao.listPublicByCpuAndMemory(numCpu, memorySizeMB);
+ return CollectionUtils.isEmpty(offerings) ?
+ createServiceOfferingForVMImporting(numCpu, memorySizeMB, maxCpuUsage).getId() :
+ offerings.get(0).getId();
+ }
+
+ /**
+ * Check if disk is ROOT disk
+ */
+ private boolean isRootDisk(VirtualDisk disk, Map<VirtualDisk, VolumeVO> disksMapping, Backup backup) {
+ if (!disksMapping.containsKey(disk)) {
+ return false;
+ }
+ VolumeVO volumeVO = disksMapping.get(disk);
+ if (volumeVO == null) {
+ final VMInstanceVO vm = _vmDao.findByIdIncludingRemoved(backup.getVmId());
+ if (vm == null) {
+ throw new CloudRuntimeException("Failed to find the volumes details from the VM backup");
+ }
+ List<Backup.VolumeInfo> backedUpVolumes = vm.getBackupVolumeList();
+ for (Backup.VolumeInfo backedUpVolume : backedUpVolumes) {
+ if (backedUpVolume.getSize().equals(disk.getCapacityInBytes())) {
+ return backedUpVolume.getType().equals(Volume.Type.ROOT);
+ }
+ }
+ } else {
+ return volumeVO.getVolumeType().equals(Volume.Type.ROOT);
+ }
+ throw new CloudRuntimeException("Could not determinate ROOT disk for VM to import");
+ }
+
+ /**
+ * Check backing info
+ */
+ private void checkBackingInfo(VirtualDeviceBackingInfo backingInfo) {
+ if (! (backingInfo instanceof VirtualDiskFlatVer2BackingInfo)) {
+ throw new CloudRuntimeException("Unsopported backing, expected " + VirtualDiskFlatVer2BackingInfo.class.getSimpleName());
+ }
+ }
+
+ /**
+ * Get pool ID from datastore UUID
+ */
+ private Long getPoolIdFromDatastoreUuid(String datastoreUuid) {
+ String poolUuid = UuidUtils.normalize(datastoreUuid);
+ StoragePoolVO pool = _storagePoolDao.findByUuid(poolUuid);
+ if (pool == null) {
+ throw new CloudRuntimeException("Couldn't find storage pool " + poolUuid);
+ }
+ return pool.getId();
+ }
+
+ /**
+ * Get pool ID for disk
+ */
+ private Long getPoolId(VirtualDisk disk) {
+ VirtualDeviceBackingInfo backing = disk.getBacking();
+ checkBackingInfo(backing);
+ VirtualDiskFlatVer2BackingInfo info = (VirtualDiskFlatVer2BackingInfo) backing;
+ String[] fileNameParts = info.getFileName().split(" ");
+ String datastoreUuid = StringUtils.substringBetween(fileNameParts[0], "[", "]");
+ return getPoolIdFromDatastoreUuid(datastoreUuid);
+ }
+
+ /**
+ * Get volume name from filename
+ */
+ private String getVolumeNameFromFileName(String fileName) {
+ String[] fileNameParts = fileName.split(" ");
+ String volumePath = fileNameParts[1];
+ return volumePath.split("/")[1].replaceFirst(".vmdk", "");
+ }
+
+ /**
+ * Get root disk template path
+ */
+ private String getRootDiskTemplatePath(VirtualDisk rootDisk) {
+ VirtualDeviceBackingInfo backing = rootDisk.getBacking();
+ checkBackingInfo(backing);
+ VirtualDiskFlatVer2BackingInfo info = (VirtualDiskFlatVer2BackingInfo) backing;
+ VirtualDiskFlatVer2BackingInfo parent = info.getParent();
+ return (parent != null) ? getVolumeNameFromFileName(parent.getFileName()) : getVolumeNameFromFileName(info.getFileName());
+ }
+
+ /**
+ * Get template MO
+ */
+ private VirtualMachineMO getTemplate(DatacenterMO dcMo, String templatePath) throws Exception {
+ VirtualMachineMO template = dcMo.findVm(templatePath);
+ if (!template.isTemplate()) {
+ throw new CloudRuntimeException(templatePath + " is not a template");
+ }
+ return template;
+ }
+
+ /**
+ * Get template pool ID
+ */
+ private Long getTemplatePoolId(VirtualMachineMO template) throws Exception {
+ VirtualMachineConfigSummary configSummary = template.getConfigSummary();
+ String vmPathName = configSummary.getVmPathName();
+ String[] pathParts = vmPathName.split(" ");
+ String dataStoreUuid = pathParts[0].replace("[", "").replace("]", "");
+ return getPoolIdFromDatastoreUuid(dataStoreUuid);
+ }
+
+ /**
+ * Get template size
+ */
+ private Long getTemplateSize(VirtualMachineMO template, String vmInternalName,
+ Map<VirtualDisk, VolumeVO> disksMapping, Backup backup) throws Exception {
+ List<VirtualDisk> disks = template.getVirtualDisks();
+ if (CollectionUtils.isEmpty(disks)) {
+ throw new CloudRuntimeException("Couldn't find VM template size");
+ }
+ return disks.get(0).getCapacityInBytes();
+ }
+
+ /**
+ * Create a VM Template record on DB
+ */
+ private VMTemplateVO createVMTemplateRecord(String vmInternalName, long guestOsId, long accountId) {
+ Long nextTemplateId = vmTemplateDao.getNextInSequence(Long.class, "id");
+ VMTemplateVO templateVO = new VMTemplateVO(nextTemplateId, "Imported-from-" + vmInternalName,
+ Storage.ImageFormat.OVA,false, false, false, Storage.TemplateType.USER,
+ null, false, 64, accountId, null, "Template imported from VM " + vmInternalName,
+ false, guestOsId, false, HypervisorType.VMware, null, null,
+ false, false, false);
+ return vmTemplateDao.persist(templateVO);
+ }
+
+ /**
+ * Retrieve the template ID matching the template on templatePath. There are 2 cases:
+ * - There are no references on DB for primary storage -> create a template DB record and return its ID
+ * - There are references on DB for primary storage -> return template ID for any of those references
+ */
+ private long getTemplateId(String templatePath, String vmInternalName, Long guestOsId, long accountId) {
+ List<VMTemplateStoragePoolVO> poolRefs = templateStoragePoolDao.listByTemplatePath(templatePath);
+ return CollectionUtils.isNotEmpty(poolRefs) ?
+ poolRefs.get(0).getTemplateId() :
+ createVMTemplateRecord(vmInternalName, guestOsId, accountId).getId();
+ }
+
+ /**
+ * Update template reference on primary storage, if needed
+ */
+ private void updateTemplateRef(long templateId, Long poolId, String templatePath, Long templateSize) {
+ VMTemplateStoragePoolVO templateRef = templateStoragePoolDao.findByPoolPath(poolId, templatePath);
+ if (templateRef == null) {
+ templateRef = new VMTemplateStoragePoolVO(poolId, templateId, null, 100,
+ VMTemplateStorageResourceAssoc.Status.DOWNLOADED, templatePath, null,
+ null, templatePath, templateSize);
+ templateRef.setState(ObjectInDataStoreStateMachine.State.Ready);
+ templateStoragePoolDao.persist(templateRef);
+ }
+ }
+
+ /**
+ * Get template ID for VM being imported. If it is not found, it is created
+ */
+ private Long getImportingVMTemplate(List<VirtualDisk> virtualDisks, DatacenterMO dcMo, String vmInternalName,
+ Long guestOsId, long accountId, Map<VirtualDisk, VolumeVO> disksMapping, Backup backup) throws Exception {
+ for (VirtualDisk disk : virtualDisks) {
+ if (isRootDisk(disk, disksMapping, backup)) {
+ VolumeVO volumeVO = disksMapping.get(disk);
+ if (volumeVO == null) {
+ String templatePath = getRootDiskTemplatePath(disk);
+ VirtualMachineMO template = getTemplate(dcMo, templatePath);
+ Long poolId = getTemplatePoolId(template);
+ Long templateSize = getTemplateSize(template, vmInternalName, disksMapping, backup);
+ long templateId = getTemplateId(templatePath, vmInternalName, guestOsId, accountId);
+ updateTemplateRef(templateId, poolId, templatePath, templateSize);
+ return templateId;
+ } else {
+ return volumeVO.getTemplateId();
+ }
+ }
+ }
+ throw new CloudRuntimeException("Could not find ROOT disk for VM " + vmInternalName);
+ }
+
+ /**
+ * If VM does not exist: create and persist VM
+ * If VM exists: update VM
+ */
+ private VMInstanceVO getVM(String vmInternalName, long templateId, long guestOsId,
+ long serviceOfferingId, long zoneId, long accountId, long userId,
+ long domainId) {
+ VMInstanceVO vm = _vmDao.findVMByInstanceNameIncludingRemoved(vmInternalName);
+ if (vm != null) {
+ vm.setState(VirtualMachine.State.Stopped);
+ vm.setPowerState(VirtualMachine.PowerState.PowerOff);
+ _vmDao.update(vm.getId(), vm);
+ if (vm.getRemoved() != null) {
+ _vmDao.unremove(vm.getId());
+ UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_CREATE, accountId, vm.getDataCenterId(), vm.getId(),
+ vm.getHostName(), vm.getServiceOfferingId(), vm.getTemplateId(),
+ vm.getHypervisorType().toString(), VirtualMachine.class.getName(), vm.getUuid(), vm.isDisplayVm());
+ }
+ return _vmDao.findById(vm.getId());
+ } else {
+ long id = userVmDao.getNextInSequence(Long.class, "id");
+ UserVmVO vmInstanceVO = new UserVmVO(id, vmInternalName, vmInternalName, templateId, HypervisorType.VMware,
+ guestOsId, false, false, domainId, accountId, userId, serviceOfferingId,
+ null, vmInternalName, null);
+ vmInstanceVO.setDataCenterId(zoneId);
+ return userVmDao.persist(vmInstanceVO);
+ }
+ }
+
+ /**
+ * Create and persist volume
+ */
+ private VolumeVO createVolumeRecord(Volume.Type type, String volumeName, long zoneId, long domainId,
+ long accountId, long diskOfferingId, Storage.ProvisioningType provisioningType,
+ Long size, long instanceId, Long poolId, long templateId, Integer unitNumber, VirtualMachineDiskInfo diskInfo) {
+ VolumeVO volumeVO = new VolumeVO(type, volumeName, zoneId, domainId, accountId, diskOfferingId,
+ provisioningType, size, null, null, null);
+ volumeVO.setFormat(Storage.ImageFormat.OVA);
+ volumeVO.setPath(volumeName);
+ volumeVO.setState(Volume.State.Ready);
+ volumeVO.setInstanceId(instanceId);
+ volumeVO.setPoolId(poolId);
+ volumeVO.setTemplateId(templateId);
+ volumeVO.setAttached(new Date());
+ volumeVO.setRemoved(null);
+ volumeVO.setChainInfo(new Gson().toJson(diskInfo));
+ if (unitNumber != null) {
+ volumeVO.setDeviceId(unitNumber.longValue());
+ }
+ return _volumeDao.persist(volumeVO);
+ }
+
+ /**
+ * Get volume name from VM disk
+ */
+ private String getVolumeName(VirtualDisk disk, VirtualMachineMO vmToImport) throws Exception {
+ return vmToImport.getVmdkFileBaseName(disk);
+ }
+
+ /**
+ * Get provisioning type for VM disk info
+ */
+ private Storage.ProvisioningType getProvisioningType(VirtualDiskFlatVer2BackingInfo backing) {
+ Boolean thinProvisioned = backing.isThinProvisioned();
+ if (BooleanUtils.isTrue(thinProvisioned)) {
+ return Storage.ProvisioningType.THIN;
+ }
+ return Storage.ProvisioningType.SPARSE;
+ }
+
+ /**
+ * Get disk offering ID for volume being imported. If it is not found it is mapped to "Custom" ID
+ */
+ private long getDiskOfferingId(long size, Storage.ProvisioningType provisioningType) {
+ List<DiskOfferingVO> offerings = diskOfferingDao.listAllBySizeAndProvisioningType(size, provisioningType);
+ return CollectionUtils.isNotEmpty(offerings) ?
+ offerings.get(0).getId() :
+ diskOfferingDao.findByUniqueName("Cloud.Com-Custom").getId();
+ }
+
+ protected VolumeVO updateVolume(VirtualDisk disk, Map<VirtualDisk, VolumeVO> disksMapping, VirtualMachineMO vmToImport, Long poolId, VirtualMachine vm) throws Exception {
+ VolumeVO volume = disksMapping.get(disk);
+ String volumeName = getVolumeName(disk, vmToImport);
+ volume.setPath(volumeName);
+ volume.setPoolId(poolId);
+ VirtualMachineDiskInfo diskInfo = getDiskInfo(vmToImport, poolId, volumeName);
+ volume.setChainInfo(new Gson().toJson(diskInfo));
+ volume.setInstanceId(vm.getId());
+ volume.setState(Volume.State.Ready);
+ volume.setAttached(new Date());
+ _volumeDao.update(volume.getId(), volume);
+ if (volume.getRemoved() != null) {
+ _volumeDao.unremove(volume.getId());
+ if (vm.getType() == Type.User) {
+ UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_CREATE, volume.getAccountId(), volume.getDataCenterId(),
+ volume.getId(), volume.getName(), volume.getDiskOfferingId(), null, volume.getSize(),
+ Volume.class.getName(), volume.getUuid(), volume.isDisplayVolume());
+ _resourceLimitService.incrementResourceCount(vm.getAccountId(), Resource.ResourceType.volume, volume.isDisplayVolume());
+ _resourceLimitService.incrementResourceCount(vm.getAccountId(), Resource.ResourceType.primary_storage, volume.isDisplayVolume(), volume.getSize());
+ }
+ }
+ return volume;
+ }
+
+ /**
+ * Get volumes for VM being imported
+ */
+ private void syncVMVolumes(VMInstanceVO vmInstanceVO, List<VirtualDisk> virtualDisks,
+ Map<VirtualDisk, VolumeVO> disksMapping, VirtualMachineMO vmToImport, Backup backup) throws Exception {
+ long zoneId = vmInstanceVO.getDataCenterId();
+ long accountId = vmInstanceVO.getAccountId();
+ long domainId = vmInstanceVO.getDomainId();
+ long templateId = vmInstanceVO.getTemplateId();
+ long instanceId = vmInstanceVO.getId();
+
+ for (VirtualDisk disk : virtualDisks) {
+ Long poolId = getPoolId(disk);
+ Volume volume = null;
+ if (disksMapping.containsKey(disk) && disksMapping.get(disk) != null) {
+ volume = updateVolume(disk, disksMapping, vmToImport, poolId, vmInstanceVO);
+ } else {
+ volume = createVolume(disk, vmToImport, domainId, zoneId, accountId, instanceId, poolId, templateId, backup, true);
+ }
+ s_logger.debug("VM backup restored (updated/created) volume id:" + volume.getId() + " for VM id:" + instanceId);
+ }
+ }
+
+ private VirtualMachineDiskInfo getDiskInfo(VirtualMachineMO vmMo, Long poolId, String volumeName) throws Exception {
+ VirtualMachineDiskInfoBuilder diskInfoBuilder = vmMo.getDiskInfoBuilder();
+ String poolName = _storagePoolDao.findById(poolId).getUuid().replace("-", "");
+ return diskInfoBuilder.getDiskInfoByBackingFileBaseName(volumeName, poolName);
+ }
+
+ private VolumeVO createVolume(VirtualDisk disk, VirtualMachineMO vmToImport, long domainId, long zoneId,
+ long accountId, long instanceId, Long poolId, long templateId, Backup backup, boolean isImport) throws Exception {
+ VMInstanceVO vm = _vmDao.findByIdIncludingRemoved(backup.getVmId());
+ if (vm == null) {
+ throw new CloudRuntimeException("Failed to find the backup volume information from the VM backup");
+ }
+ List<Backup.VolumeInfo> backedUpVolumes = vm.getBackupVolumeList();
+ Volume.Type type = Volume.Type.DATADISK;
+ Long size = disk.getCapacityInBytes();
+ if (isImport) {
+ for (Backup.VolumeInfo volumeInfo : backedUpVolumes) {
+ if (volumeInfo.getSize().equals(disk.getCapacityInBytes())) {
+ type = volumeInfo.getType();
+ }
+ }
+ }
+ VirtualDeviceBackingInfo backing = disk.getBacking();
+ checkBackingInfo(backing);
+ VirtualDiskFlatVer2BackingInfo info = (VirtualDiskFlatVer2BackingInfo) backing;
+ String volumeName = getVolumeName(disk, vmToImport);
+ Storage.ProvisioningType provisioningType = getProvisioningType(info);
+ long diskOfferingId = getDiskOfferingId(size, provisioningType);
+ Integer unitNumber = disk.getUnitNumber();
+ VirtualMachineDiskInfo diskInfo = getDiskInfo(vmToImport, poolId, volumeName);
+ return createVolumeRecord(type, volumeName, zoneId, domainId, accountId, diskOfferingId,
+ provisioningType, size, instanceId, poolId, templateId, unitNumber, diskInfo);
+ }
+
+ /**
+ * Get physical network ID from zoneId and Vmware label
+ */
+ private long getPhysicalNetworkId(Long zoneId, String tag) {
+ List<PhysicalNetworkVO> physicalNetworks = physicalNetworkDao.listByZone(zoneId);
+ for (PhysicalNetworkVO physicalNetwork : physicalNetworks) {
+ PhysicalNetworkTrafficTypeVO vo = _physicalNetworkTrafficTypeDao.findBy(physicalNetwork.getId(), TrafficType.Guest);
+ if (vo == null) {
+ continue;
+ }
+ String vmwareNetworkLabel = vo.getVmwareNetworkLabel();
+ if (!vmwareNetworkLabel.startsWith(tag)) {
+ throw new CloudRuntimeException("Vmware network label does not start with: " + tag);
+ }
+ return physicalNetwork.getId();
+ }
+ throw new CloudRuntimeException("Could not find guest physical network matching tag: " + tag + " on zone " + zoneId);
+ }
+
+ /**
+ * Create and persist network
+ */
+ private NetworkVO createNetworkRecord(Long zoneId, String tag, String vlan, long accountId, long domainId) {
+ Long physicalNetworkId = getPhysicalNetworkId(zoneId, tag);
+ final long id = _networkDao.getNextInSequence(Long.class, "id");
+ NetworkVO networkVO = new NetworkVO(id, TrafficType.Guest, Networks.Mode.Dhcp, BroadcastDomainType.Vlan, 9L,
+ domainId, accountId, id, "Imported-network-" + id, "Imported-network-" + id, null, Network.GuestType.Isolated,
+ zoneId, physicalNetworkId, ControlledEntity.ACLType.Account, false, null, false);
+ networkVO.setBroadcastUri(BroadcastDomainType.Vlan.toUri(vlan));
+ networkVO.setGuruName("ExternalGuestNetworkGuru");
+ networkVO.setState(Network.State.Implemented);
+ return _networkDao.persist(networkVO);
+ }
+
+ /**
+ * Get network from VM network name
+ */
+ private NetworkVO getGuestNetworkFromNetworkMorName(String name, long accountId, Long zoneId, long domainId) {
+ String prefix = "cloud.guest.";
+ String nameWithoutPrefix = name.replace(prefix, "");
+ String[] parts = nameWithoutPrefix.split("\\.");
+ String vlan = parts[0];
+ String tag = parts[parts.length - 1];
+ String[] tagSplit = tag.split("-");
+ tag = tagSplit[tagSplit.length - 1];
+ NetworkVO networkVO = _networkDao.findByVlan(vlan);
+ if (networkVO == null) {
+ networkVO = createNetworkRecord(zoneId, tag, vlan, accountId, domainId);
+ }
+ return networkVO;
+ }
+
+ /**
+ * Get map between VM networks and its IDs on CloudStack
+ */
+ private Map<String, NetworkVO> getNetworksMapping(String[] vmNetworkNames, long accountId, long zoneId, long domainId) {
+ Map<String, NetworkVO> mapping = new HashMap<>();
+ for (String networkName : vmNetworkNames) {
+ NetworkVO networkVO = getGuestNetworkFromNetworkMorName(networkName, accountId, zoneId, domainId);
+ mapping.put(networkName, networkVO);
+ }
+ return mapping;
+ }
+
+ /**
+ * Get network MO from VM NIC
+ */
+ private NetworkMO getNetworkMO(VirtualE1000 nic, VmwareContext context) {
+ VirtualDeviceConnectInfo connectable = nic.getConnectable();
+ VirtualEthernetCardNetworkBackingInfo info = (VirtualEthernetCardNetworkBackingInfo) nic.getBacking();
+ ManagedObjectReference networkMor = info.getNetwork();
+ if (networkMor == null) {
+ throw new CloudRuntimeException("Could not find network for NIC on: " + nic.getMacAddress());
+ }
+ return new NetworkMO(context, networkMor);
+ }
+
+ private Pair<String, String> getNicMacAddressAndNetworkName(VirtualDevice nicDevice, VmwareContext context) throws Exception {
+ VirtualE1000 nic = (VirtualE1000) nicDevice;
+ String macAddress = nic.getMacAddress();
+ NetworkMO networkMO = getNetworkMO(nic, context);
+ String networkName = networkMO.getName();
+ return new Pair<>(macAddress, networkName);
+ }
+
+ private void syncVMNics(VirtualDevice[] nicDevices, DatacenterMO dcMo, Map<String, NetworkVO> networksMapping,
+ VMInstanceVO vm) throws Exception {
+ VmwareContext context = dcMo.getContext();
+ List<NicVO> allNics = _nicDao.listByVmId(vm.getId());
+ for (VirtualDevice nicDevice : nicDevices) {
+ Pair<String, String> pair = getNicMacAddressAndNetworkName(nicDevice, context);
+ String macAddress = pair.first();
+ String networkName = pair.second();
+ NetworkVO networkVO = networksMapping.get(networkName);
+ NicVO nicVO = _nicDao.findByNetworkIdAndMacAddress(networkVO.getId(), macAddress);
+ if (nicVO != null) {
+ allNics.remove(nicVO);
+ }
+ }
+ for (final NicVO unMappedNic : allNics) {
+ vmManager.removeNicFromVm(vm, unMappedNic);
+ }
+ }
+
+ private Map<VirtualDisk, VolumeVO> getDisksMapping(Backup backup, List<VirtualDisk> virtualDisks) {
+ final VMInstanceVO vm = _vmDao.findByIdIncludingRemoved(backup.getVmId());
+ if (vm == null) {
+ throw new CloudRuntimeException("Failed to find the volumes details from the VM backup");
+ }
+ List<Backup.VolumeInfo> backedUpVolumes = vm.getBackupVolumeList();
+ Map<String, Boolean> usedVols = new HashMap<>();
+ Map<VirtualDisk, VolumeVO> map = new HashMap<>();
+
+ for (Backup.VolumeInfo backedUpVol : backedUpVolumes) {
+ for (VirtualDisk disk : virtualDisks) {
+ if (!map.containsKey(disk) && backedUpVol.getSize().equals(disk.getCapacityInBytes())
+ && !usedVols.containsKey(backedUpVol.getUuid())) {
+ String volId = backedUpVol.getUuid();
+ VolumeVO vol = _volumeDao.findByUuidIncludingRemoved(volId);
+ usedVols.put(backedUpVol.getUuid(), true);
+ map.put(disk, vol);
+ s_logger.debug("VM restore mapping for disk " + disk.getBacking() +
+ " (capacity: " + disk.getCapacityInBytes() + ") with volume ID" + vol.getId());
+ }
+ }
+ }
+ return map;
+ }
+
+ /**
+ * Find VM on datacenter
+ */
+ private VirtualMachineMO findVM(DatacenterMO dcMo, String path) throws Exception {
+ VirtualMachineMO vm = dcMo.findVm(path);
+ if (vm == null) {
+ throw new CloudRuntimeException("Error finding VM: " + path);
+ }
+ return vm;
+ }
+
+ /**
+ * Find restored volume based on volume info
+ */
+ private VirtualDisk findRestoredVolume(Backup.VolumeInfo volumeInfo, VirtualMachineMO vm) throws Exception {
+ List<VirtualDisk> virtualDisks = vm.getVirtualDisks();
+ for (VirtualDisk disk: virtualDisks) {
+ if (disk.getCapacityInBytes().equals(volumeInfo.getSize())) {
+ return disk;
+ }
+ }
+ throw new CloudRuntimeException("Volume to restore could not be found");
+ }
+
+ /**
+ * Get volume full path
+ */
+ private String getVolumeFullPath(VirtualDisk disk) {
+ VirtualDeviceBackingInfo backing = disk.getBacking();
+ checkBackingInfo(backing);
+ VirtualDiskFlatVer2BackingInfo info = (VirtualDiskFlatVer2BackingInfo) backing;
+ return info.getFileName();
+ }
+
+ /**
+ * Get dest volume full path
+ */
+ private String getDestVolumeFullPath(VirtualDisk restoredDisk, VirtualMachineMO restoredVm,
+ VirtualMachineMO vmMo) throws Exception {
+ VirtualDisk vmDisk = vmMo.getVirtualDisks().get(0);
+ String vmDiskPath = vmMo.getVmdkFileBaseName(vmDisk);
+ String vmDiskFullPath = getVolumeFullPath(vmMo.getVirtualDisks().get(0));
+ String restoredVolumePath = restoredVm.getVmdkFileBaseName(restoredDisk);
+ return vmDiskFullPath.replace(vmDiskPath, restoredVolumePath);
+ }
+
+ /**
+ * Get dest datastore mor
+ */
+ private ManagedObjectReference getDestStoreMor(VirtualMachineMO vmMo) throws Exception {
+ VirtualDisk vmDisk = vmMo.getVirtualDisks().get(0);
+ VirtualDeviceBackingInfo backing = vmDisk.getBacking();
+ checkBackingInfo(backing);
+ VirtualDiskFlatVer2BackingInfo info = (VirtualDiskFlatVer2BackingInfo) backing;
+ return info.getDatastore();
+ }
+
+ @Override
+ public VirtualMachine importVirtualMachineFromBackup(long zoneId, long domainId, long accountId, long userId,
+ String vmInternalName, Backup backup) throws Exception {
+ DatacenterMO dcMo = getDatacenterMO(zoneId);
+ VirtualMachineMO vmToImport = dcMo.findVm(vmInternalName);
+ if (vmToImport == null) {
+ throw new CloudRuntimeException("Error finding VM: " + vmInternalName);
+ }
+ VirtualMachineConfigSummary configSummary = vmToImport.getConfigSummary();
+ VirtualMachineRuntimeInfo runtimeInfo = vmToImport.getRuntimeInfo();
+ List<VirtualDisk> virtualDisks = vmToImport.getVirtualDisks();
+ String[] vmNetworkNames = vmToImport.getNetworks();
+ VirtualDevice[] nicDevices = vmToImport.getNicDevices();
+
+ Map<VirtualDisk, VolumeVO> disksMapping = getDisksMapping(backup, virtualDisks);
+ Map<String, NetworkVO> networksMapping = getNetworksMapping(vmNetworkNames, accountId, zoneId, domainId);
+
+ long guestOsId = getImportingVMGuestOs(configSummary);
+ long serviceOfferingId = getImportingVMServiceOffering(configSummary, runtimeInfo);
+ long templateId = getImportingVMTemplate(virtualDisks, dcMo, vmInternalName, guestOsId, accountId, disksMapping, backup);
+
+ VMInstanceVO vm = getVM(vmInternalName, templateId, guestOsId, serviceOfferingId, zoneId, accountId, userId, domainId);
+ syncVMVolumes(vm, virtualDisks, disksMapping, vmToImport, backup);
+ syncVMNics(nicDevices, dcMo, networksMapping, vm);
+
+ return vm;
+ }
+
+ @Override
+ public boolean attachRestoredVolumeToVirtualMachine(long zoneId, String location, Backup.VolumeInfo volumeInfo,
+ VirtualMachine vm, long poolId, Backup backup) throws Exception {
+ DatacenterMO dcMo = getDatacenterMO(zoneId);
+ VirtualMachineMO vmRestored = findVM(dcMo, location);
+ VirtualMachineMO vmMo = findVM(dcMo, vm.getInstanceName());
+ VirtualDisk restoredDisk = findRestoredVolume(volumeInfo, vmRestored);
+ String diskPath = vmRestored.getVmdkFileBaseName(restoredDisk);
+
+ s_logger.debug("Restored disk size=" + restoredDisk.getCapacityInKB() + " path=" + diskPath);
+
+ // Detach restored VM disks
+ vmRestored.detachAllDisks();
+
+ String srcPath = getVolumeFullPath(restoredDisk);
+ String destPath = getDestVolumeFullPath(restoredDisk, vmRestored, vmMo);
+
+ VirtualDiskManagerMO virtualDiskManagerMO = new VirtualDiskManagerMO(dcMo.getContext());
+
+ // Copy volume to the VM folder
+ virtualDiskManagerMO.moveVirtualDisk(srcPath, dcMo.getMor(), destPath, dcMo.getMor(), true);
+
+ try {
+ // Attach volume to VM
+ vmMo.attachDisk(new String[] {destPath}, getDestStoreMor(vmMo));
+ } catch (Exception e) {
+ s_logger.error("Failed to attach the restored volume: " + diskPath, e);
+ return false;
+ } finally {
+ // Destroy restored VM
+ vmRestored.destroy();
+ }
+
+ VirtualDisk attachedDisk = getAttachedDisk(vmMo, diskPath);
+ if (attachedDisk == null) {
+ s_logger.error("Failed to get the attached the (restored) volume " + diskPath);
+ return false;
+ }
+ createVolume(attachedDisk, vmMo, vm.getDomainId(), vm.getDataCenterId(), vm.getAccountId(), vm.getId(),
+ poolId, vm.getTemplateId(), backup, false);
+
+ return true;
+ }
+
+ private VirtualDisk getAttachedDisk(VirtualMachineMO vmMo, String diskPath) throws Exception {
+ for (VirtualDisk disk : vmMo.getVirtualDisks()) {
+ if (vmMo.getVmdkFileBaseName(disk).equals(diskPath)) {
+ return disk;
+ }
+ }
+ return null;
+ }
+
@Override
public List<Command> finalizeMigrate(VirtualMachine vm, StoragePool destination) {
List<Command> commands = new ArrayList<Command>();
diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
index 4b2f830..1102f9d 100644
--- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
+++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
@@ -45,6 +45,7 @@
import com.cloud.exception.DiscoveryException;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceInUseException;
+import com.cloud.host.Host;
import com.cloud.host.HostVO;
import com.cloud.hypervisor.Hypervisor;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
@@ -367,6 +368,10 @@
details.put("url", hostMo.getHostName());
details.put("username", username);
details.put("password", password);
+ boolean uefiLegacySupported = hostMo.isUefiLegacySupported();
+ if (uefiLegacySupported) {
+ details.put(Host.HOST_UEFI_ENABLE, "true");
+ }
String guid = morHost.getType() + ":" + morHost.getValue() + "@" + url.getHost();
details.put("guid", guid);
diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
index 1d3c1ad..c4b939a 100644
--- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
+++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
@@ -199,7 +199,7 @@
@Inject
private PrimaryDataStoreDao primaryStorageDao;
@Inject
- private VMTemplatePoolDao templateDataStoreDao;
+ private VMTemplatePoolDao templateStoragePoolDao;
@Inject
private TemplateJoinDao templateDao;
@Inject
@@ -1443,7 +1443,7 @@
*/
private Runnable getCleanupFullyClonedTemplatesTask() {
return new CleanupFullyClonedTemplatesTask(primaryStorageDao,
- templateDataStoreDao,
+ templateStoragePoolDao,
templateDao,
vmInstanceDao,
cloneSettingDao,
diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
index b73d250..f17d613 100644
--- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
+++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
@@ -109,6 +109,8 @@
newPath = createOvaForVolume((VolumeObjectTO)data, timeout);
} else if (data.getObjectType() == DataObjectType.TEMPLATE) {
newPath = createOvaForTemplate((TemplateObjectTO)data, timeout);
+ } else if (data.getObjectType() == DataObjectType.ARCHIVE) {
+ newPath = cmd.getInstallPath();
}
if (newPath != null) {
cmd.setInstallPath(newPath);
@@ -523,7 +525,7 @@
String details = null;
boolean success = false;
- String newVolumeName = UUID.randomUUID().toString().replaceAll("-", "");
+ String newVolumeName = UUID.randomUUID().toString().replace("-", "");
VmwareContext context = hostService.getServiceContext(cmd);
try {
@@ -1051,7 +1053,7 @@
Integer nfsVersion) throws Exception {
String volumeFolder = String.valueOf(volumeId) + "/";
- String newVolume = UUID.randomUUID().toString().replaceAll("-", "");
+ String newVolume = UUID.randomUUID().toString().replace("-", "");
restoreVolumeFromSecStorage(hyperHost, dsMo, newVolume, secStorageUrl, "volumes/" + volumeFolder, exportName, nfsVersion);
return new Pair<String, String>(volumeFolder, newVolume);
diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 26b0e7c..fab6f0a 100644
--- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -44,19 +44,6 @@
import javax.naming.ConfigurationException;
import javax.xml.datatype.XMLGregorianCalendar;
-import com.cloud.agent.api.storage.OVFPropertyTO;
-import com.cloud.utils.crypt.DBEncryptionUtil;
-import com.vmware.vim25.ArrayUpdateOperation;
-import com.vmware.vim25.VAppOvfSectionInfo;
-import com.vmware.vim25.VAppOvfSectionSpec;
-import com.vmware.vim25.VAppProductInfo;
-import com.vmware.vim25.VAppProductSpec;
-import com.vmware.vim25.VAppPropertyInfo;
-import com.vmware.vim25.VAppPropertySpec;
-import com.vmware.vim25.VmConfigInfo;
-import com.vmware.vim25.VmConfigSpec;
-import org.apache.commons.collections.CollectionUtils;
-
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.storage.command.CopyCommand;
import org.apache.cloudstack.storage.command.StorageSubSystemCommand;
@@ -66,6 +53,8 @@
import org.apache.cloudstack.storage.to.TemplateObjectTO;
import org.apache.cloudstack.storage.to.VolumeObjectTO;
import org.apache.cloudstack.utils.volume.VirtualMachineDiskInfo;
+import org.apache.cloudstack.vm.UnmanagedInstanceTO;
+import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.math.NumberUtils;
import org.apache.log4j.Logger;
@@ -101,6 +90,8 @@
import com.cloud.agent.api.GetHostStatsCommand;
import com.cloud.agent.api.GetStorageStatsAnswer;
import com.cloud.agent.api.GetStorageStatsCommand;
+import com.cloud.agent.api.GetUnmanagedInstancesAnswer;
+import com.cloud.agent.api.GetUnmanagedInstancesCommand;
import com.cloud.agent.api.GetVmDiskStatsAnswer;
import com.cloud.agent.api.GetVmDiskStatsCommand;
import com.cloud.agent.api.GetVmIpAddressCommand;
@@ -184,6 +175,7 @@
import com.cloud.agent.api.storage.DestroyCommand;
import com.cloud.agent.api.storage.MigrateVolumeAnswer;
import com.cloud.agent.api.storage.MigrateVolumeCommand;
+import com.cloud.agent.api.storage.OVFPropertyTO;
import com.cloud.agent.api.storage.PrimaryStorageDownloadAnswer;
import com.cloud.agent.api.storage.PrimaryStorageDownloadCommand;
import com.cloud.agent.api.storage.ResizeVolumeAnswer;
@@ -216,6 +208,7 @@
import com.cloud.hypervisor.vmware.mo.DatastoreFile;
import com.cloud.hypervisor.vmware.mo.DatastoreMO;
import com.cloud.hypervisor.vmware.mo.DiskControllerType;
+import com.cloud.hypervisor.vmware.mo.DistributedVirtualSwitchMO;
import com.cloud.hypervisor.vmware.mo.FeatureKeyConstants;
import com.cloud.hypervisor.vmware.mo.HostDatastoreSystemMO;
import com.cloud.hypervisor.vmware.mo.HostMO;
@@ -254,6 +247,7 @@
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
import com.cloud.utils.Ternary;
+import com.cloud.utils.crypt.DBEncryptionUtil;
import com.cloud.utils.db.DB;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.exception.ExceptionUtil;
@@ -267,24 +261,30 @@
import com.cloud.vm.VirtualMachine.PowerState;
import com.cloud.vm.VirtualMachineName;
import com.cloud.vm.VmDetailConstants;
+import com.google.common.base.Strings;
import com.google.gson.Gson;
import com.vmware.vim25.AboutInfo;
+import com.vmware.vim25.ArrayUpdateOperation;
import com.vmware.vim25.BoolPolicy;
import com.vmware.vim25.ComputeResourceSummary;
import com.vmware.vim25.CustomFieldStringValue;
import com.vmware.vim25.DVPortConfigInfo;
import com.vmware.vim25.DVPortConfigSpec;
import com.vmware.vim25.DasVmPriority;
+import com.vmware.vim25.DatastoreInfo;
import com.vmware.vim25.DatastoreSummary;
import com.vmware.vim25.DistributedVirtualPort;
import com.vmware.vim25.DistributedVirtualSwitchPortConnection;
import com.vmware.vim25.DistributedVirtualSwitchPortCriteria;
import com.vmware.vim25.DynamicProperty;
import com.vmware.vim25.GuestInfo;
+import com.vmware.vim25.GuestNicInfo;
import com.vmware.vim25.HostCapability;
import com.vmware.vim25.HostHostBusAdapter;
import com.vmware.vim25.HostInternetScsiHba;
+import com.vmware.vim25.HostPortGroupSpec;
import com.vmware.vim25.ManagedObjectReference;
+import com.vmware.vim25.NasDatastoreInfo;
import com.vmware.vim25.ObjectContent;
import com.vmware.vim25.OptionValue;
import com.vmware.vim25.PerfCounterInfo;
@@ -296,19 +296,28 @@
import com.vmware.vim25.PerfQuerySpec;
import com.vmware.vim25.RuntimeFaultFaultMsg;
import com.vmware.vim25.ToolsUnavailableFaultMsg;
+import com.vmware.vim25.VAppOvfSectionInfo;
+import com.vmware.vim25.VAppOvfSectionSpec;
+import com.vmware.vim25.VAppProductInfo;
+import com.vmware.vim25.VAppProductSpec;
+import com.vmware.vim25.VAppPropertyInfo;
+import com.vmware.vim25.VAppPropertySpec;
import com.vmware.vim25.VMwareDVSPortSetting;
import com.vmware.vim25.VimPortType;
import com.vmware.vim25.VirtualDevice;
import com.vmware.vim25.VirtualDeviceBackingInfo;
import com.vmware.vim25.VirtualDeviceConfigSpec;
import com.vmware.vim25.VirtualDeviceConfigSpecOperation;
+import com.vmware.vim25.VirtualDeviceFileBackingInfo;
import com.vmware.vim25.VirtualDisk;
import com.vmware.vim25.VirtualDiskFlatVer2BackingInfo;
import com.vmware.vim25.VirtualEthernetCard;
import com.vmware.vim25.VirtualEthernetCardDistributedVirtualPortBackingInfo;
import com.vmware.vim25.VirtualEthernetCardNetworkBackingInfo;
import com.vmware.vim25.VirtualEthernetCardOpaqueNetworkBackingInfo;
+import com.vmware.vim25.VirtualIDEController;
import com.vmware.vim25.VirtualMachineConfigSpec;
+import com.vmware.vim25.VirtualMachineBootOptions;
import com.vmware.vim25.VirtualMachineFileInfo;
import com.vmware.vim25.VirtualMachineFileLayoutEx;
import com.vmware.vim25.VirtualMachineFileLayoutExFileInfo;
@@ -319,7 +328,15 @@
import com.vmware.vim25.VirtualMachineRuntimeInfo;
import com.vmware.vim25.VirtualMachineToolsStatus;
import com.vmware.vim25.VirtualMachineVideoCard;
+import com.vmware.vim25.VirtualPCNet32;
+import com.vmware.vim25.VirtualSCSIController;
import com.vmware.vim25.VirtualUSBController;
+import com.vmware.vim25.VirtualVmxnet2;
+import com.vmware.vim25.VirtualVmxnet3;
+import com.vmware.vim25.VmConfigInfo;
+import com.vmware.vim25.VmConfigSpec;
+import com.vmware.vim25.VmfsDatastoreInfo;
+import com.vmware.vim25.VmwareDistributedVirtualSwitchPvlanSpec;
import com.vmware.vim25.VmwareDistributedVirtualSwitchVlanIdSpec;
public class VmwareResource implements StoragePoolResource, ServerResource, VmwareHostService, VirtualRouterDeployer {
@@ -377,6 +394,7 @@
protected VirtualRoutingResource _vrResource;
protected final static HashMap<VirtualMachinePowerState, PowerState> s_powerStatesTable = new HashMap<VirtualMachinePowerState, PowerState>();
+
static {
s_powerStatesTable.put(VirtualMachinePowerState.POWERED_ON, PowerState.PowerOn);
s_powerStatesTable.put(VirtualMachinePowerState.POWERED_OFF, PowerState.PowerOff);
@@ -429,118 +447,120 @@
Class<? extends Command> clz = cmd.getClass();
if (cmd instanceof NetworkElementCommand) {
- return _vrResource.executeRequest((NetworkElementCommand)cmd);
+ return _vrResource.executeRequest((NetworkElementCommand) cmd);
} else if (clz == ReadyCommand.class) {
- answer = execute((ReadyCommand)cmd);
+ answer = execute((ReadyCommand) cmd);
} else if (clz == GetHostStatsCommand.class) {
- answer = execute((GetHostStatsCommand)cmd);
+ answer = execute((GetHostStatsCommand) cmd);
} else if (clz == GetVmStatsCommand.class) {
- answer = execute((GetVmStatsCommand)cmd);
+ answer = execute((GetVmStatsCommand) cmd);
} else if (clz == GetVmNetworkStatsCommand.class) {
answer = execute((GetVmNetworkStatsCommand) cmd);
} else if (clz == GetVmDiskStatsCommand.class) {
- answer = execute((GetVmDiskStatsCommand)cmd);
+ answer = execute((GetVmDiskStatsCommand) cmd);
} else if (cmd instanceof GetVolumeStatsCommand) {
- return execute((GetVolumeStatsCommand)cmd);
+ return execute((GetVolumeStatsCommand) cmd);
} else if (clz == CheckHealthCommand.class) {
- answer = execute((CheckHealthCommand)cmd);
+ answer = execute((CheckHealthCommand) cmd);
} else if (clz == StopCommand.class) {
- answer = execute((StopCommand)cmd);
+ answer = execute((StopCommand) cmd);
} else if (clz == RebootRouterCommand.class) {
- answer = execute((RebootRouterCommand)cmd);
+ answer = execute((RebootRouterCommand) cmd);
} else if (clz == RebootCommand.class) {
- answer = execute((RebootCommand)cmd);
+ answer = execute((RebootCommand) cmd);
} else if (clz == CheckVirtualMachineCommand.class) {
- answer = execute((CheckVirtualMachineCommand)cmd);
+ answer = execute((CheckVirtualMachineCommand) cmd);
} else if (clz == PrepareForMigrationCommand.class) {
- answer = execute((PrepareForMigrationCommand)cmd);
+ answer = execute((PrepareForMigrationCommand) cmd);
} else if (clz == MigrateCommand.class) {
- answer = execute((MigrateCommand)cmd);
+ answer = execute((MigrateCommand) cmd);
} else if (clz == MigrateVmToPoolCommand.class) {
- answer = execute((MigrateVmToPoolCommand)cmd);
+ answer = execute((MigrateVmToPoolCommand) cmd);
} else if (clz == MigrateWithStorageCommand.class) {
- answer = execute((MigrateWithStorageCommand)cmd);
+ answer = execute((MigrateWithStorageCommand) cmd);
} else if (clz == MigrateVolumeCommand.class) {
- answer = execute((MigrateVolumeCommand)cmd);
+ answer = execute((MigrateVolumeCommand) cmd);
} else if (clz == DestroyCommand.class) {
- answer = execute((DestroyCommand)cmd);
+ answer = execute((DestroyCommand) cmd);
} else if (clz == CreateStoragePoolCommand.class) {
- return execute((CreateStoragePoolCommand)cmd);
+ return execute((CreateStoragePoolCommand) cmd);
} else if (clz == ModifyTargetsCommand.class) {
- answer = execute((ModifyTargetsCommand)cmd);
+ answer = execute((ModifyTargetsCommand) cmd);
} else if (clz == ModifyStoragePoolCommand.class) {
- answer = execute((ModifyStoragePoolCommand)cmd);
+ answer = execute((ModifyStoragePoolCommand) cmd);
} else if (clz == DeleteStoragePoolCommand.class) {
- answer = execute((DeleteStoragePoolCommand)cmd);
+ answer = execute((DeleteStoragePoolCommand) cmd);
} else if (clz == CopyVolumeCommand.class) {
- answer = execute((CopyVolumeCommand)cmd);
+ answer = execute((CopyVolumeCommand) cmd);
} else if (clz == AttachIsoCommand.class) {
- answer = execute((AttachIsoCommand)cmd);
+ answer = execute((AttachIsoCommand) cmd);
} else if (clz == ValidateSnapshotCommand.class) {
- answer = execute((ValidateSnapshotCommand)cmd);
+ answer = execute((ValidateSnapshotCommand) cmd);
} else if (clz == ManageSnapshotCommand.class) {
- answer = execute((ManageSnapshotCommand)cmd);
+ answer = execute((ManageSnapshotCommand) cmd);
} else if (clz == BackupSnapshotCommand.class) {
- answer = execute((BackupSnapshotCommand)cmd);
+ answer = execute((BackupSnapshotCommand) cmd);
} else if (clz == CreateVolumeFromSnapshotCommand.class) {
- answer = execute((CreateVolumeFromSnapshotCommand)cmd);
+ answer = execute((CreateVolumeFromSnapshotCommand) cmd);
} else if (clz == CreatePrivateTemplateFromVolumeCommand.class) {
- answer = execute((CreatePrivateTemplateFromVolumeCommand)cmd);
+ answer = execute((CreatePrivateTemplateFromVolumeCommand) cmd);
} else if (clz == CreatePrivateTemplateFromSnapshotCommand.class) {
- answer = execute((CreatePrivateTemplateFromSnapshotCommand)cmd);
+ answer = execute((CreatePrivateTemplateFromSnapshotCommand) cmd);
} else if (clz == UpgradeSnapshotCommand.class) {
- answer = execute((UpgradeSnapshotCommand)cmd);
+ answer = execute((UpgradeSnapshotCommand) cmd);
} else if (clz == GetStorageStatsCommand.class) {
- answer = execute((GetStorageStatsCommand)cmd);
+ answer = execute((GetStorageStatsCommand) cmd);
} else if (clz == PrimaryStorageDownloadCommand.class) {
- answer = execute((PrimaryStorageDownloadCommand)cmd);
+ answer = execute((PrimaryStorageDownloadCommand) cmd);
} else if (clz == GetVncPortCommand.class) {
- answer = execute((GetVncPortCommand)cmd);
+ answer = execute((GetVncPortCommand) cmd);
} else if (clz == SetupCommand.class) {
- answer = execute((SetupCommand)cmd);
+ answer = execute((SetupCommand) cmd);
} else if (clz == MaintainCommand.class) {
- answer = execute((MaintainCommand)cmd);
+ answer = execute((MaintainCommand) cmd);
} else if (clz == PingTestCommand.class) {
- answer = execute((PingTestCommand)cmd);
+ answer = execute((PingTestCommand) cmd);
} else if (clz == CheckOnHostCommand.class) {
- answer = execute((CheckOnHostCommand)cmd);
+ answer = execute((CheckOnHostCommand) cmd);
} else if (clz == ModifySshKeysCommand.class) {
- answer = execute((ModifySshKeysCommand)cmd);
+ answer = execute((ModifySshKeysCommand) cmd);
} else if (clz == NetworkUsageCommand.class) {
- answer = execute((NetworkUsageCommand)cmd);
+ answer = execute((NetworkUsageCommand) cmd);
} else if (clz == StartCommand.class) {
- answer = execute((StartCommand)cmd);
+ answer = execute((StartCommand) cmd);
} else if (clz == CheckSshCommand.class) {
- answer = execute((CheckSshCommand)cmd);
+ answer = execute((CheckSshCommand) cmd);
} else if (clz == CheckNetworkCommand.class) {
- answer = execute((CheckNetworkCommand)cmd);
+ answer = execute((CheckNetworkCommand) cmd);
} else if (clz == PlugNicCommand.class) {
- answer = execute((PlugNicCommand)cmd);
+ answer = execute((PlugNicCommand) cmd);
} else if (clz == ReplugNicCommand.class) {
- answer = execute((ReplugNicCommand)cmd);
+ answer = execute((ReplugNicCommand) cmd);
} else if (clz == UnPlugNicCommand.class) {
- answer = execute((UnPlugNicCommand)cmd);
+ answer = execute((UnPlugNicCommand) cmd);
} else if (cmd instanceof CreateVMSnapshotCommand) {
- return execute((CreateVMSnapshotCommand)cmd);
+ return execute((CreateVMSnapshotCommand) cmd);
} else if (cmd instanceof DeleteVMSnapshotCommand) {
- return execute((DeleteVMSnapshotCommand)cmd);
+ return execute((DeleteVMSnapshotCommand) cmd);
} else if (cmd instanceof RevertToVMSnapshotCommand) {
- return execute((RevertToVMSnapshotCommand)cmd);
+ return execute((RevertToVMSnapshotCommand) cmd);
} else if (clz == ResizeVolumeCommand.class) {
- return execute((ResizeVolumeCommand)cmd);
+ return execute((ResizeVolumeCommand) cmd);
} else if (clz == UnregisterVMCommand.class) {
- return execute((UnregisterVMCommand)cmd);
+ return execute((UnregisterVMCommand) cmd);
} else if (cmd instanceof StorageSubSystemCommand) {
- checkStorageProcessorAndHandlerNfsVersionAttribute((StorageSubSystemCommand)cmd);
- return storageHandler.handleStorageCommands((StorageSubSystemCommand)cmd);
+ checkStorageProcessorAndHandlerNfsVersionAttribute((StorageSubSystemCommand) cmd);
+ return storageHandler.handleStorageCommands((StorageSubSystemCommand) cmd);
} else if (clz == ScaleVmCommand.class) {
- return execute((ScaleVmCommand)cmd);
+ return execute((ScaleVmCommand) cmd);
} else if (clz == PvlanSetupCommand.class) {
- return execute((PvlanSetupCommand)cmd);
+ return execute((PvlanSetupCommand) cmd);
} else if (clz == GetVmIpAddressCommand.class) {
- return execute((GetVmIpAddressCommand)cmd);
+ return execute((GetVmIpAddressCommand) cmd);
} else if (clz == UnregisterNicCommand.class) {
- answer = execute((UnregisterNicCommand)cmd);
+ answer = execute((UnregisterNicCommand) cmd);
+ } else if (clz == GetUnmanagedInstancesCommand.class) {
+ answer = execute((GetUnmanagedInstancesCommand) cmd);
} else {
answer = Answer.createUnsupportedCommandAnswer(cmd);
}
@@ -586,6 +606,7 @@
* If _storageNfsVersion is not null -> nothing to do, version already set.<br>
* If _storageNfsVersion is null -> examine StorageSubSystemCommand to get NFS version and set it
* to the storage processor and storage handler.
+ *
* @param cmd command to execute
*/
protected void checkStorageProcessorAndHandlerNfsVersionAttribute(StorageSubSystemCommand cmd) {
@@ -594,18 +615,19 @@
if (cmd instanceof CopyCommand) {
EnumMap<VmwareStorageProcessorConfigurableFields, Object> params = new EnumMap<VmwareStorageProcessorConfigurableFields, Object>(
VmwareStorageProcessorConfigurableFields.class);
- examineStorageSubSystemCommandNfsVersion((CopyCommand)cmd, params);
- params = examineStorageSubSystemCommandFullCloneFlagForVmware((CopyCommand)cmd, params);
+ examineStorageSubSystemCommandNfsVersion((CopyCommand) cmd, params);
+ params = examineStorageSubSystemCommandFullCloneFlagForVmware((CopyCommand) cmd, params);
reconfigureProcessorByHandler(params);
}
}
/**
* Reconfigure processor by handler
+ *
* @param params params
*/
protected void reconfigureProcessorByHandler(EnumMap<VmwareStorageProcessorConfigurableFields, Object> params) {
- VmwareStorageSubsystemCommandHandler handler = (VmwareStorageSubsystemCommandHandler)storageHandler;
+ VmwareStorageSubsystemCommandHandler handler = (VmwareStorageSubsystemCommandHandler) storageHandler;
boolean success = handler.reconfigureStorageProcessor(params);
if (success) {
s_logger.info("VmwareStorageProcessor and VmwareStorageSubsystemCommandHandler successfully reconfigured");
@@ -616,7 +638,8 @@
/**
* Examine StorageSubSystem command to get full clone flag, if provided
- * @param cmd command to execute
+ *
+ * @param cmd command to execute
* @param params params
* @return copy of params including new values, if suitable
*/
@@ -627,7 +650,7 @@
if (hypervisor != null && hypervisor.equals(HypervisorType.VMware)) {
DataStoreTO destDataStore = cmd.getDestTO().getDataStore();
if (destDataStore instanceof PrimaryDataStoreTO) {
- PrimaryDataStoreTO dest = (PrimaryDataStoreTO)destDataStore;
+ PrimaryDataStoreTO dest = (PrimaryDataStoreTO) destDataStore;
if (dest.isFullCloneFlag() != null) {
paramsCopy.put(VmwareStorageProcessorConfigurableFields.FULL_CLONE_FLAG, dest.isFullCloneFlag().booleanValue());
}
@@ -638,7 +661,8 @@
/**
* Examine StorageSubSystem command to get storage NFS version, if provided
- * @param cmd command to execute
+ *
+ * @param cmd command to execute
* @param params params
*/
protected void examineStorageSubSystemCommandNfsVersion(CopyCommand cmd, EnumMap<VmwareStorageProcessorConfigurableFields, Object> params) {
@@ -646,7 +670,7 @@
boolean nfsVersionFound = false;
if (srcDataStore instanceof NfsTO) {
- nfsVersionFound = getStorageNfsVersionFromNfsTO((NfsTO)srcDataStore);
+ nfsVersionFound = getStorageNfsVersionFromNfsTO((NfsTO) srcDataStore);
}
if (nfsVersionFound) {
@@ -656,6 +680,7 @@
/**
* Get storage NFS version from NfsTO
+ *
* @param nfsTO nfsTO
* @return true if NFS version was found and not null, false in other case
*/
@@ -742,7 +767,7 @@
// OfflineVmwareMigration: 3. attach the disk to the worker
vmdkDataStorePath = VmwareStorageLayoutHelper.getLegacyDatastorePathFromVmdkFileName(dsMo, path + VMDK_EXTENSION);
- vmMo.attachDisk(new String[] { vmdkDataStorePath }, morDS);
+ vmMo.attachDisk(new String[]{vmdkDataStorePath}, morDS);
}
}
@@ -772,7 +797,7 @@
// IDE virtual disk cannot be re-sized if VM is running
if (vdisk.second() != null && vdisk.second().contains("ide")) {
throw new Exception("Re-sizing a virtual disk over an IDE controller is not supported in the VMware hypervisor. " +
- "Please re-try when virtual disk is attached to a VM using a SCSI controller.");
+ "Please re-try when virtual disk is attached to a VM using a SCSI controller.");
}
if (cmd.isManaged()) {
@@ -798,16 +823,14 @@
_storageProcessor.expandDatastore(hostDatastoreSystem, dsMo);
}
- if (vdisk.second() != null && !vdisk.second().toLowerCase().startsWith("scsi"))
- {
- s_logger.error("Unsupported disk device bus "+ vdisk.second());
- throw new Exception("Unsupported disk device bus "+ vdisk.second());
+ if (vdisk.second() != null && !vdisk.second().toLowerCase().startsWith("scsi")) {
+ s_logger.error("Unsupported disk device bus " + vdisk.second());
+ throw new Exception("Unsupported disk device bus " + vdisk.second());
}
VirtualDisk disk = vdisk.first();
- if ((VirtualDiskFlatVer2BackingInfo)disk.getBacking() != null && ((VirtualDiskFlatVer2BackingInfo)disk.getBacking()).getParent() != null)
- {
- s_logger.error("Resize is not supported because Disk device has Parent "+ ((VirtualDiskFlatVer2BackingInfo)disk.getBacking()).getParent().getUuid());
- throw new Exception("Resize is not supported because Disk device has Parent "+ ((VirtualDiskFlatVer2BackingInfo)disk.getBacking()).getParent().getUuid());
+ if ((VirtualDiskFlatVer2BackingInfo) disk.getBacking() != null && ((VirtualDiskFlatVer2BackingInfo) disk.getBacking()).getParent() != null) {
+ s_logger.error("Resize is not supported because Disk device has Parent " + ((VirtualDiskFlatVer2BackingInfo) disk.getBacking()).getParent().getUuid());
+ throw new Exception("Resize is not supported because Disk device has Parent " + ((VirtualDiskFlatVer2BackingInfo) disk.getBacking()).getParent().getUuid());
}
String vmdkAbsFile = getAbsoluteVmdkFile(disk);
@@ -945,15 +968,15 @@
assert cmd.getRouterAccessIp() != null;
if (cmd instanceof IpAssocVpcCommand) {
- return prepareNetworkElementCommand((IpAssocVpcCommand)cmd);
+ return prepareNetworkElementCommand((IpAssocVpcCommand) cmd);
} else if (cmd instanceof IpAssocCommand) {
- return prepareNetworkElementCommand((IpAssocCommand)cmd);
+ return prepareNetworkElementCommand((IpAssocCommand) cmd);
} else if (cmd instanceof SetSourceNatCommand) {
- return prepareNetworkElementCommand((SetSourceNatCommand)cmd);
+ return prepareNetworkElementCommand((SetSourceNatCommand) cmd);
} else if (cmd instanceof SetupGuestNetworkCommand) {
- return prepareNetworkElementCommand((SetupGuestNetworkCommand)cmd);
+ return prepareNetworkElementCommand((SetupGuestNetworkCommand) cmd);
} else if (cmd instanceof SetNetworkACLCommand) {
- return prepareNetworkElementCommand((SetNetworkACLCommand)cmd);
+ return prepareNetworkElementCommand((SetNetworkACLCommand) cmd);
}
return new ExecutionResult(true, null);
}
@@ -1026,7 +1049,7 @@
VirtualDevice[] nics = vmMo.getNicDevices();
for (VirtualDevice nic : nics) {
if (nic instanceof VirtualEthernetCard) {
- if (((VirtualEthernetCard)nic).getMacAddress().equals(mac))
+ if (((VirtualEthernetCard) nic).getMacAddress().equals(mac))
return nic;
}
}
@@ -1124,7 +1147,7 @@
if (vmMo == null) {
if (hyperHost instanceof HostMO) {
- ClusterMO clusterMo = new ClusterMO(hyperHost.getContext(), ((HostMO)hyperHost).getParentMor());
+ ClusterMO clusterMo = new ClusterMO(hyperHost.getContext(), ((HostMO) hyperHost).getParentMor());
vmMo = clusterMo.findVmOnHyperHost(vmName);
}
}
@@ -1146,7 +1169,7 @@
VirtualEthernetCardType nicDeviceType = VirtualEthernetCardType.E1000;
Map<String, String> details = cmd.getDetails();
if (details != null) {
- nicDeviceType = VirtualEthernetCardType.valueOf((String)details.get("nicAdapter"));
+ nicDeviceType = VirtualEthernetCardType.valueOf((String) details.get("nicAdapter"));
}
// find a usable device number in VMware environment
@@ -1208,7 +1231,7 @@
if (vmMo == null) {
if (hyperHost instanceof HostMO) {
- ClusterMO clusterMo = new ClusterMO(hyperHost.getContext(), ((HostMO)hyperHost).getParentMor());
+ ClusterMO clusterMo = new ClusterMO(hyperHost.getContext(), ((HostMO) hyperHost).getParentMor());
vmMo = clusterMo.findVmOnHyperHost(vmName);
}
}
@@ -1287,7 +1310,7 @@
if (vmMo == null) {
if (hyperHost instanceof HostMO) {
- ClusterMO clusterMo = new ClusterMO(hyperHost.getContext(), ((HostMO)hyperHost).getParentMor());
+ ClusterMO clusterMo = new ClusterMO(hyperHost.getContext(), ((HostMO) hyperHost).getParentMor());
vmMo = clusterMo.findVmOnHyperHost(vmName);
}
}
@@ -1352,7 +1375,7 @@
try {
VirtualDevice[] nicDevices = vmMo.getNicDevices();
- VirtualEthernetCard device = (VirtualEthernetCard)nicDevices[nicIndex];
+ VirtualEthernetCard device = (VirtualEthernetCard) nicDevices[nicIndex];
if (VirtualSwitchType.StandardVirtualSwitch == vSwitchType) {
VirtualEthernetCardNetworkBackingInfo nicBacking = new VirtualEthernetCardNetworkBackingInfo();
@@ -1422,7 +1445,7 @@
// the check and will try to find it within cluster
if (vmMo == null) {
if (hyperHost instanceof HostMO) {
- ClusterMO clusterMo = new ClusterMO(hyperHost.getContext(), ((HostMO)hyperHost).getParentMor());
+ ClusterMO clusterMo = new ClusterMO(hyperHost.getContext(), ((HostMO) hyperHost).getParentMor());
vmMo = clusterMo.findVmOnHyperHost(routerName);
}
}
@@ -1548,13 +1571,13 @@
for (DiskTO vol : disks) {
if (vol.getType() != Volume.Type.ISO) {
- VolumeObjectTO volumeTO = (VolumeObjectTO)vol.getData();
+ VolumeObjectTO volumeTO = (VolumeObjectTO) vol.getData();
DataStoreTO primaryStore = volumeTO.getDataStore();
if (primaryStore.getUuid() != null && !primaryStore.getUuid().isEmpty()) {
validatedDisks.add(vol);
}
} else if (vol.getType() == Volume.Type.ISO) {
- TemplateObjectTO templateTO = (TemplateObjectTO)vol.getData();
+ TemplateObjectTO templateTO = (TemplateObjectTO) vol.getData();
if (templateTO.getPath() != null && !templateTO.getPath().isEmpty()) {
validatedDisks.add(vol);
}
@@ -1611,7 +1634,7 @@
// Check if license supports the feature
VmwareHelper.isFeatureLicensed(hyperHost, FeatureKeyConstants.HOTPLUG);
- VmwareHelper.setVmScaleUpConfig(vmConfigSpec, vmSpec.getCpus(), vmSpec.getMaxSpeed(), vmSpec.getMinSpeed(), (int)requestedMaxMemoryInMb, ramMb,
+ VmwareHelper.setVmScaleUpConfig(vmConfigSpec, vmSpec.getCpus(), vmSpec.getMaxSpeed(), vmSpec.getMinSpeed(), (int) requestedMaxMemoryInMb, ramMb,
vmSpec.getLimitCpuUse());
if (!vmMo.configureVm(vmConfigSpec)) {
@@ -1700,6 +1723,11 @@
String dataDiskController = vmSpec.getDetails().get(VmDetailConstants.DATA_DISK_CONTROLLER);
String rootDiskController = vmSpec.getDetails().get(VmDetailConstants.ROOT_DISK_CONTROLLER);
DiskTO rootDiskTO = null;
+ String bootMode = "bios";
+ if (vmSpec.getDetails().containsKey(VmDetailConstants.BOOT_MODE)) {
+ bootMode = vmSpec.getDetails().get(VmDetailConstants.BOOT_MODE);
+ }
+
// If root disk controller is scsi, then data disk controller would also be scsi instead of using 'osdefault'
// This helps avoid mix of different scsi subtype controllers in instance.
if (DiskControllerType.osdefault == DiskControllerType.getType(dataDiskController) && DiskControllerType.lsilogic == DiskControllerType.getType(rootDiskController)) {
@@ -1771,9 +1799,9 @@
diskInfoBuilder = vmMo.getDiskInfoBuilder();
hasSnapshot = vmMo.hasSnapshot();
if (!hasSnapshot)
- vmMo.tearDownDevices(new Class<?>[] {VirtualDisk.class, VirtualEthernetCard.class});
+ vmMo.tearDownDevices(new Class<?>[]{VirtualDisk.class, VirtualEthernetCard.class});
else
- vmMo.tearDownDevices(new Class<?>[] {VirtualEthernetCard.class});
+ vmMo.tearDownDevices(new Class<?>[]{VirtualEthernetCard.class});
if (systemVm) {
ensureScsiDiskControllers(vmMo, systemVmScsiControllerType.toString(), numScsiControllerForSystemVm, firstScsiControllerBusNum);
} else {
@@ -1797,9 +1825,9 @@
diskInfoBuilder = vmMo.getDiskInfoBuilder();
hasSnapshot = vmMo.hasSnapshot();
if (!hasSnapshot)
- vmMo.tearDownDevices(new Class<?>[] {VirtualDisk.class, VirtualEthernetCard.class});
+ vmMo.tearDownDevices(new Class<?>[]{VirtualDisk.class, VirtualEthernetCard.class});
else
- vmMo.tearDownDevices(new Class<?>[] {VirtualEthernetCard.class});
+ vmMo.tearDownDevices(new Class<?>[]{VirtualEthernetCard.class});
if (systemVm) {
// System volumes doesn't require more than 1 SCSI controller as there is no requirement for data volumes.
@@ -1854,7 +1882,7 @@
}
tearDownVm(vmMo);
} else if (!hyperHost.createBlankVm(vmNameOnVcenter, vmInternalCSName, vmSpec.getCpus(), vmSpec.getMaxSpeed().intValue(), getReservedCpuMHZ(vmSpec),
- vmSpec.getLimitCpuUse(), (int)(vmSpec.getMaxRam() / ResourceType.bytesToMiB), getReservedMemoryMb(vmSpec), guestOsId, rootDiskDataStoreDetails.first(), false,
+ vmSpec.getLimitCpuUse(), (int) (vmSpec.getMaxRam() / ResourceType.bytesToMiB), getReservedMemoryMb(vmSpec), guestOsId, rootDiskDataStoreDetails.first(), false,
controllerInfo, systemVm)) {
throw new Exception("Failed to create VM. vmName: " + vmInternalCSName);
}
@@ -1880,7 +1908,7 @@
VirtualMachineConfigSpec vmConfigSpec = new VirtualMachineConfigSpec();
- VmwareHelper.setBasicVmConfig(vmConfigSpec, vmSpec.getCpus(), vmSpec.getMaxSpeed(), getReservedCpuMHZ(vmSpec), (int)(vmSpec.getMaxRam() / (1024 * 1024)),
+ VmwareHelper.setBasicVmConfig(vmConfigSpec, vmSpec.getCpus(), vmSpec.getMaxSpeed(), getReservedCpuMHZ(vmSpec), (int) (vmSpec.getMaxRam() / (1024 * 1024)),
getReservedMemoryMb(vmSpec), guestOsId, vmSpec.getLimitCpuUse());
// Check for multi-cores per socket settings
@@ -1898,7 +1926,7 @@
// Check for hotadd settings
vmConfigSpec.setMemoryHotAddEnabled(vmMo.isMemoryHotAddSupported(guestOsId));
- String hostApiVersion = ((HostMO)hyperHost).getHostAboutInfo().getApiVersion();
+ String hostApiVersion = ((HostMO) hyperHost).getHostAboutInfo().getApiVersion();
if (numCoresPerSocket > 1 && hostApiVersion.compareTo("5.0") < 0) {
s_logger.warn("Dynamic scaling of CPU is not supported for Virtual Machines with multi-core vCPUs in case of ESXi hosts 4.1 and prior. Hence CpuHotAdd will not be"
+ " enabled for Virtual Machine: " + vmInternalCSName);
@@ -2011,7 +2039,6 @@
}
-
//
// Setup ROOT/DATA disk devices
//
@@ -2050,7 +2077,7 @@
if (!hasSnapshot) {
deviceConfigSpecArray[i] = new VirtualDeviceConfigSpec();
- VolumeObjectTO volumeTO = (VolumeObjectTO)vol.getData();
+ VolumeObjectTO volumeTO = (VolumeObjectTO) vol.getData();
DataStoreTO primaryStore = volumeTO.getDataStore();
Map<String, String> details = vol.getDetails();
boolean managed = false;
@@ -2096,7 +2123,7 @@
// Setup USB devices
//
if (guestOsId.startsWith("darwin")) { //Mac OS
- VirtualDevice[] devices = vmMo.getMatchedDevices(new Class<?>[] {VirtualUSBController.class});
+ VirtualDevice[] devices = vmMo.getMatchedDevices(new Class<?>[]{VirtualUSBController.class});
if (devices.length == 0) {
s_logger.debug("No USB Controller device on VM Start. Add USB Controller device for Mac OS VM " + vmInternalCSName);
@@ -2139,7 +2166,7 @@
for (int nicIndex = nics.length - extraPublicNics; nicIndex < nics.length; nicIndex++) {
VirtualDevice nicDevice = peerVmMo.getNicDeviceByIndex(nics[nicIndex].getDeviceId());
if (nicDevice != null) {
- String mac = ((VirtualEthernetCard)nicDevice).getMacAddress();
+ String mac = ((VirtualEthernetCard) nicDevice).getMacAddress();
if (mac != null) {
s_logger.info("Use same MAC as previous RvR, the MAC is " + mac + " for extra NIC with device id: " + nics[nicIndex].getDeviceId());
nics[nicIndex].setMac(mac);
@@ -2258,6 +2285,16 @@
}
}
+ if (StringUtils.isNotBlank(bootMode) && !bootMode.equalsIgnoreCase("bios")) {
+ vmConfigSpec.setFirmware("efi");
+ if (vmSpec.getDetails().containsKey(ApiConstants.BootType.UEFI.toString()) && "secure".equalsIgnoreCase(vmSpec.getDetails().get(ApiConstants.BootType.UEFI.toString()))) {
+ VirtualMachineBootOptions bootOptions = new VirtualMachineBootOptions();
+ bootOptions.setEfiSecureBootEnabled(true);
+ vmConfigSpec.setBootOptions(bootOptions);
+ }
+ }
+
+
//
// Configure VM
//
@@ -2412,8 +2449,8 @@
* and seting properties values from ovfProperties
*/
protected void copyVAppConfigsFromTemplate(VmConfigInfo vAppConfig,
- List<OVFPropertyTO> ovfProperties,
- VirtualMachineConfigSpec vmConfig) throws Exception {
+ List<OVFPropertyTO> ovfProperties,
+ VirtualMachineConfigSpec vmConfig) throws Exception {
VmConfigSpec vmConfigSpec = new VmConfigSpec();
vmConfigSpec.getEula().addAll(vAppConfig.getEula());
vmConfigSpec.setInstallBootStopDelay(vAppConfig.getInstallBootStopDelay());
@@ -2436,10 +2473,10 @@
private void resizeRootDiskOnVMStart(VirtualMachineMO vmMo, DiskTO rootDiskTO, VmwareHypervisorHost hyperHost, VmwareContext context) throws Exception {
final Pair<VirtualDisk, String> vdisk = getVirtualDiskInfo(vmMo, appendFileType(rootDiskTO.getPath(), VMDK_EXTENSION));
- assert(vdisk != null);
+ assert (vdisk != null);
Long reqSize = 0L;
- final VolumeObjectTO volumeTO = ((VolumeObjectTO)rootDiskTO.getData());
+ final VolumeObjectTO volumeTO = ((VolumeObjectTO) rootDiskTO.getData());
if (volumeTO != null) {
reqSize = volumeTO.getSize() / 1024;
}
@@ -2451,7 +2488,7 @@
if (diskChain != null && diskChain.length > 1) {
s_logger.warn("Disk chain length for the VM is greater than one, this is not supported");
- throw new CloudRuntimeException("Unsupported VM disk chain length: "+ diskChain.length);
+ throw new CloudRuntimeException("Unsupported VM disk chain length: " + diskChain.length);
}
boolean resizingSupported = false;
@@ -2461,7 +2498,7 @@
}
if (!resizingSupported) {
s_logger.warn("Resizing of root disk is only support for scsi device/bus, the provide VM's disk device bus name is " + diskInfo.getDiskDeviceBusName());
- throw new CloudRuntimeException("Unsupported VM root disk device bus: "+ diskInfo.getDiskDeviceBusName());
+ throw new CloudRuntimeException("Unsupported VM root disk device bus: " + diskInfo.getDiskDeviceBusName());
}
disk.setCapacityInKB(reqSize);
@@ -2511,8 +2548,9 @@
* Sets video card memory to the one provided in detail svga.vramSize (if provided) on {@code vmConfigSpec}.
* 64MB was always set before.
* Size must be in KB.
- * @param vmMo virtual machine mo
- * @param vmSpec virtual machine specs
+ *
+ * @param vmMo virtual machine mo
+ * @param vmSpec virtual machine specs
* @param vmConfigSpec virtual machine config spec
* @throws Exception exception
*/
@@ -2530,14 +2568,15 @@
/**
* Search for vm video card iterating through vm device list
- * @param vmMo virtual machine mo
+ *
+ * @param vmMo virtual machine mo
* @param svgaVmramSize new svga vram size (in KB)
- * @param vmConfigSpec virtual machine config spec
+ * @param vmConfigSpec virtual machine config spec
*/
protected void setNewVRamSizeVmVideoCard(VirtualMachineMO vmMo, long svgaVmramSize, VirtualMachineConfigSpec vmConfigSpec) throws Exception {
for (VirtualDevice device : vmMo.getAllDeviceList()) {
if (device instanceof VirtualMachineVideoCard) {
- VirtualMachineVideoCard videoCard = (VirtualMachineVideoCard)device;
+ VirtualMachineVideoCard videoCard = (VirtualMachineVideoCard) device;
modifyVmVideoCardVRamSize(videoCard, vmMo, svgaVmramSize, vmConfigSpec);
}
}
@@ -2545,10 +2584,11 @@
/**
* Modifies vm vram size if it was set to a different size to the one provided in svga.vramSize (user_vm_details or template_vm_details) on {@code vmConfigSpec}
- * @param videoCard vm's video card device
- * @param vmMo virtual machine mo
+ *
+ * @param videoCard vm's video card device
+ * @param vmMo virtual machine mo
* @param svgaVmramSize new svga vram size (in KB)
- * @param vmConfigSpec virtual machine config spec
+ * @param vmConfigSpec virtual machine config spec
*/
protected void modifyVmVideoCardVRamSize(VirtualMachineVideoCard videoCard, VirtualMachineMO vmMo, long svgaVmramSize, VirtualMachineConfigSpec vmConfigSpec) {
if (videoCard.getVideoRamSizeInKB().longValue() != svgaVmramSize) {
@@ -2559,9 +2599,10 @@
/**
* Add edit spec on {@code vmConfigSpec} to modify svga vram size
- * @param videoCard video card device to edit providing the svga vram size
+ *
+ * @param videoCard video card device to edit providing the svga vram size
* @param svgaVmramSize new svga vram size (in KB)
- * @param vmConfigSpec virtual machine spec
+ * @param vmConfigSpec virtual machine spec
*/
protected void configureSpecVideoCardNewVRamSize(VirtualMachineVideoCard videoCard, long svgaVmramSize, VirtualMachineConfigSpec vmConfigSpec) {
videoCard.setVideoRamSizeInKB(svgaVmramSize);
@@ -2582,15 +2623,15 @@
boolean hasSnapshot = false;
hasSnapshot = vmMo.hasSnapshot();
if (!hasSnapshot)
- vmMo.tearDownDevices(new Class<?>[] {VirtualDisk.class, VirtualEthernetCard.class});
+ vmMo.tearDownDevices(new Class<?>[]{VirtualDisk.class, VirtualEthernetCard.class});
else
- vmMo.tearDownDevices(new Class<?>[] {VirtualEthernetCard.class});
+ vmMo.tearDownDevices(new Class<?>[]{VirtualEthernetCard.class});
vmMo.ensureScsiDeviceController();
}
int getReservedMemoryMb(VirtualMachineTO vmSpec) {
if (vmSpec.getDetails().get(VMwareGuru.VmwareReserveMemory.key()).equalsIgnoreCase("true")) {
- return (int)(vmSpec.getMinRam() / ResourceType.bytesToMiB);
+ return (int) (vmSpec.getMinRam() / ResourceType.bytesToMiB);
}
return 0;
}
@@ -2604,9 +2645,9 @@
// return the finalized disk chain for startup, from top to bottom
private String[] syncDiskChain(DatacenterMO dcMo, VirtualMachineMO vmMo, VirtualMachineTO vmSpec, DiskTO vol, VirtualMachineDiskInfo diskInfo,
- HashMap<String, Pair<ManagedObjectReference, DatastoreMO>> dataStoresDetails) throws Exception {
+ HashMap<String, Pair<ManagedObjectReference, DatastoreMO>> dataStoresDetails) throws Exception {
- VolumeObjectTO volumeTO = (VolumeObjectTO)vol.getData();
+ VolumeObjectTO volumeTO = (VolumeObjectTO) vol.getData();
DataStoreTO primaryStore = volumeTO.getDataStore();
Map<String, String> details = vol.getDetails();
boolean isManaged = false;
@@ -2652,8 +2693,7 @@
}
datastoreDiskPath = VmwareStorageLayoutHelper.syncVolumeToVmDefaultFolder(dcMo, vmMo.getName(), dsMo, vmdkPath);
- }
- else {
+ } else {
if (vmdkPath == null) {
vmdkPath = dsMo.getName();
}
@@ -2668,7 +2708,7 @@
s_logger.warn("Volume " + volumeTO.getId() + " does not seem to exist on datastore, out of sync? path: " + datastoreDiskPath);
}
- return new String[] {datastoreDiskPath};
+ return new String[]{datastoreDiskPath};
}
// Pair<internal CS name, vCenter display name>
@@ -2747,6 +2787,9 @@
private static void configCustomExtraOption(List<OptionValue> extraOptions, VirtualMachineTO vmSpec) {
// we no longer to validation anymore
for (Map.Entry<String, String> entry : vmSpec.getDetails().entrySet()) {
+ if (entry.getKey().equalsIgnoreCase(VmDetailConstants.BOOT_MODE)) {
+ continue;
+ }
OptionValue newVal = new OptionValue();
newVal.setKey(entry.getKey());
newVal.setValue(entry.getValue());
@@ -2772,7 +2815,7 @@
VirtualDeviceBackingInfo backing = nicVirtualDevice.getBacking();
if (backing instanceof VirtualEthernetCardDistributedVirtualPortBackingInfo) {
// This NIC is connected to a Distributed Virtual Switch
- VirtualEthernetCardDistributedVirtualPortBackingInfo portInfo = (VirtualEthernetCardDistributedVirtualPortBackingInfo)backing;
+ VirtualEthernetCardDistributedVirtualPortBackingInfo portInfo = (VirtualEthernetCardDistributedVirtualPortBackingInfo) backing;
DistributedVirtualSwitchPortConnection port = portInfo.getPort();
String portKey = port.getPortKey();
String portGroupKey = port.getPortgroupKey();
@@ -2796,8 +2839,8 @@
if (portKey.equals(dvPort.getKey())) {
vmDvPort = dvPort;
}
- VMwareDVSPortSetting settings = (VMwareDVSPortSetting)dvPort.getConfig().getSetting();
- VmwareDistributedVirtualSwitchVlanIdSpec vlanId = (VmwareDistributedVirtualSwitchVlanIdSpec)settings.getVlan();
+ VMwareDVSPortSetting settings = (VMwareDVSPortSetting) dvPort.getConfig().getSetting();
+ VmwareDistributedVirtualSwitchVlanIdSpec vlanId = (VmwareDistributedVirtualSwitchVlanIdSpec) settings.getVlan();
s_logger.trace("Found port " + dvPort.getKey() + " with vlan " + vlanId.getVlanId());
if (vlanId.getVlanId() > 0 && vlanId.getVlanId() < 4095) {
usedVlans.add(vlanId.getVlanId());
@@ -2809,9 +2852,9 @@
}
DVPortConfigInfo dvPortConfigInfo = vmDvPort.getConfig();
- VMwareDVSPortSetting settings = (VMwareDVSPortSetting)dvPortConfigInfo.getSetting();
+ VMwareDVSPortSetting settings = (VMwareDVSPortSetting) dvPortConfigInfo.getSetting();
- VmwareDistributedVirtualSwitchVlanIdSpec vlanId = (VmwareDistributedVirtualSwitchVlanIdSpec)settings.getVlan();
+ VmwareDistributedVirtualSwitchVlanIdSpec vlanId = (VmwareDistributedVirtualSwitchVlanIdSpec) settings.getVlan();
BoolPolicy blocked = settings.getBlocked();
if (blocked.isValue() == Boolean.TRUE) {
s_logger.trace("Port is blocked, set a vlanid and unblock");
@@ -2863,7 +2906,7 @@
private VirtualMachineDiskInfo getMatchingExistingDisk(VirtualMachineDiskInfoBuilder diskInfoBuilder, DiskTO vol, VmwareHypervisorHost hyperHost, VmwareContext context)
throws Exception {
if (diskInfoBuilder != null) {
- VolumeObjectTO volume = (VolumeObjectTO)vol.getData();
+ VolumeObjectTO volume = (VolumeObjectTO) vol.getData();
String dsName = null;
String diskBackingFileBaseName = null;
@@ -2992,14 +3035,14 @@
}
private void postDiskConfigBeforeStart(VirtualMachineMO vmMo, VirtualMachineTO vmSpec, DiskTO[] sortedDisks, int ideControllerKey,
- int scsiControllerKey, Map<String, Map<String, String>> iqnToData, VmwareHypervisorHost hyperHost, VmwareContext context) throws Exception {
+ int scsiControllerKey, Map<String, Map<String, String>> iqnToData, VmwareHypervisorHost hyperHost, VmwareContext context) throws Exception {
VirtualMachineDiskInfoBuilder diskInfoBuilder = vmMo.getDiskInfoBuilder();
for (DiskTO vol : sortedDisks) {
if (vol.getType() == Volume.Type.ISO)
continue;
- VolumeObjectTO volumeTO = (VolumeObjectTO)vol.getData();
+ VolumeObjectTO volumeTO = (VolumeObjectTO) vol.getData();
VirtualMachineDiskInfo diskInfo = getMatchingExistingDisk(diskInfoBuilder, vol, hyperHost, context);
assert (diskInfo != null);
@@ -3184,14 +3227,14 @@
}
private HashMap<String, Pair<ManagedObjectReference, DatastoreMO>> inferDatastoreDetailsFromDiskInfo(VmwareHypervisorHost hyperHost, VmwareContext context,
- DiskTO[] disks, Command cmd) throws Exception {
+ DiskTO[] disks, Command cmd) throws Exception {
HashMap<String, Pair<ManagedObjectReference, DatastoreMO>> mapIdToMors = new HashMap<>();
assert (hyperHost != null) && (context != null);
for (DiskTO vol : disks) {
if (vol.getType() != Volume.Type.ISO) {
- VolumeObjectTO volumeTO = (VolumeObjectTO)vol.getData();
+ VolumeObjectTO volumeTO = (VolumeObjectTO) vol.getData();
DataStoreTO primaryStore = volumeTO.getDataStore();
String poolUuid = primaryStore.getUuid();
@@ -3226,8 +3269,7 @@
if (vmdkPath != null) {
datastoreVolumePath = dsMo.getDatastorePath(vmdkPath + VMDK_EXTENSION);
- }
- else {
+ } else {
datastoreVolumePath = dsMo.getDatastorePath(dsMo.getName() + VMDK_EXTENSION);
}
@@ -3236,8 +3278,7 @@
}
mapIdToMors.put(datastoreName, new Pair<>(morDatastore, new DatastoreMO(context, morDatastore)));
- }
- else {
+ } else {
ManagedObjectReference morDatastore = HypervisorHostHelper.findDatastoreWithBackwardsCompatibility(hyperHost, poolUuid);
if (morDatastore == null) {
@@ -3349,8 +3390,7 @@
networkInfo = HypervisorHostHelper.prepareNetwork(switchName, namePrefix, hostMo,
getVlanInfo(nicTo, vlanToken), nicTo.getNetworkRateMbps(), nicTo.getNetworkRateMulticastMbps(),
_opsTimeout, true, nicTo.getBroadcastType(), nicTo.getUuid(), nicTo.getDetails());
- }
- else {
+ } else {
String vlanId = getVlanInfo(nicTo, vlanToken);
String svlanId = null;
boolean pvlannetwork = (getPvlanInfo(nicTo) == null) ? false : true;
@@ -3371,7 +3411,7 @@
// return Ternary <switch name, switch tyep, vlan tagging>
private Ternary<String, String, String> getTargetSwitch(NicTO nicTo) throws CloudException {
- TrafficType[] supportedTrafficTypes = new TrafficType[] {TrafficType.Guest, TrafficType.Public, TrafficType.Control, TrafficType.Management, TrafficType.Storage};
+ TrafficType[] supportedTrafficTypes = new TrafficType[]{TrafficType.Guest, TrafficType.Public, TrafficType.Control, TrafficType.Management, TrafficType.Storage};
TrafficType trafficType = nicTo.getType();
if (!Arrays.asList(supportedTrafficTypes).contains(trafficType)) {
@@ -3470,7 +3510,7 @@
int templateRootPos = isoUrl.indexOf("template/tmpl");
templateRootPos = (templateRootPos < 0 ? isoUrl.indexOf(ConfigDrive.CONFIGDRIVEDIR) : templateRootPos);
- if (templateRootPos < 0 ) {
+ if (templateRootPos < 0) {
throw new Exception("Invalid ISO path info");
}
@@ -3652,7 +3692,7 @@
if (!(perfValue instanceof PerfEntityMetric)) {
continue;
}
- final List<PerfMetricSeries> values = ((PerfEntityMetric)perfValue).getValue();
+ final List<PerfMetricSeries> values = ((PerfEntityMetric) perfValue).getValue();
if (values == null || values.isEmpty()) {
continue;
}
@@ -3660,7 +3700,7 @@
if (!(value instanceof PerfMetricIntSeries) || !value.getId().getInstance().equals(diskBusName)) {
continue;
}
- final List<Long> perfStats = ((PerfMetricIntSeries)value).getValue();
+ final List<Long> perfStats = ((PerfMetricIntSeries) value).getValue();
if (perfStats.size() > 0) {
long sum = 0;
for (long val : perfStats) {
@@ -3710,7 +3750,7 @@
DatacenterMO dcMo = new DatacenterMO(getServiceContext(), dcMor);
HashMap<String, VolumeStatsEntry> statEntry = new HashMap<String, VolumeStatsEntry>();
- for (String chainInfo : cmd.getVolumeUuids()){
+ for (String chainInfo : cmd.getVolumeUuids()) {
if (chainInfo != null) {
VirtualMachineDiskInfo infoInChain = _gson.fromJson(chainInfo, VirtualMachineDiskInfo.class);
if (infoInChain != null) {
@@ -3837,7 +3877,7 @@
s_logger.info("Executing resource RebootRouterCommand: " + _gson.toJson(cmd));
}
- RebootAnswer answer = (RebootAnswer)execute((RebootCommand)cmd);
+ RebootAnswer answer = (RebootAnswer) execute((RebootCommand) cmd);
if (answer.getResult()) {
String connectResult = connect(cmd.getVmName(), cmd.getPrivateIpAddress());
@@ -4036,7 +4076,7 @@
return new Answer(cmd, (Exception) e);
}
if (s_logger.isDebugEnabled()) {
- s_logger.debug("problem" , e);
+ s_logger.debug("problem", e);
}
s_logger.error(e.getLocalizedMessage());
return new Answer(cmd, false, "unknown problem: " + e.getLocalizedMessage());
@@ -4050,7 +4090,7 @@
// OfflineVmwareMigration: getVolumesFromCommand(cmd);
Map<Integer, Long> volumeDeviceKey = getVolumesFromCommand(vmMo, cmd);
if (s_logger.isTraceEnabled()) {
- for (Integer diskId: volumeDeviceKey.keySet()) {
+ for (Integer diskId : volumeDeviceKey.keySet()) {
s_logger.trace(String.format("disk to migrate has disk id %d and volumeId %d", diskId, volumeDeviceKey.get(diskId)));
}
}
@@ -4070,12 +4110,12 @@
} catch (Exception e) {
String msg = "change data store for VM " + vmMo.getVmName() + " failed";
s_logger.error(msg + ": " + e.getLocalizedMessage());
- throw new CloudRuntimeException(msg,e);
+ throw new CloudRuntimeException(msg, e);
}
}
Answer createAnswerForCmd(VirtualMachineMO vmMo, String poolUuid, Command cmd, Map<Integer, Long> volumeDeviceKey) throws Exception {
- List<VolumeObjectTO> volumeToList = new ArrayList<>();
+ List<VolumeObjectTO> volumeToList = new ArrayList<>();
VirtualMachineDiskInfoBuilder diskInfoBuilder = vmMo.getDiskInfoBuilder();
VirtualDisk[] disks = vmMo.getAllDiskDevice();
Answer answer;
@@ -4098,7 +4138,7 @@
newVol.setChainInfo(_gson.toJson(diskInfo));
volumeToList.add(newVol);
}
- return new MigrateVmToPoolAnswer((MigrateVmToPoolCommand)cmd, volumeToList);
+ return new MigrateVmToPoolAnswer((MigrateVmToPoolCommand) cmd, volumeToList);
}
return new Answer(cmd, false, null);
}
@@ -4106,12 +4146,12 @@
private Map<Integer, Long> getVolumesFromCommand(VirtualMachineMO vmMo, Command cmd) throws Exception {
Map<Integer, Long> volumeDeviceKey = new HashMap<Integer, Long>();
if (cmd instanceof MigrateVmToPoolCommand) {
- MigrateVmToPoolCommand mcmd = (MigrateVmToPoolCommand)cmd;
+ MigrateVmToPoolCommand mcmd = (MigrateVmToPoolCommand) cmd;
for (VolumeTO volume : mcmd.getVolumes()) {
addVolumeDiskmapping(vmMo, volumeDeviceKey, volume.getPath(), volume.getId());
}
} else if (cmd instanceof MigrateVolumeCommand) {
- MigrateVolumeCommand mcmd = (MigrateVolumeCommand)cmd;
+ MigrateVolumeCommand mcmd = (MigrateVolumeCommand) cmd;
addVolumeDiskmapping(vmMo, volumeDeviceKey, mcmd.getVolumePath(), mcmd.getVolumeId());
}
return volumeDeviceKey;
@@ -4133,7 +4173,7 @@
private ManagedObjectReference getTargetDatastoreMOReference(String destinationPool, VmwareHypervisorHost hyperHost) {
ManagedObjectReference morDs;
try {
- if(s_logger.isDebugEnabled()) {
+ if (s_logger.isDebugEnabled()) {
s_logger.debug(String.format("finding datastore %s", destinationPool));
}
morDs = HypervisorHostHelper.findDatastoreWithBackwardsCompatibility(hyperHost, destinationPool);
@@ -4261,7 +4301,7 @@
throw new CloudRuntimeException(msg);
}
VmwareManager mgr = tgtHyperHost.getContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME);
- String srcHostApiVersion = ((HostMO)srcHyperHost).getHostAboutInfo().getApiVersion();
+ String srcHostApiVersion = ((HostMO) srcHyperHost).getHostAboutInfo().getApiVersion();
// find VM through datacenter (VM is not at the target host yet)
vmMo = srcHyperHost.findVmOnPeerHyperHost(vmName);
@@ -4448,7 +4488,7 @@
String msg = "MigrationCommand failed due to " + VmwareHelper.getExceptionMessage(e);
s_logger.warn(msg, e);
- return new MigrateWithStorageAnswer(cmd, (Exception)e);
+ return new MigrateWithStorageAnswer(cmd, (Exception) e);
} finally {
// Cleanup datastores mounted on source host
for (String mountedDatastore : mountedDatastoresAtSource) {
@@ -4481,15 +4521,15 @@
// we need to spawn a worker VM to attach the volume to and move it
vmName = getWorkerName(getServiceContext(), cmd, 0);
- // OfflineVmwareMigration: refactor for re-use
- // OfflineVmwareMigration: 1. find data(store)
+ // OfflineVmwareMigration: refactor for re-use
+ // OfflineVmwareMigration: 1. find data(store)
// OfflineVmwareMigration: more robust would be to find the store given the volume as it might have been moved out of band or due to error
// example: DatastoreMO existingVmDsMo = new DatastoreMO(dcMo.getContext(), dcMo.findDatastore(fileInDatastore.getDatastoreName()));
morSourceDS = HypervisorHostHelper.findDatastoreWithBackwardsCompatibility(hyperHost, cmd.getSourcePool().getUuid());
dsMo = new DatastoreMO(hyperHost.getContext(), morSourceDS);
s_logger.info("Create worker VM " + vmName);
- // OfflineVmwareMigration: 2. create the worker with access to the data(store)
+ // OfflineVmwareMigration: 2. create the worker with access to the data(store)
vmMo = HypervisorHostHelper.createWorkerVM(hyperHost, dsMo, vmName);
if (vmMo == null) {
// OfflineVmwareMigration: don't throw a general Exception but think of a specific one
@@ -4501,21 +4541,21 @@
String vmdkFileName = path + VMDK_EXTENSION;
vmdkDataStorePath = VmwareStorageLayoutHelper.getLegacyDatastorePathFromVmdkFileName(dsMo, vmdkFileName);
if (!dsMo.fileExists(vmdkDataStorePath)) {
- if(s_logger.isDebugEnabled()) {
+ if (s_logger.isDebugEnabled()) {
s_logger.debug(String.format("path not found (%s), trying under '%s'", vmdkFileName, path));
}
vmdkDataStorePath = VmwareStorageLayoutHelper.getVmwareDatastorePathFromVmdkFileName(dsMo, path, vmdkFileName);
}
if (!dsMo.fileExists(vmdkDataStorePath)) {
- if(s_logger.isDebugEnabled()) {
+ if (s_logger.isDebugEnabled()) {
s_logger.debug(String.format("path not found (%s), trying under '%s'", vmdkFileName, vmName));
}
vmdkDataStorePath = VmwareStorageLayoutHelper.getVmwareDatastorePathFromVmdkFileName(dsMo, vmName, vmdkFileName);
}
- if(s_logger.isDebugEnabled()) {
+ if (s_logger.isDebugEnabled()) {
s_logger.debug(String.format("attaching %s to %s for migration", vmdkDataStorePath, vmMo.getVmName()));
}
- vmMo.attachDisk(new String[] { vmdkDataStorePath }, morSourceDS);
+ vmMo.attachDisk(new String[]{vmdkDataStorePath}, morSourceDS);
}
// OfflineVmwareMigration: 4. find the (worker-) VM
@@ -4531,7 +4571,7 @@
VirtualDisk[] disks = vmMo.getAllDiskDevice();
String format = "disk %d is attached as %s";
for (VirtualDisk disk : disks) {
- s_logger.trace(String.format(format,disk.getKey(),vmMo.getVmdkFileBaseName(disk)));
+ s_logger.trace(String.format(format, disk.getKey(), vmMo.getVmdkFileBaseName(disk)));
}
}
@@ -4578,7 +4618,7 @@
}
}
if (answer instanceof MigrateVolumeAnswer) {
- String newPath = ((MigrateVolumeAnswer)answer).getVolumePath();
+ String newPath = ((MigrateVolumeAnswer) answer).getVolumePath();
String vmdkFileName = newPath + VMDK_EXTENSION;
try {
VmwareStorageLayoutHelper.syncVolumeToRootFolder(dsMo.getOwnerDatacenter().first(), dsMo, newPath, vmName);
@@ -4725,7 +4765,7 @@
VmwareManager mgr = dcMo.getContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME);
- List<ObjectContent> ocs = dcMo.getHostPropertiesOnDatacenterHostFolder(new String[] {"name", "parent"});
+ List<ObjectContent> ocs = dcMo.getHostPropertiesOnDatacenterHostFolder(new String[]{"name", "parent"});
if (ocs != null && ocs.size() > 0) {
for (ObjectContent oc : ocs) {
HostMO hostMo = new HostMO(dcMo.getContext(), oc.getObj());
@@ -4773,15 +4813,13 @@
hostMOs.add(hostMO);
}
- }
- catch (Exception ex) {
+ } catch (Exception ex) {
s_logger.error(ex.getMessage(), ex);
throw new CloudRuntimeException(ex.getMessage(), ex);
}
- }
- else {
- hostMOs.add((HostMO)hyperHost);
+ } else {
+ hostMOs.add((HostMO) hyperHost);
}
handleTargets(cmd.getAdd(), cmd.getTargetTypeToRemove(), cmd.isRemoveAsync(), cmd.getTargets(), hostMOs);
@@ -4843,8 +4881,7 @@
if (targets != null && targets.size() > 0) {
try {
_storageProcessor.handleTargets(add, targetTypeToRemove, isRemoveAsync, targets, hosts);
- }
- catch (Exception ex) {
+ } catch (Exception ex) {
s_logger.warn(ex.getMessage());
}
}
@@ -5261,7 +5298,7 @@
}
}
- Pair<String, Integer> portInfo = vmMo.getVncPort(mgr.getManagementPortGroupByHost((HostMO)hyperHost));
+ Pair<String, Integer> portInfo = vmMo.getVncPort(mgr.getManagementPortGroupByHost((HostMO) hyperHost));
if (s_logger.isTraceEnabled()) {
s_logger.trace("Found vnc port info. vm: " + cmd.getName() + " host: " + portInfo.first() + ", vnc port: " + portInfo.second());
@@ -5316,7 +5353,7 @@
VmwareHypervisorHost hyperHost = getHyperHost(context);
try {
- HostMO hostMo = (HostMO)hyperHost;
+ HostMO hostMo = (HostMO) hyperHost;
ClusterMO clusterMo = new ClusterMO(context, hostMo.getHyperHostCluster());
VmwareManager mgr = context.getStockObject(VmwareManager.CONTEXT_STOCK_NAME);
@@ -5418,7 +5455,7 @@
try {
VmwareContext context = getServiceContext();
VmwareManager mgr = context.getStockObject(VmwareManager.CONTEXT_STOCK_NAME);
- return (PrimaryStorageDownloadAnswer)mgr.getStorageManager().execute(this, cmd);
+ return (PrimaryStorageDownloadAnswer) mgr.getStorageManager().execute(this, cmd);
} catch (Throwable e) {
if (e instanceof RemoteException) {
s_logger.warn("Encounter remote exception to vCenter, invalidate VMware session context");
@@ -5511,7 +5548,7 @@
// Get a list of all the hosts in this cluster
@SuppressWarnings("unchecked")
- List<ManagedObjectReference> hosts = (List<ManagedObjectReference>)context.getVimClient().getDynamicProperty(clusterMO, "host");
+ List<ManagedObjectReference> hosts = (List<ManagedObjectReference>) context.getVimClient().getDynamicProperty(clusterMO, "host");
if (hosts == null) {
return new Answer(cmd, false, "No hosts in cluster, which is pretty weird");
}
@@ -5556,7 +5593,7 @@
try {
VmwareContext context = getServiceContext();
VmwareManager mgr = context.getStockObject(VmwareManager.CONTEXT_STOCK_NAME);
- return (CopyVolumeAnswer)mgr.getStorageManager().execute(this, cmd);
+ return (CopyVolumeAnswer) mgr.getStorageManager().execute(this, cmd);
} catch (Throwable e) {
if (e instanceof RemoteException) {
s_logger.warn("Encounter remote exception to vCenter, invalidate VMware session context");
@@ -5610,13 +5647,13 @@
s_logger.info("Scan hung worker VM to recycle");
- int workerKey = ((HostMO)hyperHost).getCustomFieldKey("VirtualMachine", CustomFieldConstants.CLOUD_WORKER);
- int workerTagKey = ((HostMO)hyperHost).getCustomFieldKey("VirtualMachine", CustomFieldConstants.CLOUD_WORKER_TAG);
+ int workerKey = ((HostMO) hyperHost).getCustomFieldKey("VirtualMachine", CustomFieldConstants.CLOUD_WORKER);
+ int workerTagKey = ((HostMO) hyperHost).getCustomFieldKey("VirtualMachine", CustomFieldConstants.CLOUD_WORKER_TAG);
String workerPropName = String.format("value[%d]", workerKey);
String workerTagPropName = String.format("value[%d]", workerTagKey);
// GC worker that has been running for too long
- ObjectContent[] ocs = hyperHost.getVmPropertiesOnHyperHost(new String[] {"name", "config.template", workerPropName, workerTagPropName,});
+ ObjectContent[] ocs = hyperHost.getVmPropertiesOnHyperHost(new String[]{"name", "config.template", workerPropName, workerTagPropName,});
if (ocs != null) {
for (ObjectContent oc : ocs) {
List<DynamicProperty> props = oc.getPropSet();
@@ -5627,13 +5664,13 @@
for (DynamicProperty prop : props) {
if (prop.getName().equals("config.template")) {
- template = (Boolean)prop.getVal();
+ template = (Boolean) prop.getVal();
} else if (prop.getName().equals(workerPropName)) {
- CustomFieldStringValue val = (CustomFieldStringValue)prop.getVal();
+ CustomFieldStringValue val = (CustomFieldStringValue) prop.getVal();
if (val != null && val.getValue() != null && val.getValue().equalsIgnoreCase("true"))
isWorker = true;
} else if (prop.getName().equals(workerTagPropName)) {
- CustomFieldStringValue val = (CustomFieldStringValue)prop.getVal();
+ CustomFieldStringValue val = (CustomFieldStringValue) prop.getVal();
workerTag = val.getValue();
}
}
@@ -5679,14 +5716,14 @@
try {
VmwareHypervisorHost hyperHost = getHyperHost(context);
assert (hyperHost instanceof HostMO);
- if (!((HostMO)hyperHost).isHyperHostConnected()) {
+ if (!((HostMO) hyperHost).isHyperHostConnected()) {
s_logger.info("Host " + hyperHost.getHyperHostName() + " is not in connected state");
return null;
}
- ((HostMO)hyperHost).enableVncOnHostFirewall();
+ ((HostMO) hyperHost).enableVncOnHostFirewall();
- AboutInfo aboutInfo = ((HostMO)hyperHost).getHostAboutInfo();
+ AboutInfo aboutInfo = ((HostMO) hyperHost).getHostAboutInfo();
hostApiVersion = aboutInfo.getApiVersion();
} catch (Exception e) {
@@ -5722,7 +5759,7 @@
try {
VmwareHypervisorHost hyperHost = getHyperHost(context);
if (hyperHost instanceof HostMO) {
- HostMO hostMo = (HostMO)hyperHost;
+ HostMO hostMo = (HostMO) hyperHost;
List<Pair<ManagedObjectReference, String>> dsList = hostMo.getLocalDatastoreOnHost();
for (Pair<ManagedObjectReference, String> dsPair : dsList) {
@@ -5803,15 +5840,15 @@
VmwareHypervisorHost hyperHost = getHyperHost(getServiceContext());
if (hyperHost instanceof HostMO) {
- HostMO host = (HostMO)hyperHost;
+ HostMO host = (HostMO) hyperHost;
HostStorageSystemMO hostStorageSystem = host.getHostStorageSystemMO();
for (HostHostBusAdapter hba : hostStorageSystem.getStorageDeviceInfo().getHostBusAdapter()) {
if (hba instanceof HostInternetScsiHba) {
- HostInternetScsiHba hostInternetScsiHba = (HostInternetScsiHba)hba;
+ HostInternetScsiHba hostInternetScsiHba = (HostInternetScsiHba) hba;
if (hostInternetScsiHba.isIsSoftwareBased()) {
- return ((HostInternetScsiHba)hba).getIScsiName();
+ return ((HostInternetScsiHba) hba).getIScsiName();
}
}
}
@@ -5836,7 +5873,7 @@
cmd.setDom0MinMemory(0);
cmd.setSpeed(summary.getCpuSpeed());
cmd.setCpuSockets(summary.getCpuSockets());
- cmd.setCpus((int)summary.getCpuCount());
+ cmd.setCpus((int) summary.getCpuCount());
cmd.setMemory(summary.getMemoryBytes());
}
@@ -5848,7 +5885,7 @@
assert (hyperHost instanceof HostMO);
VmwareManager mgr = hyperHost.getContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME);
- VmwareHypervisorHostNetworkSummary summary = hyperHost.getHyperHostNetworkSummary(mgr.getManagementPortGroupByHost((HostMO)hyperHost));
+ VmwareHypervisorHostNetworkSummary summary = hyperHost.getHyperHostNetworkSummary(mgr.getManagementPortGroupByHost((HostMO) hyperHost));
if (summary == null) {
throw new Exception("No ESX(i) host found");
}
@@ -5993,7 +6030,7 @@
private HashMap<String, HostVmStateReportEntry> getHostVmStateReport() throws Exception {
VmwareHypervisorHost hyperHost = getHyperHost(getServiceContext());
- int key = ((HostMO)hyperHost).getCustomFieldKey("VirtualMachine", CustomFieldConstants.CLOUD_VM_INTERNAL_NAME);
+ int key = ((HostMO) hyperHost).getCustomFieldKey("VirtualMachine", CustomFieldConstants.CLOUD_VM_INTERNAL_NAME);
if (key == 0) {
s_logger.warn("Custom field " + CustomFieldConstants.CLOUD_VM_INTERNAL_NAME + " is not registered ?!");
}
@@ -6001,7 +6038,7 @@
// CLOUD_VM_INTERNAL_NAME stores the internal CS generated vm name. This was earlier stored in name. Now, name can be either the hostname or
// the internal CS name, but the custom field CLOUD_VM_INTERNAL_NAME always stores the internal CS name.
- ObjectContent[] ocs = hyperHost.getVmPropertiesOnHyperHost(new String[] {"name", "runtime.powerState", "config.template", instanceNameCustomField});
+ ObjectContent[] ocs = hyperHost.getVmPropertiesOnHyperHost(new String[]{"name", "runtime.powerState", "config.template", instanceNameCustomField});
HashMap<String, HostVmStateReportEntry> newStates = new HashMap<String, HostVmStateReportEntry>();
if (ocs != null && ocs.length > 0) {
@@ -6019,12 +6056,12 @@
isTemplate = true;
}
} else if (objProp.getName().equals("runtime.powerState")) {
- powerState = (VirtualMachinePowerState)objProp.getVal();
+ powerState = (VirtualMachinePowerState) objProp.getVal();
} else if (objProp.getName().equals("name")) {
- name = (String)objProp.getVal();
+ name = (String) objProp.getVal();
} else if (objProp.getName().contains(instanceNameCustomField)) {
if (objProp.getVal() != null)
- VMInternalCSName = ((CustomFieldStringValue)objProp.getVal()).getValue();
+ VMInternalCSName = ((CustomFieldStringValue) objProp.getVal()).getValue();
} else {
assert (false);
}
@@ -6045,7 +6082,7 @@
private HashMap<String, PowerState> getVmStates() throws Exception {
VmwareHypervisorHost hyperHost = getHyperHost(getServiceContext());
- int key = ((HostMO)hyperHost).getCustomFieldKey("VirtualMachine", CustomFieldConstants.CLOUD_VM_INTERNAL_NAME);
+ int key = ((HostMO) hyperHost).getCustomFieldKey("VirtualMachine", CustomFieldConstants.CLOUD_VM_INTERNAL_NAME);
if (key == 0) {
s_logger.warn("Custom field " + CustomFieldConstants.CLOUD_VM_INTERNAL_NAME + " is not registered ?!");
}
@@ -6053,7 +6090,7 @@
// CLOUD_VM_INTERNAL_NAME stores the internal CS generated vm name. This was earlier stored in name. Now, name can be either the hostname or
// the internal CS name, but the custom field CLOUD_VM_INTERNAL_NAME always stores the internal CS name.
- ObjectContent[] ocs = hyperHost.getVmPropertiesOnHyperHost(new String[] {"name", "runtime.powerState", "config.template", instanceNameCustomField});
+ ObjectContent[] ocs = hyperHost.getVmPropertiesOnHyperHost(new String[]{"name", "runtime.powerState", "config.template", instanceNameCustomField});
HashMap<String, PowerState> newStates = new HashMap<String, PowerState>();
if (ocs != null && ocs.length > 0) {
@@ -6071,12 +6108,12 @@
isTemplate = true;
}
} else if (objProp.getName().equals("runtime.powerState")) {
- powerState = (VirtualMachinePowerState)objProp.getVal();
+ powerState = (VirtualMachinePowerState) objProp.getVal();
} else if (objProp.getName().equals("name")) {
- name = (String)objProp.getVal();
+ name = (String) objProp.getVal();
} else if (objProp.getName().contains(instanceNameCustomField)) {
if (objProp.getVal() != null)
- VMInternalCSName = ((CustomFieldStringValue)objProp.getVal()).getValue();
+ VMInternalCSName = ((CustomFieldStringValue) objProp.getVal()).getValue();
} else {
assert (false);
}
@@ -6137,7 +6174,7 @@
}
}
- int key = ((HostMO)hyperHost).getCustomFieldKey("VirtualMachine", CustomFieldConstants.CLOUD_VM_INTERNAL_NAME);
+ int key = ((HostMO) hyperHost).getCustomFieldKey("VirtualMachine", CustomFieldConstants.CLOUD_VM_INTERNAL_NAME);
if (key == 0) {
s_logger.warn("Custom field " + CustomFieldConstants.CLOUD_VM_INTERNAL_NAME + " is not registered ?!");
}
@@ -6150,8 +6187,8 @@
final String memMbStr = "config.hardware.memoryMB";
final String allocatedCpuStr = "summary.runtime.maxCpuUsage";
- ObjectContent[] ocs = hyperHost.getVmPropertiesOnHyperHost(new String[] {
- "name", numCpuStr, cpuUseStr, guestMemUseStr, memLimitStr, memMbStr,allocatedCpuStr, instanceNameCustomField
+ ObjectContent[] ocs = hyperHost.getVmPropertiesOnHyperHost(new String[]{
+ "name", numCpuStr, cpuUseStr, guestMemUseStr, memLimitStr, memMbStr, allocatedCpuStr, instanceNameCustomField
});
if (ocs != null && ocs.length > 0) {
@@ -6172,7 +6209,7 @@
vmNameOnVcenter = objProp.getVal().toString();
} else if (objProp.getName().contains(instanceNameCustomField)) {
if (objProp.getVal() != null)
- vmInternalCSName = ((CustomFieldStringValue)objProp.getVal()).getValue();
+ vmInternalCSName = ((CustomFieldStringValue) objProp.getVal()).getValue();
} else if (objProp.getName().equals(guestMemUseStr)) {
guestMemusage = objProp.getVal().toString();
} else if (objProp.getName().equals(numCpuStr)) {
@@ -6183,12 +6220,12 @@
memlimit = objProp.getVal().toString();
} else if (objProp.getName().equals(memMbStr)) {
memkb = objProp.getVal().toString();
- } else if (objProp.getName().equals(allocatedCpuStr)){
- allocatedCpu = NumberUtils.toDouble(objProp.getVal().toString());
+ } else if (objProp.getName().equals(allocatedCpuStr)) {
+ allocatedCpu = NumberUtils.toDouble(objProp.getVal().toString());
}
}
- maxCpuUsage = (maxCpuUsage/allocatedCpu)*100;
+ maxCpuUsage = (maxCpuUsage / allocatedCpu) * 100;
if (vmInternalCSName != null) {
name = vmInternalCSName;
} else {
@@ -6275,7 +6312,7 @@
}
}
- final VmStatsEntry vmStats = new VmStatsEntry( NumberUtils.toDouble(memkb)*1024,NumberUtils.toDouble(guestMemusage)*1024,NumberUtils.toDouble(memlimit)*1024,
+ final VmStatsEntry vmStats = new VmStatsEntry(NumberUtils.toDouble(memkb) * 1024, NumberUtils.toDouble(guestMemusage) * 1024, NumberUtils.toDouble(memlimit) * 1024,
maxCpuUsage, networkReadKBs, networkWriteKBs, NumberUtils.toInt(numberCPUs), "vm");
vmStats.setDiskReadIOs(diskReadIops);
vmStats.setDiskWriteIOs(diskWriteIops);
@@ -6400,7 +6437,7 @@
HostStatsEntry entry = new HostStatsEntry();
entry.setEntityType("host");
- double cpuUtilization = ((double)(hardwareSummary.getTotalCpu() - hardwareSummary.getEffectiveCpu()) / (double)hardwareSummary.getTotalCpu() * 100);
+ double cpuUtilization = ((double) (hardwareSummary.getTotalCpu() - hardwareSummary.getEffectiveCpu()) / (double) hardwareSummary.getTotalCpu() * 100);
entry.setCpuUtilization(cpuUtilization);
entry.setTotalMemoryKBs(hardwareSummary.getTotalMemory() / 1024);
entry.setFreeMemoryKBs(hardwareSummary.getEffectiveMemory() * 1024);
@@ -6424,14 +6461,14 @@
try {
_name = name;
- _url = (String)params.get("url");
- _username = (String)params.get("username");
- _password = (String)params.get("password");
- _dcId = (String)params.get("zone");
- _pod = (String)params.get("pod");
- _cluster = (String)params.get("cluster");
+ _url = (String) params.get("url");
+ _username = (String) params.get("username");
+ _password = (String) params.get("password");
+ _dcId = (String) params.get("zone");
+ _pod = (String) params.get("pod");
+ _cluster = (String) params.get("cluster");
- _guid = (String)params.get("guid");
+ _guid = (String) params.get("guid");
String[] tokens = _guid.split("@");
_vCenterAddress = tokens[1];
_morHyperHost = new ManagedObjectReference();
@@ -6439,8 +6476,8 @@
_morHyperHost.setType(hostTokens[0]);
_morHyperHost.setValue(hostTokens[1]);
- _guestTrafficInfo = (VmwareTrafficLabel)params.get("guestTrafficInfo");
- _publicTrafficInfo = (VmwareTrafficLabel)params.get("publicTrafficInfo");
+ _guestTrafficInfo = (VmwareTrafficLabel) params.get("guestTrafficInfo");
+ _publicTrafficInfo = (VmwareTrafficLabel) params.get("publicTrafficInfo");
VmwareContext context = getServiceContext();
VmwareManager mgr = context.getStockObject(VmwareManager.CONTEXT_STOCK_NAME);
if (mgr == null) {
@@ -6471,14 +6508,14 @@
}
if (_privateNetworkVSwitchName == null) {
- _privateNetworkVSwitchName = (String)params.get("private.network.vswitch.name");
+ _privateNetworkVSwitchName = (String) params.get("private.network.vswitch.name");
}
- String value = (String)params.get("vmware.recycle.hung.wokervm");
+ String value = (String) params.get("vmware.recycle.hung.wokervm");
if (value != null && value.equalsIgnoreCase("true"))
_recycleHungWorker = true;
- value = (String)params.get("vmware.root.disk.controller");
+ value = (String) params.get("vmware.root.disk.controller");
if (value != null && value.equalsIgnoreCase("scsi"))
_rootDiskController = DiskControllerType.scsi;
else if (value != null && value.equalsIgnoreCase("ide"))
@@ -6486,7 +6523,7 @@
else
_rootDiskController = DiskControllerType.osdefault;
- Integer intObj = (Integer)params.get("ports.per.dvportgroup");
+ Integer intObj = (Integer) params.get("ports.per.dvportgroup");
if (intObj != null)
_portsPerDvPortGroup = intObj.intValue();
@@ -6494,25 +6531,25 @@
+ _publicTrafficInfo.getVirtualSwitchType() + " : " + _publicTrafficInfo.getVirtualSwitchName() + ", guest traffic over "
+ _guestTrafficInfo.getVirtualSwitchType() + " : " + _guestTrafficInfo.getVirtualSwitchName());
- Boolean boolObj = (Boolean)params.get("vmware.create.full.clone");
+ Boolean boolObj = (Boolean) params.get("vmware.create.full.clone");
if (boolObj != null && boolObj.booleanValue()) {
_fullCloneFlag = true;
} else {
_fullCloneFlag = false;
}
- boolObj = (Boolean)params.get("vm.instancename.flag");
+ boolObj = (Boolean) params.get("vm.instancename.flag");
if (boolObj != null && boolObj.booleanValue()) {
_instanceNameFlag = true;
} else {
_instanceNameFlag = false;
}
- value = (String)params.get("scripts.timeout");
+ value = (String) params.get("scripts.timeout");
int timeout = NumbersUtil.parseInt(value, 1440) * 1000;
storageNfsVersion = NfsSecondaryStorageResource.retrieveNfsVersionFromParams(params);
- _storageProcessor = new VmwareStorageProcessor((VmwareHostService)this, _fullCloneFlag, (VmwareStorageMount)mgr, timeout, this, _shutdownWaitMs, null,
+ _storageProcessor = new VmwareStorageProcessor((VmwareHostService) this, _fullCloneFlag, (VmwareStorageMount) mgr, timeout, this, _shutdownWaitMs, null,
storageNfsVersion);
storageHandler = new VmwareStorageSubsystemCommandHandler(_storageProcessor, storageNfsVersion);
@@ -6706,11 +6743,12 @@
/**
* Use data center to look for vm, instead of randomly picking up a cluster<br/>
* (in multiple cluster environments vm could not be found if wrong cluster was chosen)
- * @param context vmware context
+ *
+ * @param context vmware context
* @param hyperHost vmware hv host
- * @param vol volume
+ * @param vol volume
* @return a virtualmachinemo if could be found on datacenter.
- * @throws Exception if there is an error while finding vm
+ * @throws Exception if there is an error while finding vm
* @throws CloudRuntimeException if datacenter cannot be found
*/
protected VirtualMachineMO findVmOnDatacenter(VmwareContext context, VmwareHypervisorHost hyperHost, VolumeTO vol) throws Exception {
@@ -6727,7 +6765,7 @@
String vmdkAbsFile = null;
VirtualDeviceBackingInfo backingInfo = disk.getBacking();
if (backingInfo instanceof VirtualDiskFlatVer2BackingInfo) {
- VirtualDiskFlatVer2BackingInfo diskBackingInfo = (VirtualDiskFlatVer2BackingInfo)backingInfo;
+ VirtualDiskFlatVer2BackingInfo diskBackingInfo = (VirtualDiskFlatVer2BackingInfo) backingInfo;
vmdkAbsFile = diskBackingInfo.getFileName();
}
return vmdkAbsFile;
@@ -6766,4 +6804,298 @@
}
return keyFile;
}
+
+ private List<UnmanagedInstanceTO.Disk> getUnmanageInstanceDisks(VirtualMachineMO vmMo) {
+ List<UnmanagedInstanceTO.Disk> instanceDisks = new ArrayList<>();
+ VirtualDisk[] disks = null;
+ try {
+ disks = vmMo.getAllDiskDevice();
+ } catch (Exception e) {
+ s_logger.info("Unable to retrieve unmanaged instance disks. " + e.getMessage());
+ }
+ if (disks != null) {
+ for (VirtualDevice diskDevice : disks) {
+ try {
+ if (diskDevice instanceof VirtualDisk) {
+ UnmanagedInstanceTO.Disk instanceDisk = new UnmanagedInstanceTO.Disk();
+ VirtualDisk disk = (VirtualDisk) diskDevice;
+ instanceDisk.setDiskId(disk.getDiskObjectId());
+ instanceDisk.setLabel(disk.getDeviceInfo() != null ? disk.getDeviceInfo().getLabel() : "");
+ instanceDisk.setFileBaseName(vmMo.getVmdkFileBaseName(disk));
+ instanceDisk.setImagePath(getAbsoluteVmdkFile(disk));
+ instanceDisk.setCapacity(disk.getCapacityInBytes());
+ instanceDisk.setPosition(diskDevice.getUnitNumber());
+ DatastoreFile file = new DatastoreFile(getAbsoluteVmdkFile(disk));
+ if (!Strings.isNullOrEmpty(file.getFileBaseName()) && !Strings.isNullOrEmpty(file.getDatastoreName())) {
+ VirtualMachineDiskInfo diskInfo = vmMo.getDiskInfoBuilder().getDiskInfoByBackingFileBaseName(file.getFileBaseName(), file.getDatastoreName());
+ instanceDisk.setChainInfo(getGson().toJson(diskInfo));
+ }
+ for (VirtualDevice device : vmMo.getAllDeviceList()) {
+ if (diskDevice.getControllerKey() == device.getKey()) {
+ if (device instanceof VirtualIDEController) {
+ instanceDisk.setController(DiskControllerType.getType(device.getClass().getSimpleName()).toString());
+ instanceDisk.setControllerUnit(((VirtualIDEController) device).getBusNumber());
+ } else if (device instanceof VirtualSCSIController) {
+ instanceDisk.setController(DiskControllerType.getType(device.getClass().getSimpleName()).toString());
+ instanceDisk.setControllerUnit(((VirtualSCSIController) device).getBusNumber());
+ } else {
+ instanceDisk.setController(DiskControllerType.none.toString());
+ }
+ break;
+ }
+ }
+ if (disk.getBacking() instanceof VirtualDeviceFileBackingInfo) {
+ VirtualDeviceFileBackingInfo diskBacking = (VirtualDeviceFileBackingInfo) disk.getBacking();
+ ManagedObjectReference morDs = diskBacking.getDatastore();
+ DatastoreInfo info = (DatastoreInfo)vmMo.getContext().getVimClient().getDynamicProperty(diskBacking.getDatastore(), "info");
+ if (info instanceof NasDatastoreInfo) {
+ NasDatastoreInfo dsInfo = (NasDatastoreInfo) info;
+ instanceDisk.setDatastoreName(dsInfo.getName());
+ if (dsInfo.getNas() != null) {
+ instanceDisk.setDatastoreHost(dsInfo.getNas().getRemoteHost());
+ instanceDisk.setDatastorePath(dsInfo.getNas().getRemotePath());
+ instanceDisk.setDatastoreType(dsInfo.getNas().getType());
+ }
+ } else if (info instanceof VmfsDatastoreInfo) {
+ VmfsDatastoreInfo dsInfo = (VmfsDatastoreInfo) info;
+ instanceDisk.setDatastoreName(dsInfo.getVmfs().getName());
+ instanceDisk.setDatastoreType(dsInfo.getVmfs().getType());
+ } else {
+ String msg = String.format("Unmanaged instance disk: %s is on unsupported datastore %s", instanceDisk.getDiskId(), info.getClass().getSimpleName());
+ s_logger.error(msg);
+ throw new Exception(msg);
+ }
+ }
+ s_logger.info(vmMo.getName() + " " + disk.getDeviceInfo().getLabel() + " " + disk.getDeviceInfo().getSummary() + " " + disk.getDiskObjectId() + " " + disk.getCapacityInKB() + " " + instanceDisk.getController());
+ instanceDisks.add(instanceDisk);
+ }
+ } catch (Exception e) {
+ s_logger.info("Unable to retrieve unmanaged instance disk info. " + e.getMessage());
+ }
+ }
+ Collections.sort(instanceDisks, new Comparator<UnmanagedInstanceTO.Disk>() {
+ @Override
+ public int compare(final UnmanagedInstanceTO.Disk disk1, final UnmanagedInstanceTO.Disk disk2) {
+ return extractInt(disk1) - extractInt(disk2);
+ }
+
+ int extractInt(UnmanagedInstanceTO.Disk disk) {
+ String num = disk.getLabel().replaceAll("\\D", "");
+ // return 0 if no digits found
+ return num.isEmpty() ? 0 : Integer.parseInt(num);
+ }
+ });
+ }
+ return instanceDisks;
+ }
+
+ private List<UnmanagedInstanceTO.Nic> getUnmanageInstanceNics(VmwareHypervisorHost hyperHost, VirtualMachineMO vmMo) {
+ List<UnmanagedInstanceTO.Nic> instanceNics = new ArrayList<>();
+
+ HashMap<String, List<String>> guestNicMacIPAddressMap = new HashMap<>();
+ try {
+ GuestInfo guestInfo = vmMo.getGuestInfo();
+ if (guestInfo.getToolsStatus() == VirtualMachineToolsStatus.TOOLS_OK) {
+ for (GuestNicInfo nicInfo: guestInfo.getNet()) {
+ if (CollectionUtils.isNotEmpty(nicInfo.getIpAddress())) {
+ List<String> ipAddresses = new ArrayList<>();
+ for (String ipAddress : nicInfo.getIpAddress()) {
+ if (NetUtils.isValidIp4(ipAddress)) {
+ ipAddresses.add(ipAddress);
+ }
+ }
+ guestNicMacIPAddressMap.put(nicInfo.getMacAddress(), ipAddresses);
+ }
+ }
+ } else {
+ s_logger.info(String.format("Unable to retrieve guest nics for instance: %s from VMware tools as tools status: %s", vmMo.getName(), guestInfo.getToolsStatus().toString()));
+ }
+ } catch (Exception e) {
+ s_logger.info("Unable to retrieve guest nics for instance from VMware tools. " + e.getMessage());
+ }
+ VirtualDevice[] nics = null;
+ try {
+ nics = vmMo.getNicDevices();
+ } catch (Exception e) {
+ s_logger.info("Unable to retrieve unmanaged instance nics. " + e.getMessage());
+ }
+ if (nics != null) {
+ for (VirtualDevice nic : nics) {
+ try {
+ VirtualEthernetCard ethCardDevice = (VirtualEthernetCard) nic;
+ s_logger.error(nic.getClass().getCanonicalName() + " " + nic.getBacking().getClass().getCanonicalName() + " " + ethCardDevice.getMacAddress());
+ UnmanagedInstanceTO.Nic instanceNic = new UnmanagedInstanceTO.Nic();
+ instanceNic.setNicId(ethCardDevice.getDeviceInfo().getLabel());
+ if (ethCardDevice instanceof VirtualPCNet32) {
+ instanceNic.setAdapterType(VirtualEthernetCardType.PCNet32.toString());
+ } else if (ethCardDevice instanceof VirtualVmxnet2) {
+ instanceNic.setAdapterType(VirtualEthernetCardType.Vmxnet2.toString());
+ } else if (ethCardDevice instanceof VirtualVmxnet3) {
+ instanceNic.setAdapterType(VirtualEthernetCardType.Vmxnet3.toString());
+ } else {
+ instanceNic.setAdapterType(VirtualEthernetCardType.E1000.toString());
+ }
+ instanceNic.setMacAddress(ethCardDevice.getMacAddress());
+ if (guestNicMacIPAddressMap.containsKey(instanceNic.getMacAddress())) {
+ instanceNic.setIpAddress(guestNicMacIPAddressMap.get(instanceNic.getMacAddress()));
+ }
+ if (ethCardDevice.getSlotInfo() != null) {
+ instanceNic.setPciSlot(ethCardDevice.getSlotInfo().toString());
+ }
+ VirtualDeviceBackingInfo backing = ethCardDevice.getBacking();
+ if (backing instanceof VirtualEthernetCardDistributedVirtualPortBackingInfo) {
+ VirtualEthernetCardDistributedVirtualPortBackingInfo backingInfo = (VirtualEthernetCardDistributedVirtualPortBackingInfo) backing;
+ DistributedVirtualSwitchPortConnection port = backingInfo.getPort();
+ String portKey = port.getPortKey();
+ String portGroupKey = port.getPortgroupKey();
+ String dvSwitchUuid = port.getSwitchUuid();
+
+ s_logger.debug("NIC " + nic.toString() + " is connected to dvSwitch " + dvSwitchUuid + " pg " + portGroupKey + " port " + portKey);
+
+ ManagedObjectReference dvSwitchManager = vmMo.getContext().getVimClient().getServiceContent().getDvSwitchManager();
+ ManagedObjectReference dvSwitch = vmMo.getContext().getVimClient().getService().queryDvsByUuid(dvSwitchManager, dvSwitchUuid);
+
+ // Get all ports
+ DistributedVirtualSwitchPortCriteria criteria = new DistributedVirtualSwitchPortCriteria();
+ criteria.setInside(true);
+ criteria.getPortgroupKey().add(portGroupKey);
+ List<DistributedVirtualPort> dvPorts = vmMo.getContext().getVimClient().getService().fetchDVPorts(dvSwitch, criteria);
+
+ for (DistributedVirtualPort dvPort : dvPorts) {
+ // Find the port for this NIC by portkey
+ if (portKey.equals(dvPort.getKey())) {
+ VMwareDVSPortSetting settings = (VMwareDVSPortSetting) dvPort.getConfig().getSetting();
+ if (settings.getVlan() instanceof VmwareDistributedVirtualSwitchVlanIdSpec) {
+ VmwareDistributedVirtualSwitchVlanIdSpec vlanId = (VmwareDistributedVirtualSwitchVlanIdSpec) settings.getVlan();
+ s_logger.trace("Found port " + dvPort.getKey() + " with vlan " + vlanId.getVlanId());
+ if (vlanId.getVlanId() > 0 && vlanId.getVlanId() < 4095) {
+ instanceNic.setVlan(vlanId.getVlanId());
+ }
+ } else if (settings.getVlan() instanceof VmwareDistributedVirtualSwitchPvlanSpec) {
+ VmwareDistributedVirtualSwitchPvlanSpec pvlanSpec = (VmwareDistributedVirtualSwitchPvlanSpec) settings.getVlan();
+ s_logger.trace("Found port " + dvPort.getKey() + " with pvlan " + pvlanSpec.getPvlanId());
+ if (pvlanSpec.getPvlanId() > 0 && pvlanSpec.getPvlanId() < 4095) {
+ DistributedVirtualSwitchMO dvSwitchMo = new DistributedVirtualSwitchMO(vmMo.getContext(), dvSwitch);
+ Pair<Integer, HypervisorHostHelper.PvlanType> vlanDetails = dvSwitchMo.retrieveVlanFromPvlan(pvlanSpec.getPvlanId(), dvSwitch);
+ if (vlanDetails != null && vlanDetails.first() != null && vlanDetails.second() != null) {
+ instanceNic.setVlan(vlanDetails.first());
+ instanceNic.setPvlan(pvlanSpec.getPvlanId());
+ instanceNic.setPvlanType(vlanDetails.second().toString());
+ }
+ }
+ }
+ break;
+ }
+ }
+ } else if (backing instanceof VirtualEthernetCardNetworkBackingInfo) {
+ VirtualEthernetCardNetworkBackingInfo backingInfo = (VirtualEthernetCardNetworkBackingInfo) backing;
+ instanceNic.setNetwork(backingInfo.getDeviceName());
+ if (hyperHost instanceof HostMO) {
+ HostMO hostMo = (HostMO) hyperHost;
+ HostPortGroupSpec portGroupSpec = hostMo.getHostPortGroupSpec(backingInfo.getDeviceName());
+ instanceNic.setVlan(portGroupSpec.getVlanId());
+ }
+ }
+ instanceNics.add(instanceNic);
+ } catch (Exception e) {
+ s_logger.info("Unable to retrieve unmanaged instance nic info. " + e.getMessage());
+ }
+ }
+ Collections.sort(instanceNics, new Comparator<UnmanagedInstanceTO.Nic>() {
+ @Override
+ public int compare(final UnmanagedInstanceTO.Nic nic1, final UnmanagedInstanceTO.Nic nic2) {
+ return extractInt(nic1) - extractInt(nic2);
+ }
+
+ int extractInt(UnmanagedInstanceTO.Nic nic) {
+ String num = nic.getNicId().replaceAll("\\D", "");
+ // return 0 if no digits found
+ return num.isEmpty() ? 0 : Integer.parseInt(num);
+ }
+ });
+ }
+ return instanceNics;
+ }
+
+ private UnmanagedInstanceTO getUnmanagedInstance(VmwareHypervisorHost hyperHost, VirtualMachineMO vmMo) {
+ UnmanagedInstanceTO instance = null;
+ try {
+ instance = new UnmanagedInstanceTO();
+ instance.setName(vmMo.getVmName());
+ instance.setCpuCores(vmMo.getConfigSummary().getNumCpu());
+ instance.setCpuCoresPerSocket(vmMo.getCoresPerSocket());
+ instance.setCpuSpeed(vmMo.getConfigSummary().getCpuReservation());
+ instance.setMemory(vmMo.getConfigSummary().getMemorySizeMB());
+ instance.setOperatingSystemId(vmMo.getVmGuestInfo().getGuestId());
+ if (Strings.isNullOrEmpty(instance.getOperatingSystemId())) {
+ instance.setOperatingSystemId(vmMo.getConfigSummary().getGuestId());
+ }
+ VirtualMachineGuestOsIdentifier osIdentifier = VirtualMachineGuestOsIdentifier.OTHER_GUEST;
+ try {
+ osIdentifier = VirtualMachineGuestOsIdentifier.fromValue(instance.getOperatingSystemId());
+ } catch (IllegalArgumentException iae) {
+ if (!Strings.isNullOrEmpty(instance.getOperatingSystemId()) && instance.getOperatingSystemId().contains("64")) {
+ osIdentifier = VirtualMachineGuestOsIdentifier.OTHER_GUEST_64;
+ }
+ }
+ instance.setOperatingSystem(vmMo.getGuestInfo().getGuestFullName());
+ if (Strings.isNullOrEmpty(instance.getOperatingSystem())) {
+ instance.setOperatingSystem(vmMo.getConfigSummary().getGuestFullName());
+ }
+ UnmanagedInstanceTO.PowerState powerState = UnmanagedInstanceTO.PowerState.PowerUnknown;
+ if (vmMo.getPowerState().toString().equalsIgnoreCase("POWERED_ON")) {
+ powerState = UnmanagedInstanceTO.PowerState.PowerOn;
+ }
+ if (vmMo.getPowerState().toString().equalsIgnoreCase("POWERED_OFF")) {
+ powerState = UnmanagedInstanceTO.PowerState.PowerOff;
+ }
+ instance.setPowerState(powerState);
+ instance.setDisks(getUnmanageInstanceDisks(vmMo));
+ instance.setNics(getUnmanageInstanceNics(hyperHost, vmMo));
+ } catch (Exception e) {
+ s_logger.info("Unable to retrieve unmanaged instance info. " + e.getMessage());
+ }
+
+ return instance;
+ }
+
+ private Answer execute(GetUnmanagedInstancesCommand cmd) {
+ if (s_logger.isInfoEnabled()) {
+ s_logger.info("Executing resource GetUnmanagedInstancesCommand " + _gson.toJson(cmd));
+ }
+
+ VmwareContext context = getServiceContext();
+ HashMap<String, UnmanagedInstanceTO> unmanagedInstances = new HashMap<>();
+ try {
+ VmwareHypervisorHost hyperHost = getHyperHost(context);
+
+ String vmName = cmd.getInstanceName();
+ List<VirtualMachineMO> vmMos = hyperHost.listVmsOnHyperHost(vmName);
+
+ for (VirtualMachineMO vmMo : vmMos) {
+ if (vmMo == null) {
+ continue;
+ }
+ if (vmMo.isTemplate()) {
+ continue;
+ }
+ // Filter managed instances
+ if (cmd.hasManagedInstance(vmMo.getName())) {
+ continue;
+ }
+ // Filter instance if answer is requested for a particular instance name
+ if (!Strings.isNullOrEmpty(cmd.getInstanceName()) &&
+ !cmd.getInstanceName().equals(vmMo.getVmName())) {
+ continue;
+ }
+ UnmanagedInstanceTO instance = getUnmanagedInstance(hyperHost, vmMo);
+ if (instance != null) {
+ unmanagedInstances.put(instance.getName(), instance);
+ }
+ }
+ } catch (Exception e) {
+ s_logger.info("GetUnmanagedInstancesCommand failed due to " + VmwareHelper.getExceptionMessage(e));
+ }
+ return new GetUnmanagedInstancesAnswer(cmd, "", unmanagedInstances);
+ }
}
diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java
index 71968fa..796db94 100644
--- a/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java
+++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java
@@ -34,40 +34,7 @@
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import com.vmware.vim25.VmConfigInfo;
import org.apache.cloudstack.agent.directdownload.DirectDownloadCommand;
-import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
-
-import com.google.common.base.Strings;
-import com.google.gson.Gson;
-import com.vmware.vim25.DatastoreHostMount;
-import com.vmware.vim25.HostHostBusAdapter;
-import com.vmware.vim25.HostInternetScsiHba;
-import com.vmware.vim25.HostInternetScsiHbaAuthenticationProperties;
-import com.vmware.vim25.HostInternetScsiHbaSendTarget;
-import com.vmware.vim25.HostInternetScsiHbaStaticTarget;
-import com.vmware.vim25.HostInternetScsiTargetTransport;
-import com.vmware.vim25.HostResignatureRescanResult;
-import com.vmware.vim25.HostUnresolvedVmfsResignatureSpec;
-import com.vmware.vim25.HostScsiDisk;
-import com.vmware.vim25.HostScsiTopology;
-import com.vmware.vim25.HostScsiTopologyInterface;
-import com.vmware.vim25.HostScsiTopologyLun;
-import com.vmware.vim25.HostScsiTopologyTarget;
-import com.vmware.vim25.HostUnresolvedVmfsExtent;
-import com.vmware.vim25.HostUnresolvedVmfsVolume;
-import com.vmware.vim25.InvalidStateFaultMsg;
-import com.vmware.vim25.ManagedObjectReference;
-import com.vmware.vim25.VirtualDeviceBackingInfo;
-import com.vmware.vim25.VirtualDeviceConfigSpec;
-import com.vmware.vim25.VirtualDeviceConfigSpecOperation;
-import com.vmware.vim25.VirtualMachineConfigSpec;
-import com.vmware.vim25.VirtualDisk;
-import com.vmware.vim25.VirtualDiskFlatVer2BackingInfo;
-import com.vmware.vim25.VmfsDatastoreExpandSpec;
-import com.vmware.vim25.VmfsDatastoreOption;
-
import org.apache.cloudstack.storage.command.AttachAnswer;
import org.apache.cloudstack.storage.command.AttachCommand;
import org.apache.cloudstack.storage.command.CopyCmdAnswer;
@@ -87,6 +54,8 @@
import org.apache.cloudstack.storage.to.TemplateObjectTO;
import org.apache.cloudstack.storage.to.VolumeObjectTO;
import org.apache.cloudstack.utils.volume.VirtualMachineDiskInfo;
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.Command;
@@ -127,6 +96,35 @@
import com.cloud.utils.script.Script;
import com.cloud.vm.VirtualMachine.PowerState;
import com.cloud.vm.VmDetailConstants;
+import com.google.common.base.Strings;
+import com.google.gson.Gson;
+import com.vmware.vim25.DatastoreHostMount;
+import com.vmware.vim25.HostHostBusAdapter;
+import com.vmware.vim25.HostInternetScsiHba;
+import com.vmware.vim25.HostInternetScsiHbaAuthenticationProperties;
+import com.vmware.vim25.HostInternetScsiHbaSendTarget;
+import com.vmware.vim25.HostInternetScsiHbaStaticTarget;
+import com.vmware.vim25.HostInternetScsiTargetTransport;
+import com.vmware.vim25.HostResignatureRescanResult;
+import com.vmware.vim25.HostScsiDisk;
+import com.vmware.vim25.HostScsiTopology;
+import com.vmware.vim25.HostScsiTopologyInterface;
+import com.vmware.vim25.HostScsiTopologyLun;
+import com.vmware.vim25.HostScsiTopologyTarget;
+import com.vmware.vim25.HostUnresolvedVmfsExtent;
+import com.vmware.vim25.HostUnresolvedVmfsResignatureSpec;
+import com.vmware.vim25.HostUnresolvedVmfsVolume;
+import com.vmware.vim25.InvalidStateFaultMsg;
+import com.vmware.vim25.ManagedObjectReference;
+import com.vmware.vim25.VirtualDeviceBackingInfo;
+import com.vmware.vim25.VirtualDeviceConfigSpec;
+import com.vmware.vim25.VirtualDeviceConfigSpecOperation;
+import com.vmware.vim25.VirtualDisk;
+import com.vmware.vim25.VirtualDiskFlatVer2BackingInfo;
+import com.vmware.vim25.VirtualMachineConfigSpec;
+import com.vmware.vim25.VmConfigInfo;
+import com.vmware.vim25.VmfsDatastoreExpandSpec;
+import com.vmware.vim25.VmfsDatastoreOption;
public class VmwareStorageProcessor implements StorageProcessor {
@@ -3527,9 +3525,9 @@
private static String deriveTemplateUuidOnHost(VmwareHypervisorHost hyperHost, String storeIdentifier, String templateName) {
String templateUuid;
- try{
+ try {
templateUuid = UUID.nameUUIDFromBytes((templateName + "@" + storeIdentifier + "-" + hyperHost.getMor().getValue()).getBytes("UTF-8")).toString();
- }catch(UnsupportedEncodingException e){
+ } catch(UnsupportedEncodingException e){
s_logger.warn("unexpected encoding error, using default Charset: " + e.getLocalizedMessage());
templateUuid = UUID.nameUUIDFromBytes((templateName + "@" + storeIdentifier + "-" + hyperHost.getMor().getValue()).getBytes(Charset.defaultCharset()))
.toString();
@@ -3556,4 +3554,9 @@
public Answer handleDownloadTemplateToPrimaryStorage(DirectDownloadCommand cmd) {
return null;
}
+
+ @Override
+ public Answer copyVolumeFromPrimaryToPrimary(CopyCommand cmd) {
+ return null;
+ }
}
diff --git a/plugins/hypervisors/vmware/src/test/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImplTest.java b/plugins/hypervisors/vmware/src/test/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImplTest.java
index 499ed24..8aa92f7 100644
--- a/plugins/hypervisors/vmware/src/test/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImplTest.java
+++ b/plugins/hypervisors/vmware/src/test/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImplTest.java
@@ -102,7 +102,7 @@
host.setDataCenterId(1);
host.setHypervisorType(Hypervisor.HypervisorType.VMware);
Mockito.doReturn(Collections.singletonList(host)).when(hostDao).listAllHostsByZoneAndHypervisorType(Mockito.anyLong(), Mockito.any());
- Mockito.doReturn(hostDetails).when(hostDetailsDao).findDetails(Mockito.anyLong());
+ Mockito.lenient().doReturn(hostDetails).when(hostDetailsDao).findDetails(Mockito.anyLong());
Mockito.doReturn("some-old-guid").when(hostDetails).get("guid");
Mockito.doReturn(hostDetails).when(hostDetailsDao).findDetails(Mockito.anyLong());
diff --git a/plugins/hypervisors/vmware/src/test/java/com/cloud/hypervisor/vmware/resource/VmwareResourceTest.java b/plugins/hypervisors/vmware/src/test/java/com/cloud/hypervisor/vmware/resource/VmwareResourceTest.java
index c2b3f36..7cebaf1 100644
--- a/plugins/hypervisors/vmware/src/test/java/com/cloud/hypervisor/vmware/resource/VmwareResourceTest.java
+++ b/plugins/hypervisors/vmware/src/test/java/com/cloud/hypervisor/vmware/resource/VmwareResourceTest.java
@@ -16,20 +16,19 @@
// under the License.
package com.cloud.hypervisor.vmware.resource;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.never;
import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
-
-import java.util.ArrayList;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import static org.powermock.api.mockito.PowerMockito.whenNew;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.EnumMap;
import java.util.HashMap;
@@ -51,14 +50,6 @@
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
-import com.vmware.vim25.HostCapability;
-import com.vmware.vim25.ManagedObjectReference;
-import com.vmware.vim25.VimPortType;
-import com.vmware.vim25.VirtualDevice;
-import com.vmware.vim25.VirtualDeviceConfigSpec;
-import com.vmware.vim25.VirtualMachineConfigSpec;
-import com.vmware.vim25.VirtualMachineVideoCard;
-
import com.cloud.agent.api.Command;
import com.cloud.agent.api.ScaleVmAnswer;
import com.cloud.agent.api.ScaleVmCommand;
@@ -67,19 +58,25 @@
import com.cloud.agent.api.to.NicTO;
import com.cloud.agent.api.to.VirtualMachineTO;
import com.cloud.agent.api.to.VolumeTO;
-import com.cloud.hypervisor.vmware.mo.DatacenterMO;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.hypervisor.vmware.mo.DatacenterMO;
import com.cloud.hypervisor.vmware.mo.HostMO;
import com.cloud.hypervisor.vmware.mo.VirtualMachineMO;
import com.cloud.hypervisor.vmware.mo.VmwareHypervisorHost;
import com.cloud.hypervisor.vmware.util.VmwareClient;
import com.cloud.hypervisor.vmware.util.VmwareContext;
-import com.cloud.vm.VmDetailConstants;
import com.cloud.storage.resource.VmwareStorageProcessor;
-import com.cloud.storage.resource.VmwareStorageSubsystemCommandHandler;
import com.cloud.storage.resource.VmwareStorageProcessor.VmwareStorageProcessorConfigurableFields;
-
+import com.cloud.storage.resource.VmwareStorageSubsystemCommandHandler;
import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.VmDetailConstants;
+import com.vmware.vim25.HostCapability;
+import com.vmware.vim25.ManagedObjectReference;
+import com.vmware.vim25.VimPortType;
+import com.vmware.vim25.VirtualDevice;
+import com.vmware.vim25.VirtualDeviceConfigSpec;
+import com.vmware.vim25.VirtualMachineConfigSpec;
+import com.vmware.vim25.VirtualMachineVideoCard;
@RunWith(PowerMockRunner.class)
@PrepareForTest({CopyCommand.class, DatacenterMO.class, VmwareResource.class})
@@ -399,7 +396,7 @@
verify(_resource, never()).examineStorageSubSystemCommandNfsVersion(Matchers.eq(storageCmd), any(EnumMap.class));
}
- @Test(expected=CloudRuntimeException.class)
+ @Test(expected= CloudRuntimeException.class)
public void testFindVmOnDatacenterNullHyperHostReference() throws Exception {
when(hyperHost.getMor()).thenReturn(null);
_resource.findVmOnDatacenter(context, hyperHost, volume);
diff --git a/plugins/hypervisors/xenserver/pom.xml b/plugins/hypervisors/xenserver/pom.xml
index e6101b8..57a1d2d 100644
--- a/plugins/hypervisors/xenserver/pom.xml
+++ b/plugins/hypervisors/xenserver/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
index 79a9fb2..ea168d5 100644
--- a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
@@ -49,6 +49,10 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+import org.apache.cloudstack.diagnostics.CopyToSecondaryStorageAnswer;
+import org.apache.cloudstack.diagnostics.CopyToSecondaryStorageCommand;
+import org.apache.cloudstack.diagnostics.DiagnosticsService;
+import org.apache.cloudstack.hypervisor.xenserver.ExtraConfigurationUtility;
import org.apache.cloudstack.storage.to.TemplateObjectTO;
import org.apache.cloudstack.storage.to.VolumeObjectTO;
import org.apache.commons.collections.CollectionUtils;
@@ -200,6 +204,7 @@
}
private final static int BASE_TO_CONVERT_BYTES_INTO_KILOBYTES = 1024;
+ private final static String BASE_MOUNT_POINT_ON_REMOTE = "/var/cloud_mount/";
private static final XenServerConnectionPool ConnPool = XenServerConnectionPool.getInstance();
// static min values for guests on xenserver
@@ -1404,7 +1409,7 @@
}
}
try {
- finalizeVmMetaData(vm, conn, vmSpec);
+ finalizeVmMetaData(vm, vmr, conn, vmSpec);
} catch (final Exception e) {
throw new CloudRuntimeException("Unable to finalize VM MetaData: " + vmSpec);
}
@@ -1859,7 +1864,7 @@
}
}
- protected void finalizeVmMetaData(final VM vm, final Connection conn, final VirtualMachineTO vmSpec) throws Exception {
+ protected void finalizeVmMetaData(final VM vm, final VM.Record vmr, final Connection conn, final VirtualMachineTO vmSpec) throws Exception {
final Map<String, String> details = vmSpec.getDetails();
if (details != null) {
@@ -1890,6 +1895,13 @@
}
}
}
+
+ // Add configuration settings VM record for User VM instances before creating VM
+ Map<String, String> extraConfig = vmSpec.getExtraConfig();
+ if (vmSpec.getType().equals(VirtualMachine.Type.User) && MapUtils.isNotEmpty(extraConfig)) {
+ s_logger.info("Appending user extra configuration settings to VM");
+ ExtraConfigurationUtility.setExtraConfigurationToVm(conn,vmr, vm, extraConfig);
+ }
}
/**
@@ -5604,4 +5616,67 @@
}
+ /**
+ * Get Diagnostics Data API
+ * Copy zip file from system vm and copy file directly to secondary storage
+ */
+ public Answer copyDiagnosticsFileToSecondaryStorage(Connection conn, CopyToSecondaryStorageCommand cmd) {
+ String secondaryStorageUrl = cmd.getSecondaryStorageUrl();
+ String vmIP = cmd.getSystemVmIp();
+ String diagnosticsZipFile = cmd.getFileName();
+
+ String localDir = null;
+ boolean success;
+
+ // Mount Secondary storage
+ String secondaryStorageMountPath = null;
+ try {
+ URI uri = new URI(secondaryStorageUrl);
+ secondaryStorageMountPath = uri.getHost() + ":" + uri.getPath();
+ localDir = BASE_MOUNT_POINT_ON_REMOTE + UUID.nameUUIDFromBytes(secondaryStorageMountPath.getBytes());
+ String mountPoint = mountNfs(conn, secondaryStorageMountPath, localDir);
+ if (org.apache.commons.lang.StringUtils.isBlank(mountPoint)) {
+ return new CopyToSecondaryStorageAnswer(cmd, false, "Could not mount secondary storage " + secondaryStorageMountPath + " on host " + localDir);
+ }
+
+ String dataDirectoryInSecondaryStore = localDir + File.separator + DiagnosticsService.DIAGNOSTICS_DIRECTORY;
+ final CopyToSecondaryStorageAnswer answer;
+ final String scpResult = callHostPlugin(conn, "vmops", "secureCopyToHost", "hostfilepath", dataDirectoryInSecondaryStore,
+ "srcip", vmIP, "srcfilepath", cmd.getFileName()).toLowerCase();
+
+ if (scpResult.contains("success")) {
+ answer = new CopyToSecondaryStorageAnswer(cmd, true, "File copied to secondary storage successfully.");
+ } else {
+ answer = new CopyToSecondaryStorageAnswer(cmd, false, "Zip file " + diagnosticsZipFile.replace("/root/", "") + "could not be copied to secondary storage due to " + scpResult);
+ }
+ umountNfs(conn, secondaryStorageMountPath, localDir);
+ localDir = null;
+ return answer;
+ } catch (Exception e) {
+ String msg = "Exception caught zip file copy to secondary storage URI: " + secondaryStorageUrl + "Exception : " + e;
+ s_logger.error(msg, e);
+ return new CopyToSecondaryStorageAnswer(cmd, false, msg);
+ } finally {
+ if (localDir != null) umountNfs(conn, secondaryStorageMountPath, localDir);
+ }
+ }
+
+ private String mountNfs(Connection conn, String remoteDir, String localDir) {
+ if (localDir == null) {
+ localDir = BASE_MOUNT_POINT_ON_REMOTE + UUID.nameUUIDFromBytes(remoteDir.getBytes());
+ }
+ return callHostPlugin(conn, "cloud-plugin-storage", "mountNfsSecondaryStorage", "localDir", localDir, "remoteDir", remoteDir);
+ }
+
+ // Unmount secondary storage from host
+ private void umountNfs(Connection conn, String remoteDir, String localDir) {
+ if (localDir == null) {
+ localDir = BASE_MOUNT_POINT_ON_REMOTE + UUID.nameUUIDFromBytes(remoteDir.getBytes());
+ }
+ String result = callHostPlugin(conn, "cloud-plugin-storage", "umountNfsSecondaryStorage", "localDir", localDir, "remoteDir", remoteDir);
+ if (org.apache.commons.lang.StringUtils.isBlank(result)) {
+ String errMsg = "Could not umount secondary storage " + remoteDir + " on host " + localDir;
+ s_logger.warn(errMsg);
+ }
+ }
}
diff --git a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
index fc72e79..e4c07d4 100644
--- a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
+++ b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
@@ -31,21 +31,6 @@
import java.util.Set;
import java.util.UUID;
-import org.apache.commons.lang3.BooleanUtils;
-import org.apache.log4j.Logger;
-import org.apache.xmlrpc.XmlRpcException;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.xensource.xenapi.Connection;
-import com.xensource.xenapi.SR;
-import com.xensource.xenapi.Types;
-import com.xensource.xenapi.Types.BadServerResponse;
-import com.xensource.xenapi.Types.VmPowerState;
-import com.xensource.xenapi.Types.XenAPIException;
-import com.xensource.xenapi.VBD;
-import com.xensource.xenapi.VDI;
-import com.xensource.xenapi.VM;
-
import org.apache.cloudstack.agent.directdownload.DirectDownloadCommand;
import org.apache.cloudstack.storage.command.AttachAnswer;
import org.apache.cloudstack.storage.command.AttachCommand;
@@ -67,6 +52,9 @@
import org.apache.cloudstack.storage.to.SnapshotObjectTO;
import org.apache.cloudstack.storage.to.TemplateObjectTO;
import org.apache.cloudstack.storage.to.VolumeObjectTO;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.log4j.Logger;
+import org.apache.xmlrpc.XmlRpcException;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.to.DataObjectType;
@@ -86,12 +74,24 @@
import com.cloud.storage.resource.StorageProcessor;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.storage.S3.ClientOptions;
+import com.google.common.annotations.VisibleForTesting;
+import com.xensource.xenapi.Connection;
+import com.xensource.xenapi.SR;
+import com.xensource.xenapi.Types;
+import com.xensource.xenapi.Types.BadServerResponse;
+import com.xensource.xenapi.Types.VmPowerState;
+import com.xensource.xenapi.Types.XenAPIException;
+import com.xensource.xenapi.VBD;
+import com.xensource.xenapi.VDI;
+import com.xensource.xenapi.VM;
public class XenServerStorageProcessor implements StorageProcessor {
private static final Logger s_logger = Logger.getLogger(XenServerStorageProcessor.class);
protected CitrixResourceBase hypervisorResource;
protected String BaseMountPointOnHost = "/var/run/cloud_mount";
+ protected final static String BASE_MOUNT_POINT_ON_REMOTE = "/var/cloud_mount/";
+
public XenServerStorageProcessor(final CitrixResourceBase resource) {
hypervisorResource = resource;
}
@@ -210,6 +210,11 @@
}
@Override
+ public Answer copyVolumeFromPrimaryToPrimary(CopyCommand cmd) {
+ return null;
+ }
+
+ @Override
public AttachAnswer attachIso(final AttachCommand cmd) {
final DiskTO disk = cmd.getDisk();
final DataTO data = disk.getData();
diff --git a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
index ddafc15..a2c8b70 100644
--- a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
+++ b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
@@ -71,7 +71,7 @@
private void mountNfs(Connection conn, String remoteDir, String localDir) {
if (localDir == null) {
- localDir = "/var/cloud_mount/" + UUID.nameUUIDFromBytes(remoteDir.getBytes());
+ localDir = BASE_MOUNT_POINT_ON_REMOTE + UUID.nameUUIDFromBytes(remoteDir.getBytes());
}
String result = hypervisorResource.callHostPluginAsync(conn, "cloud-plugin-storage", "mountNfsSecondaryStorage", 100 * 1000, "localDir", localDir, "remoteDir", remoteDir);
if (StringUtils.isBlank(result)) {
@@ -241,7 +241,7 @@
}
protected SR createFileSr(Connection conn, String remotePath, String dir) {
- String localDir = "/var/cloud_mount/" + UUID.nameUUIDFromBytes(remotePath.getBytes());
+ String localDir = BASE_MOUNT_POINT_ON_REMOTE + UUID.nameUUIDFromBytes(remotePath.getBytes());
mountNfs(conn, remotePath, localDir);
return createFileSR(conn, localDir + "/" + dir);
}
@@ -563,7 +563,7 @@
SR snapshotSr = null;
Task task = null;
try {
- final String localDir = "/var/cloud_mount/" + UUID.nameUUIDFromBytes(secondaryStorageMountPath.getBytes());
+ final String localDir = BASE_MOUNT_POINT_ON_REMOTE + UUID.nameUUIDFromBytes(secondaryStorageMountPath.getBytes());
mountNfs(conn, secondaryStorageMountPath, localDir);
final boolean result = makeDirectory(conn, localDir + "/" + folder);
if (!result) {
@@ -1074,7 +1074,7 @@
srcSr = createFileSr(conn, srcUri.getHost() + ":" + srcUri.getPath(), srcDir);
final String destNfsPath = destUri.getHost() + ":" + destUri.getPath();
- final String localDir = "/var/cloud_mount/" + UUID.nameUUIDFromBytes(destNfsPath.getBytes());
+ final String localDir = BASE_MOUNT_POINT_ON_REMOTE + UUID.nameUUIDFromBytes(destNfsPath.getBytes());
mountNfs(conn, destUri.getHost() + ":" + destUri.getPath(), localDir);
makeDirectory(conn, localDir + "/" + destDir);
@@ -1216,7 +1216,7 @@
srcSr = hypervisorResource.getIscsiSR(conn, iScsiName, storageHost, iScsiName, chapInitiatorUsername, chapInitiatorSecret, false, srType, true);
final String destNfsPath = destUri.getHost() + ":" + destUri.getPath();
- final String localDir = "/var/cloud_mount/" + UUID.nameUUIDFromBytes(destNfsPath.getBytes());
+ final String localDir = BASE_MOUNT_POINT_ON_REMOTE + UUID.nameUUIDFromBytes(destNfsPath.getBytes());
mountNfs(conn, destNfsPath, localDir);
makeDirectory(conn, localDir + "/" + destDir);
diff --git a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCoppyToSecondaryStorageCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCoppyToSecondaryStorageCommandWrapper.java
new file mode 100644
index 0000000..cacab0f
--- /dev/null
+++ b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCoppyToSecondaryStorageCommandWrapper.java
@@ -0,0 +1,43 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase;
+
+import org.apache.cloudstack.diagnostics.CopyToSecondaryStorageCommand;
+import org.apache.log4j.Logger;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.hypervisor.xenserver.resource.CitrixResourceBase;
+import com.cloud.resource.CommandWrapper;
+import com.cloud.resource.ResourceWrapper;
+import com.xensource.xenapi.Connection;
+
+
+@ResourceWrapper(handles = CopyToSecondaryStorageCommand.class)
+public class CitrixCoppyToSecondaryStorageCommandWrapper extends CommandWrapper<CopyToSecondaryStorageCommand, Answer, CitrixResourceBase> {
+ public static final Logger LOGGER = Logger.getLogger(CitrixCoppyToSecondaryStorageCommandWrapper.class);
+
+ @Override
+ public Answer execute(CopyToSecondaryStorageCommand cmd, CitrixResourceBase citrixResourceBase) {
+ final Connection conn = citrixResourceBase.getConnection();
+ String msg = String.format("Copying diagnostics zip file %s from system vm %s to secondary storage %s", cmd.getFileName(), cmd.getSystemVmIp(), cmd.getSecondaryStorageUrl());
+ LOGGER.debug(msg);
+ // Allow the hypervisor host to copy file from system VM to mounted secondary storage
+ return citrixResourceBase.copyDiagnosticsFileToSecondaryStorage(conn, cmd);
+ }
+}
\ No newline at end of file
diff --git a/plugins/hypervisors/xenserver/src/main/java/org/apache/cloudstack/hypervisor/xenserver/ExtraConfigurationUtility.java b/plugins/hypervisors/xenserver/src/main/java/org/apache/cloudstack/hypervisor/xenserver/ExtraConfigurationUtility.java
new file mode 100644
index 0000000..b58c5f8
--- /dev/null
+++ b/plugins/hypervisors/xenserver/src/main/java/org/apache/cloudstack/hypervisor/xenserver/ExtraConfigurationUtility.java
@@ -0,0 +1,180 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.hypervisor.xenserver;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.apache.xmlrpc.XmlRpcException;
+
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.xensource.xenapi.Connection;
+import com.xensource.xenapi.Types;
+import com.xensource.xenapi.VM;
+
+public class ExtraConfigurationUtility {
+ private static final Logger LOG = Logger.getLogger(ExtraConfigurationUtility.class);
+
+ public static void setExtraConfigurationToVm(Connection conn, VM.Record vmr, VM vm, Map<String, String> extraConfig) {
+ Map<String, Object> recordMap = vmr.toMap();
+ for (String key : extraConfig.keySet()) {
+ String cfg = extraConfig.get(key);
+ Map<String, String> configParams = prepareKeyValuePair(cfg);
+
+ // paramKey is either param or param:key for map parameters
+ String paramKey = configParams.keySet().toString().replaceAll("[\\[\\]]", "");
+ String paramValue = configParams.get(paramKey);
+
+ //Map params
+ if (paramKey.contains(":")) {
+ applyConfigWithNestedKeyValue(conn, vm, recordMap, paramKey, paramValue);
+ } else {
+ applyConfigWithKeyValue(conn, vm, recordMap, paramKey, paramValue);
+ }
+ }
+ }
+
+ private static boolean isValidOperation(Map<String, Object> recordMap, String actualParam) {
+ return recordMap.containsKey(actualParam);
+ }
+
+ /**
+ * Nested keys contain ":" between the paramKey and need to split into operation param and key
+ * */
+ private static void applyConfigWithNestedKeyValue(Connection conn, VM vm, Map<String, Object> recordMap, String paramKey, String paramValue) {
+ int i = paramKey.indexOf(":");
+ String actualParam = paramKey.substring(0, i);
+ String keyName = paramKey.substring(i + 1);
+
+ if (!isValidOperation(recordMap, actualParam)) {
+ LOG.error("Unsupported extra configuration has been passed " + actualParam);
+ throw new InvalidParameterValueException("Unsupported extra configuration option has been passed: " + actualParam);
+ }
+
+ try {
+ switch (actualParam) {
+ case "VCPUs_params":
+ vm.addToVCPUsParams(conn, keyName, paramValue);
+ break;
+ case "platform":
+ vm.addToOtherConfig(conn, keyName, paramValue);
+ break;
+ case "HVM_boot_params":
+ vm.addToHVMBootParams(conn, keyName, paramValue);
+ break;
+ case "other_config":
+ vm.addToOtherConfig(conn, keyName, paramValue);
+ break;
+ case "xenstore_data":
+ vm.addToXenstoreData(conn, keyName, paramValue);
+ break;
+ default:
+ String msg = String.format("Passed configuration %s is not supported", paramKey);
+ LOG.warn(msg);
+ }
+ } catch (XmlRpcException | Types.XenAPIException e) {
+ LOG.error("Exception caught while setting VM configuration. exception: " + e.getMessage());
+ throw new CloudRuntimeException("Exception caught while setting VM configuration", e);
+ }
+ }
+
+ private static void applyConfigWithKeyValue(Connection conn, VM vm, Map<String, Object> recordMap, String paramKey, String paramValue) {
+ if (!isValidOperation(recordMap, paramKey)) {
+ LOG.error("Unsupported extra configuration has been passed: " + paramKey);
+ throw new InvalidParameterValueException("Unsupported extra configuration parameter key has been passed: " + paramKey);
+ }
+
+ try {
+ switch (paramKey) {
+ case "HVM_boot_policy":
+ vm.setHVMBootPolicy(conn, paramValue);
+ break;
+ case "HVM_shadow_multiplier":
+ vm.setHVMShadowMultiplier(conn, Double.valueOf(paramValue));
+ break;
+ case "PV_kernel":
+ vm.setPVKernel(conn, paramValue);
+ break;
+ case "PV_ramdisk":
+ vm.setPVRamdisk(conn, paramValue);
+ break;
+ case "PV_args":
+ vm.setPVArgs(conn, paramValue);
+ break;
+ case "PV_legacy_args":
+ vm.setPVLegacyArgs(conn, paramValue);
+ break;
+ case "PV_bootloader":
+ vm.setPVBootloader(conn, paramValue);
+ break;
+ case "PV_bootloader_args":
+ vm.setPVBootloaderArgs(conn, paramValue);
+ break;
+ case "ha_restart_priority":
+ vm.setHaRestartPriority(conn, paramValue);
+ break;
+ case "start_delay":
+ vm.setStartDelay(conn, Long.valueOf(paramValue));
+ break;
+ case "shutdown_delay":
+ vm.setShutdownDelay(conn, Long.valueOf(paramValue));
+ break;
+ case "order":
+ vm.setOrder(conn, Long.valueOf(paramValue));
+ break;
+ case "VCPUs_max":
+ vm.setVCPUsMax(conn, Long.valueOf(paramValue));
+ break;
+ case "VCPUs_at_startup":
+ vm.setVCPUsAtStartup(conn, Long.valueOf(paramValue));
+ break;
+ case "is-a-template":
+ vm.setIsATemplate(conn, Boolean.valueOf(paramValue));
+ break;
+ case "memory_static_max":
+ vm.setMemoryStaticMax(conn, Long.valueOf(paramValue));
+ break;
+ case "memory_static_min":
+ vm.setMemoryStaticMin(conn, Long.valueOf(paramValue));
+ break;
+ case "memory_dynamic_max":
+ vm.setMemoryDynamicMax(conn, Long.valueOf(paramValue));
+ break;
+ case "memory_dynamic_min":
+ vm.setMemoryDynamicMin(conn, Long.valueOf(paramValue));
+ break;
+ default:
+ String anotherMessage = String.format("Passed configuration %s is not supported", paramKey);
+ LOG.error(anotherMessage);
+ }
+ } catch (XmlRpcException | Types.XenAPIException e) {
+ LOG.error("Exception caught while setting VM configuration, exception: " + e.getMessage());
+ throw new CloudRuntimeException("Exception caught while setting VM configuration: ", e);
+ }
+ }
+
+ private static Map<String, String> prepareKeyValuePair(String cfg) {
+ Map<String, String> configKeyPair = new HashMap<>();
+ int indexOfEqualSign = cfg.indexOf("=");
+ String key = cfg.substring(0, indexOfEqualSign).replace("-", "_");
+ String value = cfg.substring(indexOfEqualSign + 1);
+ configKeyPair.put(key, value);
+ return configKeyPair;
+ }
+}
\ No newline at end of file
diff --git a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/XenServerGuruTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/XenServerGuruTest.java
index a9d0143..84ce99b 100644
--- a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/XenServerGuruTest.java
+++ b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/XenServerGuruTest.java
@@ -82,11 +82,11 @@
Mockito.when(copyCommandMock.getDestTO()).thenReturn(destinationDataMock);
Mockito.when(changedHost.getId()).thenReturn(changedHostId);
- Mockito.when(defaultHost.getId()).thenReturn(defaultHostId);
+ Mockito.lenient().when(defaultHost.getId()).thenReturn(defaultHostId);
Mockito.when(defaultHost.getDataCenterId()).thenReturn(zoneId);
Mockito.when(hostDaoMock.findById(defaultHostId)).thenReturn(defaultHost);
- Mockito.when(hostDaoMock.findById(changedHostId)).thenReturn(changedHost);
+ Mockito.lenient().when(hostDaoMock.findById(changedHostId)).thenReturn(changedHost);
}
@Test
diff --git a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessorTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessorTest.java
index 0cf99b6..7022e6d 100644
--- a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessorTest.java
+++ b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessorTest.java
@@ -21,6 +21,7 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.times;
import java.util.HashSet;
@@ -177,7 +178,7 @@
SR sr = xenserver625StorageProcessor.retrieveAlreadyConfiguredSr(connectionMock, pathMock);
- PowerMockito.verifyStatic();
+ PowerMockito.verifyStatic(SR.class);
SR.getByNameLabel(connectionMock, pathMock);
Assert.assertNull(sr);
}
@@ -337,7 +338,7 @@
SR sr = xenserver625StorageProcessor.createNewFileSr(connectionMock, pathMock);
assertNull(sr);
- Mockito.verify(xenserver625StorageProcessor).removeSrAndPbdIfPossible(Mockito.eq(connectionMock), Mockito.any(SR.class), Mockito.any(PBD.class));
+ Mockito.verify(xenserver625StorageProcessor).removeSrAndPbdIfPossible(Mockito.eq(connectionMock), nullable(SR.class), nullable(PBD.class));
}
@Test
@@ -403,7 +404,7 @@
Mockito.verify(srMock).scan(connectionMock);
Mockito.verify(pbdMock).plug(connectionMock);
- PowerMockito.verifyStatic();
+ PowerMockito.verifyStatic(PBD.class);
SR.introduce(Mockito.eq(connectionMock), Mockito.eq(srUuid), Mockito.eq(pathMock), Mockito.eq(pathMock), Mockito.eq("file"), Mockito.eq("file"), Mockito.eq(false),
Mockito.anyMapOf(String.class, String.class));
PBD.create(Mockito.eq(connectionMock), Mockito.any(Record.class));
diff --git a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRequestWrapperTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRequestWrapperTest.java
index c8d729a..219c76a 100755
--- a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRequestWrapperTest.java
+++ b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRequestWrapperTest.java
@@ -45,8 +45,9 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.AttachIsoCommand;
@@ -95,6 +96,7 @@
import com.cloud.agent.api.RevertToVMSnapshotCommand;
import com.cloud.agent.api.ScaleVmCommand;
import com.cloud.agent.api.SecurityGroupRulesCmd;
+import com.cloud.agent.api.SecurityGroupRulesCmd.IpPortAndProto;
import com.cloud.agent.api.SetupCommand;
import com.cloud.agent.api.StartCommand;
import com.cloud.agent.api.StopCommand;
@@ -102,7 +104,6 @@
import com.cloud.agent.api.UpdateHostPasswordCommand;
import com.cloud.agent.api.UpgradeSnapshotCommand;
import com.cloud.agent.api.VMSnapshotTO;
-import com.cloud.agent.api.SecurityGroupRulesCmd.IpPortAndProto;
import com.cloud.agent.api.check.CheckSshCommand;
import com.cloud.agent.api.proxy.CheckConsoleProxyLoadCommand;
import com.cloud.agent.api.proxy.WatchConsoleProxyLoadCommand;
@@ -144,7 +145,8 @@
import com.xensource.xenapi.VM;
import com.xensource.xenapi.VMGuestMetrics;
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(PowerMockRunner.class)
+@PrepareForTest(value = {Pool.Record.class})
public class CitrixRequestWrapperTest {
@Mock
diff --git a/plugins/integrations/cloudian/pom.xml b/plugins/integrations/cloudian/pom.xml
index 769a9ab..70a559f 100644
--- a/plugins/integrations/cloudian/pom.xml
+++ b/plugins/integrations/cloudian/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/integrations/kubernetes-service/pom.xml b/plugins/integrations/kubernetes-service/pom.xml
new file mode 100644
index 0000000..ca63530
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/pom.xml
@@ -0,0 +1,135 @@
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>cloud-plugin-integrations-kubernetes-service</artifactId>
+ <name>Apache CloudStack Plugin - Kubernetes Service</name>
+ <parent>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloudstack-plugins</artifactId>
+ <version>4.14.1.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-framework-db</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-framework-ca</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-framework-security</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-engine-schema</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-engine-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-engine-components-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-framework-managed-context</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>javax.persistence</artifactId>
+ <version>${cs.jpa.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>${cs.gson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${cs.guava.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${cs.log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${org.springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${org.springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${org.springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${org.springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${cs.codec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <version>${cs.hamcrest.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>${cs.bcprov.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>${cs.joda-time.version}</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesCluster.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesCluster.java
new file mode 100644
index 0000000..aef304a
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesCluster.java
@@ -0,0 +1,134 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.kubernetes.cluster;
+
+import java.util.Date;
+
+import org.apache.cloudstack.acl.ControlledEntity;
+import org.apache.cloudstack.api.Displayable;
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
+import com.cloud.utils.fsm.StateMachine2;
+
+/**
+ * KubernetesCluster describes the properties of a Kubernetes cluster
+ * StateMachine maintains its states.
+ *
+ */
+public interface KubernetesCluster extends ControlledEntity, com.cloud.utils.fsm.StateObject<KubernetesCluster.State>, Identity, InternalIdentity, Displayable {
+
+ enum Event {
+ StartRequested,
+ StopRequested,
+ DestroyRequested,
+ RecoveryRequested,
+ ScaleUpRequested,
+ ScaleDownRequested,
+ UpgradeRequested,
+ OperationSucceeded,
+ OperationFailed,
+ CreateFailed,
+ FaultsDetected;
+ }
+
+ enum State {
+ Created("Initial State of Kubernetes cluster. At this state its just a logical/DB entry with no resources consumed"),
+ Starting("Resources needed for Kubernetes cluster are being provisioned"),
+ Running("Necessary resources are provisioned and Kubernetes cluster is in operational ready state to launch Kubernetes"),
+ Stopping("Resources for the Kubernetes cluster are being destroyed"),
+ Stopped("All resources for the Kubernetes cluster are destroyed, Kubernetes cluster may still have ephemeral resource like persistent volumes provisioned"),
+ Scaling("Transient state in which resources are either getting scaled up/down"),
+ Upgrading("Transient state in which cluster is getting upgraded"),
+ Alert("State to represent Kubernetes clusters which are not in expected desired state (operationally in active control place, stopped cluster VM's etc)."),
+ Recovering("State in which Kubernetes cluster is recovering from alert state"),
+ Destroyed("End state of Kubernetes cluster in which all resources are destroyed, cluster will not be usable further"),
+ Destroying("State in which resources for the Kubernetes cluster is getting cleaned up or yet to be cleaned up by garbage collector"),
+ Error("State of the failed to create Kubernetes clusters");
+
+ protected static final StateMachine2<State, KubernetesCluster.Event, KubernetesCluster> s_fsm = new StateMachine2<State, KubernetesCluster.Event, KubernetesCluster>();
+
+ public static StateMachine2<State, KubernetesCluster.Event, KubernetesCluster> getStateMachine() { return s_fsm; }
+
+ static {
+ s_fsm.addTransition(State.Created, Event.StartRequested, State.Starting);
+
+ s_fsm.addTransition(State.Starting, Event.OperationSucceeded, State.Running);
+ s_fsm.addTransition(State.Starting, Event.OperationFailed, State.Alert);
+ s_fsm.addTransition(State.Starting, Event.CreateFailed, State.Error);
+ s_fsm.addTransition(State.Starting, Event.StopRequested, State.Stopping);
+
+ s_fsm.addTransition(State.Running, Event.StopRequested, State.Stopping);
+ s_fsm.addTransition(State.Alert, Event.StopRequested, State.Stopping);
+ s_fsm.addTransition(State.Stopping, Event.OperationSucceeded, State.Stopped);
+ s_fsm.addTransition(State.Stopping, Event.OperationFailed, State.Alert);
+
+ s_fsm.addTransition(State.Stopped, Event.StartRequested, State.Starting);
+
+ s_fsm.addTransition(State.Running, Event.FaultsDetected, State.Alert);
+
+ s_fsm.addTransition(State.Running, Event.ScaleUpRequested, State.Scaling);
+ s_fsm.addTransition(State.Running, Event.ScaleDownRequested, State.Scaling);
+ s_fsm.addTransition(State.Scaling, Event.OperationSucceeded, State.Running);
+ s_fsm.addTransition(State.Scaling, Event.OperationFailed, State.Alert);
+
+ s_fsm.addTransition(State.Running, Event.UpgradeRequested, State.Upgrading);
+ s_fsm.addTransition(State.Upgrading, Event.OperationSucceeded, State.Running);
+ s_fsm.addTransition(State.Upgrading, Event.OperationFailed, State.Alert);
+
+ s_fsm.addTransition(State.Alert, Event.RecoveryRequested, State.Recovering);
+ s_fsm.addTransition(State.Recovering, Event.OperationSucceeded, State.Running);
+ s_fsm.addTransition(State.Recovering, Event.OperationFailed, State.Alert);
+
+ s_fsm.addTransition(State.Running, Event.DestroyRequested, State.Destroying);
+ s_fsm.addTransition(State.Stopped, Event.DestroyRequested, State.Destroying);
+ s_fsm.addTransition(State.Alert, Event.DestroyRequested, State.Destroying);
+ s_fsm.addTransition(State.Error, Event.DestroyRequested, State.Destroying);
+
+ s_fsm.addTransition(State.Destroying, Event.OperationSucceeded, State.Destroyed);
+
+ }
+ String _description;
+
+ State(String description) {
+ _description = description;
+ }
+ }
+
+ long getId();
+ String getName();
+ String getDescription();
+ long getZoneId();
+ long getKubernetesVersionId();
+ long getServiceOfferingId();
+ long getTemplateId();
+ long getNetworkId();
+ long getDomainId();
+ long getAccountId();
+ long getMasterNodeCount();
+ long getNodeCount();
+ long getTotalNodeCount();
+ String getKeyPair();
+ long getCores();
+ long getMemory();
+ long getNodeRootDiskSize();
+ String getEndpoint();
+ boolean isCheckForGc();
+ @Override
+ State getState();
+ Date getCreated();
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterDetailsVO.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterDetailsVO.java
new file mode 100644
index 0000000..30b2864
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterDetailsVO.java
@@ -0,0 +1,84 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.kubernetes.cluster;
+
+
+import javax.persistence.Column;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+
+import org.apache.cloudstack.api.ResourceDetail;
+
+@Entity
+@Table(name = "kubernetes_cluster_details")
+public class KubernetesClusterDetailsVO implements ResourceDetail {
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "id")
+ private long id;
+
+ @Column(name = "cluster_id")
+ private long resourceId;
+
+ @Column(name = "name")
+ private String name;
+
+ @Column(name = "value", length = 10240)
+ private String value;
+
+ @Column(name = "display")
+ private boolean display;
+
+ public KubernetesClusterDetailsVO() {
+ }
+
+ public KubernetesClusterDetailsVO(long id, String name, String value, boolean display) {
+ this.resourceId = id;
+ this.name = name;
+ this.value = value;
+ this.display = display;
+ }
+
+ @Override
+ public long getId() {
+ return id;
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public String getValue() {
+ return value;
+ }
+
+ @Override
+ public long getResourceId() {
+ return resourceId;
+ }
+
+ @Override
+ public boolean isDisplay() {
+ return display;
+ }
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterEventTypes.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterEventTypes.java
new file mode 100755
index 0000000..a947e42
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterEventTypes.java
@@ -0,0 +1,26 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.kubernetes.cluster;
+
+public class KubernetesClusterEventTypes {
+ public static final String EVENT_KUBERNETES_CLUSTER_CREATE = "KUBERNETES.CLUSTER.CREATE";
+ public static final String EVENT_KUBERNETES_CLUSTER_DELETE = "KUBERNETES.CLUSTER.DELETE";
+ public static final String EVENT_KUBERNETES_CLUSTER_START = "KUBERNETES.CLUSTER.START";
+ public static final String EVENT_KUBERNETES_CLUSTER_STOP = "KUBERNETES.CLUSTER.STOP";
+ public static final String EVENT_KUBERNETES_CLUSTER_SCALE = "KUBERNETES.CLUSTER.SCALE";
+ public static final String EVENT_KUBERNETES_CLUSTER_UPGRADE = "KUBERNETES.CLUSTER.UPGRADE";
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
new file mode 100644
index 0000000..358fa03
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
@@ -0,0 +1,1500 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.kubernetes.cluster;
+
+import java.math.BigInteger;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+
+import org.apache.cloudstack.acl.ControlledEntity;
+import org.apache.cloudstack.acl.SecurityChecker;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.command.user.kubernetes.cluster.CreateKubernetesClusterCmd;
+import org.apache.cloudstack.api.command.user.kubernetes.cluster.DeleteKubernetesClusterCmd;
+import org.apache.cloudstack.api.command.user.kubernetes.cluster.GetKubernetesClusterConfigCmd;
+import org.apache.cloudstack.api.command.user.kubernetes.cluster.ListKubernetesClustersCmd;
+import org.apache.cloudstack.api.command.user.kubernetes.cluster.ScaleKubernetesClusterCmd;
+import org.apache.cloudstack.api.command.user.kubernetes.cluster.StartKubernetesClusterCmd;
+import org.apache.cloudstack.api.command.user.kubernetes.cluster.StopKubernetesClusterCmd;
+import org.apache.cloudstack.api.command.user.kubernetes.cluster.UpgradeKubernetesClusterCmd;
+import org.apache.cloudstack.api.response.KubernetesClusterConfigResponse;
+import org.apache.cloudstack.api.response.KubernetesClusterResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
+import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+
+import com.cloud.api.ApiDBUtils;
+import com.cloud.api.query.dao.NetworkOfferingJoinDao;
+import com.cloud.api.query.dao.TemplateJoinDao;
+import com.cloud.api.query.vo.NetworkOfferingJoinVO;
+import com.cloud.api.query.vo.TemplateJoinVO;
+import com.cloud.capacity.CapacityManager;
+import com.cloud.dc.ClusterDetailsDao;
+import com.cloud.dc.ClusterDetailsVO;
+import com.cloud.dc.ClusterVO;
+import com.cloud.dc.DataCenter;
+import com.cloud.dc.DataCenterVO;
+import com.cloud.dc.dao.ClusterDao;
+import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.deploy.DeployDestination;
+import com.cloud.domain.Domain;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.InsufficientServerCapacityException;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.PermissionDeniedException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.host.Host.Type;
+import com.cloud.host.HostVO;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.kubernetes.cluster.actionworkers.KubernetesClusterActionWorker;
+import com.cloud.kubernetes.cluster.actionworkers.KubernetesClusterDestroyWorker;
+import com.cloud.kubernetes.cluster.actionworkers.KubernetesClusterScaleWorker;
+import com.cloud.kubernetes.cluster.actionworkers.KubernetesClusterStartWorker;
+import com.cloud.kubernetes.cluster.actionworkers.KubernetesClusterStopWorker;
+import com.cloud.kubernetes.cluster.actionworkers.KubernetesClusterUpgradeWorker;
+import com.cloud.kubernetes.cluster.dao.KubernetesClusterDao;
+import com.cloud.kubernetes.cluster.dao.KubernetesClusterDetailsDao;
+import com.cloud.kubernetes.cluster.dao.KubernetesClusterVmMapDao;
+import com.cloud.kubernetes.version.KubernetesSupportedVersion;
+import com.cloud.kubernetes.version.KubernetesSupportedVersionVO;
+import com.cloud.kubernetes.version.KubernetesVersionManagerImpl;
+import com.cloud.kubernetes.version.dao.KubernetesSupportedVersionDao;
+import com.cloud.network.IpAddress;
+import com.cloud.network.Network;
+import com.cloud.network.Network.Service;
+import com.cloud.network.NetworkModel;
+import com.cloud.network.NetworkService;
+import com.cloud.network.Networks;
+import com.cloud.network.PhysicalNetwork;
+import com.cloud.network.dao.FirewallRulesDao;
+import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkVO;
+import com.cloud.network.dao.PhysicalNetworkDao;
+import com.cloud.network.rules.FirewallRule;
+import com.cloud.network.rules.FirewallRuleVO;
+import com.cloud.offering.NetworkOffering;
+import com.cloud.offering.ServiceOffering;
+import com.cloud.offerings.NetworkOfferingServiceMapVO;
+import com.cloud.offerings.NetworkOfferingVO;
+import com.cloud.offerings.dao.NetworkOfferingDao;
+import com.cloud.offerings.dao.NetworkOfferingServiceMapDao;
+import com.cloud.org.Cluster;
+import com.cloud.org.Grouping;
+import com.cloud.projects.Project;
+import com.cloud.resource.ResourceManager;
+import com.cloud.service.ServiceOfferingVO;
+import com.cloud.service.dao.ServiceOfferingDao;
+import com.cloud.storage.VMTemplateVO;
+import com.cloud.storage.VMTemplateZoneVO;
+import com.cloud.storage.dao.VMTemplateDao;
+import com.cloud.storage.dao.VMTemplateZoneDao;
+import com.cloud.user.Account;
+import com.cloud.user.AccountManager;
+import com.cloud.user.AccountService;
+import com.cloud.user.SSHKeyPairVO;
+import com.cloud.user.dao.SSHKeyPairDao;
+import com.cloud.utils.Pair;
+import com.cloud.utils.Ternary;
+import com.cloud.utils.component.ComponentContext;
+import com.cloud.utils.component.ManagerBase;
+import com.cloud.utils.concurrency.NamedThreadFactory;
+import com.cloud.utils.db.Filter;
+import com.cloud.utils.db.GlobalLock;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
+import com.cloud.utils.db.Transaction;
+import com.cloud.utils.db.TransactionCallback;
+import com.cloud.utils.db.TransactionCallbackNoReturn;
+import com.cloud.utils.db.TransactionStatus;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.fsm.NoTransitionException;
+import com.cloud.utils.fsm.StateMachine2;
+import com.cloud.utils.net.NetUtils;
+import com.cloud.vm.UserVmVO;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.dao.UserVmDao;
+import com.cloud.vm.dao.VMInstanceDao;
+import com.google.common.base.Strings;
+
+public class KubernetesClusterManagerImpl extends ManagerBase implements KubernetesClusterService {
+
+ private static final Logger LOGGER = Logger.getLogger(KubernetesClusterManagerImpl.class);
+ private static final String DEFAULT_NETWORK_OFFERING_FOR_KUBERNETES_SERVICE_NAME = "DefaultNetworkOfferingforKubernetesService";
+
+ protected StateMachine2<KubernetesCluster.State, KubernetesCluster.Event, KubernetesCluster> _stateMachine = KubernetesCluster.State.getStateMachine();
+
+ ScheduledExecutorService _gcExecutor;
+ ScheduledExecutorService _stateScanner;
+
+ @Inject
+ public KubernetesClusterDao kubernetesClusterDao;
+ @Inject
+ public KubernetesClusterVmMapDao kubernetesClusterVmMapDao;
+ @Inject
+ public KubernetesClusterDetailsDao kubernetesClusterDetailsDao;
+ @Inject
+ public KubernetesSupportedVersionDao kubernetesSupportedVersionDao;
+ @Inject
+ protected SSHKeyPairDao sshKeyPairDao;
+ @Inject
+ protected DataCenterDao dataCenterDao;
+ @Inject
+ protected ClusterDao clusterDao;
+ @Inject
+ protected ClusterDetailsDao clusterDetailsDao;
+ @Inject
+ protected ServiceOfferingDao serviceOfferingDao;
+ @Inject
+ protected VMTemplateDao templateDao;
+ @Inject
+ protected VMTemplateZoneDao templateZoneDao;
+ @Inject
+ protected TemplateJoinDao templateJoinDao;
+ @Inject
+ protected AccountService accountService;
+ @Inject
+ protected AccountManager accountManager;
+ @Inject
+ protected VMInstanceDao vmInstanceDao;
+ @Inject
+ protected UserVmDao userVmDao;
+ @Inject
+ protected NetworkOfferingDao networkOfferingDao;
+ @Inject
+ protected NetworkOfferingJoinDao networkOfferingJoinDao;
+ @Inject
+ protected NetworkOfferingServiceMapDao networkOfferingServiceMapDao;
+ @Inject
+ protected NetworkService networkService;
+ @Inject
+ protected NetworkModel networkModel;
+ @Inject
+ protected PhysicalNetworkDao physicalNetworkDao;
+ @Inject
+ protected NetworkOrchestrationService networkMgr;
+ @Inject
+ protected NetworkDao networkDao;
+ @Inject
+ protected CapacityManager capacityManager;
+ @Inject
+ protected ResourceManager resourceManager;
+ @Inject
+ protected FirewallRulesDao firewallRulesDao;
+
+ private void logMessage(final Level logLevel, final String message, final Exception e) {
+ if (logLevel == Level.WARN) {
+ if (e != null) {
+ LOGGER.warn(message, e);
+ } else {
+ LOGGER.warn(message);
+ }
+ } else {
+ if (e != null) {
+ LOGGER.error(message, e);
+ } else {
+ LOGGER.error(message);
+ }
+ }
+ }
+
+ private void logTransitStateAndThrow(final Level logLevel, final String message, final Long kubernetesClusterId, final KubernetesCluster.Event event, final Exception e) throws CloudRuntimeException {
+ logMessage(logLevel, message, e);
+ if (kubernetesClusterId != null && event != null) {
+ stateTransitTo(kubernetesClusterId, event);
+ }
+ if (e == null) {
+ throw new CloudRuntimeException(message);
+ }
+ throw new CloudRuntimeException(message, e);
+ }
+
+ private void logAndThrow(final Level logLevel, final String message) throws CloudRuntimeException {
+ logTransitStateAndThrow(logLevel, message, null, null, null);
+ }
+
+ private void logAndThrow(final Level logLevel, final String message, final Exception ex) throws CloudRuntimeException {
+ logTransitStateAndThrow(logLevel, message, null, null, ex);
+ }
+
+ private boolean isKubernetesServiceTemplateConfigured(DataCenter zone) {
+ // Check Kubernetes VM template for zone
+ boolean isHyperVAvailable = false;
+ boolean isKVMAvailable = false;
+ boolean isVMwareAvailable = false;
+ boolean isXenserverAvailable = false;
+ List<ClusterVO> clusters = clusterDao.listByZoneId(zone.getId());
+ for (ClusterVO clusterVO : clusters) {
+ if (Hypervisor.HypervisorType.Hyperv.equals(clusterVO.getHypervisorType())) {
+ isHyperVAvailable = true;
+ }
+ if (Hypervisor.HypervisorType.KVM.equals(clusterVO.getHypervisorType())) {
+ isKVMAvailable = true;
+ }
+ if (Hypervisor.HypervisorType.VMware.equals(clusterVO.getHypervisorType())) {
+ isVMwareAvailable = true;
+ }
+ if (Hypervisor.HypervisorType.XenServer.equals(clusterVO.getHypervisorType())) {
+ isXenserverAvailable = true;
+ }
+ }
+ List<Pair<String, String>> templatePairs = new ArrayList<>();
+ if (isHyperVAvailable) {
+ templatePairs.add(new Pair<>(KubernetesClusterHyperVTemplateName.key(), KubernetesClusterHyperVTemplateName.value()));
+ }
+ if (isKVMAvailable) {
+ templatePairs.add(new Pair<>(KubernetesClusterKVMTemplateName.key(), KubernetesClusterKVMTemplateName.value()));
+ }
+ if (isVMwareAvailable) {
+ templatePairs.add(new Pair<>(KubernetesClusterVMwareTemplateName.key(), KubernetesClusterVMwareTemplateName.value()));
+ }
+ if (isXenserverAvailable) {
+ templatePairs.add(new Pair<>(KubernetesClusterXenserverTemplateName.key(), KubernetesClusterXenserverTemplateName.value()));
+ }
+ for (Pair<String, String> templatePair : templatePairs) {
+ String templateKey = templatePair.first();
+ String templateName = templatePair.second();
+ if (Strings.isNullOrEmpty(templateName)) {
+ LOGGER.warn(String.format("Global setting %s is empty. Template name need to be specified for Kubernetes service to function", templateKey));
+ return false;
+ }
+ final VMTemplateVO template = templateDao.findByTemplateName(templateName);
+ if (template == null) {
+ LOGGER.warn(String.format("Unable to find the template %s to be used for provisioning Kubernetes cluster nodes", templateName));
+ return false;
+ }
+ List<VMTemplateZoneVO> listZoneTemplate = templateZoneDao.listByZoneTemplate(zone.getId(), template.getId());
+ if (listZoneTemplate == null || listZoneTemplate.isEmpty()) {
+ LOGGER.warn(String.format("The template ID: %s, name: %s is not available for use in zone ID: %s provisioning Kubernetes cluster nodes", template.getUuid(), templateName, zone.getUuid()));
+ return false;
+ }
+ }
+ return true;
+ }
+
+ private boolean isKubernetesServiceNetworkOfferingConfigured(DataCenter zone) {
+ // Check network offering
+ String networkOfferingName = KubernetesClusterNetworkOffering.value();
+ if (networkOfferingName == null || networkOfferingName.isEmpty()) {
+ LOGGER.warn(String.format("Global setting %s is empty. Admin has not yet specified the network offering to be used for provisioning isolated network for the cluster", KubernetesClusterNetworkOffering.key()));
+ return false;
+ }
+ NetworkOfferingVO networkOffering = networkOfferingDao.findByUniqueName(networkOfferingName);
+ if (networkOffering == null) {
+ LOGGER.warn(String.format("Unable to find the network offering %s to be used for provisioning Kubernetes cluster", networkOfferingName));
+ return false;
+ }
+ if (networkOffering.getState() == NetworkOffering.State.Disabled) {
+ LOGGER.warn(String.format("Network offering ID: %s is not enabled", networkOffering.getUuid()));
+ return false;
+ }
+ List<String> services = networkOfferingServiceMapDao.listServicesForNetworkOffering(networkOffering.getId());
+ if (services == null || services.isEmpty() || !services.contains("SourceNat")) {
+ LOGGER.warn(String.format("Network offering ID: %s does not have necessary services to provision Kubernetes cluster", networkOffering.getUuid()));
+ return false;
+ }
+ if (!networkOffering.isEgressDefaultPolicy()) {
+ LOGGER.warn(String.format("Network offering ID: %s has egress default policy turned off should be on to provision Kubernetes cluster", networkOffering.getUuid()));
+ return false;
+ }
+ boolean offeringAvailableForZone = false;
+ List<NetworkOfferingJoinVO> networkOfferingJoinVOs = networkOfferingJoinDao.findByZoneId(zone.getId(), true);
+ for (NetworkOfferingJoinVO networkOfferingJoinVO : networkOfferingJoinVOs) {
+ if (networkOffering.getId() == networkOfferingJoinVO.getId()) {
+ offeringAvailableForZone = true;
+ break;
+ }
+ }
+ if (!offeringAvailableForZone) {
+ LOGGER.warn(String.format("Network offering ID: %s is not available for zone ID: %s", networkOffering.getUuid(), zone.getUuid()));
+ return false;
+ }
+ long physicalNetworkId = networkModel.findPhysicalNetworkId(zone.getId(), networkOffering.getTags(), networkOffering.getTrafficType());
+ PhysicalNetwork physicalNetwork = physicalNetworkDao.findById(physicalNetworkId);
+ if (physicalNetwork == null) {
+ LOGGER.warn(String.format("Unable to find physical network with tag: %s", networkOffering.getTags()));
+ return false;
+ }
+ return true;
+ }
+
+ private boolean isKubernetesServiceConfigured(DataCenter zone) {
+ if (!isKubernetesServiceTemplateConfigured(zone)) {
+ return false;
+ }
+ if (!isKubernetesServiceNetworkOfferingConfigured(zone)) {
+ return false;
+ }
+ return true;
+ }
+
+ private IpAddress getSourceNatIp(Network network) {
+ List<? extends IpAddress> addresses = networkModel.listPublicIpsAssignedToGuestNtwk(network.getId(), true);
+ if (CollectionUtils.isEmpty(addresses)) {
+ return null;
+ }
+ for (IpAddress address : addresses) {
+ if (address.isSourceNat()) {
+ return address;
+ }
+ }
+ return null;
+ }
+
+ private VMTemplateVO getKubernetesServiceTemplate(Hypervisor.HypervisorType hypervisorType) {
+ String tempalteName = null;
+ switch (hypervisorType) {
+ case Hyperv:
+ tempalteName = KubernetesClusterHyperVTemplateName.value();
+ break;
+ case KVM:
+ tempalteName = KubernetesClusterKVMTemplateName.value();
+ break;
+ case VMware:
+ tempalteName = KubernetesClusterVMwareTemplateName.value();
+ break;
+ case XenServer:
+ tempalteName = KubernetesClusterXenserverTemplateName.value();
+ break;
+ }
+ return templateDao.findByTemplateName(tempalteName);
+ }
+
+ private boolean validateIsolatedNetwork(Network network, int clusterTotalNodeCount) {
+ if (Network.GuestType.Isolated.equals(network.getGuestType())) {
+ if (Network.State.Allocated.equals(network.getState())) { // Allocated networks won't have IP and rules
+ return true;
+ }
+ IpAddress sourceNatIp = getSourceNatIp(network);
+ if (sourceNatIp == null) {
+ throw new InvalidParameterValueException(String.format("Network ID: %s does not have a source NAT IP associated with it. To provision a Kubernetes Cluster, source NAT IP is required", network.getUuid()));
+ }
+ List<FirewallRuleVO> rules = firewallRulesDao.listByIpAndPurposeAndNotRevoked(sourceNatIp.getId(), FirewallRule.Purpose.Firewall);
+ for (FirewallRuleVO rule : rules) {
+ Integer startPort = rule.getSourcePortStart();
+ Integer endPort = rule.getSourcePortEnd();
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Network rule : " + startPort + " " + endPort);
+ }
+ if (startPort <= KubernetesClusterActionWorker.CLUSTER_API_PORT && KubernetesClusterActionWorker.CLUSTER_API_PORT <= endPort) {
+ throw new InvalidParameterValueException(String.format("Network ID: %s has conflicting firewall rules to provision Kubernetes cluster for API access", network.getUuid()));
+ }
+ if (startPort <= KubernetesClusterActionWorker.CLUSTER_NODES_DEFAULT_START_SSH_PORT && KubernetesClusterActionWorker.CLUSTER_NODES_DEFAULT_START_SSH_PORT + clusterTotalNodeCount <= endPort) {
+ throw new InvalidParameterValueException(String.format("Network ID: %s has conflicting firewall rules to provision Kubernetes cluster for node VM SSH access", network.getUuid()));
+ }
+ }
+ rules = firewallRulesDao.listByIpAndPurposeAndNotRevoked(sourceNatIp.getId(), FirewallRule.Purpose.PortForwarding);
+ for (FirewallRuleVO rule : rules) {
+ Integer startPort = rule.getSourcePortStart();
+ Integer endPort = rule.getSourcePortEnd();
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Network rule : " + startPort + " " + endPort);
+ }
+ if (startPort <= KubernetesClusterActionWorker.CLUSTER_API_PORT && KubernetesClusterActionWorker.CLUSTER_API_PORT <= endPort) {
+ throw new InvalidParameterValueException(String.format("Network ID: %s has conflicting port forwarding rules to provision Kubernetes cluster for API access", network.getUuid()));
+ }
+ if (startPort <= KubernetesClusterActionWorker.CLUSTER_NODES_DEFAULT_START_SSH_PORT && KubernetesClusterActionWorker.CLUSTER_NODES_DEFAULT_START_SSH_PORT + clusterTotalNodeCount <= endPort) {
+ throw new InvalidParameterValueException(String.format("Network ID: %s has conflicting port forwarding rules to provision Kubernetes cluster for node VM SSH access", network.getUuid()));
+ }
+ }
+ }
+ return true;
+ }
+
+ private boolean validateNetwork(Network network, int clusterTotalNodeCount) {
+ NetworkOffering networkOffering = networkOfferingDao.findById(network.getNetworkOfferingId());
+ if (networkOffering.isSystemOnly()) {
+ throw new InvalidParameterValueException(String.format("Network ID: %s is for system use only", network.getUuid()));
+ }
+ if (!networkModel.areServicesSupportedInNetwork(network.getId(), Service.UserData)) {
+ throw new InvalidParameterValueException(String.format("Network ID: %s does not support userdata that is required for Kubernetes cluster", network.getUuid()));
+ }
+ if (!networkModel.areServicesSupportedInNetwork(network.getId(), Service.Firewall)) {
+ throw new InvalidParameterValueException(String.format("Network ID: %s does not support firewall that is required for Kubernetes cluster", network.getUuid()));
+ }
+ if (!networkModel.areServicesSupportedInNetwork(network.getId(), Service.PortForwarding)) {
+ throw new InvalidParameterValueException(String.format("Network ID: %s does not support port forwarding that is required for Kubernetes cluster", network.getUuid()));
+ }
+ if (!networkModel.areServicesSupportedInNetwork(network.getId(), Service.Dhcp)) {
+ throw new InvalidParameterValueException(String.format("Network ID: %s does not support DHCP that is required for Kubernetes cluster", network.getUuid()));
+ }
+ validateIsolatedNetwork(network, clusterTotalNodeCount);
+ return true;
+ }
+
+ private boolean validateServiceOffering(final ServiceOffering serviceOffering, final KubernetesSupportedVersion version) {
+ if (serviceOffering.isDynamic()) {
+ throw new InvalidParameterValueException(String.format("Custom service offerings are not supported for creating clusters, service offering ID: %s", serviceOffering.getUuid()));
+ }
+ if (serviceOffering.getCpu() < MIN_KUBERNETES_CLUSTER_NODE_CPU || serviceOffering.getRamSize() < MIN_KUBERNETES_CLUSTER_NODE_RAM_SIZE) {
+ throw new InvalidParameterValueException(String.format("Kubernetes cluster cannot be created with service offering ID: %s, Kubernetes cluster template(CoreOS) needs minimum %d vCPUs and %d MB RAM", serviceOffering.getUuid(), MIN_KUBERNETES_CLUSTER_NODE_CPU, MIN_KUBERNETES_CLUSTER_NODE_RAM_SIZE));
+ }
+ if (serviceOffering.getCpu() < version.getMinimumCpu()) {
+ throw new InvalidParameterValueException(String.format("Kubernetes cluster cannot be created with service offering ID: %s, Kubernetes version ID: %s needs minimum %d vCPUs", serviceOffering.getUuid(), version.getUuid(), version.getMinimumCpu()));
+ }
+ if (serviceOffering.getRamSize() < version.getMinimumRamSize()) {
+ throw new InvalidParameterValueException(String.format("Kubernetes cluster cannot be created with service offering ID: %s, associated Kubernetes version ID: %s needs minimum %d MB RAM", serviceOffering.getUuid(), version.getUuid(), version.getMinimumRamSize()));
+ }
+ return true;
+ }
+
+ private void validateDockerRegistryParams(final String dockerRegistryUserName,
+ final String dockerRegistryPassword,
+ final String dockerRegistryUrl,
+ final String dockerRegistryEmail) {
+ // if no params related to docker registry specified then nothing to validate so return true
+ if ((dockerRegistryUserName == null || dockerRegistryUserName.isEmpty()) &&
+ (dockerRegistryPassword == null || dockerRegistryPassword.isEmpty()) &&
+ (dockerRegistryUrl == null || dockerRegistryUrl.isEmpty()) &&
+ (dockerRegistryEmail == null || dockerRegistryEmail.isEmpty())) {
+ return;
+ }
+
+ // all params related to docker registry must be specified or nothing
+ if (!((dockerRegistryUserName != null && !dockerRegistryUserName.isEmpty()) &&
+ (dockerRegistryPassword != null && !dockerRegistryPassword.isEmpty()) &&
+ (dockerRegistryUrl != null && !dockerRegistryUrl.isEmpty()) &&
+ (dockerRegistryEmail != null && !dockerRegistryEmail.isEmpty()))) {
+ throw new InvalidParameterValueException("All the docker private registry parameters (username, password, url, email) required are specified");
+ }
+
+ try {
+ URL url = new URL(dockerRegistryUrl);
+ } catch (MalformedURLException e) {
+ throw new InvalidParameterValueException("Invalid docker registry url specified");
+ }
+
+ Pattern VALID_EMAIL_ADDRESS_REGEX = Pattern.compile("^[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,6}$", Pattern.CASE_INSENSITIVE);
+ Matcher matcher = VALID_EMAIL_ADDRESS_REGEX.matcher(dockerRegistryEmail);
+ if (!matcher.find()) {
+ throw new InvalidParameterValueException("Invalid docker registry email specified");
+ }
+ }
+
+ private DeployDestination plan(final long nodesCount, final DataCenter zone, final ServiceOffering offering) throws InsufficientServerCapacityException {
+ final int cpu_requested = offering.getCpu() * offering.getSpeed();
+ final long ram_requested = offering.getRamSize() * 1024L * 1024L;
+ List<HostVO> hosts = resourceManager.listAllHostsInOneZoneByType(Type.Routing, zone.getId());
+ final Map<String, Pair<HostVO, Integer>> hosts_with_resevered_capacity = new ConcurrentHashMap<String, Pair<HostVO, Integer>>();
+ for (HostVO h : hosts) {
+ hosts_with_resevered_capacity.put(h.getUuid(), new Pair<HostVO, Integer>(h, 0));
+ }
+ boolean suitable_host_found = false;
+ Cluster planCluster = null;
+ for (int i = 1; i <= nodesCount + 1; i++) {
+ suitable_host_found = false;
+ for (Map.Entry<String, Pair<HostVO, Integer>> hostEntry : hosts_with_resevered_capacity.entrySet()) {
+ Pair<HostVO, Integer> hp = hostEntry.getValue();
+ HostVO h = hp.first();
+ int reserved = hp.second();
+ reserved++;
+ ClusterVO cluster = clusterDao.findById(h.getClusterId());
+ ClusterDetailsVO cluster_detail_cpu = clusterDetailsDao.findDetail(cluster.getId(), "cpuOvercommitRatio");
+ ClusterDetailsVO cluster_detail_ram = clusterDetailsDao.findDetail(cluster.getId(), "memoryOvercommitRatio");
+ Float cpuOvercommitRatio = Float.parseFloat(cluster_detail_cpu.getValue());
+ Float memoryOvercommitRatio = Float.parseFloat(cluster_detail_ram.getValue());
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(String.format("Checking host ID: %s for capacity already reserved %d", h.getUuid(), reserved));
+ }
+ if (capacityManager.checkIfHostHasCapacity(h.getId(), cpu_requested * reserved, ram_requested * reserved, false, cpuOvercommitRatio, memoryOvercommitRatio, true)) {
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(String.format("Found host ID: %s for with enough capacity, CPU=%d RAM=%d", h.getUuid(), cpu_requested * reserved, ram_requested * reserved));
+ }
+ hostEntry.setValue(new Pair<HostVO, Integer>(h, reserved));
+ suitable_host_found = true;
+ planCluster = cluster;
+ break;
+ }
+ }
+ if (!suitable_host_found) {
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Suitable hosts not found in datacenter ID: %s for node %d", zone.getUuid(), i));
+ }
+ break;
+ }
+ }
+ if (suitable_host_found) {
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Suitable hosts found in datacenter ID: %s, creating deployment destination", zone.getUuid()));
+ }
+ return new DeployDestination(zone, null, planCluster, null);
+ }
+ String msg = String.format("Cannot find enough capacity for Kubernetes cluster(requested cpu=%1$s memory=%2$s)",
+ cpu_requested * nodesCount, ram_requested * nodesCount);
+ LOGGER.warn(msg);
+ throw new InsufficientServerCapacityException(msg, DataCenter.class, zone.getId());
+ }
+
+ @Override
+ public KubernetesClusterResponse createKubernetesClusterResponse(long kubernetesClusterId) {
+ KubernetesClusterVO kubernetesCluster = kubernetesClusterDao.findById(kubernetesClusterId);
+ KubernetesClusterResponse response = new KubernetesClusterResponse();
+ response.setObjectName(KubernetesCluster.class.getSimpleName().toLowerCase());
+ response.setId(kubernetesCluster.getUuid());
+ response.setName(kubernetesCluster.getName());
+ response.setDescription(kubernetesCluster.getDescription());
+ DataCenterVO zone = ApiDBUtils.findZoneById(kubernetesCluster.getZoneId());
+ response.setZoneId(zone.getUuid());
+ response.setZoneName(zone.getName());
+ response.setMasterNodes(kubernetesCluster.getMasterNodeCount());
+ response.setClusterSize(kubernetesCluster.getNodeCount());
+ VMTemplateVO template = ApiDBUtils.findTemplateById(kubernetesCluster.getTemplateId());
+ response.setTemplateId(template.getUuid());
+ ServiceOfferingVO offering = serviceOfferingDao.findById(kubernetesCluster.getServiceOfferingId());
+ response.setServiceOfferingId(offering.getUuid());
+ response.setServiceOfferingName(offering.getName());
+ KubernetesSupportedVersionVO version = kubernetesSupportedVersionDao.findById(kubernetesCluster.getKubernetesVersionId());
+ if (version != null) {
+ response.setKubernetesVersionId(version.getUuid());
+ response.setKubernetesVersionName(version.getName());
+ }
+ Account account = ApiDBUtils.findAccountById(kubernetesCluster.getAccountId());
+ if (account.getType() == Account.ACCOUNT_TYPE_PROJECT) {
+ Project project = ApiDBUtils.findProjectByProjectAccountId(account.getId());
+ response.setProjectId(project.getUuid());
+ response.setProjectName(project.getName());
+ } else {
+ response.setAccountName(account.getAccountName());
+ }
+ Domain domain = ApiDBUtils.findDomainById(kubernetesCluster.getDomainId());
+ response.setDomainId(domain.getUuid());
+ response.setDomainName(domain.getName());
+ response.setKeypair(kubernetesCluster.getKeyPair());
+ response.setState(kubernetesCluster.getState().toString());
+ response.setCores(String.valueOf(kubernetesCluster.getCores()));
+ response.setMemory(String.valueOf(kubernetesCluster.getMemory()));
+ NetworkVO ntwk = networkDao.findByIdIncludingRemoved(kubernetesCluster.getNetworkId());
+ response.setEndpoint(kubernetesCluster.getEndpoint());
+ response.setNetworkId(ntwk.getUuid());
+ response.setAssociatedNetworkName(ntwk.getName());
+ List<String> vmIds = new ArrayList<String>();
+ List<KubernetesClusterVmMapVO> vmList = kubernetesClusterVmMapDao.listByClusterId(kubernetesCluster.getId());
+ if (vmList != null && !vmList.isEmpty()) {
+ for (KubernetesClusterVmMapVO vmMapVO : vmList) {
+ UserVmVO userVM = userVmDao.findById(vmMapVO.getVmId());
+ if (userVM != null) {
+ vmIds.add(userVM.getUuid());
+ }
+ }
+ }
+ response.setVirtualMachineIds(vmIds);
+ return response;
+ }
+
+ private void validateKubernetesClusterCreateParameters(final CreateKubernetesClusterCmd cmd) throws CloudRuntimeException {
+ final String name = cmd.getName();
+ final Long zoneId = cmd.getZoneId();
+ final Long kubernetesVersionId = cmd.getKubernetesVersionId();
+ final Long serviceOfferingId = cmd.getServiceOfferingId();
+ final Account owner = accountService.getActiveAccountById(cmd.getEntityOwnerId());
+ final Long networkId = cmd.getNetworkId();
+ final String sshKeyPair = cmd.getSSHKeyPairName();
+ final Long masterNodeCount = cmd.getMasterNodes();
+ final Long clusterSize = cmd.getClusterSize();
+ final String dockerRegistryUserName = cmd.getDockerRegistryUserName();
+ final String dockerRegistryPassword = cmd.getDockerRegistryPassword();
+ final String dockerRegistryUrl = cmd.getDockerRegistryUrl();
+ final String dockerRegistryEmail = cmd.getDockerRegistryEmail();
+ final Long nodeRootDiskSize = cmd.getNodeRootDiskSize();
+ final String externalLoadBalancerIpAddress = cmd.getExternalLoadBalancerIpAddress();
+
+ if (name == null || name.isEmpty()) {
+ throw new InvalidParameterValueException("Invalid name for the Kubernetes cluster name:" + name);
+ }
+
+ if (masterNodeCount < 1 || masterNodeCount > 100) {
+ throw new InvalidParameterValueException("Invalid cluster master nodes count: " + masterNodeCount);
+ }
+
+ if (clusterSize < 1 || clusterSize > 100) {
+ throw new InvalidParameterValueException("Invalid cluster size: " + clusterSize);
+ }
+
+ DataCenter zone = dataCenterDao.findById(zoneId);
+ if (zone == null) {
+ throw new InvalidParameterValueException("Unable to find zone by ID: " + zoneId);
+ }
+
+ if (Grouping.AllocationState.Disabled == zone.getAllocationState()) {
+ throw new PermissionDeniedException(String.format("Cannot perform this operation, zone ID: %s is currently disabled", zone.getUuid()));
+ }
+
+ if (!isKubernetesServiceConfigured(zone)) {
+ throw new CloudRuntimeException("Kubernetes service has not been configured properly to provision Kubernetes clusters");
+ }
+
+ final KubernetesSupportedVersion clusterKubernetesVersion = kubernetesSupportedVersionDao.findById(kubernetesVersionId);
+ if (clusterKubernetesVersion == null) {
+ throw new InvalidParameterValueException("Unable to find given Kubernetes version in supported versions");
+ }
+ if (!KubernetesSupportedVersion.State.Enabled.equals(clusterKubernetesVersion.getState())) {
+ throw new InvalidParameterValueException(String.format("Kubernetes version ID: %s is in %s state", clusterKubernetesVersion.getUuid(), clusterKubernetesVersion.getState()));
+ }
+ if (clusterKubernetesVersion.getZoneId() != null && !clusterKubernetesVersion.getZoneId().equals(zone.getId())) {
+ throw new InvalidParameterValueException(String.format("Kubernetes version ID: %s is not available for zone ID: %s", clusterKubernetesVersion.getUuid(), zone.getUuid()));
+ }
+ if (masterNodeCount > 1 ) {
+ try {
+ if (KubernetesVersionManagerImpl.compareSemanticVersions(clusterKubernetesVersion.getSemanticVersion(), MIN_KUBERNETES_VERSION_HA_SUPPORT) < 0) {
+ throw new InvalidParameterValueException(String.format("HA support is available only for Kubernetes version %s and above. Given version ID: %s is %s", MIN_KUBERNETES_VERSION_HA_SUPPORT, clusterKubernetesVersion.getUuid(), clusterKubernetesVersion.getSemanticVersion()));
+ }
+ } catch (IllegalArgumentException e) {
+ logAndThrow(Level.WARN, String.format("Unable to compare Kubernetes version for given version ID: %s with %s", clusterKubernetesVersion.getUuid(), MIN_KUBERNETES_VERSION_HA_SUPPORT), e);
+ }
+ }
+
+ if (clusterKubernetesVersion.getZoneId() != null && clusterKubernetesVersion.getZoneId() != zone.getId()) {
+ throw new InvalidParameterValueException(String.format("Kubernetes version ID: %s is not available for zone ID: %s", clusterKubernetesVersion.getUuid(), zone.getUuid()));
+ }
+
+ TemplateJoinVO iso = templateJoinDao.findById(clusterKubernetesVersion.getIsoId());
+ if (iso == null) {
+ throw new InvalidParameterValueException(String.format("Invalid ISO associated with version ID: %s", clusterKubernetesVersion.getUuid()));
+ }
+ if (!ObjectInDataStoreStateMachine.State.Ready.equals(iso.getState())) {
+ throw new InvalidParameterValueException(String.format("ISO associated with version ID: %s is not in Ready state", clusterKubernetesVersion.getUuid()));
+ }
+
+ ServiceOffering serviceOffering = serviceOfferingDao.findById(serviceOfferingId);
+ if (serviceOffering == null) {
+ throw new InvalidParameterValueException("No service offering with ID: " + serviceOfferingId);
+ }
+
+ if (sshKeyPair != null && !sshKeyPair.isEmpty()) {
+ SSHKeyPairVO sshKeyPairVO = sshKeyPairDao.findByName(owner.getAccountId(), owner.getDomainId(), sshKeyPair);
+ if (sshKeyPairVO == null) {
+ throw new InvalidParameterValueException(String.format("Given SSH key pair with name: %s was not found for the account %s", sshKeyPair, owner.getAccountName()));
+ }
+ }
+
+ if (nodeRootDiskSize != null && nodeRootDiskSize <= 0) {
+ throw new InvalidParameterValueException(String.format("Invalid value for %s", ApiConstants.NODE_ROOT_DISK_SIZE));
+ }
+
+ if (!validateServiceOffering(serviceOffering, clusterKubernetesVersion)) {
+ throw new InvalidParameterValueException("Given service offering ID: %s is not suitable for Kubernetes cluster");
+ }
+
+ validateDockerRegistryParams(dockerRegistryUserName, dockerRegistryPassword, dockerRegistryUrl, dockerRegistryEmail);
+
+ Network network = null;
+ if (networkId != null) {
+ network = networkService.getNetwork(networkId);
+ if (network == null) {
+ throw new InvalidParameterValueException("Unable to find network with given ID");
+ }
+ }
+
+ if (!Strings.isNullOrEmpty(externalLoadBalancerIpAddress)) {
+ if (!NetUtils.isValidIp4(externalLoadBalancerIpAddress) && !NetUtils.isValidIp6(externalLoadBalancerIpAddress)) {
+ throw new InvalidParameterValueException("Invalid external load balancer IP address");
+ }
+ if (network == null) {
+ throw new InvalidParameterValueException(String.format("%s parameter must be specified along with %s parameter", ApiConstants.EXTERNAL_LOAD_BALANCER_IP_ADDRESS, ApiConstants.NETWORK_ID));
+ }
+ if (Network.GuestType.Shared.equals(network.getGuestType())) {
+ throw new InvalidParameterValueException(String.format("%s parameter must be specified along with %s type of network", ApiConstants.EXTERNAL_LOAD_BALANCER_IP_ADDRESS, Network.GuestType.Shared.toString()));
+ }
+ }
+
+ if (!KubernetesClusterExperimentalFeaturesEnabled.value() && (!Strings.isNullOrEmpty(dockerRegistryUrl) ||
+ !Strings.isNullOrEmpty(dockerRegistryUserName) || !Strings.isNullOrEmpty(dockerRegistryEmail) || !Strings.isNullOrEmpty(dockerRegistryPassword))) {
+ throw new CloudRuntimeException(String.format("Private registry for the Kubernetes cluster is an experimental feature. Use %s configuration for enabling experimental features", KubernetesClusterExperimentalFeaturesEnabled.key()));
+ }
+ }
+
+ private Network getKubernetesClusterNetworkIfMissing(final String clusterName, final DataCenter zone, final Account owner, final int masterNodesCount,
+ final int nodesCount, final String externalLoadBalancerIpAddress, final Long networkId) throws CloudRuntimeException {
+ Network network = null;
+ if (networkId != null) {
+ network = networkDao.findById(networkId);
+ if (Network.GuestType.Isolated.equals(network.getGuestType())) {
+ if (kubernetesClusterDao.listByNetworkId(network.getId()).isEmpty()) {
+ if (!validateNetwork(network, masterNodesCount + nodesCount)) {
+ throw new InvalidParameterValueException(String.format("Network ID: %s is not suitable for Kubernetes cluster", network.getUuid()));
+ }
+ networkModel.checkNetworkPermissions(owner, network);
+ } else {
+ throw new InvalidParameterValueException(String.format("Network ID: %s is already under use by another Kubernetes cluster", network.getUuid()));
+ }
+ } else if (Network.GuestType.Shared.equals(network.getGuestType())) {
+ if (masterNodesCount > 1 && Strings.isNullOrEmpty(externalLoadBalancerIpAddress)) {
+ throw new InvalidParameterValueException(String.format("Multi-master, HA Kubernetes cluster with %s network ID: %s needs an external load balancer IP address. %s parameter can be used",
+ network.getGuestType().toString(), network.getUuid(), ApiConstants.EXTERNAL_LOAD_BALANCER_IP_ADDRESS));
+ }
+ }
+ } else { // user has not specified network in which cluster VM's to be provisioned, so create a network for Kubernetes cluster
+ NetworkOfferingVO networkOffering = networkOfferingDao.findByUniqueName(KubernetesClusterNetworkOffering.value());
+
+ long physicalNetworkId = networkModel.findPhysicalNetworkId(zone.getId(), networkOffering.getTags(), networkOffering.getTrafficType());
+ PhysicalNetwork physicalNetwork = physicalNetworkDao.findById(physicalNetworkId);
+
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Creating network for account ID: %s from the network offering ID: %s as part of Kubernetes cluster: %s deployment process", owner.getUuid(), networkOffering.getUuid(), clusterName));
+ }
+
+ try {
+ network = networkMgr.createGuestNetwork(networkOffering.getId(), clusterName + "-network", owner.getAccountName() + "-network",
+ null, null, null, false, null, owner, null, physicalNetwork, zone.getId(), ControlledEntity.ACLType.Account, null, null, null, null, true, null, null, null);
+ } catch (ConcurrentOperationException | InsufficientCapacityException | ResourceAllocationException e) {
+ logAndThrow(Level.ERROR, String.format("Unable to create network for the Kubernetes cluster: %s", clusterName));
+ }
+ }
+ return network;
+ }
+
+ private void addKubernetesClusterDetails(final KubernetesCluster kubernetesCluster, final Network network, final CreateKubernetesClusterCmd cmd) {
+ final String externalLoadBalancerIpAddress = cmd.getExternalLoadBalancerIpAddress();
+ final String dockerRegistryUserName = cmd.getDockerRegistryUserName();
+ final String dockerRegistryPassword = cmd.getDockerRegistryPassword();
+ final String dockerRegistryUrl = cmd.getDockerRegistryUrl();
+ final String dockerRegistryEmail = cmd.getDockerRegistryEmail();
+ final boolean networkCleanup = cmd.getNetworkId() == null;
+ Transaction.execute(new TransactionCallbackNoReturn() {
+ @Override
+ public void doInTransactionWithoutResult(TransactionStatus status) {
+ List<KubernetesClusterDetailsVO> details = new ArrayList<>();
+ if (Network.GuestType.Shared.equals(network.getGuestType()) && !Strings.isNullOrEmpty(externalLoadBalancerIpAddress)) {
+ details.add(new KubernetesClusterDetailsVO(kubernetesCluster.getId(), ApiConstants.EXTERNAL_LOAD_BALANCER_IP_ADDRESS, externalLoadBalancerIpAddress, true));
+ }
+ if (!Strings.isNullOrEmpty(dockerRegistryUserName)) {
+ details.add(new KubernetesClusterDetailsVO(kubernetesCluster.getId(), ApiConstants.DOCKER_REGISTRY_USER_NAME, dockerRegistryUserName, true));
+ }
+ if (!Strings.isNullOrEmpty(dockerRegistryPassword)) {
+ details.add(new KubernetesClusterDetailsVO(kubernetesCluster.getId(), ApiConstants.DOCKER_REGISTRY_PASSWORD, dockerRegistryPassword, false));
+ }
+ if (!Strings.isNullOrEmpty(dockerRegistryUrl)) {
+ details.add(new KubernetesClusterDetailsVO(kubernetesCluster.getId(), ApiConstants.DOCKER_REGISTRY_URL, dockerRegistryUrl, true));
+ }
+ if (!Strings.isNullOrEmpty(dockerRegistryEmail)) {
+ details.add(new KubernetesClusterDetailsVO(kubernetesCluster.getId(), ApiConstants.DOCKER_REGISTRY_EMAIL, dockerRegistryEmail, true));
+ }
+ details.add(new KubernetesClusterDetailsVO(kubernetesCluster.getId(), ApiConstants.USERNAME, "admin", true));
+ SecureRandom random = new SecureRandom();
+ String randomPassword = new BigInteger(130, random).toString(32);
+ details.add(new KubernetesClusterDetailsVO(kubernetesCluster.getId(), ApiConstants.PASSWORD, randomPassword, false));
+ details.add(new KubernetesClusterDetailsVO(kubernetesCluster.getId(), "networkCleanup", String.valueOf(networkCleanup), true));
+ kubernetesClusterDetailsDao.saveDetails(details);
+ }
+ });
+ }
+
+ private void validateKubernetesClusterScaleParameters(ScaleKubernetesClusterCmd cmd) {
+ final Long kubernetesClusterId = cmd.getId();
+ final Long serviceOfferingId = cmd.getServiceOfferingId();
+ final Long clusterSize = cmd.getClusterSize();
+ if (kubernetesClusterId == null || kubernetesClusterId < 1L) {
+ throw new InvalidParameterValueException("Invalid Kubernetes cluster ID");
+ }
+ KubernetesClusterVO kubernetesCluster = kubernetesClusterDao.findById(kubernetesClusterId);
+ if (kubernetesCluster == null || kubernetesCluster.getRemoved() != null) {
+ throw new InvalidParameterValueException("Invalid Kubernetes cluster ID");
+ }
+ final DataCenter zone = dataCenterDao.findById(kubernetesCluster.getZoneId());
+ if (zone == null) {
+ logAndThrow(Level.WARN, String.format("Unable to find zone for Kubernetes cluster ID: %s", kubernetesCluster.getUuid()));
+ }
+
+ Account caller = CallContext.current().getCallingAccount();
+ accountManager.checkAccess(caller, SecurityChecker.AccessType.OperateEntry, false, kubernetesCluster);
+
+ if (serviceOfferingId == null && clusterSize == null) {
+ throw new InvalidParameterValueException(String.format("Kubernetes cluster ID: %s cannot be scaled, either a new service offering or a new cluster size must be passed", kubernetesCluster.getUuid()));
+ }
+
+ final KubernetesSupportedVersion clusterVersion = kubernetesSupportedVersionDao.findById(kubernetesCluster.getKubernetesVersionId());
+ if (clusterVersion == null) {
+ throw new CloudRuntimeException(String.format("Invalid Kubernetes version associated with Kubernetes cluster ID: %s", kubernetesCluster.getUuid()));
+ }
+
+ ServiceOffering serviceOffering = null;
+ if (serviceOfferingId != null) {
+ serviceOffering = serviceOfferingDao.findById(serviceOfferingId);
+ if (serviceOffering == null) {
+ throw new InvalidParameterValueException("Failed to find service offering ID: " + serviceOfferingId);
+ } else {
+ if (serviceOffering.isDynamic()) {
+ throw new InvalidParameterValueException(String.format("Custom service offerings are not supported for Kubernetes clusters. Kubernetes cluster ID: %s, service offering ID: %s", kubernetesCluster.getUuid(), serviceOffering.getUuid()));
+ }
+ if (serviceOffering.getCpu() < MIN_KUBERNETES_CLUSTER_NODE_CPU || serviceOffering.getRamSize() < MIN_KUBERNETES_CLUSTER_NODE_RAM_SIZE) {
+ throw new InvalidParameterValueException(String.format("Kubernetes cluster ID: %s cannot be scaled with service offering ID: %s, Kubernetes cluster template(CoreOS) needs minimum %d vCPUs and %d MB RAM",
+ kubernetesCluster.getUuid(), serviceOffering.getUuid(), MIN_KUBERNETES_CLUSTER_NODE_CPU, MIN_KUBERNETES_CLUSTER_NODE_RAM_SIZE));
+ }
+ if (serviceOffering.getCpu() < clusterVersion.getMinimumCpu()) {
+ throw new InvalidParameterValueException(String.format("Kubernetes cluster ID: %s cannot be scaled with service offering ID: %s, associated Kubernetes version ID: %s needs minimum %d vCPUs",
+ kubernetesCluster.getUuid(), serviceOffering.getUuid(), clusterVersion.getUuid(), clusterVersion.getMinimumCpu()));
+ }
+ if (serviceOffering.getRamSize() < clusterVersion.getMinimumRamSize()) {
+ throw new InvalidParameterValueException(String.format("Kubernetes cluster ID: %s cannot be scaled with service offering ID: %s, associated Kubernetes version ID: %s needs minimum %d MB RAM",
+ kubernetesCluster.getUuid(), serviceOffering.getUuid(), clusterVersion.getUuid(), clusterVersion.getMinimumRamSize()));
+ }
+ }
+ final ServiceOffering existingServiceOffering = serviceOfferingDao.findById(kubernetesCluster.getServiceOfferingId());
+ if (serviceOffering.getRamSize() < existingServiceOffering.getRamSize() ||
+ serviceOffering.getCpu() * serviceOffering.getSpeed() < existingServiceOffering.getCpu() * existingServiceOffering.getSpeed()) {
+ logAndThrow(Level.WARN, String.format("Kubernetes cluster cannot be scaled down for service offering. Service offering ID: %s offers lesser resources as compared to service offering ID: %s of Kubernetes cluster ID: %s",
+ serviceOffering.getUuid(), existingServiceOffering.getUuid(), kubernetesCluster.getUuid()));
+ }
+ }
+
+ if (!(kubernetesCluster.getState().equals(KubernetesCluster.State.Created) ||
+ kubernetesCluster.getState().equals(KubernetesCluster.State.Running) ||
+ kubernetesCluster.getState().equals(KubernetesCluster.State.Stopped))) {
+ throw new PermissionDeniedException(String.format("Kubernetes cluster ID: %s is in %s state", kubernetesCluster.getUuid(), kubernetesCluster.getState().toString()));
+ }
+
+ if (clusterSize != null) {
+ if (kubernetesCluster.getState().equals(KubernetesCluster.State.Stopped)) { // Cannot scale stopped cluster currently for cluster size
+ throw new PermissionDeniedException(String.format("Kubernetes cluster ID: %s is in %s state", kubernetesCluster.getUuid(), kubernetesCluster.getState().toString()));
+ }
+ if (clusterSize < 1) {
+ throw new InvalidParameterValueException(String.format("Kubernetes cluster ID: %s cannot be scaled for size, %d", kubernetesCluster.getUuid(), clusterSize));
+ }
+ }
+ }
+
+ private void validateKubernetesClusterUpgradeParameters(UpgradeKubernetesClusterCmd cmd) {
+ // Validate parameters
+ final Long kubernetesClusterId = cmd.getId();
+ final Long upgradeVersionId = cmd.getKubernetesVersionId();
+ if (kubernetesClusterId == null || kubernetesClusterId < 1L) {
+ throw new InvalidParameterValueException("Invalid Kubernetes cluster ID");
+ }
+ if (upgradeVersionId == null || upgradeVersionId < 1L) {
+ throw new InvalidParameterValueException("Invalid Kubernetes version ID");
+ }
+ KubernetesClusterVO kubernetesCluster = kubernetesClusterDao.findById(kubernetesClusterId);
+ if (kubernetesCluster == null || kubernetesCluster.getRemoved() != null) {
+ throw new InvalidParameterValueException("Invalid Kubernetes cluster ID");
+ }
+ accountManager.checkAccess(CallContext.current().getCallingAccount(), SecurityChecker.AccessType.OperateEntry, false, kubernetesCluster);
+ if (!KubernetesCluster.State.Running.equals(kubernetesCluster.getState())) {
+ throw new InvalidParameterValueException(String.format("Kubernetes cluster ID: %s is not in running state", kubernetesCluster.getUuid()));
+ }
+ KubernetesSupportedVersionVO upgradeVersion = kubernetesSupportedVersionDao.findById(upgradeVersionId);
+ if (upgradeVersion == null || upgradeVersion.getRemoved() != null) {
+ throw new InvalidParameterValueException("Invalid Kubernetes version ID");
+ }
+ if (!KubernetesSupportedVersion.State.Enabled.equals(upgradeVersion.getState())) {
+ throw new InvalidParameterValueException(String.format("Kubernetes version ID: %s for upgrade is in %s state", upgradeVersion.getUuid(), upgradeVersion.getState()));
+ }
+ KubernetesSupportedVersionVO clusterVersion = kubernetesSupportedVersionDao.findById(kubernetesCluster.getKubernetesVersionId());
+ if (clusterVersion == null || clusterVersion.getRemoved() != null) {
+ throw new InvalidParameterValueException(String.format("Invalid Kubernetes version associated with cluster ID: %s",
+ kubernetesCluster.getUuid()));
+ }
+ final ServiceOffering serviceOffering = serviceOfferingDao.findByIdIncludingRemoved(kubernetesCluster.getServiceOfferingId());
+ if (serviceOffering == null) {
+ throw new CloudRuntimeException(String.format("Invalid service offering associated with Kubernetes cluster ID: %s", kubernetesCluster.getUuid()));
+ }
+ if (serviceOffering.getCpu() < upgradeVersion.getMinimumCpu()) {
+ throw new InvalidParameterValueException(String.format("Kubernetes cluster ID: %s cannot be upgraded with Kubernetes version ID: %s which needs minimum %d vCPUs while associated service offering ID: %s offers only %d vCPUs",
+ kubernetesCluster.getUuid(), upgradeVersion.getUuid(), upgradeVersion.getMinimumCpu(), serviceOffering.getUuid(), serviceOffering.getCpu()));
+ }
+ if (serviceOffering.getRamSize() < upgradeVersion.getMinimumRamSize()) {
+ throw new InvalidParameterValueException(String.format("Kubernetes cluster ID: %s cannot be upgraded with Kubernetes version ID: %s which needs minimum %d MB RAM while associated service offering ID: %s offers only %d MB RAM",
+ kubernetesCluster.getUuid(), upgradeVersion.getUuid(), upgradeVersion.getMinimumRamSize(), serviceOffering.getUuid(), serviceOffering.getRamSize()));
+ }
+ // Check upgradeVersion is either patch upgrade or immediate minor upgrade
+ try {
+ KubernetesVersionManagerImpl.canUpgradeKubernetesVersion(clusterVersion.getSemanticVersion(), upgradeVersion.getSemanticVersion());
+ } catch (IllegalArgumentException e) {
+ throw new InvalidParameterValueException(e.getMessage());
+ }
+
+ TemplateJoinVO iso = templateJoinDao.findById(upgradeVersion.getIsoId());
+ if (iso == null) {
+ throw new InvalidParameterValueException(String.format("Invalid ISO associated with version ID: %s", upgradeVersion.getUuid()));
+ }
+ if (!ObjectInDataStoreStateMachine.State.Ready.equals(iso.getState())) {
+ throw new InvalidParameterValueException(String.format("ISO associated with version ID: %s is not in Ready state", upgradeVersion.getUuid()));
+ }
+ }
+
+ protected boolean stateTransitTo(long kubernetesClusterId, KubernetesCluster.Event e) {
+ KubernetesClusterVO kubernetesCluster = kubernetesClusterDao.findById(kubernetesClusterId);
+ try {
+ return _stateMachine.transitTo(kubernetesCluster, e, null, kubernetesClusterDao);
+ } catch (NoTransitionException nte) {
+ LOGGER.warn(String.format("Failed to transition state of the Kubernetes cluster ID: %s in state %s on event %s", kubernetesCluster.getUuid(), kubernetesCluster.getState().toString(), e.toString()), nte);
+ return false;
+ }
+ }
+
+ @Override
+ public KubernetesCluster createKubernetesCluster(CreateKubernetesClusterCmd cmd) throws CloudRuntimeException {
+ if (!KubernetesServiceEnabled.value()) {
+ logAndThrow(Level.ERROR, "Kubernetes Service plugin is disabled");
+ }
+
+ validateKubernetesClusterCreateParameters(cmd);
+
+ final DataCenter zone = dataCenterDao.findById(cmd.getZoneId());
+ final long masterNodeCount = cmd.getMasterNodes();
+ final long clusterSize = cmd.getClusterSize();
+ final long totalNodeCount = masterNodeCount + clusterSize;
+ final ServiceOffering serviceOffering = serviceOfferingDao.findById(cmd.getServiceOfferingId());
+ final Account owner = accountService.getActiveAccountById(cmd.getEntityOwnerId());
+ final KubernetesSupportedVersion clusterKubernetesVersion = kubernetesSupportedVersionDao.findById(cmd.getKubernetesVersionId());
+
+ DeployDestination deployDestination = null;
+ try {
+ deployDestination = plan(totalNodeCount, zone, serviceOffering);
+ } catch (InsufficientCapacityException e) {
+ logAndThrow(Level.ERROR, String.format("Creating Kubernetes cluster failed due to insufficient capacity for %d cluster nodes in zone ID: %s with service offering ID: %s", totalNodeCount, zone.getUuid(), serviceOffering.getUuid()));
+ }
+ if (deployDestination == null || deployDestination.getCluster() == null) {
+ logAndThrow(Level.ERROR, String.format("Creating Kubernetes cluster failed due to error while finding suitable deployment plan for cluster in zone ID: %s", zone.getUuid()));
+ }
+
+ final Network defaultNetwork = getKubernetesClusterNetworkIfMissing(cmd.getName(), zone, owner, (int)masterNodeCount, (int)clusterSize, cmd.getExternalLoadBalancerIpAddress(), cmd.getNetworkId());
+ final VMTemplateVO finalTemplate = getKubernetesServiceTemplate(deployDestination.getCluster().getHypervisorType());
+ final long cores = serviceOffering.getCpu() * (masterNodeCount + clusterSize);
+ final long memory = serviceOffering.getRamSize() * (masterNodeCount + clusterSize);
+
+ final KubernetesClusterVO cluster = Transaction.execute(new TransactionCallback<KubernetesClusterVO>() {
+ @Override
+ public KubernetesClusterVO doInTransaction(TransactionStatus status) {
+ KubernetesClusterVO newCluster = new KubernetesClusterVO(cmd.getName(), cmd.getDisplayName(), zone.getId(), clusterKubernetesVersion.getId(),
+ serviceOffering.getId(), finalTemplate.getId(), defaultNetwork.getId(), owner.getDomainId(),
+ owner.getAccountId(), masterNodeCount, clusterSize, KubernetesCluster.State.Created, cmd.getSSHKeyPairName(), cores, memory, cmd.getNodeRootDiskSize(), "");
+ kubernetesClusterDao.persist(newCluster);
+ return newCluster;
+ }
+ });
+
+ addKubernetesClusterDetails(cluster, defaultNetwork, cmd);
+
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Kubernetes cluster name: %s and ID: %s has been created", cluster.getName(), cluster.getUuid()));
+ }
+ return cluster;
+ }
+
+ /**
+ * Start operation can be performed at two different life stages of Kubernetes cluster. First when a freshly created cluster
+ * in which case there are no resources provisioned for the Kubernetes cluster. So during start all the resources
+ * are provisioned from scratch. Second kind of start, happens on Stopped Kubernetes cluster, in which all resources
+ * are provisioned (like volumes, nics, networks etc). It just that VM's are not in running state. So just
+ * start the VM's (which can possibly implicitly start the network also).
+ * @param kubernetesClusterId
+ * @param onCreate
+ * @return
+ * @throws CloudRuntimeException
+ */
+
+ @Override
+ public boolean startKubernetesCluster(long kubernetesClusterId, boolean onCreate) throws CloudRuntimeException {
+ if (!KubernetesServiceEnabled.value()) {
+ logAndThrow(Level.ERROR, "Kubernetes Service plugin is disabled");
+ }
+ final KubernetesClusterVO kubernetesCluster = kubernetesClusterDao.findById(kubernetesClusterId);
+ if (kubernetesCluster == null) {
+ throw new InvalidParameterValueException("Failed to find Kubernetes cluster with given ID");
+ }
+ if (kubernetesCluster.getRemoved() != null) {
+ throw new InvalidParameterValueException(String.format("Kubernetes cluster ID: %s is already deleted", kubernetesCluster.getUuid()));
+ }
+ accountManager.checkAccess(CallContext.current().getCallingAccount(), SecurityChecker.AccessType.OperateEntry, false, kubernetesCluster);
+ if (kubernetesCluster.getState().equals(KubernetesCluster.State.Running)) {
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(String.format("Kubernetes cluster ID: %s is in running state", kubernetesCluster.getUuid()));
+ }
+ return true;
+ }
+ if (kubernetesCluster.getState().equals(KubernetesCluster.State.Starting)) {
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(String.format("Kubernetes cluster ID: %s is already in starting state", kubernetesCluster.getUuid()));
+ }
+ return true;
+ }
+ final DataCenter zone = dataCenterDao.findById(kubernetesCluster.getZoneId());
+ if (zone == null) {
+ logAndThrow(Level.WARN, String.format("Unable to find zone for Kubernetes cluster ID: %s", kubernetesCluster.getUuid()));
+ }
+ KubernetesClusterStartWorker startWorker =
+ new KubernetesClusterStartWorker(kubernetesCluster, this);
+ startWorker = ComponentContext.inject(startWorker);
+ if (onCreate) {
+ // Start for Kubernetes cluster in 'Created' state
+ return startWorker.startKubernetesClusterOnCreate();
+ } else {
+ // Start for Kubernetes cluster in 'Stopped' state. Resources are already provisioned, just need to be started
+ return startWorker.startStoppedKubernetesCluster();
+ }
+ }
+
+ @Override
+ public boolean stopKubernetesCluster(long kubernetesClusterId) throws CloudRuntimeException {
+ if (!KubernetesServiceEnabled.value()) {
+ logAndThrow(Level.ERROR, "Kubernetes Service plugin is disabled");
+ }
+ final KubernetesClusterVO kubernetesCluster = kubernetesClusterDao.findById(kubernetesClusterId);
+ if (kubernetesCluster == null) {
+ throw new InvalidParameterValueException("Failed to find Kubernetes cluster with given ID");
+ }
+ if (kubernetesCluster.getRemoved() != null) {
+ throw new InvalidParameterValueException(String.format("Kubernetes cluster ID: %s is already deleted", kubernetesCluster.getUuid()));
+ }
+ accountManager.checkAccess(CallContext.current().getCallingAccount(), SecurityChecker.AccessType.OperateEntry, false, kubernetesCluster);
+ if (kubernetesCluster.getState().equals(KubernetesCluster.State.Stopped)) {
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(String.format("Kubernetes cluster ID: %s is already stopped", kubernetesCluster.getUuid()));
+ }
+ return true;
+ }
+ if (kubernetesCluster.getState().equals(KubernetesCluster.State.Stopping)) {
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(String.format("Kubernetes cluster ID: %s is getting stopped", kubernetesCluster.getUuid()));
+ }
+ return true;
+ }
+ KubernetesClusterStopWorker stopWorker = new KubernetesClusterStopWorker(kubernetesCluster, this);
+ stopWorker = ComponentContext.inject(stopWorker);
+ return stopWorker.stop();
+ }
+
+ @Override
+ public boolean deleteKubernetesCluster(Long kubernetesClusterId) throws CloudRuntimeException {
+ if (!KubernetesServiceEnabled.value()) {
+ logAndThrow(Level.ERROR, "Kubernetes Service plugin is disabled");
+ }
+ KubernetesClusterVO cluster = kubernetesClusterDao.findById(kubernetesClusterId);
+ if (cluster == null) {
+ throw new InvalidParameterValueException("Invalid cluster id specified");
+ }
+ accountManager.checkAccess(CallContext.current().getCallingAccount(), SecurityChecker.AccessType.OperateEntry, false, cluster);
+ KubernetesClusterDestroyWorker destroyWorker = new KubernetesClusterDestroyWorker(cluster, this);
+ destroyWorker = ComponentContext.inject(destroyWorker);
+ return destroyWorker.destroy();
+ }
+
+ @Override
+ public ListResponse<KubernetesClusterResponse> listKubernetesClusters(ListKubernetesClustersCmd cmd) {
+ if (!KubernetesServiceEnabled.value()) {
+ logAndThrow(Level.ERROR, "Kubernetes Service plugin is disabled");
+ }
+ final CallContext ctx = CallContext.current();
+ final Account caller = ctx.getCallingAccount();
+ final Long clusterId = cmd.getId();
+ final String state = cmd.getState();
+ final String name = cmd.getName();
+ final String keyword = cmd.getKeyword();
+ List<KubernetesClusterResponse> responsesList = new ArrayList<KubernetesClusterResponse>();
+ List<Long> permittedAccounts = new ArrayList<Long>();
+ Ternary<Long, Boolean, Project.ListProjectResourcesCriteria> domainIdRecursiveListProject = new Ternary<Long, Boolean, Project.ListProjectResourcesCriteria>(cmd.getDomainId(), cmd.isRecursive(), null);
+ accountManager.buildACLSearchParameters(caller, clusterId, cmd.getAccountName(), cmd.getProjectId(), permittedAccounts, domainIdRecursiveListProject, cmd.listAll(), false);
+ Long domainId = domainIdRecursiveListProject.first();
+ Boolean isRecursive = domainIdRecursiveListProject.second();
+ Project.ListProjectResourcesCriteria listProjectResourcesCriteria = domainIdRecursiveListProject.third();
+ Filter searchFilter = new Filter(KubernetesClusterVO.class, "id", true, cmd.getStartIndex(), cmd.getPageSizeVal());
+ SearchBuilder<KubernetesClusterVO> sb = kubernetesClusterDao.createSearchBuilder();
+ accountManager.buildACLSearchBuilder(sb, domainId, isRecursive, permittedAccounts, listProjectResourcesCriteria);
+ sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
+ sb.and("name", sb.entity().getName(), SearchCriteria.Op.EQ);
+ sb.and("keyword", sb.entity().getName(), SearchCriteria.Op.LIKE);
+ sb.and("state", sb.entity().getState(), SearchCriteria.Op.IN);
+ SearchCriteria<KubernetesClusterVO> sc = sb.create();
+ accountManager.buildACLSearchCriteria(sc, domainId, isRecursive, permittedAccounts, listProjectResourcesCriteria);
+ if (state != null) {
+ sc.setParameters("state", state);
+ }
+ if(keyword != null){
+ sc.setParameters("keyword", "%" + keyword + "%");
+ }
+ if (clusterId != null) {
+ sc.setParameters("id", clusterId);
+ }
+ if (name != null) {
+ sc.setParameters("name", name);
+ }
+ List<KubernetesClusterVO> kubernetesClusters = kubernetesClusterDao.search(sc, searchFilter);
+ for (KubernetesClusterVO cluster : kubernetesClusters) {
+ KubernetesClusterResponse clusterResponse = createKubernetesClusterResponse(cluster.getId());
+ responsesList.add(clusterResponse);
+ }
+ ListResponse<KubernetesClusterResponse> response = new ListResponse<KubernetesClusterResponse>();
+ response.setResponses(responsesList);
+ return response;
+ }
+
+ public KubernetesClusterConfigResponse getKubernetesClusterConfig(GetKubernetesClusterConfigCmd cmd) {
+ if (!KubernetesServiceEnabled.value()) {
+ logAndThrow(Level.ERROR, "Kubernetes Service plugin is disabled");
+ }
+ final Long clusterId = cmd.getId();
+ KubernetesCluster kubernetesCluster = kubernetesClusterDao.findById(clusterId);
+ if (kubernetesCluster == null) {
+ throw new InvalidParameterValueException("Invalid Kubernetes cluster ID specified");
+ }
+ KubernetesClusterConfigResponse response = new KubernetesClusterConfigResponse();
+ response.setId(kubernetesCluster.getUuid());
+ response.setName(kubernetesCluster.getName());
+ String configData = "";
+ KubernetesClusterDetailsVO clusterDetailsVO = kubernetesClusterDetailsDao.findDetail(kubernetesCluster.getId(), "kubeConfigData");
+ if (clusterDetailsVO != null && !Strings.isNullOrEmpty(clusterDetailsVO.getValue())) {
+ configData = new String(Base64.decodeBase64(clusterDetailsVO.getValue()));
+ } else {
+ if (KubernetesCluster.State.Starting.equals(kubernetesCluster.getState())) {
+ throw new CloudRuntimeException(String.format("Setup is in progress for Kubernetes cluster ID: %s, config not available at this moment", kubernetesCluster.getUuid()));
+ } else {
+ throw new CloudRuntimeException((String.format("Config not found for Kubernetes cluster ID: %s", kubernetesCluster.getUuid())));
+ }
+ }
+ response.setConfigData(configData);
+ response.setObjectName("clusterconfig");
+ return response;
+ }
+
+ @Override
+ public boolean scaleKubernetesCluster(ScaleKubernetesClusterCmd cmd) throws CloudRuntimeException {
+ if (!KubernetesServiceEnabled.value()) {
+ logAndThrow(Level.ERROR, "Kubernetes Service plugin is disabled");
+ }
+ validateKubernetesClusterScaleParameters(cmd);
+ KubernetesClusterScaleWorker scaleWorker =
+ new KubernetesClusterScaleWorker(kubernetesClusterDao.findById(cmd.getId()),
+ serviceOfferingDao.findById(cmd.getServiceOfferingId()), cmd.getClusterSize(), this);
+ scaleWorker = ComponentContext.inject(scaleWorker);
+ return scaleWorker.scaleCluster();
+ }
+
+ @Override
+ public boolean upgradeKubernetesCluster(UpgradeKubernetesClusterCmd cmd) throws CloudRuntimeException {
+ if (!KubernetesServiceEnabled.value()) {
+ logAndThrow(Level.ERROR, "Kubernetes Service plugin is disabled");
+ }
+ validateKubernetesClusterUpgradeParameters(cmd);
+ KubernetesClusterUpgradeWorker upgradeWorker =
+ new KubernetesClusterUpgradeWorker(kubernetesClusterDao.findById(cmd.getId()),
+ kubernetesSupportedVersionDao.findById(cmd.getKubernetesVersionId()), this);
+ upgradeWorker = ComponentContext.inject(upgradeWorker);
+ return upgradeWorker.upgradeCluster();
+ }
+
+ @Override
+ public List<Class<?>> getCommands() {
+ List<Class<?>> cmdList = new ArrayList<Class<?>>();
+ if (!KubernetesServiceEnabled.value()) {
+ return cmdList;
+ }
+ cmdList.add(CreateKubernetesClusterCmd.class);
+ cmdList.add(StartKubernetesClusterCmd.class);
+ cmdList.add(StopKubernetesClusterCmd.class);
+ cmdList.add(DeleteKubernetesClusterCmd.class);
+ cmdList.add(ListKubernetesClustersCmd.class);
+ cmdList.add(GetKubernetesClusterConfigCmd.class);
+ cmdList.add(ScaleKubernetesClusterCmd.class);
+ cmdList.add(UpgradeKubernetesClusterCmd.class);
+ return cmdList;
+ }
+
+ @Override
+ public KubernetesCluster findById(final Long id) {
+ return kubernetesClusterDao.findById(id);
+ }
+
+ // Garbage collector periodically run through the Kubernetes clusters marked for GC. For each Kubernetes cluster
+ // marked for GC, attempt is made to destroy cluster.
+ public class KubernetesClusterGarbageCollector extends ManagedContextRunnable {
+ @Override
+ protected void runInContext() {
+ GlobalLock gcLock = GlobalLock.getInternLock("KubernetesCluster.GC.Lock");
+ try {
+ if (gcLock.lock(3)) {
+ try {
+ reallyRun();
+ } finally {
+ gcLock.unlock();
+ }
+ }
+ } finally {
+ gcLock.releaseRef();
+ }
+ }
+
+ public void reallyRun() {
+ try {
+ List<KubernetesClusterVO> kubernetesClusters = kubernetesClusterDao.findKubernetesClustersToGarbageCollect();
+ for (KubernetesCluster kubernetesCluster : kubernetesClusters) {
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Running Kubernetes cluster garbage collector on Kubernetes cluster ID: %s", kubernetesCluster.getUuid()));
+ }
+ try {
+ KubernetesClusterDestroyWorker destroyWorker = new KubernetesClusterDestroyWorker(kubernetesCluster, KubernetesClusterManagerImpl.this);
+ destroyWorker = ComponentContext.inject(destroyWorker);
+ if (destroyWorker.destroy()) {
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Garbage collection complete for Kubernetes cluster ID: %s", kubernetesCluster.getUuid()));
+ }
+ } else {
+ LOGGER.warn(String.format("Garbage collection failed for Kubernetes cluster ID: %s, it will be attempted to garbage collected in next run", kubernetesCluster.getUuid()));
+ }
+ } catch (CloudRuntimeException e) {
+ LOGGER.warn(String.format("Failed to destroy Kubernetes cluster ID: %s during GC", kubernetesCluster.getUuid()), e);
+ // proceed further with rest of the Kubernetes cluster garbage collection
+ }
+ }
+ } catch (Exception e) {
+ LOGGER.warn("Caught exception while running Kubernetes cluster gc: ", e);
+ }
+ }
+ }
+
+ /* Kubernetes cluster scanner checks if the Kubernetes cluster is in desired state. If it detects Kubernetes cluster
+ is not in desired state, it will trigger an event and marks the Kubernetes cluster to be 'Alert' state. For e.g a
+ Kubernetes cluster in 'Running' state should mean all the cluster of node VM's in the custer should be running and
+ number of the node VM's should be of cluster size, and the master node VM's is running. It is possible due to
+ out of band changes by user or hosts going down, we may end up one or more VM's in stopped state. in which case
+ scanner detects these changes and marks the cluster in 'Alert' state. Similarly cluster in 'Stopped' state means
+ all the cluster VM's are in stopped state any mismatch in states should get picked up by Kubernetes cluster and
+ mark the Kubernetes cluster to be 'Alert' state. Through recovery API, or reconciliation clusters in 'Alert' will
+ be brought back to known good state or desired state.
+ */
+ public class KubernetesClusterStatusScanner extends ManagedContextRunnable {
+ private boolean firstRun = true;
+ @Override
+ protected void runInContext() {
+ GlobalLock gcLock = GlobalLock.getInternLock("KubernetesCluster.State.Scanner.Lock");
+ try {
+ if (gcLock.lock(3)) {
+ try {
+ reallyRun();
+ } finally {
+ gcLock.unlock();
+ }
+ }
+ } finally {
+ gcLock.releaseRef();
+ }
+ }
+
+ public void reallyRun() {
+ try {
+ // run through Kubernetes clusters in 'Running' state and ensure all the VM's are Running in the cluster
+ List<KubernetesClusterVO> runningKubernetesClusters = kubernetesClusterDao.findKubernetesClustersInState(KubernetesCluster.State.Running);
+ for (KubernetesCluster kubernetesCluster : runningKubernetesClusters) {
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Running Kubernetes cluster state scanner on Kubernetes cluster ID: %s", kubernetesCluster.getUuid()));
+ }
+ try {
+ if (!isClusterVMsInDesiredState(kubernetesCluster, VirtualMachine.State.Running)) {
+ stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.FaultsDetected);
+ }
+ } catch (Exception e) {
+ LOGGER.warn(String.format("Failed to run Kubernetes cluster Running state scanner on Kubernetes cluster ID: %s status scanner", kubernetesCluster.getUuid()), e);
+ }
+ }
+
+ // run through Kubernetes clusters in 'Stopped' state and ensure all the VM's are Stopped in the cluster
+ List<KubernetesClusterVO> stoppedKubernetesClusters = kubernetesClusterDao.findKubernetesClustersInState(KubernetesCluster.State.Stopped);
+ for (KubernetesCluster kubernetesCluster : stoppedKubernetesClusters) {
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Running Kubernetes cluster state scanner on Kubernetes cluster ID: %s for state: %s", kubernetesCluster.getUuid(), KubernetesCluster.State.Stopped.toString()));
+ }
+ try {
+ if (!isClusterVMsInDesiredState(kubernetesCluster, VirtualMachine.State.Stopped)) {
+ stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.FaultsDetected);
+ }
+ } catch (Exception e) {
+ LOGGER.warn(String.format("Failed to run Kubernetes cluster Stopped state scanner on Kubernetes cluster ID: %s status scanner", kubernetesCluster.getUuid()), e);
+ }
+ }
+
+ // run through Kubernetes clusters in 'Alert' state and reconcile state as 'Running' if the VM's are running or 'Stopped' if VM's are stopped
+ List<KubernetesClusterVO> alertKubernetesClusters = kubernetesClusterDao.findKubernetesClustersInState(KubernetesCluster.State.Alert);
+ for (KubernetesClusterVO kubernetesCluster : alertKubernetesClusters) {
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Running Kubernetes cluster state scanner on Kubernetes cluster ID: %s for state: %s", kubernetesCluster.getUuid(), KubernetesCluster.State.Alert.toString()));
+ }
+ try {
+ if (isClusterVMsInDesiredState(kubernetesCluster, VirtualMachine.State.Running)) {
+ KubernetesClusterStartWorker startWorker =
+ new KubernetesClusterStartWorker(kubernetesCluster, KubernetesClusterManagerImpl.this);
+ startWorker = ComponentContext.inject(startWorker);
+ startWorker.reconcileAlertCluster();
+ } else if (isClusterVMsInDesiredState(kubernetesCluster, VirtualMachine.State.Stopped)) {
+ stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.StopRequested);
+ stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.OperationSucceeded);
+ }
+ } catch (Exception e) {
+ LOGGER.warn(String.format("Failed to run Kubernetes cluster Alert state scanner on Kubernetes cluster ID: %s status scanner", kubernetesCluster.getUuid()), e);
+ }
+ }
+
+
+ if (firstRun) {
+ // run through Kubernetes clusters in 'Starting' state and reconcile state as 'Alert' or 'Error' if the VM's are running
+ List<KubernetesClusterVO> startingKubernetesClusters = kubernetesClusterDao.findKubernetesClustersInState(KubernetesCluster.State.Starting);
+ for (KubernetesCluster kubernetesCluster : startingKubernetesClusters) {
+ if ((new Date()).getTime() - kubernetesCluster.getCreated().getTime() < 10*60*1000) {
+ continue;
+ }
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Running Kubernetes cluster state scanner on Kubernetes cluster ID: %s for state: %s", kubernetesCluster.getUuid(), KubernetesCluster.State.Starting.toString()));
+ }
+ try {
+ if (isClusterVMsInDesiredState(kubernetesCluster, VirtualMachine.State.Running)) {
+ stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.FaultsDetected);
+ } else {
+ stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
+ }
+ } catch (Exception e) {
+ LOGGER.warn(String.format("Failed to run Kubernetes cluster Starting state scanner on Kubernetes cluster ID: %s status scanner", kubernetesCluster.getUuid()), e);
+ }
+ }
+ List<KubernetesClusterVO> destroyingKubernetesClusters = kubernetesClusterDao.findKubernetesClustersInState(KubernetesCluster.State.Destroying);
+ for (KubernetesCluster kubernetesCluster : destroyingKubernetesClusters) {
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Running Kubernetes cluster state scanner on Kubernetes cluster ID: %s for state: %s", kubernetesCluster.getUuid(), KubernetesCluster.State.Destroying.toString()));
+ }
+ try {
+ KubernetesClusterDestroyWorker destroyWorker = new KubernetesClusterDestroyWorker(kubernetesCluster, KubernetesClusterManagerImpl.this);
+ destroyWorker = ComponentContext.inject(destroyWorker);
+ destroyWorker.destroy();
+ } catch (Exception e) {
+ LOGGER.warn(String.format("Failed to run Kubernetes cluster Destroying state scanner on Kubernetes cluster ID: %s status scanner", kubernetesCluster.getUuid()), e);
+ }
+ }
+ }
+ } catch (Exception e) {
+ LOGGER.warn("Caught exception while running Kubernetes cluster state scanner", e);
+ }
+ firstRun = false;
+ }
+ }
+
+ // checks if Kubernetes cluster is in desired state
+ boolean isClusterVMsInDesiredState(KubernetesCluster kubernetesCluster, VirtualMachine.State state) {
+ List<KubernetesClusterVmMapVO> clusterVMs = kubernetesClusterVmMapDao.listByClusterId(kubernetesCluster.getId());
+
+ // check cluster is running at desired capacity include master nodes as well
+ if (clusterVMs.size() < kubernetesCluster.getTotalNodeCount()) {
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(String.format("Found only %d VMs in the Kubernetes cluster ID: %s while expected %d VMs to be in state: %s",
+ clusterVMs.size(), kubernetesCluster.getUuid(), kubernetesCluster.getTotalNodeCount(), state.toString()));
+ }
+ return false;
+ }
+ // check if all the VM's are in same state
+ for (KubernetesClusterVmMapVO clusterVm : clusterVMs) {
+ VMInstanceVO vm = vmInstanceDao.findByIdIncludingRemoved(clusterVm.getVmId());
+ if (vm.getState() != state) {
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(String.format("Found VM ID: %s in the Kubernetes cluster ID: %s in state: %s while expected to be in state: %s. So moving the cluster to Alert state for reconciliation",
+ vm.getUuid(), kubernetesCluster.getUuid(), vm.getState().toString(), state.toString()));
+ }
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ @Override
+ public boolean start() {
+ final Map<Network.Service, Network.Provider> defaultKubernetesServiceNetworkOfferingProviders = new HashMap<Service, Network.Provider>();
+ defaultKubernetesServiceNetworkOfferingProviders.put(Service.Dhcp, Network.Provider.VirtualRouter);
+ defaultKubernetesServiceNetworkOfferingProviders.put(Service.Dns, Network.Provider.VirtualRouter);
+ defaultKubernetesServiceNetworkOfferingProviders.put(Service.UserData, Network.Provider.VirtualRouter);
+ defaultKubernetesServiceNetworkOfferingProviders.put(Service.Firewall, Network.Provider.VirtualRouter);
+ defaultKubernetesServiceNetworkOfferingProviders.put(Service.Gateway, Network.Provider.VirtualRouter);
+ defaultKubernetesServiceNetworkOfferingProviders.put(Service.Lb, Network.Provider.VirtualRouter);
+ defaultKubernetesServiceNetworkOfferingProviders.put(Service.SourceNat, Network.Provider.VirtualRouter);
+ defaultKubernetesServiceNetworkOfferingProviders.put(Service.StaticNat, Network.Provider.VirtualRouter);
+ defaultKubernetesServiceNetworkOfferingProviders.put(Service.PortForwarding, Network.Provider.VirtualRouter);
+ defaultKubernetesServiceNetworkOfferingProviders.put(Service.Vpn, Network.Provider.VirtualRouter);
+
+ NetworkOfferingVO defaultKubernetesServiceNetworkOffering =
+ new NetworkOfferingVO(DEFAULT_NETWORK_OFFERING_FOR_KUBERNETES_SERVICE_NAME,
+ "Network Offering used for CloudStack Kubernetes service", Networks.TrafficType.Guest,
+ false, false, null, null, true,
+ NetworkOffering.Availability.Required, null, Network.GuestType.Isolated, true,
+ true, false, false, false, false,
+ false, false, false, true, true, false,
+ false, true, false, false);
+ defaultKubernetesServiceNetworkOffering.setState(NetworkOffering.State.Enabled);
+ defaultKubernetesServiceNetworkOffering = networkOfferingDao.persistDefaultNetworkOffering(defaultKubernetesServiceNetworkOffering);
+
+ for (Service service : defaultKubernetesServiceNetworkOfferingProviders.keySet()) {
+ NetworkOfferingServiceMapVO offService =
+ new NetworkOfferingServiceMapVO(defaultKubernetesServiceNetworkOffering.getId(), service,
+ defaultKubernetesServiceNetworkOfferingProviders.get(service));
+ networkOfferingServiceMapDao.persist(offService);
+ LOGGER.trace("Added service for the network offering: " + offService);
+ }
+
+ _gcExecutor.scheduleWithFixedDelay(new KubernetesClusterGarbageCollector(), 300, 300, TimeUnit.SECONDS);
+ _stateScanner.scheduleWithFixedDelay(new KubernetesClusterStatusScanner(), 300, 30, TimeUnit.SECONDS);
+
+ return true;
+ }
+
+ @Override
+ public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
+ _name = name;
+ _configParams = params;
+ _gcExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("Kubernetes-Cluster-Scavenger"));
+ _stateScanner = Executors.newScheduledThreadPool(1, new NamedThreadFactory("Kubernetes-Cluster-State-Scanner"));
+
+ return true;
+ }
+
+ @Override
+ public String getConfigComponentName() {
+ return KubernetesClusterService.class.getSimpleName();
+ }
+
+ @Override
+ public ConfigKey<?>[] getConfigKeys() {
+ return new ConfigKey<?>[] {
+ KubernetesServiceEnabled,
+ KubernetesClusterHyperVTemplateName,
+ KubernetesClusterKVMTemplateName,
+ KubernetesClusterVMwareTemplateName,
+ KubernetesClusterXenserverTemplateName,
+ KubernetesClusterNetworkOffering,
+ KubernetesClusterStartTimeout,
+ KubernetesClusterScaleTimeout,
+ KubernetesClusterUpgradeTimeout,
+ KubernetesClusterExperimentalFeaturesEnabled
+ };
+ }
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterService.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterService.java
new file mode 100644
index 0000000..db5ab91
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterService.java
@@ -0,0 +1,108 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.kubernetes.cluster;
+
+import org.apache.cloudstack.api.command.user.kubernetes.cluster.CreateKubernetesClusterCmd;
+import org.apache.cloudstack.api.command.user.kubernetes.cluster.GetKubernetesClusterConfigCmd;
+import org.apache.cloudstack.api.command.user.kubernetes.cluster.ListKubernetesClustersCmd;
+import org.apache.cloudstack.api.command.user.kubernetes.cluster.ScaleKubernetesClusterCmd;
+import org.apache.cloudstack.api.command.user.kubernetes.cluster.UpgradeKubernetesClusterCmd;
+import org.apache.cloudstack.api.response.KubernetesClusterConfigResponse;
+import org.apache.cloudstack.api.response.KubernetesClusterResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.Configurable;
+
+import com.cloud.utils.component.PluggableService;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+public interface KubernetesClusterService extends PluggableService, Configurable {
+ static final String MIN_KUBERNETES_VERSION_HA_SUPPORT = "1.16.0";
+ static final int MIN_KUBERNETES_CLUSTER_NODE_CPU = 2;
+ static final int MIN_KUBERNETES_CLUSTER_NODE_RAM_SIZE = 2048;
+
+ static final ConfigKey<Boolean> KubernetesServiceEnabled = new ConfigKey<Boolean>("Advanced", Boolean.class,
+ "cloud.kubernetes.service.enabled",
+ "false",
+ "Indicates whether Kubernetes Service plugin is enabled or not. Management server restart needed on change",
+ false);
+ static final ConfigKey<String> KubernetesClusterHyperVTemplateName = new ConfigKey<String>("Advanced", String.class,
+ "cloud.kubernetes.cluster.template.name.hyperv",
+ "Kubernetes-Service-Template-HyperV",
+ "Name of the template to be used for creating Kubernetes cluster nodes on HyperV",
+ true);
+ static final ConfigKey<String> KubernetesClusterKVMTemplateName = new ConfigKey<String>("Advanced", String.class,
+ "cloud.kubernetes.cluster.template.name.kvm",
+ "Kubernetes-Service-Template-KVM",
+ "Name of the template to be used for creating Kubernetes cluster nodes on KVM",
+ true);
+ static final ConfigKey<String> KubernetesClusterVMwareTemplateName = new ConfigKey<String>("Advanced", String.class,
+ "cloud.kubernetes.cluster.template.name.vmware",
+ "Kubernetes-Service-Template-VMware",
+ "Name of the template to be used for creating Kubernetes cluster nodes on VMware",
+ true);
+ static final ConfigKey<String> KubernetesClusterXenserverTemplateName = new ConfigKey<String>("Advanced", String.class,
+ "cloud.kubernetes.cluster.template.name.xenserver",
+ "Kubernetes-Service-Template-Xenserver",
+ "Name of the template to be used for creating Kubernetes cluster nodes on Xenserver",
+ true);
+ static final ConfigKey<String> KubernetesClusterNetworkOffering = new ConfigKey<String>("Advanced", String.class,
+ "cloud.kubernetes.cluster.network.offering",
+ "DefaultNetworkOfferingforKubernetesService",
+ "Name of the network offering that will be used to create isolated network in which Kubernetes cluster VMs will be launched",
+ false);
+ static final ConfigKey<Long> KubernetesClusterStartTimeout = new ConfigKey<Long>("Advanced", Long.class,
+ "cloud.kubernetes.cluster.start.timeout",
+ "3600",
+ "Timeout interval (in seconds) in which start operation for a Kubernetes cluster should be completed",
+ true);
+ static final ConfigKey<Long> KubernetesClusterScaleTimeout = new ConfigKey<Long>("Advanced", Long.class,
+ "cloud.kubernetes.cluster.scale.timeout",
+ "3600",
+ "Timeout interval (in seconds) in which scale operation for a Kubernetes cluster should be completed",
+ true);
+ static final ConfigKey<Long> KubernetesClusterUpgradeTimeout = new ConfigKey<Long>("Advanced", Long.class,
+ "cloud.kubernetes.cluster.upgrade.timeout",
+ "3600",
+ "Timeout interval (in seconds) in which upgrade operation for a Kubernetes cluster should be completed. Not strictly obeyed while upgrade is in progress on a node",
+ true);
+ static final ConfigKey<Boolean> KubernetesClusterExperimentalFeaturesEnabled = new ConfigKey<Boolean>("Advanced", Boolean.class,
+ "cloud.kubernetes.cluster.experimental.features.enabled",
+ "false",
+ "Indicates whether experimental feature for Kubernetes cluster such as Docker private registry are enabled or not",
+ true);
+
+ KubernetesCluster findById(final Long id);
+
+ KubernetesCluster createKubernetesCluster(CreateKubernetesClusterCmd cmd) throws CloudRuntimeException;
+
+ boolean startKubernetesCluster(long kubernetesClusterId, boolean onCreate) throws CloudRuntimeException;
+
+ boolean stopKubernetesCluster(long kubernetesClusterId) throws CloudRuntimeException;
+
+ boolean deleteKubernetesCluster(Long kubernetesClusterId) throws CloudRuntimeException;
+
+ ListResponse<KubernetesClusterResponse> listKubernetesClusters(ListKubernetesClustersCmd cmd);
+
+ KubernetesClusterConfigResponse getKubernetesClusterConfig(GetKubernetesClusterConfigCmd cmd);
+
+ KubernetesClusterResponse createKubernetesClusterResponse(long kubernetesClusterId);
+
+ boolean scaleKubernetesCluster(ScaleKubernetesClusterCmd cmd) throws CloudRuntimeException;
+
+ boolean upgradeKubernetesCluster(UpgradeKubernetesClusterCmd cmd) throws CloudRuntimeException;
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterVO.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterVO.java
new file mode 100644
index 0000000..9ff0be3
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterVO.java
@@ -0,0 +1,340 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.kubernetes.cluster;
+
+import java.util.Date;
+import java.util.UUID;
+
+
+import javax.persistence.Column;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+
+import com.cloud.utils.db.GenericDao;
+
+@Entity
+@Table(name = "kubernetes_cluster")
+public class KubernetesClusterVO implements KubernetesCluster {
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "id")
+ private long id;
+
+ @Column(name = "uuid")
+ private String uuid;
+
+ @Column(name = "name")
+ private String name;
+
+ @Column(name = "description", length = 4096)
+ private String description;
+
+ @Column(name = "zone_id")
+ private long zoneId;
+
+ @Column(name = "kubernetes_version_id")
+ private long kubernetesVersionId;
+
+ @Column(name = "service_offering_id")
+ private long serviceOfferingId;
+
+ @Column(name = "template_id")
+ private long templateId;
+
+ @Column(name = "network_id")
+ private long networkId;
+
+ @Column(name = "domain_id")
+ private long domainId;
+
+ @Column(name = "account_id")
+ private long accountId;
+
+ @Column(name = "master_node_count")
+ private long masterNodeCount;
+
+ @Column(name = "node_count")
+ private long nodeCount;
+
+ @Column(name = "cores")
+ private long cores;
+
+ @Column(name = "memory")
+ private long memory;
+
+ @Column(name = "node_root_disk_size")
+ private long nodeRootDiskSize;
+
+ @Column(name = "state")
+ private State state;
+
+ @Column(name = "key_pair")
+ private String keyPair;
+
+ @Column(name = "endpoint")
+ private String endpoint;
+
+ @Column(name = GenericDao.CREATED_COLUMN)
+ private Date created;
+
+ @Column(name = GenericDao.REMOVED_COLUMN)
+ private Date removed;
+
+ @Column(name = "gc")
+ private boolean checkForGc;
+
+ @Override
+ public long getId() {
+ return id;
+ }
+
+ public void setId(long id) {
+ this.id = id;
+ }
+
+ @Override
+ public String getUuid() {
+ return uuid;
+ }
+
+ public void setUuid(String uuid) {
+ this.uuid = uuid;
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Override
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ @Override
+ public long getZoneId() {
+ return zoneId;
+ }
+
+ public void setZoneId(long zoneId) {
+ this.zoneId = zoneId;
+ }
+
+ @Override
+ public long getKubernetesVersionId() {
+ return kubernetesVersionId;
+ }
+
+ public void setKubernetesVersionId(long kubernetesVersionId) {
+ this.kubernetesVersionId = kubernetesVersionId;
+ }
+
+ @Override
+ public long getServiceOfferingId() {
+ return serviceOfferingId;
+ }
+
+ public void setServiceOfferingId(long serviceOfferingId) {
+ this.serviceOfferingId = serviceOfferingId;
+ }
+
+ @Override
+ public long getTemplateId() {
+ return templateId;
+ }
+
+ public void setTemplateId(long templateId) {
+ this.templateId = templateId;
+ }
+
+ @Override
+ public long getNetworkId() {
+ return networkId;
+ }
+
+ public void setNetworkId(long networkId) {
+ this.networkId = networkId;
+ }
+
+ @Override
+ public long getDomainId() {
+ return domainId;
+ }
+
+ public void setDomainId(long domainId) {
+ this.domainId = domainId;
+ }
+
+ @Override
+ public long getAccountId() {
+ return accountId;
+ }
+
+ public void setAccountId(long accountId) {
+ this.accountId = accountId;
+ }
+
+ @Override
+ public long getMasterNodeCount() {
+ return masterNodeCount;
+ }
+
+ public void setMasterNodeCount(long masterNodeCount) {
+ this.masterNodeCount = masterNodeCount;
+ }
+
+ @Override
+ public long getNodeCount() {
+ return nodeCount;
+ }
+
+ public void setNodeCount(long nodeCount) {
+ this.nodeCount = nodeCount;
+ }
+
+ @Override
+ public long getTotalNodeCount() {
+ return this.masterNodeCount + this.nodeCount;
+ }
+
+ @Override
+ public long getCores() {
+ return cores;
+ }
+
+ public void setCores(long cores) {
+ this.cores = cores;
+ }
+
+ @Override
+ public long getMemory() {
+ return memory;
+ }
+
+ public void setMemory(long memory) {
+ this.memory = memory;
+ }
+
+ @Override
+ public long getNodeRootDiskSize() {
+ return nodeRootDiskSize;
+ }
+
+ public void setNodeRootDiskSize(long nodeRootDiskSize) {
+ this.nodeRootDiskSize = nodeRootDiskSize;
+ }
+
+ @Override
+ public State getState() {
+ return state;
+ }
+
+ public void setState(State state) {
+ this.state = state;
+ }
+
+ @Override
+ public String getEndpoint() {
+ return endpoint;
+ }
+
+ public void setEndpoint(String endpoint) {
+ this.endpoint = endpoint;
+ }
+
+ public String getKeyPair() {
+ return keyPair;
+ }
+
+ public void setKeyPair(String keyPair) {
+ this.keyPair = keyPair;
+ }
+
+ @Override
+ public boolean isDisplay() {
+ return true;
+ }
+
+
+ public Date getRemoved() {
+ if (removed == null)
+ return null;
+ return new Date(removed.getTime());
+ }
+
+ @Override
+ public boolean isCheckForGc() {
+ return checkForGc;
+ }
+
+ public void setCheckForGc(boolean check) {
+ checkForGc = check;
+ }
+
+ @Override
+ public Date getCreated() {
+ return created;
+ }
+
+ public KubernetesClusterVO() {
+ this.uuid = UUID.randomUUID().toString();
+ }
+
+ public KubernetesClusterVO(String name, String description, long zoneId, long kubernetesVersionId, long serviceOfferingId, long templateId,
+ long networkId, long domainId, long accountId, long masterNodeCount, long nodeCount, State state,
+ String keyPair, long cores, long memory, Long nodeRootDiskSize, String endpoint) {
+ this.uuid = UUID.randomUUID().toString();
+ this.name = name;
+ this.description = description;
+ this.zoneId = zoneId;
+ this.kubernetesVersionId = kubernetesVersionId;
+ this.serviceOfferingId = serviceOfferingId;
+ this.templateId = templateId;
+ this.networkId = networkId;
+ this.domainId = domainId;
+ this.accountId = accountId;
+ this.masterNodeCount = masterNodeCount;
+ this.nodeCount = nodeCount;
+ this.state = state;
+ this.keyPair = keyPair;
+ this.cores = cores;
+ this.memory = memory;
+ if (nodeRootDiskSize != null && nodeRootDiskSize > 0) {
+ this.nodeRootDiskSize = nodeRootDiskSize;
+ }
+ this.endpoint = endpoint;
+ this.checkForGc = false;
+ }
+
+ @Override
+ public Class<?> getEntityType() {
+ return KubernetesCluster.class;
+ }
+}
diff --git a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterVmMap.java
similarity index 60%
copy from agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
copy to plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterVmMap.java
index b244d02..c739920 100644
--- a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterVmMap.java
@@ -1,4 +1,3 @@
-//
// 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
@@ -15,22 +14,17 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-//
-package com.cloud.agent.direct.download;
+package com.cloud.kubernetes.cluster;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
-
-@RunWith(MockitoJUnitRunner.class)
-public class DirectTemplateDownloaderImplTest {
-
- private static final Long templateId = 202l;
-
- @Test
- public void testGetDirectDownloadTempPath() {
- String path = DirectTemplateDownloaderImpl.getDirectDownloadTempPath(templateId);
- Assert.assertEquals("template/2/202", path);
- }
+/**
+ * KubernetesClusterVmMap will describe mapping of ID of KubernetesCuster
+ * and ID of its VirtualMachine. A KubernetesCluster can have multiple VMs
+ * deployed for it therefore a list of KubernetesClusterVmMap are associated
+ * with a KubernetesCluster.
+ * A particular VM can be deployed only for a single KubernetesCluster.
+ */
+public interface KubernetesClusterVmMap {
+ long getId();
+ long getClusterId();
+ long getVmId();
}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterVmMapVO.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterVmMapVO.java
new file mode 100644
index 0000000..edb06e7
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterVmMapVO.java
@@ -0,0 +1,76 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.kubernetes.cluster;
+
+import javax.persistence.Column;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+
+@Entity
+@Table(name = "kubernetes_cluster_vm_map")
+public class KubernetesClusterVmMapVO implements KubernetesClusterVmMap {
+
+ @Override
+ public long getId() {
+ return id;
+ }
+
+ @Override
+ public long getClusterId() {
+ return clusterId;
+
+ }
+
+ public void setClusterId(long clusterId) {
+
+ this.clusterId = clusterId;
+ }
+
+ @Override
+ public long getVmId() {
+ return vmId;
+ }
+
+ public void setVmId(long vmId) {
+
+ this.vmId = vmId;
+ }
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "id")
+ long id;
+
+ @Column(name = "cluster_id")
+ long clusterId;
+
+ @Column(name = "vm_id")
+ long vmId;
+
+ public KubernetesClusterVmMapVO() {
+
+ }
+
+ public KubernetesClusterVmMapVO(long clusterId, long vmId) {
+ this.vmId = vmId;
+ this.clusterId = clusterId;
+ }
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterActionWorker.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterActionWorker.java
new file mode 100644
index 0000000..aad9a22
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterActionWorker.java
@@ -0,0 +1,380 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.kubernetes.cluster.actionworkers;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.ca.CAManager;
+import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
+import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+
+import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.dc.dao.VlanDao;
+import com.cloud.kubernetes.cluster.KubernetesCluster;
+import com.cloud.kubernetes.cluster.KubernetesClusterDetailsVO;
+import com.cloud.kubernetes.cluster.KubernetesClusterManagerImpl;
+import com.cloud.kubernetes.cluster.KubernetesClusterVO;
+import com.cloud.kubernetes.cluster.KubernetesClusterVmMapVO;
+import com.cloud.kubernetes.cluster.dao.KubernetesClusterDao;
+import com.cloud.kubernetes.cluster.dao.KubernetesClusterDetailsDao;
+import com.cloud.kubernetes.cluster.dao.KubernetesClusterVmMapDao;
+import com.cloud.kubernetes.version.KubernetesSupportedVersion;
+import com.cloud.kubernetes.version.dao.KubernetesSupportedVersionDao;
+import com.cloud.network.IpAddress;
+import com.cloud.network.IpAddressManager;
+import com.cloud.network.Network;
+import com.cloud.network.NetworkModel;
+import com.cloud.network.dao.NetworkDao;
+import com.cloud.service.dao.ServiceOfferingDao;
+import com.cloud.storage.Storage;
+import com.cloud.storage.VMTemplateVO;
+import com.cloud.storage.dao.VMTemplateDao;
+import com.cloud.template.TemplateApiService;
+import com.cloud.template.VirtualMachineTemplate;
+import com.cloud.user.Account;
+import com.cloud.user.dao.AccountDao;
+import com.cloud.user.dao.SSHKeyPairDao;
+import com.cloud.uservm.UserVm;
+import com.cloud.utils.Pair;
+import com.cloud.utils.StringUtils;
+import com.cloud.utils.db.Transaction;
+import com.cloud.utils.db.TransactionCallback;
+import com.cloud.utils.db.TransactionStatus;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.fsm.NoTransitionException;
+import com.cloud.utils.fsm.StateMachine2;
+import com.cloud.vm.UserVmService;
+import com.cloud.vm.dao.UserVmDao;
+import com.google.common.base.Strings;
+
+public class KubernetesClusterActionWorker {
+
+ public static final String CLUSTER_NODE_VM_USER = "core";
+ public static final int CLUSTER_API_PORT = 6443;
+ public static final int CLUSTER_NODES_DEFAULT_START_SSH_PORT = 2222;
+
+ protected static final Logger LOGGER = Logger.getLogger(KubernetesClusterActionWorker.class);
+
+ protected StateMachine2<KubernetesCluster.State, KubernetesCluster.Event, KubernetesCluster> _stateMachine = KubernetesCluster.State.getStateMachine();
+
+ @Inject
+ protected CAManager caManager;
+ @Inject
+ protected ConfigurationDao configurationDao;
+ @Inject
+ protected DataCenterDao dataCenterDao;
+ @Inject
+ protected AccountDao accountDao;
+ @Inject
+ protected IpAddressManager ipAddressManager;
+ @Inject
+ protected NetworkOrchestrationService networkMgr;
+ @Inject
+ protected NetworkDao networkDao;
+ @Inject
+ protected NetworkModel networkModel;
+ @Inject
+ protected ServiceOfferingDao serviceOfferingDao;
+ @Inject
+ protected SSHKeyPairDao sshKeyPairDao;
+ @Inject
+ protected VMTemplateDao templateDao;
+ @Inject
+ protected TemplateApiService templateService;
+ @Inject
+ protected UserVmDao userVmDao;
+ @Inject
+ protected UserVmService userVmService;
+ @Inject
+ protected VlanDao vlanDao;
+
+ protected KubernetesClusterDao kubernetesClusterDao;
+ protected KubernetesClusterVmMapDao kubernetesClusterVmMapDao;
+ protected KubernetesClusterDetailsDao kubernetesClusterDetailsDao;
+ protected KubernetesSupportedVersionDao kubernetesSupportedVersionDao;
+
+ protected KubernetesCluster kubernetesCluster;
+ protected Account owner;
+ protected File sshKeyFile;
+ protected String publicIpAddress;
+ protected int sshPort;
+
+ protected KubernetesClusterActionWorker(final KubernetesCluster kubernetesCluster, final KubernetesClusterManagerImpl clusterManager) {
+ this.kubernetesCluster = kubernetesCluster;
+ this.kubernetesClusterDao = clusterManager.kubernetesClusterDao;
+ this.kubernetesClusterDetailsDao = clusterManager.kubernetesClusterDetailsDao;
+ this.kubernetesClusterVmMapDao = clusterManager.kubernetesClusterVmMapDao;
+ this.kubernetesSupportedVersionDao = clusterManager.kubernetesSupportedVersionDao;
+ }
+
+ protected void init() {
+ this.owner = accountDao.findById(kubernetesCluster.getAccountId());
+ this.sshKeyFile = getManagementServerSshPublicKeyFile();
+ }
+
+ protected String readResourceFile(String resource) throws IOException {
+ return IOUtils.toString(Objects.requireNonNull(Thread.currentThread().getContextClassLoader().getResourceAsStream(resource)), StringUtils.getPreferredCharset());
+ }
+
+ protected void logMessage(final Level logLevel, final String message, final Exception e) {
+ if (logLevel == Level.INFO) {
+ if (LOGGER.isInfoEnabled()) {
+ if (e != null) {
+ LOGGER.info(message, e);
+ } else {
+ LOGGER.info(message);
+ }
+ }
+ } else if (logLevel == Level.DEBUG) {
+ if (LOGGER.isDebugEnabled()) {
+ if (e != null) {
+ LOGGER.debug(message, e);
+ } else {
+ LOGGER.debug(message);
+ }
+ }
+ } else if (logLevel == Level.WARN) {
+ if (e != null) {
+ LOGGER.warn(message, e);
+ } else {
+ LOGGER.warn(message);
+ }
+ } else {
+ if (e != null) {
+ LOGGER.error(message, e);
+ } else {
+ LOGGER.error(message);
+ }
+ }
+ }
+
+ protected void logTransitStateDetachIsoAndThrow(final Level logLevel, final String message, final KubernetesCluster kubernetesCluster,
+ final List<UserVm> clusterVMs, final KubernetesCluster.Event event, final Exception e) throws CloudRuntimeException {
+ logMessage(logLevel, message, e);
+ stateTransitTo(kubernetesCluster.getId(), event);
+ detachIsoKubernetesVMs(clusterVMs);
+ if (e == null) {
+ throw new CloudRuntimeException(message);
+ }
+ throw new CloudRuntimeException(message, e);
+ }
+
+ protected void logTransitStateAndThrow(final Level logLevel, final String message, final Long kubernetesClusterId, final KubernetesCluster.Event event, final Exception e) throws CloudRuntimeException {
+ logMessage(logLevel, message, e);
+ if (kubernetesClusterId != null && event != null) {
+ stateTransitTo(kubernetesClusterId, event);
+ }
+ if (e == null) {
+ throw new CloudRuntimeException(message);
+ }
+ throw new CloudRuntimeException(message, e);
+ }
+
+ protected void logTransitStateAndThrow(final Level logLevel, final String message, final Long kubernetesClusterId, final KubernetesCluster.Event event) throws CloudRuntimeException {
+ logTransitStateAndThrow(logLevel, message, kubernetesClusterId, event, null);
+ }
+
+ protected void logAndThrow(final Level logLevel, final String message) throws CloudRuntimeException {
+ logTransitStateAndThrow(logLevel, message, null, null, null);
+ }
+
+ protected void logAndThrow(final Level logLevel, final String message, final Exception ex) throws CloudRuntimeException {
+ logTransitStateAndThrow(logLevel, message, null, null, ex);
+ }
+
+ protected File getManagementServerSshPublicKeyFile() {
+ boolean devel = Boolean.parseBoolean(configurationDao.getValue("developer"));
+ String keyFile = String.format("%s/.ssh/id_rsa", System.getProperty("user.home"));
+ if (devel) {
+ keyFile += ".cloud";
+ }
+ return new File(keyFile);
+ }
+
+ protected KubernetesClusterVmMapVO addKubernetesClusterVm(final long kubernetesClusterId, final long vmId) {
+ return Transaction.execute(new TransactionCallback<KubernetesClusterVmMapVO>() {
+ @Override
+ public KubernetesClusterVmMapVO doInTransaction(TransactionStatus status) {
+ KubernetesClusterVmMapVO newClusterVmMap = new KubernetesClusterVmMapVO(kubernetesClusterId, vmId);
+ kubernetesClusterVmMapDao.persist(newClusterVmMap);
+ return newClusterVmMap;
+ }
+ });
+ }
+
+ private UserVm fetchMasterVmIfMissing(final UserVm masterVm) {
+ if (masterVm != null) {
+ return masterVm;
+ }
+ List<KubernetesClusterVmMapVO> clusterVMs = kubernetesClusterVmMapDao.listByClusterId(kubernetesCluster.getId());
+ if (CollectionUtils.isEmpty(clusterVMs)) {
+ LOGGER.warn(String.format("Unable to retrieve VMs for Kubernetes cluster ID: %s", kubernetesCluster.getUuid()));
+ return null;
+ }
+ List<Long> vmIds = new ArrayList<>();
+ for (KubernetesClusterVmMapVO vmMap : clusterVMs) {
+ vmIds.add(vmMap.getVmId());
+ }
+ Collections.sort(vmIds);
+ return userVmDao.findById(vmIds.get(0));
+ }
+
+ protected String getMasterVmPrivateIp() {
+ String ip = null;
+ UserVm vm = fetchMasterVmIfMissing(null);
+ if (vm != null) {
+ ip = vm.getPrivateIpAddress();
+ }
+ return ip;
+ }
+
+ protected Pair<String, Integer> getKubernetesClusterServerIpSshPort(UserVm masterVm) {
+ int port = CLUSTER_NODES_DEFAULT_START_SSH_PORT;
+ KubernetesClusterDetailsVO detail = kubernetesClusterDetailsDao.findDetail(kubernetesCluster.getId(), ApiConstants.EXTERNAL_LOAD_BALANCER_IP_ADDRESS);
+ if (detail != null && !Strings.isNullOrEmpty(detail.getValue())) {
+ return new Pair<>(detail.getValue(), port);
+ }
+ Network network = networkDao.findById(kubernetesCluster.getNetworkId());
+ if (network == null) {
+ LOGGER.warn(String.format("Network for Kubernetes cluster ID: %s cannot be found", kubernetesCluster.getUuid()));
+ return new Pair<>(null, port);
+ }
+ if (Network.GuestType.Isolated.equals(network.getGuestType())) {
+ List<? extends IpAddress> addresses = networkModel.listPublicIpsAssignedToGuestNtwk(network.getId(), true);
+ if (CollectionUtils.isEmpty(addresses)) {
+ LOGGER.warn(String.format("No public IP addresses found for network ID: %s, Kubernetes cluster ID: %s", network.getUuid(), kubernetesCluster.getUuid()));
+ return new Pair<>(null, port);
+ }
+ for (IpAddress address : addresses) {
+ if (address.isSourceNat()) {
+ return new Pair<>(address.getAddress().addr(), port);
+ }
+ }
+ LOGGER.warn(String.format("No source NAT IP addresses found for network ID: %s, Kubernetes cluster ID: %s", network.getUuid(), kubernetesCluster.getUuid()));
+ return new Pair<>(null, port);
+ } else if (Network.GuestType.Shared.equals(network.getGuestType())) {
+ port = 22;
+ masterVm = fetchMasterVmIfMissing(masterVm);
+ if (masterVm == null) {
+ LOGGER.warn(String.format("Unable to retrieve master VM for Kubernetes cluster ID: %s", kubernetesCluster.getUuid()));
+ return new Pair<>(null, port);
+ }
+ return new Pair<>(masterVm.getPrivateIpAddress(), port);
+ }
+ LOGGER.warn(String.format("Unable to retrieve server IP address for Kubernetes cluster ID: %s", kubernetesCluster.getUuid()));
+ return new Pair<>(null, port);
+ }
+
+ protected void attachIsoKubernetesVMs(List<UserVm> clusterVMs, final KubernetesSupportedVersion kubernetesSupportedVersion) throws CloudRuntimeException {
+ KubernetesSupportedVersion version = kubernetesSupportedVersion;
+ if (kubernetesSupportedVersion == null) {
+ version = kubernetesSupportedVersionDao.findById(kubernetesCluster.getKubernetesVersionId());
+ }
+ KubernetesCluster.Event failedEvent = KubernetesCluster.Event.OperationFailed;
+ KubernetesCluster cluster = kubernetesClusterDao.findById(kubernetesCluster.getId());
+ if (cluster != null && cluster.getState() == KubernetesCluster.State.Starting) {
+ failedEvent = KubernetesCluster.Event.CreateFailed;
+ }
+ if (version == null) {
+ logTransitStateAndThrow(Level.ERROR, String .format("Unable to find Kubernetes version for cluster ID: %s", kubernetesCluster.getUuid()), kubernetesCluster.getId(), failedEvent);
+ }
+ VMTemplateVO iso = templateDao.findById(version.getIsoId());
+ if (iso == null) {
+ logTransitStateAndThrow(Level.ERROR, String.format("Unable to attach ISO to Kubernetes cluster ID: %s. Binaries ISO not found.", kubernetesCluster.getUuid()), kubernetesCluster.getId(), failedEvent);
+ }
+ if (!iso.getFormat().equals(Storage.ImageFormat.ISO)) {
+ logTransitStateAndThrow(Level.ERROR, String.format("Unable to attach ISO to Kubernetes cluster ID: %s. Invalid Binaries ISO.", kubernetesCluster.getUuid()), kubernetesCluster.getId(), failedEvent);
+ }
+ if (!iso.getState().equals(VirtualMachineTemplate.State.Active)) {
+ logTransitStateAndThrow(Level.ERROR, String.format("Unable to attach ISO to Kubernetes cluster ID: %s. Binaries ISO not active.", kubernetesCluster.getUuid()), kubernetesCluster.getId(), failedEvent);
+ }
+ for (UserVm vm : clusterVMs) {
+ try {
+ templateService.attachIso(iso.getId(), vm.getId());
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Attached binaries ISO for VM: %s in cluster: %s", vm.getUuid(), kubernetesCluster.getName()));
+ }
+ } catch (CloudRuntimeException ex) {
+ logTransitStateAndThrow(Level.ERROR, String.format("Failed to attach binaries ISO for VM: %s in the Kubernetes cluster name: %s", vm.getDisplayName(), kubernetesCluster.getName()), kubernetesCluster.getId(), failedEvent, ex);
+ }
+ }
+ }
+
+ protected void attachIsoKubernetesVMs(List<UserVm> clusterVMs) throws CloudRuntimeException {
+ attachIsoKubernetesVMs(clusterVMs, null);
+ }
+
+ protected void detachIsoKubernetesVMs(List<UserVm> clusterVMs) {
+ for (UserVm vm : clusterVMs) {
+ boolean result = false;
+ try {
+ result = templateService.detachIso(vm.getId());
+ } catch (CloudRuntimeException ex) {
+ LOGGER.warn(String.format("Failed to detach binaries ISO from VM ID: %s in the Kubernetes cluster ID: %s ", vm.getUuid(), kubernetesCluster.getUuid()), ex);
+ }
+ if (result) {
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Detached Kubernetes binaries from VM ID: %s in the Kubernetes cluster ID: %s", vm.getUuid(), kubernetesCluster.getUuid()));
+ }
+ continue;
+ }
+ LOGGER.warn(String.format("Failed to detach binaries ISO from VM ID: %s in the Kubernetes cluster ID: %s ", vm.getUuid(), kubernetesCluster.getUuid()));
+ }
+ }
+
+ protected List<KubernetesClusterVmMapVO> getKubernetesClusterVMMaps() {
+ List<KubernetesClusterVmMapVO> clusterVMs = kubernetesClusterVmMapDao.listByClusterId(kubernetesCluster.getId());
+ if (!CollectionUtils.isEmpty(clusterVMs)) {
+ clusterVMs.sort((t1, t2) -> (int)((t1.getId() - t2.getId())/Math.abs(t1.getId() - t2.getId())));
+ }
+ return clusterVMs;
+ }
+
+ protected List<UserVm> getKubernetesClusterVMs() {
+ List<UserVm> vmList = new ArrayList<>();
+ List<KubernetesClusterVmMapVO> clusterVMs = getKubernetesClusterVMMaps();
+ if (!CollectionUtils.isEmpty(clusterVMs)) {
+ for (KubernetesClusterVmMapVO vmMap : clusterVMs) {
+ vmList.add(userVmDao.findById(vmMap.getVmId()));
+ }
+ }
+ return vmList;
+ }
+
+ protected boolean stateTransitTo(long kubernetesClusterId, KubernetesCluster.Event e) {
+ KubernetesClusterVO kubernetesCluster = kubernetesClusterDao.findById(kubernetesClusterId);
+ try {
+ return _stateMachine.transitTo(kubernetesCluster, e, null, kubernetesClusterDao);
+ } catch (NoTransitionException nte) {
+ LOGGER.warn(String.format("Failed to transition state of the Kubernetes cluster ID: %s in state %s on event %s", kubernetesCluster.getUuid(), kubernetesCluster.getState().toString(), e.toString()), nte);
+ return false;
+ }
+ }
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterDestroyWorker.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterDestroyWorker.java
new file mode 100644
index 0000000..8d7f427
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterDestroyWorker.java
@@ -0,0 +1,243 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.kubernetes.cluster.actionworkers;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.context.CallContext;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.log4j.Level;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.ManagementServerException;
+import com.cloud.exception.PermissionDeniedException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.kubernetes.cluster.KubernetesCluster;
+import com.cloud.kubernetes.cluster.KubernetesClusterDetailsVO;
+import com.cloud.kubernetes.cluster.KubernetesClusterManagerImpl;
+import com.cloud.kubernetes.cluster.KubernetesClusterVO;
+import com.cloud.kubernetes.cluster.KubernetesClusterVmMap;
+import com.cloud.kubernetes.cluster.KubernetesClusterVmMapVO;
+import com.cloud.network.IpAddress;
+import com.cloud.network.Network;
+import com.cloud.network.dao.NetworkVO;
+import com.cloud.network.rules.FirewallRule;
+import com.cloud.user.Account;
+import com.cloud.user.AccountManager;
+import com.cloud.user.User;
+import com.cloud.uservm.UserVm;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.ReservationContext;
+import com.cloud.vm.ReservationContextImpl;
+import com.cloud.vm.UserVmVO;
+
+public class KubernetesClusterDestroyWorker extends KubernetesClusterResourceModifierActionWorker {
+
+ @Inject
+ protected AccountManager accountManager;
+
+ private List<KubernetesClusterVmMapVO> clusterVMs;
+
+ public KubernetesClusterDestroyWorker(final KubernetesCluster kubernetesCluster, final KubernetesClusterManagerImpl clusterManager) {
+ super(kubernetesCluster, clusterManager);
+ }
+
+ private void validateClusterSate() {
+ if (!(kubernetesCluster.getState().equals(KubernetesCluster.State.Running)
+ || kubernetesCluster.getState().equals(KubernetesCluster.State.Stopped)
+ || kubernetesCluster.getState().equals(KubernetesCluster.State.Alert)
+ || kubernetesCluster.getState().equals(KubernetesCluster.State.Error)
+ || kubernetesCluster.getState().equals(KubernetesCluster.State.Destroying))) {
+ String msg = String.format("Cannot perform delete operation on cluster ID: %s in state: %s",kubernetesCluster.getUuid(), kubernetesCluster.getState());
+ LOGGER.warn(msg);
+ throw new PermissionDeniedException(msg);
+ }
+ }
+
+ private boolean destroyClusterVMs() {
+ boolean vmDestroyed = true;
+ if (!CollectionUtils.isEmpty(clusterVMs)) {
+ for (KubernetesClusterVmMapVO clusterVM : clusterVMs) {
+ long vmID = clusterVM.getVmId();
+
+ // delete only if VM exists and is not removed
+ UserVmVO userVM = userVmDao.findById(vmID);
+ if (userVM == null || userVM.isRemoved()) {
+ continue;
+ }
+ try {
+ UserVm vm = userVmService.destroyVm(vmID, true);
+ if (!userVmManager.expunge(userVM, CallContext.current().getCallingUserId(), CallContext.current().getCallingAccount())) {
+ LOGGER.warn(String.format("Unable to expunge VM '%s' ID: %s, destroying Kubernetes cluster will probably fail"
+ , vm.getInstanceName()
+ , vm.getUuid()));
+ }
+ kubernetesClusterVmMapDao.expunge(clusterVM.getId());
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Destroyed VM ID: %s as part of Kubernetes cluster ID: %s cleanup", vm.getUuid(), kubernetesCluster.getUuid()));
+ }
+ } catch (ResourceUnavailableException | ConcurrentOperationException e) {
+ LOGGER.warn(String.format("Failed to destroy VM ID: %s part of the Kubernetes cluster ID: %s cleanup. Moving on with destroying remaining resources provisioned for the Kubernetes cluster", userVM.getUuid(), kubernetesCluster.getUuid()), e);
+ return false;
+ }
+ }
+ }
+ return vmDestroyed;
+ }
+
+ private boolean updateKubernetesClusterEntryForGC() {
+ KubernetesClusterVO kubernetesClusterVO = kubernetesClusterDao.findById(kubernetesCluster.getId());
+ kubernetesClusterVO.setCheckForGc(true);
+ return kubernetesClusterDao.update(kubernetesCluster.getId(), kubernetesClusterVO);
+ }
+
+ private void destroyKubernetesClusterNetwork() throws ManagementServerException {
+ NetworkVO network = networkDao.findById(kubernetesCluster.getNetworkId());
+ if (network != null && network.getRemoved() == null) {
+ Account owner = accountManager.getAccount(network.getAccountId());
+ User callerUser = accountManager.getActiveUser(CallContext.current().getCallingUserId());
+ ReservationContext context = new ReservationContextImpl(null, null, callerUser, owner);
+ boolean networkDestroyed = networkMgr.destroyNetwork(kubernetesCluster.getNetworkId(), context, true);
+ if (!networkDestroyed) {
+ String msg = String.format("Failed to destroy network ID: %s as part of Kubernetes cluster ID: %s cleanup", network.getUuid(), kubernetesCluster.getUuid());
+ LOGGER.warn(msg);
+ throw new ManagementServerException(msg);
+ }
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Destroyed network: %s as part of Kubernetes cluster ID: %s cleanup", network.getUuid(), kubernetesCluster.getUuid()));
+ }
+ }
+ }
+
+ private void deleteKubernetesClusterNetworkRules() throws ManagementServerException {
+ NetworkVO network = networkDao.findById(kubernetesCluster.getNetworkId());
+ if (network == null || !Network.GuestType.Isolated.equals(network.getGuestType())) {
+ return;
+ }
+ List<Long> removedVmIds = new ArrayList<>();
+ if (!CollectionUtils.isEmpty(clusterVMs)) {
+ for (KubernetesClusterVmMapVO clusterVM : clusterVMs) {
+ removedVmIds.add(clusterVM.getVmId());
+ }
+ }
+ IpAddress publicIp = getSourceNatIp(network);
+ if (publicIp == null) {
+ throw new ManagementServerException(String.format("No source NAT IP addresses found for network ID: %s", network.getUuid()));
+ }
+ try {
+ removeLoadBalancingRule(publicIp, network, owner, CLUSTER_API_PORT);
+ } catch (ResourceUnavailableException e) {
+ throw new ManagementServerException(String.format("Failed to KubernetesCluster load balancing rule for network ID: %s", network.getUuid()));
+ }
+ FirewallRule firewallRule = removeApiFirewallRule(publicIp);
+ if (firewallRule == null) {
+ logMessage(Level.WARN, "Firewall rule for API access can't be removed", null);
+ }
+ firewallRule = removeSshFirewallRule(publicIp);
+ if (firewallRule == null) {
+ logMessage(Level.WARN, "Firewall rule for SSH access can't be removed", null);
+ }
+ try {
+ removePortForwardingRules(publicIp, network, owner, removedVmIds);
+ } catch (ResourceUnavailableException e) {
+ throw new ManagementServerException(String.format("Failed to KubernetesCluster port forwarding rules for network ID: %s", network.getUuid()));
+ }
+ }
+
+ private void validateClusterVMsDestroyed() {
+ if(clusterVMs!=null && !clusterVMs.isEmpty()) { // Wait for few seconds to get all VMs really expunged
+ final int maxRetries = 3;
+ int retryCounter = 0;
+ while (retryCounter < maxRetries) {
+ boolean allVMsRemoved = true;
+ for (KubernetesClusterVmMap clusterVM : clusterVMs) {
+ UserVmVO userVM = userVmDao.findById(clusterVM.getVmId());
+ if (userVM != null && !userVM.isRemoved()) {
+ allVMsRemoved = false;
+ break;
+ }
+ }
+ if (allVMsRemoved) {
+ break;
+ }
+ try {
+ Thread.sleep(10000);
+ } catch (InterruptedException ie) {}
+ retryCounter++;
+ }
+ }
+ }
+
+ public boolean destroy() throws CloudRuntimeException {
+ init();
+ validateClusterSate();
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Destroying Kubernetes cluster ID: %s", kubernetesCluster.getUuid()));
+ }
+ stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.DestroyRequested);
+ this.clusterVMs = kubernetesClusterVmMapDao.listByClusterId(kubernetesCluster.getId());
+ boolean vmsDestroyed = destroyClusterVMs();
+ boolean cleanupNetwork = true;
+ final KubernetesClusterDetailsVO clusterDetails = kubernetesClusterDetailsDao.findDetail(kubernetesCluster.getId(), "networkCleanup");
+ if (clusterDetails != null) {
+ cleanupNetwork = Boolean.parseBoolean(clusterDetails.getValue());
+ }
+ // if there are VM's that were not expunged, we can not delete the network
+ if (vmsDestroyed) {
+ if (cleanupNetwork) {
+ validateClusterVMsDestroyed();
+ try {
+ destroyKubernetesClusterNetwork();
+ } catch (ManagementServerException e) {
+ String msg = String.format("Failed to destroy network of Kubernetes cluster ID: %s cleanup", kubernetesCluster.getUuid());
+ LOGGER.warn(msg, e);
+ updateKubernetesClusterEntryForGC();
+ throw new CloudRuntimeException(msg, e);
+ }
+ } else {
+ try {
+ deleteKubernetesClusterNetworkRules();
+ } catch (ManagementServerException e) {
+ String msg = String.format("Failed to remove network rules of Kubernetes cluster ID: %s", kubernetesCluster.getUuid());
+ LOGGER.warn(msg, e);
+ updateKubernetesClusterEntryForGC();
+ throw new CloudRuntimeException(msg, e);
+ }
+ }
+ } else {
+ String msg = String.format("Failed to destroy one or more VMs as part of Kubernetes cluster ID: %s cleanup", kubernetesCluster.getUuid());
+ LOGGER.warn(msg);
+ updateKubernetesClusterEntryForGC();
+ throw new CloudRuntimeException(msg);
+ }
+ stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.OperationSucceeded);
+ boolean deleted = kubernetesClusterDao.remove(kubernetesCluster.getId());
+ if (!deleted) {
+ logMessage(Level.WARN, String.format("Failed to delete Kubernetes cluster ID: %s", kubernetesCluster.getUuid()), null);
+ updateKubernetesClusterEntryForGC();
+ return false;
+ }
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Kubernetes cluster ID: %s is successfully deleted", kubernetesCluster.getUuid()));
+ }
+ return true;
+ }
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java
new file mode 100644
index 0000000..5d25614
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java
@@ -0,0 +1,513 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.kubernetes.cluster.actionworkers;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.command.user.firewall.CreateFirewallRuleCmd;
+import org.apache.cloudstack.api.command.user.vm.StartVMCmd;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.log4j.Level;
+
+import com.cloud.capacity.CapacityManager;
+import com.cloud.dc.ClusterDetailsDao;
+import com.cloud.dc.ClusterDetailsVO;
+import com.cloud.dc.ClusterVO;
+import com.cloud.dc.DataCenter;
+import com.cloud.dc.dao.ClusterDao;
+import com.cloud.deploy.DeployDestination;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.InsufficientServerCapacityException;
+import com.cloud.exception.ManagementServerException;
+import com.cloud.exception.NetworkRuleConflictException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.host.Host;
+import com.cloud.host.HostVO;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.kubernetes.cluster.KubernetesCluster;
+import com.cloud.kubernetes.cluster.KubernetesClusterDetailsVO;
+import com.cloud.kubernetes.cluster.KubernetesClusterManagerImpl;
+import com.cloud.kubernetes.cluster.utils.KubernetesClusterUtil;
+import com.cloud.network.IpAddress;
+import com.cloud.network.Network;
+import com.cloud.network.dao.FirewallRulesDao;
+import com.cloud.network.dao.LoadBalancerDao;
+import com.cloud.network.dao.LoadBalancerVO;
+import com.cloud.network.firewall.FirewallService;
+import com.cloud.network.lb.LoadBalancingRulesService;
+import com.cloud.network.rules.FirewallRule;
+import com.cloud.network.rules.FirewallRuleVO;
+import com.cloud.network.rules.PortForwardingRuleVO;
+import com.cloud.network.rules.RulesService;
+import com.cloud.network.rules.dao.PortForwardingRulesDao;
+import com.cloud.offering.ServiceOffering;
+import com.cloud.resource.ResourceManager;
+import com.cloud.template.VirtualMachineTemplate;
+import com.cloud.user.Account;
+import com.cloud.user.SSHKeyPairVO;
+import com.cloud.uservm.UserVm;
+import com.cloud.utils.Pair;
+import com.cloud.utils.StringUtils;
+import com.cloud.utils.component.ComponentContext;
+import com.cloud.utils.db.Transaction;
+import com.cloud.utils.db.TransactionCallbackWithException;
+import com.cloud.utils.db.TransactionStatus;
+import com.cloud.utils.exception.ExecutionException;
+import com.cloud.utils.net.Ip;
+import com.cloud.utils.net.NetUtils;
+import com.cloud.vm.Nic;
+import com.cloud.vm.UserVmManager;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.dao.VMInstanceDao;
+import com.google.common.base.Strings;
+
+public class KubernetesClusterResourceModifierActionWorker extends KubernetesClusterActionWorker {
+
+ @Inject
+ protected CapacityManager capacityManager;
+ @Inject
+ protected ClusterDao clusterDao;
+ @Inject
+ protected ClusterDetailsDao clusterDetailsDao;
+ @Inject
+ protected FirewallRulesDao firewallRulesDao;
+ @Inject
+ protected FirewallService firewallService;
+ @Inject
+ protected LoadBalancingRulesService lbService;
+ @Inject
+ protected RulesService rulesService;
+ @Inject
+ protected PortForwardingRulesDao portForwardingRulesDao;
+ @Inject
+ protected ResourceManager resourceManager;
+ @Inject
+ protected LoadBalancerDao loadBalancerDao;
+ @Inject
+ protected VMInstanceDao vmInstanceDao;
+ @Inject
+ protected UserVmManager userVmManager;
+
+ protected String kubernetesClusterNodeNamePrefix;
+
+ protected KubernetesClusterResourceModifierActionWorker(final KubernetesCluster kubernetesCluster, final KubernetesClusterManagerImpl clusterManager) {
+ super(kubernetesCluster, clusterManager);
+ }
+
+ protected void init() {
+ super.init();
+ kubernetesClusterNodeNamePrefix = getKubernetesClusterNodeNamePrefix();
+ }
+
+ private String getKubernetesNodeConfig(final String joinIp, final boolean ejectIso) throws IOException {
+ String k8sNodeConfig = readResourceFile("/conf/k8s-node.yml");
+ final String sshPubKey = "{{ k8s.ssh.pub.key }}";
+ final String joinIpKey = "{{ k8s_master.join_ip }}";
+ final String clusterTokenKey = "{{ k8s_master.cluster.token }}";
+ final String ejectIsoKey = "{{ k8s.eject.iso }}";
+ String pubKey = "- \"" + configurationDao.getValue("ssh.publickey") + "\"";
+ String sshKeyPair = kubernetesCluster.getKeyPair();
+ if (!Strings.isNullOrEmpty(sshKeyPair)) {
+ SSHKeyPairVO sshkp = sshKeyPairDao.findByName(owner.getAccountId(), owner.getDomainId(), sshKeyPair);
+ if (sshkp != null) {
+ pubKey += "\n - \"" + sshkp.getPublicKey() + "\"";
+ }
+ }
+ k8sNodeConfig = k8sNodeConfig.replace(sshPubKey, pubKey);
+ k8sNodeConfig = k8sNodeConfig.replace(joinIpKey, joinIp);
+ k8sNodeConfig = k8sNodeConfig.replace(clusterTokenKey, KubernetesClusterUtil.generateClusterToken(kubernetesCluster));
+ k8sNodeConfig = k8sNodeConfig.replace(ejectIsoKey, String.valueOf(ejectIso));
+ /* genarate /.docker/config.json file on the nodes only if Kubernetes cluster is created to
+ * use docker private registry */
+ String dockerUserName = null;
+ String dockerPassword = null;
+ String dockerRegistryUrl = null;
+ String dockerRegistryEmail = null;
+ List<KubernetesClusterDetailsVO> details = kubernetesClusterDetailsDao.listDetails(kubernetesCluster.getId());
+ for (KubernetesClusterDetailsVO detail : details) {
+ if (detail.getName().equals(ApiConstants.DOCKER_REGISTRY_USER_NAME)) {
+ dockerUserName = detail.getValue();
+ }
+ if (detail.getName().equals(ApiConstants.DOCKER_REGISTRY_PASSWORD)) {
+ dockerPassword = detail.getValue();
+ }
+ if (detail.getName().equals(ApiConstants.DOCKER_REGISTRY_URL)) {
+ dockerRegistryUrl = detail.getValue();
+ }
+ if (detail.getName().equals(ApiConstants.DOCKER_REGISTRY_EMAIL)) {
+ dockerRegistryEmail = detail.getValue();
+ }
+ }
+ if (!Strings.isNullOrEmpty(dockerUserName) && !Strings.isNullOrEmpty(dockerPassword)) {
+ // do write file for /.docker/config.json through the code instead of k8s-node.yml as we can no make a section
+ // optional or conditionally applied
+ String dockerConfigString = "write-files:\n" +
+ " - path: /.docker/config.json\n" +
+ " owner: core:core\n" +
+ " permissions: '0644'\n" +
+ " content: |\n" +
+ " {\n" +
+ " \"auths\": {\n" +
+ " {{docker.url}}: {\n" +
+ " \"auth\": {{docker.secret}},\n" +
+ " \"email\": {{docker.email}}\n" +
+ " }\n" +
+ " }\n" +
+ " }";
+ k8sNodeConfig = k8sNodeConfig.replace("write-files:", dockerConfigString);
+ final String dockerUrlKey = "{{docker.url}}";
+ final String dockerAuthKey = "{{docker.secret}}";
+ final String dockerEmailKey = "{{docker.email}}";
+ final String usernamePasswordKey = dockerUserName + ":" + dockerPassword;
+ String base64Auth = Base64.encodeBase64String(usernamePasswordKey.getBytes(StringUtils.getPreferredCharset()));
+ k8sNodeConfig = k8sNodeConfig.replace(dockerUrlKey, "\"" + dockerRegistryUrl + "\"");
+ k8sNodeConfig = k8sNodeConfig.replace(dockerAuthKey, "\"" + base64Auth + "\"");
+ k8sNodeConfig = k8sNodeConfig.replace(dockerEmailKey, "\"" + dockerRegistryEmail + "\"");
+ }
+ return k8sNodeConfig;
+ }
+
+ protected DeployDestination plan(final long nodesCount, final DataCenter zone, final ServiceOffering offering) throws InsufficientServerCapacityException {
+ final int cpu_requested = offering.getCpu() * offering.getSpeed();
+ final long ram_requested = offering.getRamSize() * 1024L * 1024L;
+ List<HostVO> hosts = resourceManager.listAllHostsInOneZoneByType(Host.Type.Routing, zone.getId());
+ final Map<String, Pair<HostVO, Integer>> hosts_with_resevered_capacity = new ConcurrentHashMap<String, Pair<HostVO, Integer>>();
+ for (HostVO h : hosts) {
+ hosts_with_resevered_capacity.put(h.getUuid(), new Pair<HostVO, Integer>(h, 0));
+ }
+ boolean suitable_host_found = false;
+ for (int i = 1; i <= nodesCount + 1; i++) {
+ suitable_host_found = false;
+ for (Map.Entry<String, Pair<HostVO, Integer>> hostEntry : hosts_with_resevered_capacity.entrySet()) {
+ Pair<HostVO, Integer> hp = hostEntry.getValue();
+ HostVO h = hp.first();
+ int reserved = hp.second();
+ reserved++;
+ ClusterVO cluster = clusterDao.findById(h.getClusterId());
+ ClusterDetailsVO cluster_detail_cpu = clusterDetailsDao.findDetail(cluster.getId(), "cpuOvercommitRatio");
+ ClusterDetailsVO cluster_detail_ram = clusterDetailsDao.findDetail(cluster.getId(), "memoryOvercommitRatio");
+ Float cpuOvercommitRatio = Float.parseFloat(cluster_detail_cpu.getValue());
+ Float memoryOvercommitRatio = Float.parseFloat(cluster_detail_ram.getValue());
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(String.format("Checking host ID: %s for capacity already reserved %d", h.getUuid(), reserved));
+ }
+ if (capacityManager.checkIfHostHasCapacity(h.getId(), cpu_requested * reserved, ram_requested * reserved, false, cpuOvercommitRatio, memoryOvercommitRatio, true)) {
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(String.format("Found host ID: %s for with enough capacity, CPU=%d RAM=%d", h.getUuid(), cpu_requested * reserved, ram_requested * reserved));
+ }
+ hostEntry.setValue(new Pair<HostVO, Integer>(h, reserved));
+ suitable_host_found = true;
+ break;
+ }
+ }
+ if (!suitable_host_found) {
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Suitable hosts not found in datacenter ID: %s for node %d", zone.getUuid(), i));
+ }
+ break;
+ }
+ }
+ if (suitable_host_found) {
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Suitable hosts found in datacenter ID: %s, creating deployment destination", zone.getUuid()));
+ }
+ return new DeployDestination(zone, null, null, null);
+ }
+ String msg = String.format("Cannot find enough capacity for Kubernetes cluster(requested cpu=%1$s memory=%2$s)",
+ cpu_requested * nodesCount, ram_requested * nodesCount);
+ LOGGER.warn(msg);
+ throw new InsufficientServerCapacityException(msg, DataCenter.class, zone.getId());
+ }
+
+ protected DeployDestination plan() throws InsufficientServerCapacityException {
+ ServiceOffering offering = serviceOfferingDao.findById(kubernetesCluster.getServiceOfferingId());
+ DataCenter zone = dataCenterDao.findById(kubernetesCluster.getZoneId());
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(String.format("Checking deployment destination for Kubernetes cluster ID: %s in zone ID: %s", kubernetesCluster.getUuid(), zone.getUuid()));
+ }
+ return plan(kubernetesCluster.getTotalNodeCount(), zone, offering);
+ }
+
+ protected void startKubernetesVM(final UserVm vm) throws ManagementServerException {
+ try {
+ StartVMCmd startVm = new StartVMCmd();
+ startVm = ComponentContext.inject(startVm);
+ Field f = startVm.getClass().getDeclaredField("id");
+ f.setAccessible(true);
+ f.set(startVm, vm.getId());
+ userVmService.startVirtualMachine(startVm);
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Started VM ID: %s in the Kubernetes cluster ID: %s", vm.getUuid(), kubernetesCluster.getUuid()));
+ }
+ } catch (IllegalAccessException | NoSuchFieldException | ExecutionException |
+ ResourceUnavailableException | ResourceAllocationException | InsufficientCapacityException ex) {
+ throw new ManagementServerException(String.format("Failed to start VM in the Kubernetes cluster ID: %s", kubernetesCluster.getUuid()), ex);
+ }
+
+ UserVm startVm = userVmDao.findById(vm.getId());
+ if (!startVm.getState().equals(VirtualMachine.State.Running)) {
+ throw new ManagementServerException(String.format("Failed to start VM in the Kubernetes cluster ID: %s", kubernetesCluster.getUuid()));
+ }
+ }
+
+ protected List<UserVm> provisionKubernetesClusterNodeVms(final long nodeCount, final int offset, final String publicIpAddress) throws ManagementServerException,
+ ResourceUnavailableException, InsufficientCapacityException {
+ List<UserVm> nodes = new ArrayList<>();
+ for (int i = offset + 1; i <= nodeCount; i++) {
+ UserVm vm = createKubernetesNode(publicIpAddress, i);
+ addKubernetesClusterVm(kubernetesCluster.getId(), vm.getId());
+ startKubernetesVM(vm);
+ vm = userVmDao.findById(vm.getId());
+ if (vm == null) {
+ throw new ManagementServerException(String.format("Failed to provision worker VM for Kubernetes cluster ID: %s" , kubernetesCluster.getUuid()));
+ }
+ nodes.add(vm);
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Provisioned node VM ID: %s in to the Kubernetes cluster ID: %s", vm.getUuid(), kubernetesCluster.getUuid()));
+ }
+ }
+ return nodes;
+ }
+
+ protected List<UserVm> provisionKubernetesClusterNodeVms(final long nodeCount, final String publicIpAddress) throws ManagementServerException,
+ ResourceUnavailableException, InsufficientCapacityException {
+ return provisionKubernetesClusterNodeVms(nodeCount, 0, publicIpAddress);
+ }
+
+ protected UserVm createKubernetesNode(String joinIp, int nodeInstance) throws ManagementServerException,
+ ResourceUnavailableException, InsufficientCapacityException {
+ UserVm nodeVm = null;
+ DataCenter zone = dataCenterDao.findById(kubernetesCluster.getZoneId());
+ ServiceOffering serviceOffering = serviceOfferingDao.findById(kubernetesCluster.getServiceOfferingId());
+ VirtualMachineTemplate template = templateDao.findById(kubernetesCluster.getTemplateId());
+ List<Long> networkIds = new ArrayList<Long>();
+ networkIds.add(kubernetesCluster.getNetworkId());
+ Account owner = accountDao.findById(kubernetesCluster.getAccountId());
+ Network.IpAddresses addrs = new Network.IpAddresses(null, null);
+ long rootDiskSize = kubernetesCluster.getNodeRootDiskSize();
+ Map<String, String> customParameterMap = new HashMap<String, String>();
+ if (rootDiskSize > 0) {
+ customParameterMap.put("rootdisksize", String.valueOf(rootDiskSize));
+ }
+ String hostName = getKubernetesClusterNodeAvailableName(String.format("%s-node-%s", kubernetesClusterNodeNamePrefix, nodeInstance));
+ String k8sNodeConfig = null;
+ try {
+ k8sNodeConfig = getKubernetesNodeConfig(joinIp, Hypervisor.HypervisorType.VMware.equals(template.getHypervisorType()));
+ } catch (IOException e) {
+ logAndThrow(Level.ERROR, "Failed to read Kubernetes node configuration file", e);
+ }
+ String base64UserData = Base64.encodeBase64String(k8sNodeConfig.getBytes(StringUtils.getPreferredCharset()));
+ nodeVm = userVmService.createAdvancedVirtualMachine(zone, serviceOffering, template, networkIds, owner,
+ hostName, hostName, null, null, null,
+ null, BaseCmd.HTTPMethod.POST, base64UserData, kubernetesCluster.getKeyPair(),
+ null, addrs, null, null, null, customParameterMap, null, null, null, null);
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Created node VM ID: %s, %s in the Kubernetes cluster ID: %s", nodeVm.getUuid(), hostName, kubernetesCluster.getUuid()));
+ }
+ return nodeVm;
+ }
+
+ protected IpAddress getSourceNatIp(Network network) {
+ List<? extends IpAddress> addresses = networkModel.listPublicIpsAssignedToGuestNtwk(network.getId(), true);
+ if (CollectionUtils.isEmpty(addresses)) {
+ return null;
+ }
+ for (IpAddress address : addresses) {
+ if (address.isSourceNat()) {
+ return address;
+ }
+ }
+ return null;
+ }
+
+ protected void provisionFirewallRules(final IpAddress publicIp, final Account account, int startPort, int endPort) throws NoSuchFieldException,
+ IllegalAccessException, ResourceUnavailableException, NetworkRuleConflictException {
+ List<String> sourceCidrList = new ArrayList<String>();
+ sourceCidrList.add("0.0.0.0/0");
+
+ CreateFirewallRuleCmd rule = new CreateFirewallRuleCmd();
+ rule = ComponentContext.inject(rule);
+
+ Field addressField = rule.getClass().getDeclaredField("ipAddressId");
+ addressField.setAccessible(true);
+ addressField.set(rule, publicIp.getId());
+
+ Field protocolField = rule.getClass().getDeclaredField("protocol");
+ protocolField.setAccessible(true);
+ protocolField.set(rule, "TCP");
+
+ Field startPortField = rule.getClass().getDeclaredField("publicStartPort");
+ startPortField.setAccessible(true);
+ startPortField.set(rule, startPort);
+
+ Field endPortField = rule.getClass().getDeclaredField("publicEndPort");
+ endPortField.setAccessible(true);
+ endPortField.set(rule, endPort);
+
+ Field cidrField = rule.getClass().getDeclaredField("cidrlist");
+ cidrField.setAccessible(true);
+ cidrField.set(rule, sourceCidrList);
+
+ firewallService.createIngressFirewallRule(rule);
+ firewallService.applyIngressFwRules(publicIp.getId(), account);
+ }
+
+ /**
+ * To provision SSH port forwarding rules for the given Kubernetes cluster
+ * for its given virtual machines
+ * @param publicIp
+ * @param network
+ * @param account
+ * @param List<Long> clusterVMIds (when empty then method must be called while
+ * down-scaling of the KubernetesCluster therefore no new rules
+ * to be added)
+ * @param firewallRuleSourcePortStart
+ * @throws ResourceUnavailableException
+ * @throws NetworkRuleConflictException
+ */
+ protected void provisionSshPortForwardingRules(IpAddress publicIp, Network network, Account account,
+ List<Long> clusterVMIds, int firewallRuleSourcePortStart) throws ResourceUnavailableException,
+ NetworkRuleConflictException {
+ if (!CollectionUtils.isEmpty(clusterVMIds)) {
+ final long publicIpId = publicIp.getId();
+ final long networkId = network.getId();
+ final long accountId = account.getId();
+ final long domainId = account.getDomainId();
+ for (int i = 0; i < clusterVMIds.size(); ++i) {
+ long vmId = clusterVMIds.get(i);
+ Nic vmNic = networkModel.getNicInNetwork(vmId, networkId);
+ final Ip vmIp = new Ip(vmNic.getIPv4Address());
+ final long vmIdFinal = vmId;
+ final int srcPortFinal = firewallRuleSourcePortStart + i;
+
+ PortForwardingRuleVO pfRule = Transaction.execute(new TransactionCallbackWithException<PortForwardingRuleVO, NetworkRuleConflictException>() {
+ @Override
+ public PortForwardingRuleVO doInTransaction(TransactionStatus status) throws NetworkRuleConflictException {
+ PortForwardingRuleVO newRule =
+ new PortForwardingRuleVO(null, publicIpId,
+ srcPortFinal, srcPortFinal,
+ vmIp,
+ 22, 22,
+ "tcp", networkId, accountId, domainId, vmIdFinal);
+ newRule.setDisplay(true);
+ newRule.setState(FirewallRule.State.Add);
+ newRule = portForwardingRulesDao.persist(newRule);
+ return newRule;
+ }
+ });
+ rulesService.applyPortForwardingRules(publicIp.getId(), account);
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Provisioned SSH port forwarding rule from port %d to 22 on %s to the VM IP : %s in Kubernetes cluster ID: %s", srcPortFinal, publicIp.getAddress().addr(), vmIp.toString(), kubernetesCluster.getUuid()));
+ }
+ }
+ }
+ }
+
+ protected FirewallRule removeApiFirewallRule(final IpAddress publicIp) {
+ FirewallRule rule = null;
+ List<FirewallRuleVO> firewallRules = firewallRulesDao.listByIpAndPurposeAndNotRevoked(publicIp.getId(), FirewallRule.Purpose.Firewall);
+ for (FirewallRuleVO firewallRule : firewallRules) {
+ if (firewallRule.getSourcePortStart() == CLUSTER_API_PORT &&
+ firewallRule.getSourcePortEnd() == CLUSTER_API_PORT) {
+ rule = firewallRule;
+ firewallService.revokeIngressFwRule(firewallRule.getId(), true);
+ break;
+ }
+ }
+ return rule;
+ }
+
+ protected FirewallRule removeSshFirewallRule(final IpAddress publicIp) {
+ FirewallRule rule = null;
+ List<FirewallRuleVO> firewallRules = firewallRulesDao.listByIpAndPurposeAndNotRevoked(publicIp.getId(), FirewallRule.Purpose.Firewall);
+ for (FirewallRuleVO firewallRule : firewallRules) {
+ if (firewallRule.getSourcePortStart() == CLUSTER_NODES_DEFAULT_START_SSH_PORT) {
+ rule = firewallRule;
+ firewallService.revokeIngressFwRule(firewallRule.getId(), true);
+ break;
+ }
+ }
+ return rule;
+ }
+
+ protected void removePortForwardingRules(final IpAddress publicIp, final Network network, final Account account, final List<Long> removedVMIds) throws ResourceUnavailableException {
+ if (!CollectionUtils.isEmpty(removedVMIds)) {
+ for (Long vmId : removedVMIds) {
+ List<PortForwardingRuleVO> pfRules = portForwardingRulesDao.listByNetwork(network.getId());
+ for (PortForwardingRuleVO pfRule : pfRules) {
+ if (pfRule.getVirtualMachineId() == vmId) {
+ portForwardingRulesDao.remove(pfRule.getId());
+ break;
+ }
+ }
+ }
+ rulesService.applyPortForwardingRules(publicIp.getId(), account);
+ }
+ }
+
+ protected void removeLoadBalancingRule(final IpAddress publicIp, final Network network,
+ final Account account, final int port) throws ResourceUnavailableException {
+ List<LoadBalancerVO> rules = loadBalancerDao.listByIpAddress(publicIp.getId());
+ for (LoadBalancerVO rule : rules) {
+ if (rule.getNetworkId() == network.getId() &&
+ rule.getAccountId() == account.getId() &&
+ rule.getSourcePortStart() == port &&
+ rule.getSourcePortEnd() == port) {
+ lbService.deleteLoadBalancerRule(rule.getId(), true);
+ break;
+ }
+ }
+ }
+
+ protected String getKubernetesClusterNodeNamePrefix() {
+ String prefix = kubernetesCluster.getName();
+ if (!NetUtils.verifyDomainNameLabel(prefix, true)) {
+ prefix = prefix.replaceAll("[^a-zA-Z0-9-]", "");
+ if (prefix.length() == 0) {
+ prefix = kubernetesCluster.getUuid();
+ }
+ prefix = "k8s-" + prefix;
+ }
+ if (prefix.length() > 40) {
+ prefix = prefix.substring(0, 40);
+ }
+ return prefix;
+ }
+
+ protected String getKubernetesClusterNodeAvailableName(final String hostName) {
+ String name = hostName;
+ int suffix = 1;
+ while (vmInstanceDao.findVMByHostName(name) != null) {
+ name = String.format("%s-%d", hostName, suffix);
+ suffix++;
+ }
+ return name;
+ }
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterScaleWorker.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterScaleWorker.java
new file mode 100644
index 0000000..0d6a028
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterScaleWorker.java
@@ -0,0 +1,431 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.kubernetes.cluster.actionworkers;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.context.CallContext;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.log4j.Level;
+
+import com.cloud.dc.DataCenter;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.ManagementServerException;
+import com.cloud.exception.NetworkRuleConflictException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.exception.VirtualMachineMigrationException;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.kubernetes.cluster.KubernetesCluster;
+import com.cloud.kubernetes.cluster.KubernetesClusterManagerImpl;
+import com.cloud.kubernetes.cluster.KubernetesClusterService;
+import com.cloud.kubernetes.cluster.KubernetesClusterVO;
+import com.cloud.kubernetes.cluster.KubernetesClusterVmMapVO;
+import com.cloud.kubernetes.cluster.utils.KubernetesClusterUtil;
+import com.cloud.network.IpAddress;
+import com.cloud.network.Network;
+import com.cloud.network.rules.FirewallRule;
+import com.cloud.offering.ServiceOffering;
+import com.cloud.uservm.UserVm;
+import com.cloud.utils.Pair;
+import com.cloud.utils.db.Transaction;
+import com.cloud.utils.db.TransactionCallback;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.ssh.SshHelper;
+import com.cloud.vm.UserVmVO;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.dao.VMInstanceDao;
+import com.google.common.base.Strings;
+
+public class KubernetesClusterScaleWorker extends KubernetesClusterResourceModifierActionWorker {
+
+ @Inject
+ protected VMInstanceDao vmInstanceDao;
+
+ private ServiceOffering serviceOffering;
+ private Long clusterSize;
+ private KubernetesCluster.State originalState;
+ private Network network;
+ private long scaleTimeoutTime;
+
+ public KubernetesClusterScaleWorker(final KubernetesCluster kubernetesCluster,
+ final ServiceOffering serviceOffering,
+ final Long clusterSize,
+ final KubernetesClusterManagerImpl clusterManager) {
+ super(kubernetesCluster, clusterManager);
+ this.serviceOffering = serviceOffering;
+ this.clusterSize = clusterSize;
+ this.originalState = kubernetesCluster.getState();
+ }
+
+ protected void init() {
+ super.init();
+ this.network = networkDao.findById(kubernetesCluster.getNetworkId());
+ }
+
+ private void logTransitStateToFailedIfNeededAndThrow(final Level logLevel, final String message, final Exception e) throws CloudRuntimeException {
+ KubernetesCluster cluster = kubernetesClusterDao.findById(kubernetesCluster.getId());
+ if (cluster != null && KubernetesCluster.State.Scaling.equals(cluster.getState())) {
+ logTransitStateAndThrow(logLevel, message, kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed, e);
+ } else {
+ logAndThrow(logLevel, message, e);
+ }
+ }
+
+ private void logTransitStateToFailedIfNeededAndThrow(final Level logLevel, final String message) throws CloudRuntimeException {
+ logTransitStateToFailedIfNeededAndThrow(logLevel, message, null);
+ }
+
+ /**
+ * Scale network rules for an existing Kubernetes cluster while scaling it
+ * Open up firewall for SSH access from port NODES_DEFAULT_START_SSH_PORT to NODES_DEFAULT_START_SSH_PORT+n.
+ * Also remove port forwarding rules for removed virtual machines and create port-forwarding rule
+ * to forward public IP traffic to all node VMs' private IP.
+ * @param clusterVMIds
+ * @param removedVMIds
+ * @throws ManagementServerException
+ */
+ private void scaleKubernetesClusterNetworkRules(final List<Long> clusterVMIds, final List<Long> removedVMIds) throws ManagementServerException {
+ if (!Network.GuestType.Isolated.equals(network.getGuestType())) {
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(String.format("Network ID: %s for Kubernetes cluster ID: %s is not an isolated network, therefore, no need for network rules", network.getUuid(), kubernetesCluster.getUuid()));
+ }
+ return;
+ }
+ IpAddress publicIp = getSourceNatIp(network);
+ if (publicIp == null) {
+ throw new ManagementServerException(String.format("No source NAT IP addresses found for network ID: %s, Kubernetes cluster ID: %s", network.getUuid(), kubernetesCluster.getUuid()));
+ }
+
+ // Remove existing SSH firewall rules
+ FirewallRule firewallRule = removeSshFirewallRule(publicIp);
+ if (firewallRule == null) {
+ throw new ManagementServerException("Firewall rule for node SSH access can't be provisioned");
+ }
+ int existingFirewallRuleSourcePortEnd = firewallRule.getSourcePortEnd();
+ final int scaledTotalNodeCount = clusterSize == null ? (int)kubernetesCluster.getTotalNodeCount() : (int)(clusterSize + kubernetesCluster.getMasterNodeCount());
+ // Provision new SSH firewall rules
+ try {
+ provisionFirewallRules(publicIp, owner, CLUSTER_NODES_DEFAULT_START_SSH_PORT, CLUSTER_NODES_DEFAULT_START_SSH_PORT + scaledTotalNodeCount - 1);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(String.format("Provisioned firewall rule to open up port %d to %d on %s in Kubernetes cluster ID: %s",
+ CLUSTER_NODES_DEFAULT_START_SSH_PORT, CLUSTER_NODES_DEFAULT_START_SSH_PORT + scaledTotalNodeCount - 1, publicIp.getAddress().addr(), kubernetesCluster.getUuid()));
+ }
+ } catch (NoSuchFieldException | IllegalAccessException | ResourceUnavailableException e) {
+ throw new ManagementServerException(String.format("Failed to activate SSH firewall rules for the Kubernetes cluster ID: %s", kubernetesCluster.getUuid()), e);
+ }
+
+ try {
+ removePortForwardingRules(publicIp, network, owner, removedVMIds);
+ } catch (ResourceUnavailableException e) {
+ throw new ManagementServerException(String.format("Failed to remove SSH port forwarding rules for removed VMs for the Kubernetes cluster ID: %s", kubernetesCluster.getUuid()), e);
+ }
+
+ try {
+ provisionSshPortForwardingRules(publicIp, network, owner, clusterVMIds, existingFirewallRuleSourcePortEnd + 1);
+ } catch (ResourceUnavailableException | NetworkRuleConflictException e) {
+ throw new ManagementServerException(String.format("Failed to activate SSH port forwarding rules for the Kubernetes cluster ID: %s", kubernetesCluster.getUuid()), e);
+ }
+ }
+
+ private KubernetesClusterVO updateKubernetesClusterEntry(final long cores, final long memory,
+ final Long size, final Long serviceOfferingId) {
+ return Transaction.execute((TransactionCallback<KubernetesClusterVO>) status -> {
+ KubernetesClusterVO updatedCluster = kubernetesClusterDao.createForUpdate(kubernetesCluster.getId());
+ updatedCluster.setCores(cores);
+ updatedCluster.setMemory(memory);
+ if (size != null) {
+ updatedCluster.setNodeCount(size);
+ }
+ if (serviceOfferingId != null) {
+ updatedCluster.setServiceOfferingId(serviceOfferingId);
+ }
+ kubernetesClusterDao.persist(updatedCluster);
+ return updatedCluster;
+ });
+ }
+
+ private KubernetesClusterVO updateKubernetesClusterEntry(final Long newSize, final ServiceOffering newServiceOffering) throws CloudRuntimeException {
+ final ServiceOffering serviceOffering = newServiceOffering == null ?
+ serviceOfferingDao.findById(kubernetesCluster.getServiceOfferingId()) : newServiceOffering;
+ final Long serviceOfferingId = newServiceOffering == null ? null : serviceOffering.getId();
+ final long size = newSize == null ? kubernetesCluster.getTotalNodeCount() : (newSize + kubernetesCluster.getMasterNodeCount());
+ final long cores = serviceOffering.getCpu() * size;
+ final long memory = serviceOffering.getRamSize() * size;
+ KubernetesClusterVO kubernetesClusterVO = updateKubernetesClusterEntry(cores, memory, newSize, serviceOfferingId);
+ if (kubernetesClusterVO == null) {
+ logTransitStateAndThrow(Level.ERROR, String.format("Scaling Kubernetes cluster ID: %s failed, unable to update Kubernetes cluster",
+ kubernetesCluster.getUuid()), kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
+ }
+ return kubernetesClusterVO;
+ }
+
+ private boolean removeKubernetesClusterNode(final String ipAddress, final int port, final UserVm userVm, final int retries, final int waitDuration) {
+ File pkFile = getManagementServerSshPublicKeyFile();
+ int retryCounter = 0;
+ String hostName = userVm.getHostName();
+ if (!Strings.isNullOrEmpty(hostName)) {
+ hostName = hostName.toLowerCase();
+ }
+ while (retryCounter < retries) {
+ retryCounter++;
+ try {
+ Pair<Boolean, String> result = SshHelper.sshExecute(ipAddress, port, CLUSTER_NODE_VM_USER,
+ pkFile, null, String.format("sudo kubectl drain %s --ignore-daemonsets --delete-local-data", hostName),
+ 10000, 10000, 60000);
+ if (!result.first()) {
+ LOGGER.warn(String.format("Draining node: %s on VM ID: %s in Kubernetes cluster ID: %s unsuccessful", hostName, userVm.getUuid(), kubernetesCluster.getUuid()));
+ } else {
+ result = SshHelper.sshExecute(ipAddress, port, CLUSTER_NODE_VM_USER,
+ pkFile, null, String.format("sudo kubectl delete node %s", hostName),
+ 10000, 10000, 30000);
+ if (result.first()) {
+ return true;
+ } else {
+ LOGGER.warn(String.format("Deleting node: %s on VM ID: %s in Kubernetes cluster ID: %s unsuccessful", hostName, userVm.getUuid(), kubernetesCluster.getUuid()));
+ }
+ }
+ break;
+ } catch (Exception e) {
+ String msg = String.format("Failed to remove Kubernetes cluster ID: %s node: %s on VM ID: %s", kubernetesCluster.getUuid(), hostName, userVm.getUuid());
+ LOGGER.warn(msg, e);
+ }
+ try {
+ Thread.sleep(waitDuration);
+ } catch (InterruptedException ie) {
+ LOGGER.error(String.format("Error while waiting for Kubernetes cluster ID: %s node: %s on VM ID: %s removal", kubernetesCluster.getUuid(), hostName, userVm.getUuid()), ie);
+ }
+ retryCounter++;
+ }
+ return false;
+ }
+
+ private void validateKubernetesClusterScaleOfferingParameters() throws CloudRuntimeException {
+ if (KubernetesCluster.State.Created.equals(originalState)) {
+ return;
+ }
+ final long originalNodeCount = kubernetesCluster.getTotalNodeCount();
+ List<KubernetesClusterVmMapVO> vmList = kubernetesClusterVmMapDao.listByClusterId(kubernetesCluster.getId());
+ if (vmList == null || vmList.isEmpty() || vmList.size() < originalNodeCount) {
+ logTransitStateToFailedIfNeededAndThrow(Level.WARN, String.format("Scaling Kubernetes cluster ID: %s failed, it is in unstable state as not enough existing VM instances found!", kubernetesCluster.getUuid()));
+ } else {
+ for (KubernetesClusterVmMapVO vmMapVO : vmList) {
+ VMInstanceVO vmInstance = vmInstanceDao.findById(vmMapVO.getVmId());
+ if (vmInstance != null && vmInstance.getState().equals(VirtualMachine.State.Running) &&
+ vmInstance.getHypervisorType() != Hypervisor.HypervisorType.XenServer &&
+ vmInstance.getHypervisorType() != Hypervisor.HypervisorType.VMware &&
+ vmInstance.getHypervisorType() != Hypervisor.HypervisorType.Simulator) {
+ logTransitStateToFailedIfNeededAndThrow(Level.WARN, String.format("Scaling Kubernetes cluster ID: %s failed, scaling Kubernetes cluster with running VMs on hypervisor %s is not supported!", kubernetesCluster.getUuid(), vmInstance.getHypervisorType()));
+ }
+ }
+ }
+ }
+
+ private void validateKubernetesClusterScaleSizeParameters() throws CloudRuntimeException {
+ final long originalClusterSize = kubernetesCluster.getNodeCount();
+ if (network == null) {
+ logTransitStateToFailedIfNeededAndThrow(Level.WARN, String.format("Scaling failed for Kubernetes cluster ID: %s, cluster network not found", kubernetesCluster.getUuid()));
+ }
+ // Check capacity and transition state
+ final long newVmRequiredCount = clusterSize - originalClusterSize;
+ final ServiceOffering clusterServiceOffering = serviceOfferingDao.findById(kubernetesCluster.getServiceOfferingId());
+ if (clusterServiceOffering == null) {
+ logTransitStateToFailedIfNeededAndThrow(Level.WARN, String.format("Scaling failed for Kubernetes cluster ID: %s, cluster service offering not found", kubernetesCluster.getUuid()));
+ }
+ if (newVmRequiredCount > 0) {
+ final DataCenter zone = dataCenterDao.findById(kubernetesCluster.getZoneId());
+ try {
+ if (originalState.equals(KubernetesCluster.State.Running)) {
+ plan(newVmRequiredCount, zone, clusterServiceOffering);
+ } else {
+ plan(kubernetesCluster.getTotalNodeCount() + newVmRequiredCount, zone, clusterServiceOffering);
+ }
+ } catch (InsufficientCapacityException e) {
+ logTransitStateToFailedIfNeededAndThrow(Level.WARN, String.format("Scaling failed for Kubernetes cluster ID: %s in zone ID: %s, insufficient capacity", kubernetesCluster.getUuid(), zone.getUuid()));
+ }
+ }
+ List<KubernetesClusterVmMapVO> vmList = kubernetesClusterVmMapDao.listByClusterId(kubernetesCluster.getId());
+ if (CollectionUtils.isEmpty(vmList) || vmList.size() < kubernetesCluster.getTotalNodeCount()) {
+ logTransitStateToFailedIfNeededAndThrow(Level.ERROR, String.format("Scaling failed for Kubernetes cluster ID: %s, it is in unstable state as not enough existing VM instances found", kubernetesCluster.getUuid()));
+ }
+ }
+
+ private void scaleKubernetesClusterOffering() throws CloudRuntimeException {
+ validateKubernetesClusterScaleOfferingParameters();
+ if (!kubernetesCluster.getState().equals(KubernetesCluster.State.Scaling)) {
+ stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.ScaleUpRequested);
+ }
+ if (KubernetesCluster.State.Created.equals(originalState)) {
+ kubernetesCluster = updateKubernetesClusterEntry(null, serviceOffering);
+ return;
+ }
+ final long size = kubernetesCluster.getTotalNodeCount();
+ List<KubernetesClusterVmMapVO> vmList = kubernetesClusterVmMapDao.listByClusterId(kubernetesCluster.getId());
+ final long tobeScaledVMCount = Math.min(vmList.size(), size);
+ for (long i = 0; i < tobeScaledVMCount; i++) {
+ KubernetesClusterVmMapVO vmMapVO = vmList.get((int) i);
+ UserVmVO userVM = userVmDao.findById(vmMapVO.getVmId());
+ boolean result = false;
+ try {
+ result = userVmManager.upgradeVirtualMachine(userVM.getId(), serviceOffering.getId(), new HashMap<String, String>());
+ } catch (ResourceUnavailableException | ManagementServerException | ConcurrentOperationException | VirtualMachineMigrationException e) {
+ logTransitStateAndThrow(Level.ERROR, String.format("Scaling Kubernetes cluster ID: %s failed, unable to scale cluster VM ID: %s", kubernetesCluster.getUuid(), userVM.getUuid()), kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed, e);
+ }
+ if (!result) {
+ logTransitStateAndThrow(Level.WARN, String.format("Scaling Kubernetes cluster ID: %s failed, unable to scale cluster VM ID: %s", kubernetesCluster.getUuid(), userVM.getUuid()),kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
+ }
+ if (System.currentTimeMillis() > scaleTimeoutTime) {
+ logTransitStateAndThrow(Level.WARN, String.format("Scaling Kubernetes cluster ID: %s failed, scaling action timed out", kubernetesCluster.getUuid()),kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
+ }
+ }
+ kubernetesCluster = updateKubernetesClusterEntry(null, serviceOffering);
+ }
+
+ private void scaleDownKubernetesClusterSize() throws CloudRuntimeException {
+ if (!kubernetesCluster.getState().equals(KubernetesCluster.State.Scaling)) {
+ stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.ScaleDownRequested);
+ }
+ final List<KubernetesClusterVmMapVO> originalVmList = getKubernetesClusterVMMaps();
+ int i = originalVmList.size() - 1;
+ List<Long> removedVmIds = new ArrayList<>();
+ while (i >= kubernetesCluster.getMasterNodeCount() + clusterSize) {
+ KubernetesClusterVmMapVO vmMapVO = originalVmList.get(i);
+ UserVmVO userVM = userVmDao.findById(vmMapVO.getVmId());
+ if (!removeKubernetesClusterNode(publicIpAddress, sshPort, userVM, 3, 30000)) {
+ logTransitStateAndThrow(Level.ERROR, String.format("Scaling failed for Kubernetes cluster ID: %s, failed to remove Kubernetes node: %s running on VM ID: %s", kubernetesCluster.getUuid(), userVM.getHostName(), userVM.getUuid()), kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
+ }
+ // For removing port-forwarding network rules
+ removedVmIds.add(userVM.getId());
+ try {
+ UserVm vm = userVmService.destroyVm(userVM.getId(), true);
+ if (!userVmManager.expunge(userVM, CallContext.current().getCallingUserId(), CallContext.current().getCallingAccount())) {
+ logTransitStateAndThrow(Level.ERROR, String.format("Scaling Kubernetes cluster ID: %s failed, unable to expunge VM '%s'."
+ , kubernetesCluster.getUuid()
+ , vm.getInstanceName()),
+ kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
+ }
+ } catch (ResourceUnavailableException e) {
+ logTransitStateAndThrow(Level.ERROR, String.format("Scaling Kubernetes cluster ID: %s failed, unable to remove VM ID: %s"
+ , kubernetesCluster.getUuid() , userVM.getUuid()), kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed, e);
+ }
+ kubernetesClusterVmMapDao.expunge(vmMapVO.getId());
+ if (System.currentTimeMillis() > scaleTimeoutTime) {
+ logTransitStateAndThrow(Level.WARN, String.format("Scaling Kubernetes cluster ID: %s failed, scaling action timed out", kubernetesCluster.getUuid()),kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
+ }
+ i--;
+ }
+ // Scale network rules to update firewall rule
+ try {
+ scaleKubernetesClusterNetworkRules(null, removedVmIds);
+ } catch (ManagementServerException e) {
+ logTransitStateAndThrow(Level.ERROR, String.format("Scaling failed for Kubernetes cluster ID: %s, unable to update network rules", kubernetesCluster.getUuid()), kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed, e);
+ }
+ }
+
+ private void scaleUpKubernetesClusterSize(final long newVmCount) throws CloudRuntimeException {
+ if (!kubernetesCluster.getState().equals(KubernetesCluster.State.Scaling)) {
+ stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.ScaleUpRequested);
+ }
+ List<UserVm> clusterVMs = new ArrayList<>();
+ List<Long> clusterVMIds = new ArrayList<>();
+ try {
+ clusterVMs = provisionKubernetesClusterNodeVms((int)(newVmCount + kubernetesCluster.getNodeCount()), (int)kubernetesCluster.getNodeCount(), publicIpAddress);
+ } catch (CloudRuntimeException | ManagementServerException | ResourceUnavailableException | InsufficientCapacityException e) {
+ logTransitStateToFailedIfNeededAndThrow(Level.ERROR, String.format("Scaling failed for Kubernetes cluster ID: %s, unable to provision node VM in the cluster", kubernetesCluster.getUuid()), e);
+ }
+ attachIsoKubernetesVMs(clusterVMs);
+ for (UserVm vm : clusterVMs) {
+ clusterVMIds.add(vm.getId());
+ }
+ try {
+ scaleKubernetesClusterNetworkRules(clusterVMIds, null);
+ } catch (ManagementServerException e) {
+ logTransitStateToFailedIfNeededAndThrow(Level.ERROR, String.format("Scaling failed for Kubernetes cluster ID: %s, unable to update network rules", kubernetesCluster.getUuid()), e);
+ }
+ KubernetesClusterVO kubernetesClusterVO = kubernetesClusterDao.findById(kubernetesCluster.getId());
+ kubernetesClusterVO.setNodeCount(clusterSize);
+ boolean readyNodesCountValid = KubernetesClusterUtil.validateKubernetesClusterReadyNodesCount(kubernetesClusterVO, publicIpAddress, sshPort,
+ CLUSTER_NODE_VM_USER, sshKeyFile, scaleTimeoutTime, 15000);
+ detachIsoKubernetesVMs(clusterVMs);
+ if (!readyNodesCountValid) { // Scaling failed
+ logTransitStateToFailedIfNeededAndThrow(Level.ERROR, String.format("Scaling unsuccessful for Kubernetes cluster ID: %s as it does not have desired number of nodes in ready state", kubernetesCluster.getUuid()));
+ }
+ }
+
+ private void scaleKubernetesClusterSize() throws CloudRuntimeException {
+ validateKubernetesClusterScaleSizeParameters();
+ final long originalClusterSize = kubernetesCluster.getNodeCount();
+ final long newVmRequiredCount = clusterSize - originalClusterSize;
+ if (KubernetesCluster.State.Created.equals(originalState)) {
+ if (!kubernetesCluster.getState().equals(KubernetesCluster.State.Scaling)) {
+ stateTransitTo(kubernetesCluster.getId(), newVmRequiredCount > 0 ? KubernetesCluster.Event.ScaleUpRequested : KubernetesCluster.Event.ScaleDownRequested);
+ }
+ kubernetesCluster = updateKubernetesClusterEntry(null, serviceOffering);
+ return;
+ }
+ Pair<String, Integer> publicIpSshPort = getKubernetesClusterServerIpSshPort(null);
+ publicIpAddress = publicIpSshPort.first();
+ sshPort = publicIpSshPort.second();
+ if (Strings.isNullOrEmpty(publicIpAddress)) {
+ logTransitStateToFailedIfNeededAndThrow(Level.ERROR, String.format("Scaling failed for Kubernetes cluster ID: %s, unable to retrieve associated public IP", kubernetesCluster.getUuid()));
+ }
+ if (newVmRequiredCount < 0) { // downscale
+ scaleDownKubernetesClusterSize();
+ } else { // upscale, same node count handled above
+ scaleUpKubernetesClusterSize(newVmRequiredCount);
+ }
+ kubernetesCluster = updateKubernetesClusterEntry(clusterSize, null);
+ }
+
+ public boolean scaleCluster() throws CloudRuntimeException {
+ init();
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Scaling Kubernetes cluster ID: %s", kubernetesCluster.getUuid()));
+ }
+ scaleTimeoutTime = System.currentTimeMillis() + KubernetesClusterService.KubernetesClusterScaleTimeout.value() * 1000;
+ final long originalClusterSize = kubernetesCluster.getNodeCount();
+ final ServiceOffering existingServiceOffering = serviceOfferingDao.findById(kubernetesCluster.getServiceOfferingId());
+ if (existingServiceOffering == null) {
+ logAndThrow(Level.ERROR, String.format("Scaling Kubernetes cluster ID: %s failed, service offering for the Kubernetes cluster not found!", kubernetesCluster.getUuid()));
+ }
+ final boolean serviceOfferingScalingNeeded = serviceOffering != null && serviceOffering.getId() != existingServiceOffering.getId();
+ final boolean clusterSizeScalingNeeded = clusterSize != null && clusterSize != originalClusterSize;
+ final long newVMRequired = clusterSize == null ? 0 : clusterSize - originalClusterSize;
+ if (serviceOfferingScalingNeeded && clusterSizeScalingNeeded) {
+ if (newVMRequired > 0) {
+ scaleKubernetesClusterOffering();
+ scaleKubernetesClusterSize();
+ } else {
+ scaleKubernetesClusterSize();
+ scaleKubernetesClusterOffering();
+ }
+ } else if (serviceOfferingScalingNeeded) {
+ scaleKubernetesClusterOffering();
+ } else if (clusterSizeScalingNeeded) {
+ scaleKubernetesClusterSize();
+ }
+ stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.OperationSucceeded);
+ return true;
+ }
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java
new file mode 100644
index 0000000..d452563
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java
@@ -0,0 +1,640 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.kubernetes.cluster.actionworkers;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.framework.ca.Certificate;
+import org.apache.cloudstack.utils.security.CertUtils;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.log4j.Level;
+
+import com.cloud.dc.DataCenter;
+import com.cloud.dc.Vlan;
+import com.cloud.dc.VlanVO;
+import com.cloud.deploy.DeployDestination;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientAddressCapacityException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.ManagementServerException;
+import com.cloud.exception.NetworkRuleConflictException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.kubernetes.cluster.KubernetesCluster;
+import com.cloud.kubernetes.cluster.KubernetesClusterDetailsVO;
+import com.cloud.kubernetes.cluster.KubernetesClusterManagerImpl;
+import com.cloud.kubernetes.cluster.KubernetesClusterService;
+import com.cloud.kubernetes.cluster.KubernetesClusterVO;
+import com.cloud.kubernetes.cluster.KubernetesClusterVmMapVO;
+import com.cloud.kubernetes.cluster.utils.KubernetesClusterUtil;
+import com.cloud.kubernetes.version.KubernetesSupportedVersion;
+import com.cloud.kubernetes.version.KubernetesVersionManagerImpl;
+import com.cloud.network.IpAddress;
+import com.cloud.network.Network;
+import com.cloud.network.addr.PublicIp;
+import com.cloud.network.rules.LoadBalancer;
+import com.cloud.offering.ServiceOffering;
+import com.cloud.template.VirtualMachineTemplate;
+import com.cloud.user.Account;
+import com.cloud.user.SSHKeyPairVO;
+import com.cloud.uservm.UserVm;
+import com.cloud.utils.Pair;
+import com.cloud.utils.StringUtils;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.net.Ip;
+import com.cloud.utils.net.NetUtils;
+import com.cloud.vm.Nic;
+import com.cloud.vm.ReservationContext;
+import com.cloud.vm.ReservationContextImpl;
+import com.cloud.vm.VirtualMachine;
+import com.google.common.base.Strings;
+
+public class KubernetesClusterStartWorker extends KubernetesClusterResourceModifierActionWorker {
+
+ public KubernetesClusterStartWorker(final KubernetesCluster kubernetesCluster, final KubernetesClusterManagerImpl clusterManager) {
+ super(kubernetesCluster, clusterManager);
+ }
+
+ private Pair<String, Map<Long, Network.IpAddresses>> getKubernetesMasterIpAddresses(final DataCenter zone, final Network network, final Account account) throws InsufficientAddressCapacityException {
+ String masterIp = null;
+ Map<Long, Network.IpAddresses> requestedIps = null;
+ if (Network.GuestType.Shared.equals(network.getGuestType())) {
+ List<Long> vlanIds = new ArrayList<>();
+ List<VlanVO> vlans = vlanDao.listVlansByNetworkId(network.getId());
+ for (VlanVO vlan : vlans) {
+ vlanIds.add(vlan.getId());
+ }
+ PublicIp ip = ipAddressManager.getAvailablePublicIpAddressFromVlans(zone.getId(), null, account, Vlan.VlanType.DirectAttached, vlanIds,network.getId(), null, false);
+ if (ip != null) {
+ masterIp = ip.getAddress().toString();
+ }
+ requestedIps = new HashMap<>();
+ Ip ipAddress = ip.getAddress();
+ boolean isIp6 = ipAddress.isIp6();
+ requestedIps.put(network.getId(), new Network.IpAddresses(ipAddress.isIp4() ? ip.getAddress().addr() : null, null));
+ } else {
+ masterIp = ipAddressManager.acquireGuestIpAddress(networkDao.findById(kubernetesCluster.getNetworkId()), null);
+ }
+ return new Pair<>(masterIp, requestedIps);
+ }
+
+ private boolean isKubernetesVersionSupportsHA() {
+ boolean haSupported = false;
+ final KubernetesSupportedVersion version = kubernetesSupportedVersionDao.findById(kubernetesCluster.getKubernetesVersionId());
+ if (version != null) {
+ try {
+ if (KubernetesVersionManagerImpl.compareSemanticVersions(version.getSemanticVersion(), KubernetesClusterService.MIN_KUBERNETES_VERSION_HA_SUPPORT) >= 0) {
+ haSupported = true;
+ }
+ } catch (IllegalArgumentException e) {
+ LOGGER.error(String.format("Unable to compare Kubernetes version for cluster version ID: %s with %s", version.getUuid(), KubernetesClusterService.MIN_KUBERNETES_VERSION_HA_SUPPORT), e);
+ }
+ }
+ return haSupported;
+ }
+
+ private String getKubernetesMasterConfig(final String masterIp, final String serverIp,
+ final String hostName, final boolean haSupported,
+ final boolean ejectIso) throws IOException {
+ String k8sMasterConfig = readResourceFile("/conf/k8s-master.yml");
+ final String apiServerCert = "{{ k8s_master.apiserver.crt }}";
+ final String apiServerKey = "{{ k8s_master.apiserver.key }}";
+ final String caCert = "{{ k8s_master.ca.crt }}";
+ final String sshPubKey = "{{ k8s.ssh.pub.key }}";
+ final String clusterToken = "{{ k8s_master.cluster.token }}";
+ final String clusterInitArgsKey = "{{ k8s_master.cluster.initargs }}";
+ final String ejectIsoKey = "{{ k8s.eject.iso }}";
+ final List<String> addresses = new ArrayList<>();
+ addresses.add(masterIp);
+ if (!serverIp.equals(masterIp)) {
+ addresses.add(serverIp);
+ }
+ final Certificate certificate = caManager.issueCertificate(null, Arrays.asList(hostName, "kubernetes",
+ "kubernetes.default", "kubernetes.default.svc", "kubernetes.default.svc.cluster", "kubernetes.default.svc.cluster.local"),
+ addresses, 3650, null);
+ final String tlsClientCert = CertUtils.x509CertificateToPem(certificate.getClientCertificate());
+ final String tlsPrivateKey = CertUtils.privateKeyToPem(certificate.getPrivateKey());
+ final String tlsCaCert = CertUtils.x509CertificatesToPem(certificate.getCaCertificates());
+ k8sMasterConfig = k8sMasterConfig.replace(apiServerCert, tlsClientCert.replace("\n", "\n "));
+ k8sMasterConfig = k8sMasterConfig.replace(apiServerKey, tlsPrivateKey.replace("\n", "\n "));
+ k8sMasterConfig = k8sMasterConfig.replace(caCert, tlsCaCert.replace("\n", "\n "));
+ String pubKey = "- \"" + configurationDao.getValue("ssh.publickey") + "\"";
+ String sshKeyPair = kubernetesCluster.getKeyPair();
+ if (!Strings.isNullOrEmpty(sshKeyPair)) {
+ SSHKeyPairVO sshkp = sshKeyPairDao.findByName(owner.getAccountId(), owner.getDomainId(), sshKeyPair);
+ if (sshkp != null) {
+ pubKey += "\n - \"" + sshkp.getPublicKey() + "\"";
+ }
+ }
+ k8sMasterConfig = k8sMasterConfig.replace(sshPubKey, pubKey);
+ k8sMasterConfig = k8sMasterConfig.replace(clusterToken, KubernetesClusterUtil.generateClusterToken(kubernetesCluster));
+ String initArgs = "";
+ if (haSupported) {
+ initArgs = String.format("--control-plane-endpoint %s:%d --upload-certs --certificate-key %s ",
+ serverIp,
+ CLUSTER_API_PORT,
+ KubernetesClusterUtil.generateClusterHACertificateKey(kubernetesCluster));
+ }
+ initArgs += String.format("--apiserver-cert-extra-sans=%s", serverIp);
+ k8sMasterConfig = k8sMasterConfig.replace(clusterInitArgsKey, initArgs);
+ k8sMasterConfig = k8sMasterConfig.replace(ejectIsoKey, String.valueOf(ejectIso));
+ return k8sMasterConfig;
+ }
+
+ private UserVm createKubernetesMaster(final Network network, String serverIp) throws ManagementServerException,
+ ResourceUnavailableException, InsufficientCapacityException {
+ UserVm masterVm = null;
+ DataCenter zone = dataCenterDao.findById(kubernetesCluster.getZoneId());
+ ServiceOffering serviceOffering = serviceOfferingDao.findById(kubernetesCluster.getServiceOfferingId());
+ VirtualMachineTemplate template = templateDao.findById(kubernetesCluster.getTemplateId());
+ List<Long> networkIds = new ArrayList<Long>();
+ networkIds.add(kubernetesCluster.getNetworkId());
+ Pair<String, Map<Long, Network.IpAddresses>> ipAddresses = getKubernetesMasterIpAddresses(zone, network, owner);
+ String masterIp = ipAddresses.first();
+ Map<Long, Network.IpAddresses> requestedIps = ipAddresses.second();
+ if (Network.GuestType.Shared.equals(network.getGuestType()) && Strings.isNullOrEmpty(serverIp)) {
+ serverIp = masterIp;
+ }
+ Network.IpAddresses addrs = new Network.IpAddresses(masterIp, null);
+ long rootDiskSize = kubernetesCluster.getNodeRootDiskSize();
+ Map<String, String> customParameterMap = new HashMap<String, String>();
+ if (rootDiskSize > 0) {
+ customParameterMap.put("rootdisksize", String.valueOf(rootDiskSize));
+ }
+ String hostName = kubernetesClusterNodeNamePrefix + "-master";
+ if (kubernetesCluster.getMasterNodeCount() > 1) {
+ hostName += "-1";
+ }
+ hostName = getKubernetesClusterNodeAvailableName(hostName);
+ boolean haSupported = isKubernetesVersionSupportsHA();
+ String k8sMasterConfig = null;
+ try {
+ k8sMasterConfig = getKubernetesMasterConfig(masterIp, serverIp, hostName, haSupported, Hypervisor.HypervisorType.VMware.equals(template.getHypervisorType()));
+ } catch (IOException e) {
+ logAndThrow(Level.ERROR, "Failed to read Kubernetes master configuration file", e);
+ }
+ String base64UserData = Base64.encodeBase64String(k8sMasterConfig.getBytes(StringUtils.getPreferredCharset()));
+ masterVm = userVmService.createAdvancedVirtualMachine(zone, serviceOffering, template, networkIds, owner,
+ hostName, hostName, null, null, null,
+ null, BaseCmd.HTTPMethod.POST, base64UserData, kubernetesCluster.getKeyPair(),
+ requestedIps, addrs, null, null, null, customParameterMap, null, null, null, null);
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Created master VM ID: %s, %s in the Kubernetes cluster ID: %s", masterVm.getUuid(), hostName, kubernetesCluster.getUuid()));
+ }
+ return masterVm;
+ }
+
+ private String getKubernetesAdditionalMasterConfig(final String joinIp, final boolean ejectIso) throws IOException {
+ String k8sMasterConfig = readResourceFile("/conf/k8s-master-add.yml");
+ final String joinIpKey = "{{ k8s_master.join_ip }}";
+ final String clusterTokenKey = "{{ k8s_master.cluster.token }}";
+ final String sshPubKey = "{{ k8s.ssh.pub.key }}";
+ final String clusterHACertificateKey = "{{ k8s_master.cluster.ha.certificate.key }}";
+ final String ejectIsoKey = "{{ k8s.eject.iso }}";
+ String pubKey = "- \"" + configurationDao.getValue("ssh.publickey") + "\"";
+ String sshKeyPair = kubernetesCluster.getKeyPair();
+ if (!Strings.isNullOrEmpty(sshKeyPair)) {
+ SSHKeyPairVO sshkp = sshKeyPairDao.findByName(owner.getAccountId(), owner.getDomainId(), sshKeyPair);
+ if (sshkp != null) {
+ pubKey += "\n - \"" + sshkp.getPublicKey() + "\"";
+ }
+ }
+ k8sMasterConfig = k8sMasterConfig.replace(sshPubKey, pubKey);
+ k8sMasterConfig = k8sMasterConfig.replace(joinIpKey, joinIp);
+ k8sMasterConfig = k8sMasterConfig.replace(clusterTokenKey, KubernetesClusterUtil.generateClusterToken(kubernetesCluster));
+ k8sMasterConfig = k8sMasterConfig.replace(clusterHACertificateKey, KubernetesClusterUtil.generateClusterHACertificateKey(kubernetesCluster));
+ k8sMasterConfig = k8sMasterConfig.replace(ejectIsoKey, String.valueOf(ejectIso));
+ return k8sMasterConfig;
+ }
+
+ private UserVm createKubernetesAdditionalMaster(final String joinIp, final int additionalMasterNodeInstance) throws ManagementServerException,
+ ResourceUnavailableException, InsufficientCapacityException {
+ UserVm additionalMasterVm = null;
+ DataCenter zone = dataCenterDao.findById(kubernetesCluster.getZoneId());
+ ServiceOffering serviceOffering = serviceOfferingDao.findById(kubernetesCluster.getServiceOfferingId());
+ VirtualMachineTemplate template = templateDao.findById(kubernetesCluster.getTemplateId());
+ List<Long> networkIds = new ArrayList<Long>();
+ networkIds.add(kubernetesCluster.getNetworkId());
+ Network.IpAddresses addrs = new Network.IpAddresses(null, null);
+ long rootDiskSize = kubernetesCluster.getNodeRootDiskSize();
+ Map<String, String> customParameterMap = new HashMap<String, String>();
+ if (rootDiskSize > 0) {
+ customParameterMap.put("rootdisksize", String.valueOf(rootDiskSize));
+ }
+ String hostName = getKubernetesClusterNodeAvailableName(String.format("%s-master-%d", kubernetesClusterNodeNamePrefix, additionalMasterNodeInstance + 1));
+ String k8sMasterConfig = null;
+ try {
+ k8sMasterConfig = getKubernetesAdditionalMasterConfig(joinIp, Hypervisor.HypervisorType.VMware.equals(template.getHypervisorType()));
+ } catch (IOException e) {
+ logAndThrow(Level.ERROR, "Failed to read Kubernetes master configuration file", e);
+ }
+ String base64UserData = Base64.encodeBase64String(k8sMasterConfig.getBytes(StringUtils.getPreferredCharset()));
+ additionalMasterVm = userVmService.createAdvancedVirtualMachine(zone, serviceOffering, template, networkIds, owner,
+ hostName, hostName, null, null, null,
+ null, BaseCmd.HTTPMethod.POST, base64UserData, kubernetesCluster.getKeyPair(),
+ null, addrs, null, null, null, customParameterMap, null, null, null, null);
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Created master VM ID: %s, %s in the Kubernetes cluster ID: %s", additionalMasterVm.getUuid(), hostName, kubernetesCluster.getUuid()));
+ }
+ return additionalMasterVm;
+ }
+
+ private UserVm provisionKubernetesClusterMasterVm(final Network network, final String publicIpAddress) throws
+ ManagementServerException, InsufficientCapacityException, ResourceUnavailableException {
+ UserVm k8sMasterVM = null;
+ k8sMasterVM = createKubernetesMaster(network, publicIpAddress);
+ addKubernetesClusterVm(kubernetesCluster.getId(), k8sMasterVM.getId());
+ startKubernetesVM(k8sMasterVM);
+ k8sMasterVM = userVmDao.findById(k8sMasterVM.getId());
+ if (k8sMasterVM == null) {
+ throw new ManagementServerException(String.format("Failed to provision master VM for Kubernetes cluster ID: %s" , kubernetesCluster.getUuid()));
+ }
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Provisioned the master VM ID: %s in to the Kubernetes cluster ID: %s", k8sMasterVM.getUuid(), kubernetesCluster.getUuid()));
+ }
+ return k8sMasterVM;
+ }
+
+ private List<UserVm> provisionKubernetesClusterAdditionalMasterVms(final String publicIpAddress) throws
+ InsufficientCapacityException, ManagementServerException, ResourceUnavailableException {
+ List<UserVm> additionalMasters = new ArrayList<>();
+ if (kubernetesCluster.getMasterNodeCount() > 1) {
+ for (int i = 1; i < kubernetesCluster.getMasterNodeCount(); i++) {
+ UserVm vm = null;
+ vm = createKubernetesAdditionalMaster(publicIpAddress, i);
+ addKubernetesClusterVm(kubernetesCluster.getId(), vm.getId());
+ startKubernetesVM(vm);
+ vm = userVmDao.findById(vm.getId());
+ if (vm == null) {
+ throw new ManagementServerException(String.format("Failed to provision additional master VM for Kubernetes cluster ID: %s" , kubernetesCluster.getUuid()));
+ }
+ additionalMasters.add(vm);
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Provisioned additional master VM ID: %s in to the Kubernetes cluster ID: %s", vm.getUuid(), kubernetesCluster.getUuid()));
+ }
+ }
+ }
+ return additionalMasters;
+ }
+
+ private Network startKubernetesClusterNetwork(final DeployDestination destination) throws ManagementServerException {
+ final ReservationContext context = new ReservationContextImpl(null, null, null, owner);
+ Network network = networkDao.findById(kubernetesCluster.getNetworkId());
+ if (network == null) {
+ String msg = String.format("Network for Kubernetes cluster ID: %s not found", kubernetesCluster.getUuid());
+ LOGGER.warn(msg);
+ stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.CreateFailed);
+ throw new ManagementServerException(msg);
+ }
+ try {
+ networkMgr.startNetwork(network.getId(), destination, context);
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Network ID: %s is started for the Kubernetes cluster ID: %s", network.getUuid(), kubernetesCluster.getUuid()));
+ }
+ } catch (ConcurrentOperationException | ResourceUnavailableException |InsufficientCapacityException e) {
+ String msg = String.format("Failed to start Kubernetes cluster ID: %s as unable to start associated network ID: %s" , kubernetesCluster.getUuid(), network.getUuid());
+ LOGGER.error(msg, e);
+ stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.CreateFailed);
+ throw new ManagementServerException(msg, e);
+ }
+ return network;
+ }
+
+ private void provisionLoadBalancerRule(final IpAddress publicIp, final Network network,
+ final Account account, final List<Long> clusterVMIds, final int port) throws NetworkRuleConflictException,
+ InsufficientAddressCapacityException {
+ LoadBalancer lb = lbService.createPublicLoadBalancerRule(null, "api-lb", "LB rule for API access",
+ port, port, port, port,
+ publicIp.getId(), NetUtils.TCP_PROTO, "roundrobin", network.getId(),
+ account.getId(), false, NetUtils.TCP_PROTO, true);
+
+ Map<Long, List<String>> vmIdIpMap = new HashMap<>();
+ for (int i = 0; i < kubernetesCluster.getMasterNodeCount(); ++i) {
+ List<String> ips = new ArrayList<>();
+ Nic masterVmNic = networkModel.getNicInNetwork(clusterVMIds.get(i), kubernetesCluster.getNetworkId());
+ ips.add(masterVmNic.getIPv4Address());
+ vmIdIpMap.put(clusterVMIds.get(i), ips);
+ }
+ lbService.assignToLoadBalancer(lb.getId(), null, vmIdIpMap);
+ }
+
+ /**
+ * Setup network rules for Kubernetes cluster
+ * Open up firewall port CLUSTER_API_PORT, secure port on which Kubernetes
+ * API server is running. Also create load balancing rule to forward public
+ * IP traffic to master VMs' private IP.
+ * Open up firewall ports NODES_DEFAULT_START_SSH_PORT to NODES_DEFAULT_START_SSH_PORT+n
+ * for SSH access. Also create port-forwarding rule to forward public IP traffic to all
+ * @param network
+ * @param clusterVMs
+ * @throws ManagementServerException
+ */
+ private void setupKubernetesClusterNetworkRules(Network network, List<UserVm> clusterVMs) throws ManagementServerException {
+ if (!Network.GuestType.Isolated.equals(network.getGuestType())) {
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(String.format("Network ID: %s for Kubernetes cluster ID: %s is not an isolated network, therefore, no need for network rules", network.getUuid(), kubernetesCluster.getUuid()));
+ }
+ return;
+ }
+ List<Long> clusterVMIds = new ArrayList<>();
+ for (UserVm vm : clusterVMs) {
+ clusterVMIds.add(vm.getId());
+ }
+ IpAddress publicIp = getSourceNatIp(network);
+ if (publicIp == null) {
+ throw new ManagementServerException(String.format("No source NAT IP addresses found for network ID: %s, Kubernetes cluster ID: %s", network.getUuid(), kubernetesCluster.getUuid()));
+ }
+
+ try {
+ provisionFirewallRules(publicIp, owner, CLUSTER_API_PORT, CLUSTER_API_PORT);
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Provisioned firewall rule to open up port %d on %s for Kubernetes cluster ID: %s",
+ CLUSTER_API_PORT, publicIp.getAddress().addr(), kubernetesCluster.getUuid()));
+ }
+ } catch (NoSuchFieldException | IllegalAccessException | ResourceUnavailableException | NetworkRuleConflictException e) {
+ throw new ManagementServerException(String.format("Failed to provision firewall rules for API access for the Kubernetes cluster ID: %s", kubernetesCluster.getUuid()), e);
+ }
+
+ try {
+ int endPort = CLUSTER_NODES_DEFAULT_START_SSH_PORT + clusterVMs.size() - 1;
+ provisionFirewallRules(publicIp, owner, CLUSTER_NODES_DEFAULT_START_SSH_PORT, endPort);
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Provisioned firewall rule to open up port %d to %d on %s for Kubernetes cluster ID: %s", CLUSTER_NODES_DEFAULT_START_SSH_PORT, endPort, publicIp.getAddress().addr(), kubernetesCluster.getUuid()));
+ }
+ } catch (NoSuchFieldException | IllegalAccessException | ResourceUnavailableException | NetworkRuleConflictException e) {
+ throw new ManagementServerException(String.format("Failed to provision firewall rules for SSH access for the Kubernetes cluster ID: %s", kubernetesCluster.getUuid()), e);
+ }
+
+ // Load balancer rule fo API access for master node VMs
+ try {
+ provisionLoadBalancerRule(publicIp, network, owner, clusterVMIds, CLUSTER_API_PORT);
+ } catch (NetworkRuleConflictException | InsufficientAddressCapacityException e) {
+ throw new ManagementServerException(String.format("Failed to provision load balancer rule for API access for the Kubernetes cluster ID: %s", kubernetesCluster.getUuid()), e);
+ }
+
+ // Port forwarding rule fo SSH access on each node VM
+ try {
+ provisionSshPortForwardingRules(publicIp, network, owner, clusterVMIds, CLUSTER_NODES_DEFAULT_START_SSH_PORT);
+ } catch (ResourceUnavailableException | NetworkRuleConflictException e) {
+ throw new ManagementServerException(String.format("Failed to activate SSH port forwarding rules for the Kubernetes cluster ID: %s", kubernetesCluster.getUuid()), e);
+ }
+ }
+
+ private void startKubernetesClusterVMs() {
+ List <UserVm> clusterVms = getKubernetesClusterVMs();
+ for (final UserVm vm : clusterVms) {
+ if (vm == null) {
+ logTransitStateAndThrow(Level.ERROR, String.format("Failed to start all VMs in Kubernetes cluster ID: %s", kubernetesCluster.getUuid()), kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
+ }
+ try {
+ startKubernetesVM(vm);
+ } catch (ManagementServerException ex) {
+ LOGGER.warn(String.format("Failed to start VM ID: %s in Kubernetes cluster ID: %s due to ", vm.getUuid(), kubernetesCluster.getUuid()) + ex);
+ // dont bail out here. proceed further to stop the reset of the VM's
+ }
+ }
+ for (final UserVm userVm : clusterVms) {
+ UserVm vm = userVmDao.findById(userVm.getId());
+ if (vm == null || !vm.getState().equals(VirtualMachine.State.Running)) {
+ logTransitStateAndThrow(Level.ERROR, String.format("Failed to start all VMs in Kubernetes cluster ID: %s", kubernetesCluster.getUuid()), kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
+ }
+ }
+ }
+
+ private boolean isKubernetesClusterKubeConfigAvailable(final long timeoutTime) {
+ if (Strings.isNullOrEmpty(publicIpAddress)) {
+ KubernetesClusterDetailsVO kubeConfigDetail = kubernetesClusterDetailsDao.findDetail(kubernetesCluster.getId(), "kubeConfigData");
+ if (kubeConfigDetail != null && !Strings.isNullOrEmpty(kubeConfigDetail.getValue())) {
+ return true;
+ }
+ }
+ String kubeConfig = KubernetesClusterUtil.getKubernetesClusterConfig(kubernetesCluster, publicIpAddress, sshPort, CLUSTER_NODE_VM_USER, sshKeyFile, timeoutTime);
+ if (!Strings.isNullOrEmpty(kubeConfig)) {
+ final String masterVMPrivateIpAddress = getMasterVmPrivateIp();
+ if (!Strings.isNullOrEmpty(masterVMPrivateIpAddress)) {
+ kubeConfig = kubeConfig.replace(String.format("server: https://%s:%d", masterVMPrivateIpAddress, CLUSTER_API_PORT),
+ String.format("server: https://%s:%d", publicIpAddress, CLUSTER_API_PORT));
+ }
+ kubernetesClusterDetailsDao.addDetail(kubernetesCluster.getId(), "kubeConfigData", Base64.encodeBase64String(kubeConfig.getBytes(StringUtils.getPreferredCharset())), false);
+ return true;
+ }
+ return false;
+ }
+
+ private boolean isKubernetesClusterDashboardServiceRunning(final boolean onCreate, final Long timeoutTime) {
+ if (!onCreate) {
+ KubernetesClusterDetailsVO dashboardServiceRunningDetail = kubernetesClusterDetailsDao.findDetail(kubernetesCluster.getId(), "dashboardServiceRunning");
+ if (dashboardServiceRunningDetail != null && Boolean.parseBoolean(dashboardServiceRunningDetail.getValue())) {
+ return true;
+ }
+ }
+ if (KubernetesClusterUtil.isKubernetesClusterDashboardServiceRunning(kubernetesCluster, publicIpAddress, sshPort, CLUSTER_NODE_VM_USER, sshKeyFile, timeoutTime, 15000)) {
+ kubernetesClusterDetailsDao.addDetail(kubernetesCluster.getId(), "dashboardServiceRunning", String.valueOf(true), false);
+ return true;
+ }
+ return false;
+ }
+
+ private void updateKubernetesClusterEntryEndpoint() {
+ KubernetesClusterVO kubernetesClusterVO = kubernetesClusterDao.findById(kubernetesCluster.getId());
+ kubernetesClusterVO.setEndpoint(String.format("https://%s:%d/", publicIpAddress, CLUSTER_API_PORT));
+ kubernetesClusterDao.update(kubernetesCluster.getId(), kubernetesClusterVO);
+ }
+
+ public boolean startKubernetesClusterOnCreate() {
+ init();
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Starting Kubernetes cluster ID: %s", kubernetesCluster.getUuid()));
+ }
+ final long startTimeoutTime = System.currentTimeMillis() + KubernetesClusterService.KubernetesClusterStartTimeout.value() * 1000;
+ stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.StartRequested);
+ DeployDestination dest = null;
+ try {
+ dest = plan();
+ } catch (InsufficientCapacityException e) {
+ logTransitStateAndThrow(Level.ERROR, String.format("Provisioning the cluster failed due to insufficient capacity in the Kubernetes cluster: %s", kubernetesCluster.getUuid()), kubernetesCluster.getId(), KubernetesCluster.Event.CreateFailed, e);
+ }
+ Network network = null;
+ try {
+ network = startKubernetesClusterNetwork(dest);
+ } catch (ManagementServerException e) {
+ logTransitStateAndThrow(Level.ERROR, String.format("Failed to start Kubernetes cluster ID: %s as its network cannot be started", kubernetesCluster.getUuid()), kubernetesCluster.getId(), KubernetesCluster.Event.CreateFailed, e);
+ }
+ Pair<String, Integer> publicIpSshPort = getKubernetesClusterServerIpSshPort(null);
+ publicIpAddress = publicIpSshPort.first();
+ if (Strings.isNullOrEmpty(publicIpAddress) &&
+ (Network.GuestType.Isolated.equals(network.getGuestType()) || kubernetesCluster.getMasterNodeCount() > 1)) { // Shared network, single-master cluster won't have an IP yet
+ logTransitStateAndThrow(Level.ERROR, String.format("Failed to start Kubernetes cluster ID: %s as no public IP found for the cluster" , kubernetesCluster.getUuid()), kubernetesCluster.getId(), KubernetesCluster.Event.CreateFailed);
+ }
+ List<UserVm> clusterVMs = new ArrayList<>();
+ UserVm k8sMasterVM = null;
+ try {
+ k8sMasterVM = provisionKubernetesClusterMasterVm(network, publicIpAddress);
+ } catch (CloudRuntimeException | ManagementServerException | ResourceUnavailableException | InsufficientCapacityException e) {
+ logTransitStateAndThrow(Level.ERROR, String.format("Provisioning the master VM failed in the Kubernetes cluster ID: %s", kubernetesCluster.getUuid()), kubernetesCluster.getId(), KubernetesCluster.Event.CreateFailed, e);
+ }
+ clusterVMs.add(k8sMasterVM);
+ if (Strings.isNullOrEmpty(publicIpAddress)) {
+ publicIpSshPort = getKubernetesClusterServerIpSshPort(k8sMasterVM);
+ publicIpAddress = publicIpSshPort.first();
+ if (Strings.isNullOrEmpty(publicIpAddress)) {
+ logTransitStateAndThrow(Level.WARN, String.format("Failed to start Kubernetes cluster ID: %s as no public IP found for the cluster", kubernetesCluster.getUuid()), kubernetesCluster.getId(), KubernetesCluster.Event.CreateFailed);
+ }
+ }
+ try {
+ List<UserVm> additionalMasterVMs = provisionKubernetesClusterAdditionalMasterVms(publicIpAddress);
+ clusterVMs.addAll(additionalMasterVMs);
+ } catch (CloudRuntimeException | ManagementServerException | ResourceUnavailableException | InsufficientCapacityException e) {
+ logTransitStateAndThrow(Level.ERROR, String.format("Provisioning additional master VM failed in the Kubernetes cluster ID: %s", kubernetesCluster.getUuid()), kubernetesCluster.getId(), KubernetesCluster.Event.CreateFailed, e);
+ }
+ try {
+ List<UserVm> nodeVMs = provisionKubernetesClusterNodeVms(kubernetesCluster.getNodeCount(), publicIpAddress);
+ clusterVMs.addAll(nodeVMs);
+ } catch (CloudRuntimeException | ManagementServerException | ResourceUnavailableException | InsufficientCapacityException e) {
+ logTransitStateAndThrow(Level.ERROR, String.format("Provisioning node VM failed in the Kubernetes cluster ID: %s", kubernetesCluster.getUuid()), kubernetesCluster.getId(), KubernetesCluster.Event.CreateFailed, e);
+ }
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Kubernetes cluster ID: %s VMs successfully provisioned", kubernetesCluster.getUuid()));
+ }
+ try {
+ setupKubernetesClusterNetworkRules(network, clusterVMs);
+ } catch (ManagementServerException e) {
+ logTransitStateAndThrow(Level.ERROR, String.format("Failed to setup Kubernetes cluster ID: %s, unable to setup network rules", kubernetesCluster.getUuid()), kubernetesCluster.getId(), KubernetesCluster.Event.CreateFailed, e);
+ }
+ attachIsoKubernetesVMs(clusterVMs);
+ if (!KubernetesClusterUtil.isKubernetesClusterMasterVmRunning(kubernetesCluster, publicIpAddress, publicIpSshPort.second(), startTimeoutTime)) {
+ String msg = String.format("Failed to setup Kubernetes cluster ID: %s in usable state as unable to access master node VMs of the cluster", kubernetesCluster.getUuid());
+ if (kubernetesCluster.getMasterNodeCount() > 1 && Network.GuestType.Shared.equals(network.getGuestType())) {
+ msg = String.format("%s. Make sure external load-balancer has port forwarding rules for SSH access on ports %d-%d and API access on port %d",
+ msg,
+ CLUSTER_NODES_DEFAULT_START_SSH_PORT,
+ CLUSTER_NODES_DEFAULT_START_SSH_PORT + kubernetesCluster.getTotalNodeCount() - 1,
+ CLUSTER_API_PORT);
+ }
+ logTransitStateDetachIsoAndThrow(Level.ERROR, msg, kubernetesCluster, clusterVMs, KubernetesCluster.Event.CreateFailed, null);
+ }
+ boolean k8sApiServerSetup = KubernetesClusterUtil.isKubernetesClusterServerRunning(kubernetesCluster, publicIpAddress, CLUSTER_API_PORT, startTimeoutTime, 15000);
+ if (!k8sApiServerSetup) {
+ logTransitStateDetachIsoAndThrow(Level.ERROR, String.format("Failed to setup Kubernetes cluster ID: %s in usable state as unable to provision API endpoint for the cluster", kubernetesCluster.getUuid()), kubernetesCluster, clusterVMs, KubernetesCluster.Event.CreateFailed, null);
+ }
+ sshPort = publicIpSshPort.second();
+ updateKubernetesClusterEntryEndpoint();
+ boolean readyNodesCountValid = KubernetesClusterUtil.validateKubernetesClusterReadyNodesCount(kubernetesCluster, publicIpAddress, sshPort,
+ CLUSTER_NODE_VM_USER, sshKeyFile, startTimeoutTime, 15000);
+ detachIsoKubernetesVMs(clusterVMs);
+ if (!readyNodesCountValid) {
+ logTransitStateAndThrow(Level.ERROR, String.format("Failed to setup Kubernetes cluster ID: %s as it does not have desired number of nodes in ready state", kubernetesCluster.getUuid()), kubernetesCluster.getId(), KubernetesCluster.Event.CreateFailed);
+ }
+ if (!isKubernetesClusterKubeConfigAvailable(startTimeoutTime)) {
+ logTransitStateAndThrow(Level.ERROR, String.format("Failed to setup Kubernetes cluster ID: %s in usable state as unable to retrieve kube-config for the cluster", kubernetesCluster.getUuid()), kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
+ }
+ if (!isKubernetesClusterDashboardServiceRunning(true, startTimeoutTime)) {
+ logTransitStateAndThrow(Level.ERROR, String.format("Failed to setup Kubernetes cluster ID: %s in usable state as unable to get Dashboard service running for the cluster", kubernetesCluster.getUuid()), kubernetesCluster.getId(),KubernetesCluster.Event.OperationFailed);
+ }
+ stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.OperationSucceeded);
+ return true;
+ }
+
+ public boolean startStoppedKubernetesCluster() throws CloudRuntimeException {
+ init();
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Starting Kubernetes cluster ID: %s", kubernetesCluster.getUuid()));
+ }
+ final long startTimeoutTime = System.currentTimeMillis() + KubernetesClusterService.KubernetesClusterStartTimeout.value() * 1000;
+ stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.StartRequested);
+ startKubernetesClusterVMs();
+ try {
+ InetAddress address = InetAddress.getByName(new URL(kubernetesCluster.getEndpoint()).getHost());
+ } catch (MalformedURLException | UnknownHostException ex) {
+ logTransitStateAndThrow(Level.ERROR, String.format("Kubernetes cluster ID: %s has invalid API endpoint. Can not verify if cluster is in ready state", kubernetesCluster.getUuid()), kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
+ }
+ Pair<String, Integer> sshIpPort = getKubernetesClusterServerIpSshPort(null);
+ publicIpAddress = sshIpPort.first();
+ sshPort = sshIpPort.second();
+ if (Strings.isNullOrEmpty(publicIpAddress)) {
+ logTransitStateAndThrow(Level.ERROR, String.format("Failed to start Kubernetes cluster ID: %s as no public IP found for the cluster" , kubernetesCluster.getUuid()), kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
+ }
+ if (!KubernetesClusterUtil.isKubernetesClusterServerRunning(kubernetesCluster, publicIpAddress, CLUSTER_API_PORT, startTimeoutTime, 15000)) {
+ logTransitStateAndThrow(Level.ERROR, String.format("Failed to start Kubernetes cluster ID: %s in usable state", kubernetesCluster.getUuid()), kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
+ }
+ if (!isKubernetesClusterKubeConfigAvailable(startTimeoutTime)) {
+ logTransitStateAndThrow(Level.ERROR, String.format("Failed to start Kubernetes cluster ID: %s in usable state as unable to retrieve kube-config for the cluster", kubernetesCluster.getUuid()), kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
+ }
+ if (!isKubernetesClusterDashboardServiceRunning(false, startTimeoutTime)) {
+ logTransitStateAndThrow(Level.ERROR, String.format("Failed to start Kubernetes cluster ID: %s in usable state as unable to get Dashboard service running for the cluster", kubernetesCluster.getUuid()), kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
+ }
+ stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.OperationSucceeded);
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Kubernetes cluster ID: %s successfully started", kubernetesCluster.getUuid()));
+ }
+ return true;
+ }
+
+ public boolean reconcileAlertCluster() {
+ init();
+ final long startTimeoutTime = System.currentTimeMillis() + 3 * 60 * 1000;
+ List<KubernetesClusterVmMapVO> vmMapVOList = getKubernetesClusterVMMaps();
+ if (CollectionUtils.isEmpty(vmMapVOList) || vmMapVOList.size() != kubernetesCluster.getTotalNodeCount()) {
+ return false;
+ }
+ Pair<String, Integer> sshIpPort = getKubernetesClusterServerIpSshPort(null);
+ publicIpAddress = sshIpPort.first();
+ sshPort = sshIpPort.second();
+ if (Strings.isNullOrEmpty(publicIpAddress)) {
+ return false;
+ }
+ long actualNodeCount = 0;
+ try {
+ actualNodeCount = KubernetesClusterUtil.getKubernetesClusterReadyNodesCount(kubernetesCluster, publicIpAddress, sshPort, CLUSTER_NODE_VM_USER, sshKeyFile);
+ } catch (Exception e) {
+ return false;
+ }
+ if (kubernetesCluster.getTotalNodeCount() != actualNodeCount) {
+ return false;
+ }
+ if (Strings.isNullOrEmpty(sshIpPort.first())) {
+ return false;
+ }
+ if (!KubernetesClusterUtil.isKubernetesClusterServerRunning(kubernetesCluster, sshIpPort.first(),
+ KubernetesClusterActionWorker.CLUSTER_API_PORT, startTimeoutTime, 0)) {
+ return false;
+ }
+ updateKubernetesClusterEntryEndpoint();
+ if (!isKubernetesClusterKubeConfigAvailable(startTimeoutTime)) {
+ return false;
+ }
+ if (!isKubernetesClusterDashboardServiceRunning(false, startTimeoutTime)) {
+ return false;
+ }
+ // mark the cluster to be running
+ stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.RecoveryRequested);
+ stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.OperationSucceeded);
+ return true;
+ }
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStopWorker.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStopWorker.java
new file mode 100644
index 0000000..a8e1a2c
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStopWorker.java
@@ -0,0 +1,62 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.kubernetes.cluster.actionworkers;
+
+import java.util.List;
+
+import org.apache.log4j.Level;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.kubernetes.cluster.KubernetesCluster;
+import com.cloud.kubernetes.cluster.KubernetesClusterManagerImpl;
+import com.cloud.uservm.UserVm;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.VirtualMachine;
+
+public class KubernetesClusterStopWorker extends KubernetesClusterActionWorker {
+ public KubernetesClusterStopWorker(final KubernetesCluster kubernetesCluster, final KubernetesClusterManagerImpl clusterManager) {
+ super(kubernetesCluster, clusterManager);
+ }
+
+ public boolean stop() throws CloudRuntimeException {
+ init();
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Stopping Kubernetes cluster ID: %s", kubernetesCluster.getUuid()));
+ }
+ stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.StopRequested);
+ List<UserVm> clusterVMs = getKubernetesClusterVMs();
+ for (UserVm vm : clusterVMs) {
+ if (vm == null) {
+ logTransitStateAndThrow(Level.ERROR, String.format("Failed to find all VMs in Kubernetes cluster ID: %s", kubernetesCluster.getUuid()), kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
+ }
+ try {
+ userVmService.stopVirtualMachine(vm.getId(), false);
+ } catch (ConcurrentOperationException ex) {
+ LOGGER.warn(String.format("Failed to stop VM ID: %s in Kubernetes cluster ID: %s", vm.getUuid(), kubernetesCluster.getUuid()), ex);
+ }
+ }
+ for (final UserVm userVm : clusterVMs) {
+ UserVm vm = userVmDao.findById(userVm.getId());
+ if (vm == null || !vm.getState().equals(VirtualMachine.State.Stopped)) {
+ logTransitStateAndThrow(Level.ERROR, String.format("Failed to stop all VMs in Kubernetes cluster ID: %s", kubernetesCluster.getUuid()), kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
+ }
+ }
+ stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.OperationSucceeded);
+ return true;
+ }
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterUpgradeWorker.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterUpgradeWorker.java
new file mode 100644
index 0000000..eb9058d
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterUpgradeWorker.java
@@ -0,0 +1,169 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.kubernetes.cluster.actionworkers;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.log4j.Level;
+
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.kubernetes.cluster.KubernetesCluster;
+import com.cloud.kubernetes.cluster.KubernetesClusterManagerImpl;
+import com.cloud.kubernetes.cluster.KubernetesClusterService;
+import com.cloud.kubernetes.cluster.KubernetesClusterVO;
+import com.cloud.kubernetes.cluster.utils.KubernetesClusterUtil;
+import com.cloud.kubernetes.version.KubernetesSupportedVersion;
+import com.cloud.kubernetes.version.KubernetesVersionManagerImpl;
+import com.cloud.uservm.UserVm;
+import com.cloud.utils.Pair;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.ssh.SshHelper;
+import com.google.common.base.Strings;
+
+public class KubernetesClusterUpgradeWorker extends KubernetesClusterActionWorker {
+
+ private List<UserVm> clusterVMs = new ArrayList<>();
+ private KubernetesSupportedVersion upgradeVersion;
+ private File upgradeScriptFile;
+ private long upgradeTimeoutTime;
+
+ public KubernetesClusterUpgradeWorker(final KubernetesCluster kubernetesCluster,
+ final KubernetesSupportedVersion upgradeVersion,
+ final KubernetesClusterManagerImpl clusterManager) {
+ super(kubernetesCluster, clusterManager);
+ this.upgradeVersion = upgradeVersion;
+ }
+
+ private void retrieveUpgradeScriptFile() {
+ try {
+ String upgradeScriptData = readResourceFile("/script/upgrade-kubernetes.sh");
+ upgradeScriptFile = File.createTempFile("upgrade-kuberntes", ".sh");
+ BufferedWriter upgradeScriptFileWriter = new BufferedWriter(new FileWriter(upgradeScriptFile));
+ upgradeScriptFileWriter.write(upgradeScriptData);
+ upgradeScriptFileWriter.close();
+ } catch (IOException e) {
+ logAndThrow(Level.ERROR, String.format("Failed to upgrade Kubernetes cluster ID: %s, unable to prepare upgrade script", kubernetesCluster.getUuid()), e);
+ }
+ }
+
+ private Pair<Boolean, String> runInstallScriptOnVM(final UserVm vm, final int index) throws Exception {
+ int nodeSshPort = sshPort == 22 ? sshPort : sshPort + index;
+ String nodeAddress = (index > 0 && sshPort == 22) ? vm.getPrivateIpAddress() : publicIpAddress;
+ SshHelper.scpTo(nodeAddress, nodeSshPort, CLUSTER_NODE_VM_USER, sshKeyFile, null,
+ "~/", upgradeScriptFile.getAbsolutePath(), "0755");
+ String cmdStr = String.format("sudo ./%s %s %s %s %s",
+ upgradeScriptFile.getName(),
+ upgradeVersion.getSemanticVersion(),
+ index == 0 ? "true" : "false",
+ KubernetesVersionManagerImpl.compareSemanticVersions(upgradeVersion.getSemanticVersion(), "1.15.0") < 0 ? "true" : "false",
+ Hypervisor.HypervisorType.VMware.equals(vm.getHypervisorType()));
+ return SshHelper.sshExecute(publicIpAddress, nodeSshPort, CLUSTER_NODE_VM_USER, sshKeyFile, null,
+ cmdStr,
+ 10000, 10000, 10 * 60 * 1000);
+ }
+
+ private void upgradeKubernetesClusterNodes() {
+ Pair<Boolean, String> result = null;
+ for (int i = 0; i < clusterVMs.size(); ++i) {
+ UserVm vm = clusterVMs.get(i);
+ String hostName = vm.getHostName();
+ if (!Strings.isNullOrEmpty(hostName)) {
+ hostName = hostName.toLowerCase();
+ }
+ result = null;
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Upgrading node on VM ID: %s in Kubernetes cluster ID: %s with Kubernetes version(%s) ID: %s",
+ vm.getUuid(), kubernetesCluster.getUuid(), upgradeVersion.getSemanticVersion(), upgradeVersion.getUuid()));
+ }
+ try {
+ result = SshHelper.sshExecute(publicIpAddress, sshPort, CLUSTER_NODE_VM_USER, sshKeyFile, null,
+ String.format("sudo kubectl drain %s --ignore-daemonsets --delete-local-data", hostName),
+ 10000, 10000, 60000);
+ } catch (Exception e) {
+ logTransitStateDetachIsoAndThrow(Level.ERROR, String.format("Failed to upgrade Kubernetes cluster ID: %s, unable to drain Kubernetes node on VM ID: %s", kubernetesCluster.getUuid(), vm.getUuid()), kubernetesCluster, clusterVMs, KubernetesCluster.Event.OperationFailed, e);
+ }
+ if (!result.first()) {
+ logTransitStateDetachIsoAndThrow(Level.ERROR, String.format("Failed to upgrade Kubernetes cluster ID: %s, unable to drain Kubernetes node on VM ID: %s", kubernetesCluster.getUuid(), vm.getUuid()), kubernetesCluster, clusterVMs, KubernetesCluster.Event.OperationFailed, null);
+ }
+ if (System.currentTimeMillis() > upgradeTimeoutTime) {
+ logTransitStateDetachIsoAndThrow(Level.ERROR, String.format("Failed to upgrade Kubernetes cluster ID: %s, upgrade action timed out", kubernetesCluster.getUuid()), kubernetesCluster, clusterVMs, KubernetesCluster.Event.OperationFailed, null);
+ }
+ try {
+ result = runInstallScriptOnVM(vm, i);
+ } catch (Exception e) {
+ logTransitStateDetachIsoAndThrow(Level.ERROR, String.format("Failed to upgrade Kubernetes cluster ID: %s, unable to upgrade Kubernetes node on VM ID: %s", kubernetesCluster.getUuid(), vm.getUuid()), kubernetesCluster, clusterVMs, KubernetesCluster.Event.OperationFailed, e);
+ }
+ if (!result.first()) {
+ logTransitStateDetachIsoAndThrow(Level.ERROR, String.format("Failed to upgrade Kubernetes cluster ID: %s, unable to upgrade Kubernetes node on VM ID: %s", kubernetesCluster.getUuid(), vm.getUuid()), kubernetesCluster, clusterVMs, KubernetesCluster.Event.OperationFailed, null);
+ }
+ if (System.currentTimeMillis() > upgradeTimeoutTime) {
+ logTransitStateDetachIsoAndThrow(Level.ERROR, String.format("Failed to upgrade Kubernetes cluster ID: %s, upgrade action timed out", kubernetesCluster.getUuid()), kubernetesCluster, clusterVMs, KubernetesCluster.Event.OperationFailed, null);
+ }
+ if (!KubernetesClusterUtil.uncordonKubernetesClusterNode(kubernetesCluster, publicIpAddress, sshPort, CLUSTER_NODE_VM_USER, getManagementServerSshPublicKeyFile(), vm, upgradeTimeoutTime, 15000)) {
+ logTransitStateDetachIsoAndThrow(Level.ERROR, String.format("Failed to upgrade Kubernetes cluster ID: %s, unable to uncordon Kubernetes node on VM ID: %s", kubernetesCluster.getUuid(), vm.getUuid()), kubernetesCluster, clusterVMs, KubernetesCluster.Event.OperationFailed, null);
+ }
+ if (i == 0) { // Wait for master to get in Ready state
+ if (!KubernetesClusterUtil.isKubernetesClusterNodeReady(kubernetesCluster, publicIpAddress, sshPort, CLUSTER_NODE_VM_USER, getManagementServerSshPublicKeyFile(), hostName, upgradeTimeoutTime, 15000)) {
+ logTransitStateDetachIsoAndThrow(Level.ERROR, String.format("Failed to upgrade Kubernetes cluster ID: %s, unable to get master Kubernetes node on VM ID: %s in ready state", kubernetesCluster.getUuid(), vm.getUuid()), kubernetesCluster, clusterVMs, KubernetesCluster.Event.OperationFailed, null);
+ }
+ }
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Successfully upgraded node on VM ID: %s in Kubernetes cluster ID: %s with Kubernetes version(%s) ID: %s",
+ vm.getUuid(), kubernetesCluster.getUuid(), upgradeVersion.getSemanticVersion(), upgradeVersion.getUuid()));
+ }
+ }
+ }
+
+ public boolean upgradeCluster() throws CloudRuntimeException {
+ init();
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Upgrading Kubernetes cluster ID: %s", kubernetesCluster.getUuid()));
+ }
+ upgradeTimeoutTime = System.currentTimeMillis() + KubernetesClusterService.KubernetesClusterUpgradeTimeout.value() * 1000;
+ Pair<String, Integer> publicIpSshPort = getKubernetesClusterServerIpSshPort(null);
+ publicIpAddress = publicIpSshPort.first();
+ sshPort = publicIpSshPort.second();
+ if (Strings.isNullOrEmpty(publicIpAddress)) {
+ logAndThrow(Level.ERROR, String.format("Upgrade failed for Kubernetes cluster ID: %s, unable to retrieve associated public IP", kubernetesCluster.getUuid()));
+ }
+ clusterVMs = getKubernetesClusterVMs();
+ if (CollectionUtils.isEmpty(clusterVMs)) {
+ logAndThrow(Level.ERROR, String.format("Upgrade failed for Kubernetes cluster ID: %s, unable to retrieve VMs for cluster", kubernetesCluster.getUuid()));
+ }
+ retrieveUpgradeScriptFile();
+ stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.UpgradeRequested);
+ attachIsoKubernetesVMs(clusterVMs, upgradeVersion);
+ upgradeKubernetesClusterNodes();
+ detachIsoKubernetesVMs(clusterVMs);
+ KubernetesClusterVO kubernetesClusterVO = kubernetesClusterDao.findById(kubernetesCluster.getId());
+ kubernetesClusterVO.setKubernetesVersionId(upgradeVersion.getId());
+ boolean updated = kubernetesClusterDao.update(kubernetesCluster.getId(), kubernetesClusterVO);
+ if (!updated) {
+ stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.OperationFailed);
+ } else {
+ stateTransitTo(kubernetesCluster.getId(), KubernetesCluster.Event.OperationSucceeded);
+ }
+ return updated;
+ }
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/dao/KubernetesClusterDao.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/dao/KubernetesClusterDao.java
new file mode 100644
index 0000000..fe67323
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/dao/KubernetesClusterDao.java
@@ -0,0 +1,34 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.kubernetes.cluster.dao;
+
+import java.util.List;
+
+import com.cloud.kubernetes.cluster.KubernetesCluster;
+import com.cloud.kubernetes.cluster.KubernetesClusterVO;
+import com.cloud.utils.db.GenericDao;
+import com.cloud.utils.fsm.StateDao;
+
+public interface KubernetesClusterDao extends GenericDao<KubernetesClusterVO, Long>,
+ StateDao<KubernetesCluster.State, KubernetesCluster.Event, KubernetesCluster> {
+
+ List<KubernetesClusterVO> listByAccount(long accountId);
+ List<KubernetesClusterVO> findKubernetesClustersToGarbageCollect();
+ List<KubernetesClusterVO> findKubernetesClustersInState(KubernetesCluster.State state);
+ List<KubernetesClusterVO> listByNetworkId(long networkId);
+ List<KubernetesClusterVO> listAllByKubernetesVersion(long kubernetesVersionId);
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/dao/KubernetesClusterDaoImpl.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/dao/KubernetesClusterDaoImpl.java
new file mode 100644
index 0000000..003286c
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/dao/KubernetesClusterDaoImpl.java
@@ -0,0 +1,112 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.kubernetes.cluster.dao;
+
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+
+import com.cloud.kubernetes.cluster.KubernetesCluster;
+import com.cloud.kubernetes.cluster.KubernetesClusterVO;
+import com.cloud.utils.db.GenericDaoBase;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
+import com.cloud.utils.db.TransactionLegacy;
+
+@Component
+public class KubernetesClusterDaoImpl extends GenericDaoBase<KubernetesClusterVO, Long> implements KubernetesClusterDao {
+
+ private final SearchBuilder<KubernetesClusterVO> AccountIdSearch;
+ private final SearchBuilder<KubernetesClusterVO> GarbageCollectedSearch;
+ private final SearchBuilder<KubernetesClusterVO> StateSearch;
+ private final SearchBuilder<KubernetesClusterVO> SameNetworkSearch;
+ private final SearchBuilder<KubernetesClusterVO> KubernetesVersionSearch;
+
+ public KubernetesClusterDaoImpl() {
+ AccountIdSearch = createSearchBuilder();
+ AccountIdSearch.and("account", AccountIdSearch.entity().getAccountId(), SearchCriteria.Op.EQ);
+ AccountIdSearch.done();
+
+ GarbageCollectedSearch = createSearchBuilder();
+ GarbageCollectedSearch.and("gc", GarbageCollectedSearch.entity().isCheckForGc(), SearchCriteria.Op.EQ);
+ GarbageCollectedSearch.and("state", GarbageCollectedSearch.entity().getState(), SearchCriteria.Op.EQ);
+ GarbageCollectedSearch.done();
+
+ StateSearch = createSearchBuilder();
+ StateSearch.and("state", StateSearch.entity().getState(), SearchCriteria.Op.EQ);
+ StateSearch.done();
+
+ SameNetworkSearch = createSearchBuilder();
+ SameNetworkSearch.and("network_id", SameNetworkSearch.entity().getNetworkId(), SearchCriteria.Op.EQ);
+ SameNetworkSearch.done();
+
+ KubernetesVersionSearch = createSearchBuilder();
+ KubernetesVersionSearch.and("kubernetesVersionId", KubernetesVersionSearch.entity().getKubernetesVersionId(), SearchCriteria.Op.EQ);
+ KubernetesVersionSearch.done();
+ }
+
+ @Override
+ public List<KubernetesClusterVO> listByAccount(long accountId) {
+ SearchCriteria<KubernetesClusterVO> sc = AccountIdSearch.create();
+ sc.setParameters("account", accountId);
+ return listBy(sc, null);
+ }
+
+ @Override
+ public List<KubernetesClusterVO> findKubernetesClustersToGarbageCollect() {
+ SearchCriteria<KubernetesClusterVO> sc = GarbageCollectedSearch.create();
+ sc.setParameters("gc", true);
+ sc.setParameters("state", KubernetesCluster.State.Destroying);
+ return listBy(sc);
+ }
+
+ @Override
+ public List<KubernetesClusterVO> findKubernetesClustersInState(KubernetesCluster.State state) {
+ SearchCriteria<KubernetesClusterVO> sc = StateSearch.create();
+ sc.setParameters("state", state);
+ return listBy(sc);
+ }
+
+ @Override
+ public boolean updateState(KubernetesCluster.State currentState, KubernetesCluster.Event event, KubernetesCluster.State nextState,
+ KubernetesCluster vo, Object data) {
+ // TODO: ensure this update is correct
+ TransactionLegacy txn = TransactionLegacy.currentTxn();
+ txn.start();
+
+ KubernetesClusterVO ccVo = (KubernetesClusterVO)vo;
+ ccVo.setState(nextState);
+ super.update(ccVo.getId(), ccVo);
+
+ txn.commit();
+ return true;
+ }
+
+ @Override
+ public List<KubernetesClusterVO> listByNetworkId(long networkId) {
+ SearchCriteria<KubernetesClusterVO> sc = SameNetworkSearch.create();
+ sc.setParameters("network_id", networkId);
+ return this.listBy(sc);
+ }
+
+ @Override
+ public List<KubernetesClusterVO> listAllByKubernetesVersion(long kubernetesVersionId) {
+ SearchCriteria<KubernetesClusterVO> sc = KubernetesVersionSearch.create();
+ sc.setParameters("kubernetesVersionId", kubernetesVersionId);
+ return this.listBy(sc);
+ }
+}
diff --git a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/dao/KubernetesClusterDetailsDao.java
similarity index 60%
copy from agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
copy to plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/dao/KubernetesClusterDetailsDao.java
index b244d02..52990eb 100644
--- a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/dao/KubernetesClusterDetailsDao.java
@@ -1,4 +1,3 @@
-//
// 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
@@ -15,22 +14,15 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-//
-package com.cloud.agent.direct.download;
+package com.cloud.kubernetes.cluster.dao;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
-@RunWith(MockitoJUnitRunner.class)
-public class DirectTemplateDownloaderImplTest {
+import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
- private static final Long templateId = 202l;
+import com.cloud.kubernetes.cluster.KubernetesClusterDetailsVO;
+import com.cloud.utils.db.GenericDao;
- @Test
- public void testGetDirectDownloadTempPath() {
- String path = DirectTemplateDownloaderImpl.getDirectDownloadTempPath(templateId);
- Assert.assertEquals("template/2/202", path);
- }
+
+public interface KubernetesClusterDetailsDao extends GenericDao<KubernetesClusterDetailsVO, Long>, ResourceDetailsDao<KubernetesClusterDetailsVO> {
+
}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/dao/KubernetesClusterDetailsDaoImpl.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/dao/KubernetesClusterDetailsDaoImpl.java
new file mode 100644
index 0000000..66ef2ad
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/dao/KubernetesClusterDetailsDaoImpl.java
@@ -0,0 +1,32 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.kubernetes.cluster.dao;
+
+import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
+import org.springframework.stereotype.Component;
+
+import com.cloud.kubernetes.cluster.KubernetesClusterDetailsVO;
+
+
+@Component
+public class KubernetesClusterDetailsDaoImpl extends ResourceDetailsDaoBase<KubernetesClusterDetailsVO> implements KubernetesClusterDetailsDao {
+
+ @Override
+ public void addDetail(long resourceId, String key, String value, boolean display) {
+ super.addDetail(new KubernetesClusterDetailsVO(resourceId, key, value, display));
+ }
+}
diff --git a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/dao/KubernetesClusterVmMapDao.java
similarity index 60%
copy from agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
copy to plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/dao/KubernetesClusterVmMapDao.java
index b244d02..8b08dd3 100644
--- a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/dao/KubernetesClusterVmMapDao.java
@@ -1,4 +1,3 @@
-//
// 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
@@ -15,22 +14,13 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-//
-package com.cloud.agent.direct.download;
+package com.cloud.kubernetes.cluster.dao;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import com.cloud.kubernetes.cluster.KubernetesClusterVmMapVO;
+import com.cloud.utils.db.GenericDao;
-@RunWith(MockitoJUnitRunner.class)
-public class DirectTemplateDownloaderImplTest {
+import java.util.List;
- private static final Long templateId = 202l;
-
- @Test
- public void testGetDirectDownloadTempPath() {
- String path = DirectTemplateDownloaderImpl.getDirectDownloadTempPath(templateId);
- Assert.assertEquals("template/2/202", path);
- }
+public interface KubernetesClusterVmMapDao extends GenericDao<KubernetesClusterVmMapVO, Long> {
+ public List<KubernetesClusterVmMapVO> listByClusterId(long clusterId);
}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/dao/KubernetesClusterVmMapDaoImpl.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/dao/KubernetesClusterVmMapDaoImpl.java
new file mode 100644
index 0000000..0b86b2c
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/dao/KubernetesClusterVmMapDaoImpl.java
@@ -0,0 +1,46 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.kubernetes.cluster.dao;
+
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+
+import com.cloud.kubernetes.cluster.KubernetesClusterVmMapVO;
+import com.cloud.utils.db.GenericDaoBase;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
+
+
+@Component
+public class KubernetesClusterVmMapDaoImpl extends GenericDaoBase<KubernetesClusterVmMapVO, Long> implements KubernetesClusterVmMapDao {
+
+ private final SearchBuilder<KubernetesClusterVmMapVO> clusterIdSearch;
+
+ public KubernetesClusterVmMapDaoImpl() {
+ clusterIdSearch = createSearchBuilder();
+ clusterIdSearch.and("clusterId", clusterIdSearch.entity().getClusterId(), SearchCriteria.Op.EQ);
+ clusterIdSearch.done();
+ }
+
+ @Override
+ public List<KubernetesClusterVmMapVO> listByClusterId(long clusterId) {
+ SearchCriteria<KubernetesClusterVmMapVO> sc = clusterIdSearch.create();
+ sc.setParameters("clusterId", clusterId);
+ return listBy(sc, null);
+ }
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/utils/KubernetesClusterUtil.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/utils/KubernetesClusterUtil.java
new file mode 100644
index 0000000..68cd916
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/utils/KubernetesClusterUtil.java
@@ -0,0 +1,311 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.kubernetes.cluster.utils;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.URL;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.log4j.Logger;
+
+import com.cloud.kubernetes.cluster.KubernetesCluster;
+import com.cloud.uservm.UserVm;
+import com.cloud.utils.Pair;
+import com.cloud.utils.StringUtils;
+import com.cloud.utils.ssh.SshHelper;
+import com.google.common.base.Strings;
+
+public class KubernetesClusterUtil {
+
+ protected static final Logger LOGGER = Logger.getLogger(KubernetesClusterUtil.class);
+
+ public static boolean isKubernetesClusterNodeReady(final KubernetesCluster kubernetesCluster, String ipAddress, int port,
+ String user, File sshKeyFile, String nodeName) throws Exception {
+ Pair<Boolean, String> result = SshHelper.sshExecute(ipAddress, port,
+ user, sshKeyFile, null,
+ String.format("sudo kubectl get nodes | awk '{if ($1 == \"%s\" && $2 == \"Ready\") print $1}'", nodeName.toLowerCase()),
+ 10000, 10000, 20000);
+ if (result.first() && nodeName.equals(result.second().trim())) {
+ return true;
+ }
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(String.format("Failed to retrieve status for node: %s in Kubernetes cluster ID: %s. Output: %s", nodeName, kubernetesCluster.getUuid(), result.second()));
+ }
+ return false;
+ }
+
+ public static boolean isKubernetesClusterNodeReady(final KubernetesCluster kubernetesCluster, final String ipAddress, final int port,
+ final String user, final File sshKeyFile, final String nodeName,
+ final long timeoutTime, final int waitDuration) {
+ while (System.currentTimeMillis() < timeoutTime) {
+ boolean ready = false;
+ try {
+ ready = isKubernetesClusterNodeReady(kubernetesCluster, ipAddress, port, user, sshKeyFile, nodeName);
+ } catch (Exception e) {
+ LOGGER.warn(String.format("Failed to retrieve state of node: %s in Kubernetes cluster ID: %s", nodeName, kubernetesCluster.getUuid()), e);
+ }
+ if (ready) {
+ return true;
+ }
+ try {
+ Thread.sleep(waitDuration);
+ } catch (InterruptedException ie) {
+ LOGGER.error(String.format("Error while waiting for Kubernetes cluster ID: %s node: %s to become ready", kubernetesCluster.getUuid(), nodeName), ie);
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Mark a given node in a given Kubernetes cluster as schedulable.
+ * kubectl uncordon command will be called through SSH using IP address and port of the host virtual machine or load balancer.
+ * Multiple retries with a given delay can be used.
+ * uncordon is required when a particular node in Kubernetes cluster is drained (usually during upgrade)
+ * @param kubernetesCluster
+ * @param ipAddress
+ * @param port
+ * @param user
+ * @param sshKeyFile
+ * @param userVm
+ * @param timeoutTime
+ * @param waitDuration
+ * @return
+ */
+ public static boolean uncordonKubernetesClusterNode(final KubernetesCluster kubernetesCluster,
+ final String ipAddress, final int port,
+ final String user, final File sshKeyFile,
+ final UserVm userVm, final long timeoutTime,
+ final int waitDuration) {
+ String hostName = userVm.getHostName();
+ if (!Strings.isNullOrEmpty(hostName)) {
+ hostName = hostName.toLowerCase();
+ }
+ while (System.currentTimeMillis() < timeoutTime) {
+ Pair<Boolean, String> result = null;
+ try {
+ result = SshHelper.sshExecute(ipAddress, port, user, sshKeyFile, null,
+ String.format("sudo kubectl uncordon %s", hostName),
+ 10000, 10000, 30000);
+ if (result.first()) {
+ return true;
+ }
+ } catch (Exception e) {
+ LOGGER.warn(String.format("Failed to uncordon node: %s on VM ID: %s in Kubernetes cluster ID: %s", hostName, userVm.getUuid(), kubernetesCluster.getUuid()), e);
+ }
+ try {
+ Thread.sleep(waitDuration);
+ } catch (InterruptedException ie) {
+ LOGGER.warn(String.format("Error while waiting for uncordon Kubernetes cluster ID: %s node: %s on VM ID: %s", kubernetesCluster.getUuid(), hostName, userVm.getUuid()), ie);
+ }
+ }
+ return false;
+ }
+
+ public static boolean isKubernetesClusterAddOnServiceRunning(final KubernetesCluster kubernetesCluster, final String ipAddress,
+ final int port, final String user, final File sshKeyFile,
+ final String namespace, String serviceName) {
+ try {
+ String cmd = "sudo kubectl get pods --all-namespaces";
+ if (!Strings.isNullOrEmpty(namespace)) {
+ cmd = String.format("sudo kubectl get pods --namespace=%s", namespace);
+ }
+ Pair<Boolean, String> result = SshHelper.sshExecute(ipAddress, port, user,
+ sshKeyFile, null, cmd,
+ 10000, 10000, 10000);
+ if (result.first() && !Strings.isNullOrEmpty(result.second())) {
+ String[] lines = result.second().split("\n");
+ for (String line :
+ lines) {
+ if (line.contains(serviceName) && line.contains("Running")) {
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(String.format("Service : %s in namespace: %s for the Kubernetes cluster ID: %s is running", serviceName, namespace, kubernetesCluster.getUuid()));
+ }
+ return true;
+ }
+ }
+ }
+ } catch (Exception e) {
+ LOGGER.warn(String.format("Unable to retrieve service: %s running status in namespace %s for Kubernetes cluster ID: %s", serviceName, namespace, kubernetesCluster.getUuid()), e);
+ }
+ return false;
+ }
+
+ public static boolean isKubernetesClusterDashboardServiceRunning(final KubernetesCluster kubernetesCluster, String ipAddress,
+ final int port, final String user, final File sshKeyFile,
+ final long timeoutTime, final long waitDuration) {
+ boolean running = false;
+ // Check if dashboard service is up running.
+ while (System.currentTimeMillis() < timeoutTime) {
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(String.format("Checking dashboard service for the Kubernetes cluster ID: %s to come up", kubernetesCluster.getUuid()));
+ }
+ if (isKubernetesClusterAddOnServiceRunning(kubernetesCluster, ipAddress, port, user, sshKeyFile, "kubernetes-dashboard", "kubernetes-dashboard")) {
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Dashboard service for the Kubernetes cluster ID: %s is in running state", kubernetesCluster.getUuid()));
+ }
+ running = true;
+ break;
+ }
+ try {
+ Thread.sleep(waitDuration);
+ } catch (InterruptedException ex) {
+ LOGGER.error(String.format("Error while waiting for Kubernetes cluster: %s API dashboard service to be available", kubernetesCluster.getUuid()), ex);
+ }
+ }
+ return running;
+ }
+
+ public static String getKubernetesClusterConfig(final KubernetesCluster kubernetesCluster, final String ipAddress, final int port,
+ final String user, final File sshKeyFile, final long timeoutTime) {
+ String kubeConfig = "";
+ while (System.currentTimeMillis() < timeoutTime) {
+ try {
+ Pair<Boolean, String> result = SshHelper.sshExecute(ipAddress, port, user,
+ sshKeyFile, null, "sudo cat /etc/kubernetes/admin.conf",
+ 10000, 10000, 10000);
+
+ if (result.first() && !Strings.isNullOrEmpty(result.second())) {
+ kubeConfig = result.second();
+ break;
+ } else {
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Failed to retrieve kube-config file for Kubernetes cluster ID: %s. Output: %s", kubernetesCluster.getUuid(), result.second()));
+ }
+ }
+ } catch (Exception e) {
+ LOGGER.warn(String.format("Failed to retrieve kube-config file for Kubernetes cluster ID: %s", kubernetesCluster.getUuid()), e);
+ }
+ }
+ return kubeConfig;
+ }
+
+ public static int getKubernetesClusterReadyNodesCount(final KubernetesCluster kubernetesCluster, final String ipAddress,
+ final int port, final String user, final File sshKeyFile) throws Exception {
+ Pair<Boolean, String> result = SshHelper.sshExecute(ipAddress, port,
+ user, sshKeyFile, null,
+ "sudo kubectl get nodes | awk '{if ($2 == \"Ready\") print $1}' | wc -l",
+ 10000, 10000, 20000);
+ if (result.first()) {
+ return Integer.parseInt(result.second().trim().replace("\"", ""));
+ } else {
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(String.format("Failed to retrieve ready nodes for Kubernetes cluster ID: %s. Output: %s", kubernetesCluster.getUuid(), result.second()));
+ }
+ }
+ return 0;
+ }
+
+ public static boolean isKubernetesClusterServerRunning(final KubernetesCluster kubernetesCluster, final String ipAddress,
+ final int port, final long timeoutTime, final long waitDuration) {
+ boolean k8sApiServerSetup = false;
+ while (System.currentTimeMillis() < timeoutTime) {
+ try {
+ String versionOutput = IOUtils.toString(new URL(String.format("https://%s:%d/version", ipAddress, port)), StringUtils.getPreferredCharset());
+ if (!Strings.isNullOrEmpty(versionOutput)) {
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Kubernetes cluster ID: %s API has been successfully provisioned, %s", kubernetesCluster.getUuid(), versionOutput));
+ }
+ k8sApiServerSetup = true;
+ break;
+ }
+ } catch (Exception e) {
+ LOGGER.warn(String.format("API endpoint for Kubernetes cluster ID: %s not available", kubernetesCluster.getUuid()), e);
+ }
+ try {
+ Thread.sleep(waitDuration);
+ } catch (InterruptedException ie) {
+ LOGGER.error(String.format("Error while waiting for Kubernetes cluster ID: %s API endpoint to be available", kubernetesCluster.getUuid()), ie);
+ }
+ }
+ return k8sApiServerSetup;
+ }
+
+ public static boolean isKubernetesClusterMasterVmRunning(final KubernetesCluster kubernetesCluster, final String ipAddress,
+ final int port, final long timeoutTime) {
+ boolean masterVmRunning = false;
+ while (!masterVmRunning && System.currentTimeMillis() < timeoutTime) {
+ try (Socket socket = new Socket()) {
+ socket.connect(new InetSocketAddress(ipAddress, port), 10000);
+ masterVmRunning = true;
+ } catch (IOException e) {
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Waiting for Kubernetes cluster ID: %s master node VMs to be accessible", kubernetesCluster.getUuid()));
+ }
+ try {
+ Thread.sleep(10000);
+ } catch (InterruptedException ex) {
+ LOGGER.warn(String.format("Error while waiting for Kubernetes cluster ID: %s master node VMs to be accessible", kubernetesCluster.getUuid()), ex);
+ }
+ }
+ }
+ return masterVmRunning;
+ }
+
+ public static boolean validateKubernetesClusterReadyNodesCount(final KubernetesCluster kubernetesCluster,
+ final String ipAddress, final int port,
+ final String user, final File sshKeyFile,
+ final long timeoutTime, final long waitDuration) {
+ while (System.currentTimeMillis() < timeoutTime) {
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(String.format("Checking ready nodes for the Kubernetes cluster ID: %s with total %d provisioned nodes", kubernetesCluster.getUuid(), kubernetesCluster.getTotalNodeCount()));
+ }
+ try {
+ int nodesCount = KubernetesClusterUtil.getKubernetesClusterReadyNodesCount(kubernetesCluster, ipAddress, port,
+ user, sshKeyFile);
+ if (nodesCount == kubernetesCluster.getTotalNodeCount()) {
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(String.format("Kubernetes cluster ID: %s has %d ready nodes now", kubernetesCluster.getUuid(), kubernetesCluster.getTotalNodeCount()));
+ }
+ return true;
+ } else {
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(String.format("Kubernetes cluster ID: %s has total %d provisioned nodes while %d ready now", kubernetesCluster.getUuid(), kubernetesCluster.getTotalNodeCount(), nodesCount));
+ }
+ }
+ } catch (Exception e) {
+ LOGGER.warn(String.format("Failed to retrieve ready node count for Kubernetes cluster ID: %s", kubernetesCluster.getUuid()), e);
+ }
+ try {
+ Thread.sleep(waitDuration);
+ } catch (InterruptedException ex) {
+ LOGGER.warn(String.format("Error while waiting during Kubernetes cluster ID: %s ready node check", kubernetesCluster.getUuid()), ex);
+ }
+ }
+ return false;
+ }
+
+ public static String generateClusterToken(final KubernetesCluster kubernetesCluster) {
+ String token = kubernetesCluster.getUuid();
+ token = token.replaceAll("-", "");
+ token = token.substring(0, 22);
+ token = token.substring(0, 6) + "." + token.substring(6);
+ return token;
+ }
+
+ public static String generateClusterHACertificateKey(final KubernetesCluster kubernetesCluster) {
+ String uuid = kubernetesCluster.getUuid();
+ StringBuilder token = new StringBuilder(uuid.replaceAll("-", ""));
+ while (token.length() < 64) {
+ token.append(token);
+ }
+ return token.toString().substring(0, 64);
+ }
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/KubernetesSupportedVersion.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/KubernetesSupportedVersion.java
new file mode 100644
index 0000000..0cb430a
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/KubernetesSupportedVersion.java
@@ -0,0 +1,49 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.kubernetes.version;
+
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
+/**
+ * KubernetesSupportedVersion describes the properties of supported kubernetes version
+ *
+ */
+public interface KubernetesSupportedVersion extends InternalIdentity, Identity {
+
+ public enum State {
+ Disabled, Enabled
+ }
+
+ long getId();
+ String getName();
+ String getSemanticVersion();
+ long getIsoId();
+ Long getZoneId();
+ State getState();
+
+ /**
+ * @return minimum # of cpu.
+ */
+ int getMinimumCpu();
+
+ /**
+ * @return minimum ram size in megabytes
+ */
+ int getMinimumRamSize();
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/KubernetesSupportedVersionVO.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/KubernetesSupportedVersionVO.java
new file mode 100644
index 0000000..3f66f94
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/KubernetesSupportedVersionVO.java
@@ -0,0 +1,168 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.kubernetes.version;
+
+import java.util.Date;
+import java.util.UUID;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import com.cloud.utils.db.GenericDao;
+
+@Entity
+@Table(name = "kubernetes_supported_version")
+public class KubernetesSupportedVersionVO implements KubernetesSupportedVersion {
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "id")
+ private long id;
+
+ @Column(name = "uuid")
+ private String uuid;
+
+ @Column(name = "name")
+ private String name;
+
+ @Column(name = "semantic_version")
+ private String semanticVersion;
+
+ @Column(name = "iso_id")
+ private long isoId;
+
+ @Column(name = "zone_id")
+ private Long zoneId;
+
+ @Column(name = "state")
+ @Enumerated(value = EnumType.STRING)
+ State state = State.Enabled;
+
+ @Column(name = "min_cpu")
+ private int minimumCpu;
+
+ @Column(name = "min_ram_size")
+ private int minimumRamSize;
+
+ @Column(name = GenericDao.CREATED_COLUMN)
+ Date created;
+
+ @Column(name = GenericDao.REMOVED_COLUMN)
+ Date removed;
+
+ public KubernetesSupportedVersionVO() {
+ this.uuid = UUID.randomUUID().toString();
+ }
+
+ public KubernetesSupportedVersionVO(String name, String semanticVersion, long isoId, Long zoneId,
+ int minimumCpu, int minimumRamSize) {
+ this.uuid = UUID.randomUUID().toString();
+ this.name = name;
+ this.semanticVersion = semanticVersion;
+ this.isoId = isoId;
+ this.zoneId = zoneId;
+ this.minimumCpu = minimumCpu;
+ this.minimumRamSize = minimumRamSize;
+ }
+
+ @Override
+ public long getId() {
+ return id;
+ }
+
+ @Override
+ public String getUuid() {
+ return uuid;
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Override
+ public String getSemanticVersion() {
+ return semanticVersion;
+ }
+
+ public void setSemanticVersion(String semanticVersion) {
+ this.semanticVersion = semanticVersion;
+ }
+
+ @Override
+ public long getIsoId() {
+ return isoId;
+ }
+
+ public void setIsoId(long isoId) {
+ this.isoId = isoId;
+ }
+
+ @Override
+ public Long getZoneId() {
+ return zoneId;
+ }
+
+ public void setZoneId(Long zoneId) {
+ this.zoneId = zoneId;
+ }
+
+ @Override
+ public State getState() {
+ return this.state;
+ }
+
+ public void setState(State state) {
+ this.state = state;
+ }
+
+ @Override
+ public int getMinimumCpu() {
+ return minimumCpu;
+ }
+
+ public void setMinimumCpu(int minimumCpu) {
+ this.minimumCpu = minimumCpu;
+ }
+
+ @Override
+ public int getMinimumRamSize() {
+ return minimumRamSize;
+ }
+
+ public void setMinimumRamSize(int minimumRamSize) {
+ this.minimumRamSize = minimumRamSize;
+ }
+
+ public Date getCreated() {
+ return created;
+ }
+
+ public Date getRemoved() {
+ return removed;
+ }
+}
diff --git a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/KubernetesVersionEventTypes.java
similarity index 60%
copy from agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
copy to plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/KubernetesVersionEventTypes.java
index b244d02..4c979ba 100644
--- a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/KubernetesVersionEventTypes.java
@@ -1,4 +1,3 @@
-//
// 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
@@ -15,22 +14,11 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-//
-package com.cloud.agent.direct.download;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+package com.cloud.kubernetes.version;
-@RunWith(MockitoJUnitRunner.class)
-public class DirectTemplateDownloaderImplTest {
-
- private static final Long templateId = 202l;
-
- @Test
- public void testGetDirectDownloadTempPath() {
- String path = DirectTemplateDownloaderImpl.getDirectDownloadTempPath(templateId);
- Assert.assertEquals("template/2/202", path);
- }
+public class KubernetesVersionEventTypes {
+ public static final String EVENT_KUBERNETES_VERSION_ADD = "KUBERNETES.VERSION.ADD";
+ public static final String EVENT_KUBERNETES_VERSION_DELETE = "KUBERNETES.VERSION.DELETE";
+ public static final String EVENT_KUBERNETES_VERSION_UPDATE = "KUBERNETES.VERSION.UPDATE";
}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/KubernetesVersionManagerImpl.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/KubernetesVersionManagerImpl.java
new file mode 100644
index 0000000..4eefc3f
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/KubernetesVersionManagerImpl.java
@@ -0,0 +1,388 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.kubernetes.version;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.command.admin.kubernetes.version.AddKubernetesSupportedVersionCmd;
+import org.apache.cloudstack.api.command.admin.kubernetes.version.DeleteKubernetesSupportedVersionCmd;
+import org.apache.cloudstack.api.command.admin.kubernetes.version.UpdateKubernetesSupportedVersionCmd;
+import org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd;
+import org.apache.cloudstack.api.command.user.iso.RegisterIsoCmd;
+import org.apache.cloudstack.api.command.user.kubernetes.version.ListKubernetesSupportedVersionsCmd;
+import org.apache.cloudstack.api.response.KubernetesSupportedVersionResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.log4j.Logger;
+
+import com.cloud.api.query.dao.TemplateJoinDao;
+import com.cloud.api.query.vo.TemplateJoinVO;
+import com.cloud.dc.DataCenterVO;
+import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.event.ActionEvent;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.kubernetes.cluster.KubernetesClusterService;
+import com.cloud.kubernetes.cluster.KubernetesClusterVO;
+import com.cloud.kubernetes.cluster.dao.KubernetesClusterDao;
+import com.cloud.kubernetes.version.dao.KubernetesSupportedVersionDao;
+import com.cloud.storage.VMTemplateVO;
+import com.cloud.storage.dao.VMTemplateDao;
+import com.cloud.storage.dao.VMTemplateZoneDao;
+import com.cloud.template.TemplateApiService;
+import com.cloud.template.VirtualMachineTemplate;
+import com.cloud.user.AccountManager;
+import com.cloud.utils.component.ComponentContext;
+import com.cloud.utils.component.ManagerBase;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.google.common.base.Strings;
+
+public class KubernetesVersionManagerImpl extends ManagerBase implements KubernetesVersionService {
+ public static final Logger LOGGER = Logger.getLogger(KubernetesVersionManagerImpl.class.getName());
+
+ @Inject
+ private KubernetesSupportedVersionDao kubernetesSupportedVersionDao;
+ @Inject
+ private KubernetesClusterDao kubernetesClusterDao;
+ @Inject
+ private AccountManager accountManager;
+ @Inject
+ private VMTemplateDao templateDao;
+ @Inject
+ private TemplateJoinDao templateJoinDao;
+ @Inject
+ private VMTemplateZoneDao templateZoneDao;
+ @Inject
+ private DataCenterDao dataCenterDao;
+ @Inject
+ private TemplateApiService templateService;
+
+ private KubernetesSupportedVersionResponse createKubernetesSupportedVersionResponse(final KubernetesSupportedVersion kubernetesSupportedVersion) {
+ KubernetesSupportedVersionResponse response = new KubernetesSupportedVersionResponse();
+ response.setObjectName("kubernetessupportedversion");
+ response.setId(kubernetesSupportedVersion.getUuid());
+ response.setName(kubernetesSupportedVersion.getName());
+ response.setSemanticVersion(kubernetesSupportedVersion.getSemanticVersion());
+ if (kubernetesSupportedVersion.getState() != null) {
+ response.setState(kubernetesSupportedVersion.getState().toString());
+ }
+ response.setMinimumCpu(kubernetesSupportedVersion.getMinimumCpu());
+ response.setMinimumRamSize(kubernetesSupportedVersion.getMinimumRamSize());
+ DataCenterVO zone = dataCenterDao.findById(kubernetesSupportedVersion.getZoneId());
+ if (zone != null) {
+ response.setZoneId(zone.getUuid());
+ response.setZoneName(zone.getName());
+ }
+ if (compareSemanticVersions(kubernetesSupportedVersion.getSemanticVersion(),
+ KubernetesClusterService.MIN_KUBERNETES_VERSION_HA_SUPPORT)>=0) {
+ response.setSupportsHA(true);
+ } else {
+ response.setSupportsHA(false);
+ }
+ TemplateJoinVO template = templateJoinDao.findById(kubernetesSupportedVersion.getIsoId());
+ if (template != null) {
+ response.setIsoId(template.getUuid());
+ response.setIsoName(template.getName());
+ response.setIsoState(template.getState().toString());
+ }
+ return response;
+ }
+
+ private ListResponse<KubernetesSupportedVersionResponse> createKubernetesSupportedVersionListResponse(List<KubernetesSupportedVersionVO> versions) {
+ List<KubernetesSupportedVersionResponse> responseList = new ArrayList<>();
+ for (KubernetesSupportedVersionVO version : versions) {
+ responseList.add(createKubernetesSupportedVersionResponse(version));
+ }
+ ListResponse<KubernetesSupportedVersionResponse> response = new ListResponse<>();
+ response.setResponses(responseList);
+ return response;
+ }
+
+ private static boolean isSemanticVersion(final String version) {
+ if(!version.matches("[0-9]+(\\.[0-9]+)*")) {
+ return false;
+ }
+ String[] parts = version.split("\\.");
+ if (parts.length < 3) {
+ return false;
+ }
+ return true;
+ }
+
+ private List <KubernetesSupportedVersionVO> filterKubernetesSupportedVersions(List <KubernetesSupportedVersionVO> versions, final String minimumSemanticVersion) {
+ if (!Strings.isNullOrEmpty(minimumSemanticVersion)) {
+ for (int i = versions.size() - 1; i >= 0; --i) {
+ KubernetesSupportedVersionVO version = versions.get(i);
+ try {
+ if (compareSemanticVersions(minimumSemanticVersion, version.getSemanticVersion()) > 0) {
+ versions.remove(i);
+ }
+ } catch (IllegalArgumentException e) {
+ LOGGER.warn(String.format("Unable to compare Kubernetes version for supported version ID: %s with %s", version.getUuid(), minimumSemanticVersion));
+ versions.remove(i);
+ }
+ }
+ }
+ return versions;
+ }
+
+ private VirtualMachineTemplate registerKubernetesVersionIso(final Long zoneId, final String versionName, final String isoUrl, final String isoChecksum)throws IllegalAccessException, NoSuchFieldException,
+ IllegalArgumentException, ResourceAllocationException {
+ String isoName = String.format("%s-Kubernetes-Binaries-ISO", versionName);
+ RegisterIsoCmd registerIsoCmd = new RegisterIsoCmd();
+ registerIsoCmd = ComponentContext.inject(registerIsoCmd);
+ registerIsoCmd.setIsoName(isoName);
+ registerIsoCmd.setPublic(true);
+ if (zoneId != null) {
+ registerIsoCmd.setZoneId(zoneId);
+ }
+ registerIsoCmd.setDisplayText(isoName);
+ registerIsoCmd.setBootable(false);
+ registerIsoCmd.setUrl(isoUrl);
+ if (!Strings.isNullOrEmpty(isoChecksum)) {
+ registerIsoCmd.setChecksum(isoChecksum);
+ }
+ registerIsoCmd.setAccountName(accountManager.getSystemAccount().getAccountName());
+ registerIsoCmd.setDomainId(accountManager.getSystemAccount().getDomainId());
+ return templateService.registerIso(registerIsoCmd);
+ }
+
+ private void deleteKubernetesVersionIso(long templateId) throws IllegalAccessException, NoSuchFieldException,
+ IllegalArgumentException {
+ DeleteIsoCmd deleteIsoCmd = new DeleteIsoCmd();
+ deleteIsoCmd = ComponentContext.inject(deleteIsoCmd);
+ deleteIsoCmd.setId(templateId);
+ templateService.deleteIso(deleteIsoCmd);
+ }
+
+ public static int compareSemanticVersions(String v1, String v2) throws IllegalArgumentException {
+ if (Strings.isNullOrEmpty(v1) || Strings.isNullOrEmpty(v2)) {
+ throw new IllegalArgumentException(String.format("Invalid version comparision with versions %s, %s", v1, v2));
+ }
+ if(!isSemanticVersion(v1)) {
+ throw new IllegalArgumentException(String.format("Invalid version format, %s", v1));
+ }
+ if(!isSemanticVersion(v2)) {
+ throw new IllegalArgumentException(String.format("Invalid version format, %s", v2));
+ }
+ String[] thisParts = v1.split("\\.");
+ String[] thatParts = v2.split("\\.");
+ int length = Math.max(thisParts.length, thatParts.length);
+ for(int i = 0; i < length; i++) {
+ int thisPart = i < thisParts.length ?
+ Integer.parseInt(thisParts[i]) : 0;
+ int thatPart = i < thatParts.length ?
+ Integer.parseInt(thatParts[i]) : 0;
+ if(thisPart < thatPart)
+ return -1;
+ if(thisPart > thatPart)
+ return 1;
+ }
+ return 0;
+ }
+
+ /**
+ * Returns a boolean value whether Kubernetes cluster upgrade can be carried from a given currentVersion to upgradeVersion
+ * Kubernetes clusters can only be upgraded from one MINOR version to the next MINOR version, or between PATCH versions of the same MINOR.
+ * That is, MINOR versions cannot be skipped during upgrade.
+ * For example, you can upgrade from 1.y to 1.y+1, but not from 1.y to 1.y+2
+ * @param currentVersion
+ * @param upgradeVersion
+ * @return
+ * @throws IllegalArgumentException
+ */
+ public static boolean canUpgradeKubernetesVersion(final String currentVersion, final String upgradeVersion) throws IllegalArgumentException {
+ int versionDiff = compareSemanticVersions(upgradeVersion, currentVersion);
+ if (versionDiff == 0) {
+ throw new IllegalArgumentException(String.format("Kubernetes clusters can not be upgraded, current version: %s, upgrade version: %s", currentVersion, upgradeVersion));
+ } else if (versionDiff < 0) {
+ throw new IllegalArgumentException(String.format("Kubernetes clusters can not be downgraded, current version: %s, upgrade version: %s", currentVersion, upgradeVersion));
+ }
+ String[] thisParts = currentVersion.split("\\.");
+ String[] thatParts = upgradeVersion.split("\\.");
+ int majorVerDiff = Integer.parseInt(thatParts[0]) - Integer.parseInt(thisParts[0]);
+ int minorVerDiff = Integer.parseInt(thatParts[1]) - Integer.parseInt(thisParts[1]);
+
+ if (majorVerDiff != 0 || minorVerDiff > 1) {
+ throw new IllegalArgumentException(String.format("Kubernetes clusters can be upgraded between next minor or patch version releases, current version: %s, upgrade version: %s", currentVersion, upgradeVersion));
+ }
+ return true;
+ }
+
+ @Override
+ public ListResponse<KubernetesSupportedVersionResponse> listKubernetesSupportedVersions(final ListKubernetesSupportedVersionsCmd cmd) {
+ if (!KubernetesClusterService.KubernetesServiceEnabled.value()) {
+ throw new CloudRuntimeException("Kubernetes Service plugin is disabled");
+ }
+ final Long versionId = cmd.getId();
+ final Long zoneId = cmd.getZoneId();
+ String minimumSemanticVersion = cmd.getMinimumSemanticVersion();
+ final Long minimumKubernetesVersionId = cmd.getMinimumKubernetesVersionId();
+ if (!Strings.isNullOrEmpty(minimumSemanticVersion) && minimumKubernetesVersionId != null) {
+ throw new CloudRuntimeException(String.format("Both parameters %s and %s can not be passed together", ApiConstants.MIN_SEMANTIC_VERSION, ApiConstants.MIN_KUBERNETES_VERSION_ID));
+ }
+ if (minimumKubernetesVersionId != null) {
+ KubernetesSupportedVersionVO minVersion = kubernetesSupportedVersionDao.findById(minimumKubernetesVersionId);
+ if (minVersion == null) {
+ throw new InvalidParameterValueException(String.format("Invalid %s passed", ApiConstants.MIN_KUBERNETES_VERSION_ID));
+ }
+ minimumSemanticVersion = minVersion.getSemanticVersion();
+ }
+ List <KubernetesSupportedVersionVO> versions = new ArrayList<>();
+ if (versionId != null) {
+ KubernetesSupportedVersionVO version = kubernetesSupportedVersionDao.findById(versionId);
+ if (version != null && (zoneId == null || version.getZoneId() == null || version.getZoneId().equals(zoneId))) {
+ versions.add(version);
+ }
+ } else {
+ if (zoneId == null) {
+ versions = kubernetesSupportedVersionDao.listAll();
+ } else {
+ versions = kubernetesSupportedVersionDao.listAllInZone(zoneId);
+ }
+ }
+ versions = filterKubernetesSupportedVersions(versions, minimumSemanticVersion);
+
+ return createKubernetesSupportedVersionListResponse(versions);
+ }
+
+ @Override
+ @ActionEvent(eventType = KubernetesVersionEventTypes.EVENT_KUBERNETES_VERSION_ADD, eventDescription = "Adding Kubernetes supported version")
+ public KubernetesSupportedVersionResponse addKubernetesSupportedVersion(final AddKubernetesSupportedVersionCmd cmd) {
+ if (!KubernetesClusterService.KubernetesServiceEnabled.value()) {
+ throw new CloudRuntimeException("Kubernetes Service plugin is disabled");
+ }
+ String name = cmd.getName();
+ final String semanticVersion = cmd.getSemanticVersion();
+ final Long zoneId = cmd.getZoneId();
+ final String isoUrl = cmd.getUrl();
+ final String isoChecksum = cmd.getChecksum();
+ final Integer minimumCpu = cmd.getMinimumCpu();
+ final Integer minimumRamSize = cmd.getMinimumRamSize();
+ if (minimumCpu == null || minimumCpu < KubernetesClusterService.MIN_KUBERNETES_CLUSTER_NODE_CPU) {
+ throw new InvalidParameterValueException(String.format("Invalid value for %s parameter", ApiConstants.MIN_CPU_NUMBER));
+ }
+ if (minimumRamSize == null || minimumRamSize < KubernetesClusterService.MIN_KUBERNETES_CLUSTER_NODE_RAM_SIZE) {
+ throw new InvalidParameterValueException(String.format("Invalid value for %s parameter", ApiConstants.MIN_MEMORY));
+ }
+ if (compareSemanticVersions(semanticVersion, MIN_KUBERNETES_VERSION) < 0) {
+ throw new InvalidParameterValueException(String.format("New supported Kubernetes version cannot be added as %s is minimum version supported by Kubernetes Service", MIN_KUBERNETES_VERSION));
+ }
+ if (zoneId != null && dataCenterDao.findById(zoneId) == null) {
+ throw new InvalidParameterValueException("Invalid zone specified");
+ }
+ if (Strings.isNullOrEmpty(isoUrl)) {
+ throw new InvalidParameterValueException(String.format("Invalid URL for ISO specified, %s", isoUrl));
+ }
+ if (Strings.isNullOrEmpty(name)) {
+ name = String.format("v%s", semanticVersion);
+ if (zoneId != null) {
+ name = String.format("%s-%s", name, dataCenterDao.findById(zoneId).getName());
+ }
+ }
+
+ VMTemplateVO template = null;
+ try {
+ VirtualMachineTemplate vmTemplate = registerKubernetesVersionIso(zoneId, name, isoUrl, isoChecksum);
+ template = templateDao.findById(vmTemplate.getId());
+ } catch (IllegalAccessException | NoSuchFieldException | IllegalArgumentException | ResourceAllocationException ex) {
+ LOGGER.error(String.format("Unable to register binaries ISO for supported kubernetes version, %s, with url: %s", name, isoUrl), ex);
+ throw new CloudRuntimeException(String.format("Unable to register binaries ISO for supported kubernetes version, %s, with url: %s", name, isoUrl));
+ }
+
+ KubernetesSupportedVersionVO supportedVersionVO = new KubernetesSupportedVersionVO(name, semanticVersion, template.getId(), zoneId, minimumCpu, minimumRamSize);
+ supportedVersionVO = kubernetesSupportedVersionDao.persist(supportedVersionVO);
+
+ return createKubernetesSupportedVersionResponse(supportedVersionVO);
+ }
+
+ @Override
+ @ActionEvent(eventType = KubernetesVersionEventTypes.EVENT_KUBERNETES_VERSION_DELETE, eventDescription = "Deleting Kubernetes supported version", async = true)
+ public boolean deleteKubernetesSupportedVersion(final DeleteKubernetesSupportedVersionCmd cmd) {
+ if (!KubernetesClusterService.KubernetesServiceEnabled.value()) {
+ throw new CloudRuntimeException("Kubernetes Service plugin is disabled");
+ }
+ final Long versionId = cmd.getId();
+ KubernetesSupportedVersion version = kubernetesSupportedVersionDao.findById(versionId);
+ if (version == null) {
+ throw new InvalidParameterValueException("Invalid Kubernetes version id specified");
+ }
+ List<KubernetesClusterVO> clusters = kubernetesClusterDao.listAllByKubernetesVersion(versionId);
+ if (clusters.size() > 0) {
+ throw new CloudRuntimeException(String.format("Unable to delete Kubernetes version ID: %s. Existing clusters currently using the version.", version.getUuid()));
+ }
+
+ VMTemplateVO template = templateDao.findByIdIncludingRemoved(version.getIsoId());
+ if (template == null) {
+ LOGGER.warn(String.format("Unable to find ISO associated with supported Kubernetes version ID: %s", version.getUuid()));
+ }
+ if (template != null && template.getRemoved() == null) { // Delete ISO
+ try {
+ deleteKubernetesVersionIso(template.getId());
+ } catch (IllegalAccessException | NoSuchFieldException | IllegalArgumentException ex) {
+ LOGGER.error(String.format("Unable to delete binaries ISO ID: %s associated with supported kubernetes version ID: %s", template.getUuid(), version.getUuid()), ex);
+ throw new CloudRuntimeException(String.format("Unable to delete binaries ISO ID: %s associated with supported kubernetes version ID: %s", template.getUuid(), version.getUuid()));
+ }
+ }
+ return kubernetesSupportedVersionDao.remove(version.getId());
+ }
+
+ @Override
+ @ActionEvent(eventType = KubernetesVersionEventTypes.EVENT_KUBERNETES_VERSION_UPDATE, eventDescription = "Updating Kubernetes supported version")
+ public KubernetesSupportedVersionResponse updateKubernetesSupportedVersion(final UpdateKubernetesSupportedVersionCmd cmd) {
+ if (!KubernetesClusterService.KubernetesServiceEnabled.value()) {
+ throw new CloudRuntimeException("Kubernetes Service plugin is disabled");
+ }
+ final Long versionId = cmd.getId();
+ KubernetesSupportedVersion.State state = null;
+ KubernetesSupportedVersionVO version = kubernetesSupportedVersionDao.findById(versionId);
+ if (version == null) {
+ throw new InvalidParameterValueException("Invalid Kubernetes version id specified");
+ }
+ try {
+ state = KubernetesSupportedVersion.State.valueOf(cmd.getState());
+ } catch (IllegalArgumentException iae) {
+ throw new InvalidParameterValueException(String.format("Invalid value for %s parameter", ApiConstants.STATE));
+ }
+ if (!state.equals(version.getState())) {
+ version = kubernetesSupportedVersionDao.createForUpdate(version.getId());
+ version.setState(state);
+ if (!kubernetesSupportedVersionDao.update(version.getId(), version)) {
+ throw new CloudRuntimeException(String.format("Failed to update Kubernetes supported version ID: %s", version.getUuid()));
+ }
+ version = kubernetesSupportedVersionDao.findById(versionId);
+ }
+ return createKubernetesSupportedVersionResponse(version);
+ }
+
+ @Override
+ public List<Class<?>> getCommands() {
+ List<Class<?>> cmdList = new ArrayList<Class<?>>();
+ if (!KubernetesClusterService.KubernetesServiceEnabled.value()) {
+ return cmdList;
+ }
+ cmdList.add(AddKubernetesSupportedVersionCmd.class);
+ cmdList.add(ListKubernetesSupportedVersionsCmd.class);
+ cmdList.add(DeleteKubernetesSupportedVersionCmd.class);
+ cmdList.add(UpdateKubernetesSupportedVersionCmd.class);
+ return cmdList;
+ }
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/KubernetesVersionService.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/KubernetesVersionService.java
new file mode 100644
index 0000000..8e4cd03
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/KubernetesVersionService.java
@@ -0,0 +1,36 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.kubernetes.version;
+
+import org.apache.cloudstack.api.command.admin.kubernetes.version.AddKubernetesSupportedVersionCmd;
+import org.apache.cloudstack.api.command.admin.kubernetes.version.DeleteKubernetesSupportedVersionCmd;
+import org.apache.cloudstack.api.command.admin.kubernetes.version.UpdateKubernetesSupportedVersionCmd;
+import org.apache.cloudstack.api.command.user.kubernetes.version.ListKubernetesSupportedVersionsCmd;
+import org.apache.cloudstack.api.response.KubernetesSupportedVersionResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+
+import com.cloud.utils.component.PluggableService;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+public interface KubernetesVersionService extends PluggableService {
+ static final String MIN_KUBERNETES_VERSION = "1.11.0";
+ ListResponse<KubernetesSupportedVersionResponse> listKubernetesSupportedVersions(ListKubernetesSupportedVersionsCmd cmd);
+ KubernetesSupportedVersionResponse addKubernetesSupportedVersion(AddKubernetesSupportedVersionCmd cmd) throws CloudRuntimeException;
+ boolean deleteKubernetesSupportedVersion(DeleteKubernetesSupportedVersionCmd cmd) throws CloudRuntimeException;
+ KubernetesSupportedVersionResponse updateKubernetesSupportedVersion(UpdateKubernetesSupportedVersionCmd cmd) throws CloudRuntimeException;
+}
diff --git a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/dao/KubernetesSupportedVersionDao.java
similarity index 60%
copy from agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
copy to plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/dao/KubernetesSupportedVersionDao.java
index b244d02..69de862 100644
--- a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/dao/KubernetesSupportedVersionDao.java
@@ -1,4 +1,3 @@
-//
// 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
@@ -15,22 +14,14 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-//
-package com.cloud.agent.direct.download;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+package com.cloud.kubernetes.version.dao;
-@RunWith(MockitoJUnitRunner.class)
-public class DirectTemplateDownloaderImplTest {
+import java.util.List;
- private static final Long templateId = 202l;
+import com.cloud.kubernetes.version.KubernetesSupportedVersionVO;
+import com.cloud.utils.db.GenericDao;
- @Test
- public void testGetDirectDownloadTempPath() {
- String path = DirectTemplateDownloaderImpl.getDirectDownloadTempPath(templateId);
- Assert.assertEquals("template/2/202", path);
- }
+public interface KubernetesSupportedVersionDao extends GenericDao<KubernetesSupportedVersionVO, Long> {
+ List<KubernetesSupportedVersionVO> listAllInZone(long dataCenterId);
}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/dao/KubernetesSupportedVersionDaoImpl.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/dao/KubernetesSupportedVersionDaoImpl.java
new file mode 100644
index 0000000..5dd6eff
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/dao/KubernetesSupportedVersionDaoImpl.java
@@ -0,0 +1,42 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.kubernetes.version.dao;
+
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+
+import com.cloud.kubernetes.version.KubernetesSupportedVersionVO;
+import com.cloud.utils.db.GenericDaoBase;
+import com.cloud.utils.db.SearchCriteria;
+
+@Component
+public class KubernetesSupportedVersionDaoImpl extends GenericDaoBase<KubernetesSupportedVersionVO, Long> implements KubernetesSupportedVersionDao {
+ public KubernetesSupportedVersionDaoImpl() {
+ }
+
+ @Override
+ public List<KubernetesSupportedVersionVO> listAllInZone(long dataCenterId) {
+ SearchCriteria<KubernetesSupportedVersionVO> sc = createSearchCriteria();
+ SearchCriteria<KubernetesSupportedVersionVO> scc = createSearchCriteria();
+ scc.addOr("zoneId", SearchCriteria.Op.EQ, dataCenterId);
+ scc.addOr("zoneId", SearchCriteria.Op.NULL);
+ sc.addAnd("zoneId", SearchCriteria.Op.SC, scc);
+ return listBy(sc);
+ }
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/admin/kubernetes/version/AddKubernetesSupportedVersionCmd.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/admin/kubernetes/version/AddKubernetesSupportedVersionCmd.java
new file mode 100644
index 0000000..a85e6ee
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/admin/kubernetes/version/AddKubernetesSupportedVersionCmd.java
@@ -0,0 +1,153 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.command.admin.kubernetes.version;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
+import org.apache.cloudstack.api.response.KubernetesSupportedVersionResponse;
+import org.apache.cloudstack.api.response.ZoneResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.log4j.Logger;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.kubernetes.version.KubernetesSupportedVersion;
+import com.cloud.kubernetes.version.KubernetesVersionService;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.google.common.base.Strings;
+
+@APICommand(name = AddKubernetesSupportedVersionCmd.APINAME,
+ description = "Add a supported Kubernetes version",
+ responseObject = KubernetesSupportedVersionResponse.class,
+ responseView = ResponseObject.ResponseView.Full,
+ entityType = {KubernetesSupportedVersion.class},
+ authorized = {RoleType.Admin})
+public class AddKubernetesSupportedVersionCmd extends BaseCmd implements AdminCmd {
+ public static final Logger LOGGER = Logger.getLogger(AddKubernetesSupportedVersionCmd.class.getName());
+ public static final String APINAME = "addKubernetesSupportedVersion";
+
+ @Inject
+ private KubernetesVersionService kubernetesVersionService;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+ @Parameter(name = ApiConstants.NAME, type = CommandType.STRING,
+ description = "the name of the Kubernetes supported version")
+ private String name;
+
+ @Parameter(name = ApiConstants.SEMANTIC_VERSION, type = CommandType.STRING, required = true,
+ description = "the semantic version of the Kubernetes version")
+ private String semanticVersion;
+
+ @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID,
+ entityType = ZoneResponse.class,
+ description = "the ID of the zone in which Kubernetes supported version will be available")
+ private Long zoneId;
+
+ @Parameter(name = ApiConstants.URL, type = CommandType.STRING,
+ description = "the URL of the binaries ISO for Kubernetes supported version")
+ private String url;
+
+ @Parameter(name = ApiConstants.CHECKSUM, type = CommandType.STRING,
+ description = "the checksum value of the binaries ISO. " + ApiConstants.CHECKSUM_PARAMETER_PREFIX_DESCRIPTION)
+ private String checksum;
+
+ @Parameter(name = ApiConstants.MIN_CPU_NUMBER, type = CommandType.INTEGER, required = true,
+ description = "the minimum number of CPUs to be set with the Kubernetes version")
+ private Integer minimumCpu;
+
+ @Parameter(name = ApiConstants.MIN_MEMORY, type = CommandType.INTEGER, required = true,
+ description = "the minimum RAM size in MB to be set with the Kubernetes version")
+ private Integer minimumRamSize;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+
+ public String getName() {
+ return name;
+ }
+
+ public String getSemanticVersion() {
+ if(Strings.isNullOrEmpty(semanticVersion)) {
+ throw new InvalidParameterValueException("Version can not be null");
+ }
+ if(!semanticVersion.matches("[0-9]+(\\.[0-9]+)*")) {
+ throw new IllegalArgumentException("Invalid version format. Semantic version needed");
+ }
+ return semanticVersion;
+ }
+
+ public Long getZoneId() {
+ return zoneId;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public String getChecksum() {
+ return checksum;
+ }
+
+ public Integer getMinimumCpu() {
+ return minimumCpu;
+ }
+
+ public Integer getMinimumRamSize() {
+ return minimumRamSize;
+ }
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + "response";
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ return CallContext.current().getCallingAccountId();
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+ @Override
+ public void execute() throws ServerApiException, ConcurrentOperationException {
+ try {
+ KubernetesSupportedVersionResponse response = kubernetesVersionService.addKubernetesSupportedVersion(this);
+ if (response == null) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to add Kubernetes supported version");
+ }
+ response.setResponseName(getCommandName());
+ setResponseObject(response);
+ } catch (CloudRuntimeException ex) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, ex.getMessage());
+ }
+ }
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/admin/kubernetes/version/DeleteKubernetesSupportedVersionCmd.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/admin/kubernetes/version/DeleteKubernetesSupportedVersionCmd.java
new file mode 100644
index 0000000..0248914
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/admin/kubernetes/version/DeleteKubernetesSupportedVersionCmd.java
@@ -0,0 +1,104 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.command.admin.kubernetes.version;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
+import org.apache.cloudstack.api.response.KubernetesSupportedVersionResponse;
+import org.apache.cloudstack.api.response.SuccessResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.log4j.Logger;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.kubernetes.version.KubernetesSupportedVersion;
+import com.cloud.kubernetes.version.KubernetesVersionEventTypes;
+import com.cloud.kubernetes.version.KubernetesVersionService;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+@APICommand(name = DeleteKubernetesSupportedVersionCmd.APINAME,
+ description = "Deletes a Kubernetes cluster",
+ responseObject = SuccessResponse.class,
+ entityType = {KubernetesSupportedVersion.class},
+ authorized = {RoleType.Admin})
+public class DeleteKubernetesSupportedVersionCmd extends BaseAsyncCmd implements AdminCmd {
+ public static final Logger LOGGER = Logger.getLogger(DeleteKubernetesSupportedVersionCmd.class.getName());
+ public static final String APINAME = "deleteKubernetesSupportedVersion";
+
+ @Inject
+ private KubernetesVersionService kubernetesVersionService;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+ @Parameter(name = ApiConstants.ID, type = CommandType.UUID,
+ entityType = KubernetesSupportedVersionResponse.class,
+ description = "the ID of the Kubernetes supported version",
+ required = true)
+ private Long id;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+ public Long getId() {
+ return id;
+ }
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + "response";
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ return CallContext.current().getCallingAccountId();
+ }
+
+ @Override
+ public String getEventType() {
+ return KubernetesVersionEventTypes.EVENT_KUBERNETES_VERSION_DELETE;
+ }
+
+ @Override
+ public String getEventDescription() {
+ return "Deleting Kubernetes supported version " + getId();
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+ @Override
+ public void execute() throws ServerApiException, ConcurrentOperationException {
+ try {
+ if (!kubernetesVersionService.deleteKubernetesSupportedVersion(this)) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Failed to delete Kubernetes supported version ID: %d", getId()));
+ }
+ SuccessResponse response = new SuccessResponse(getCommandName());
+ setResponseObject(response);
+ } catch (CloudRuntimeException ex) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, ex.getMessage());
+ }
+ }
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/admin/kubernetes/version/UpdateKubernetesSupportedVersionCmd.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/admin/kubernetes/version/UpdateKubernetesSupportedVersionCmd.java
new file mode 100644
index 0000000..bf888c5
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/admin/kubernetes/version/UpdateKubernetesSupportedVersionCmd.java
@@ -0,0 +1,103 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.command.admin.kubernetes.version;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.AdminCmd;
+import org.apache.cloudstack.api.response.KubernetesSupportedVersionResponse;
+import org.apache.log4j.Logger;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.kubernetes.version.KubernetesSupportedVersion;
+import com.cloud.kubernetes.version.KubernetesVersionService;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+@APICommand(name = UpdateKubernetesSupportedVersionCmd.APINAME,
+ description = "Update a supported Kubernetes version",
+ responseObject = KubernetesSupportedVersionResponse.class,
+ responseView = ResponseObject.ResponseView.Full,
+ entityType = {KubernetesSupportedVersion.class},
+ authorized = {RoleType.Admin})
+public class UpdateKubernetesSupportedVersionCmd extends BaseCmd implements AdminCmd {
+ public static final Logger LOGGER = Logger.getLogger(UpdateKubernetesSupportedVersionCmd.class.getName());
+ public static final String APINAME = "updateKubernetesSupportedVersion";
+
+ @Inject
+ private KubernetesVersionService kubernetesVersionService;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+ @Parameter(name = ApiConstants.ID, type = BaseCmd.CommandType.UUID,
+ entityType = KubernetesSupportedVersionResponse.class,
+ description = "the ID of the Kubernetes supported version",
+ required = true)
+ private Long id;
+
+ @Parameter(name = ApiConstants.STATE, type = CommandType.STRING,
+ description = "the enabled or disabled state of the Kubernetes supported version",
+ required = true)
+ private String state;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+ public Long getId() {
+ return id;
+ }
+
+ public String getState() {
+ return state;
+ }
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + "response";
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ return 0;
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+ @Override
+ public void execute() throws ServerApiException, ConcurrentOperationException {
+ try {
+ KubernetesSupportedVersionResponse response = kubernetesVersionService.updateKubernetesSupportedVersion(this);
+ if (response == null) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update Kubernetes supported version");
+ }
+ response.setResponseName(getCommandName());
+ setResponseObject(response);
+ } catch (CloudRuntimeException ex) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, ex.getMessage());
+ }
+ }
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/CreateKubernetesClusterCmd.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/CreateKubernetesClusterCmd.java
new file mode 100644
index 0000000..32b07c4
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/CreateKubernetesClusterCmd.java
@@ -0,0 +1,297 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.command.user.kubernetes.cluster;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.acl.SecurityChecker.AccessType;
+import org.apache.cloudstack.api.ACL;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiCommandJobType;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCreateCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.DomainResponse;
+import org.apache.cloudstack.api.response.KubernetesClusterResponse;
+import org.apache.cloudstack.api.response.KubernetesSupportedVersionResponse;
+import org.apache.cloudstack.api.response.NetworkResponse;
+import org.apache.cloudstack.api.response.ProjectResponse;
+import org.apache.cloudstack.api.response.ServiceOfferingResponse;
+import org.apache.cloudstack.api.response.ZoneResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.log4j.Logger;
+
+import com.cloud.kubernetes.cluster.KubernetesCluster;
+import com.cloud.kubernetes.cluster.KubernetesClusterEventTypes;
+import com.cloud.kubernetes.cluster.KubernetesClusterService;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+@APICommand(name = CreateKubernetesClusterCmd.APINAME,
+ description = "Creates a Kubernetes cluster",
+ responseObject = KubernetesClusterResponse.class,
+ responseView = ResponseView.Restricted,
+ entityType = {KubernetesCluster.class},
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = true,
+ authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
+public class CreateKubernetesClusterCmd extends BaseAsyncCreateCmd {
+ public static final Logger LOGGER = Logger.getLogger(CreateKubernetesClusterCmd.class.getName());
+ public static final String APINAME = "createKubernetesCluster";
+
+ @Inject
+ public KubernetesClusterService kubernetesClusterService;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+
+ @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "name for the Kubernetes cluster")
+ private String name;
+
+ @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, required = true, description = "description for the Kubernetes cluster")
+ private String description;
+
+ @ACL(accessType = AccessType.UseEntry)
+ @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, required = true,
+ description = "availability zone in which Kubernetes cluster to be launched")
+ private Long zoneId;
+
+ @Parameter(name = ApiConstants.KUBERNETES_VERSION_ID, type = CommandType.UUID, entityType = KubernetesSupportedVersionResponse.class, required = true,
+ description = "Kubernetes version with which cluster to be launched")
+ private Long kubernetesVersionId;
+
+ @ACL(accessType = AccessType.UseEntry)
+ @Parameter(name = ApiConstants.SERVICE_OFFERING_ID, type = CommandType.UUID, entityType = ServiceOfferingResponse.class,
+ required = true, description = "the ID of the service offering for the virtual machines in the cluster.")
+ private Long serviceOfferingId;
+
+ @ACL(accessType = AccessType.UseEntry)
+ @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "an optional account for the" +
+ " virtual machine. Must be used with domainId.")
+ private String accountName;
+
+ @ACL(accessType = AccessType.UseEntry)
+ @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class,
+ description = "an optional domainId for the virtual machine. If the account parameter is used, domainId must also be used.")
+ private Long domainId;
+
+ @ACL(accessType = AccessType.UseEntry)
+ @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class,
+ description = "Deploy cluster for the project")
+ private Long projectId;
+
+ @ACL(accessType = AccessType.UseEntry)
+ @Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class,
+ description = "Network in which Kubernetes cluster is to be launched")
+ private Long networkId;
+
+ @ACL(accessType = AccessType.UseEntry)
+ @Parameter(name = ApiConstants.SSH_KEYPAIR, type = CommandType.STRING,
+ description = "name of the ssh key pair used to login to the virtual machines")
+ private String sshKeyPairName;
+
+ @Parameter(name=ApiConstants.MASTER_NODES, type = CommandType.LONG,
+ description = "number of Kubernetes cluster master nodes, default is 1")
+ private Long masterNodes;
+
+ @Parameter(name=ApiConstants.EXTERNAL_LOAD_BALANCER_IP_ADDRESS, type = CommandType.STRING,
+ description = "external load balancer IP address while using shared network with Kubernetes HA cluster")
+ private String externalLoadBalancerIpAddress;
+
+ @Parameter(name=ApiConstants.SIZE, type = CommandType.LONG,
+ required = true, description = "number of Kubernetes cluster worker nodes")
+ private Long clusterSize;
+
+ @Parameter(name = ApiConstants.DOCKER_REGISTRY_USER_NAME, type = CommandType.STRING,
+ description = "user name for the docker image private registry")
+ private String dockerRegistryUserName;
+
+ @Parameter(name = ApiConstants.DOCKER_REGISTRY_PASSWORD, type = CommandType.STRING,
+ description = "password for the docker image private registry")
+ private String dockerRegistryPassword;
+
+ @Parameter(name = ApiConstants.DOCKER_REGISTRY_URL, type = CommandType.STRING,
+ description = "URL for the docker image private registry")
+ private String dockerRegistryUrl;
+
+ @Parameter(name = ApiConstants.DOCKER_REGISTRY_EMAIL, type = CommandType.STRING,
+ description = "email of the docker image private registry user")
+ private String dockerRegistryEmail;
+
+ @Parameter(name = ApiConstants.NODE_ROOT_DISK_SIZE, type = CommandType.LONG,
+ description = "root disk size of root disk for each node")
+ private Long nodeRootDiskSize;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public String getAccountName() {
+ if (accountName == null) {
+ return CallContext.current().getCallingAccount().getAccountName();
+ }
+ return accountName;
+ }
+
+ public String getDisplayName() {
+ return description;
+ }
+
+ public Long getDomainId() {
+ if (domainId == null) {
+ return CallContext.current().getCallingAccount().getDomainId();
+ }
+ return domainId;
+ }
+
+ public Long getServiceOfferingId() {
+ return serviceOfferingId;
+ }
+
+ public Long getZoneId() {
+ return zoneId;
+ }
+
+ public Long getKubernetesVersionId() {
+ return kubernetesVersionId;
+ }
+
+ public Long getNetworkId() { return networkId;}
+
+ public String getName() {
+ return name;
+ }
+
+ public String getSSHKeyPairName() {
+ return sshKeyPairName;
+ }
+
+ public Long getMasterNodes() {
+ if (masterNodes == null) {
+ return 1L;
+ }
+ return masterNodes;
+ }
+
+ public String getExternalLoadBalancerIpAddress() {
+ return externalLoadBalancerIpAddress;
+ }
+
+ public Long getClusterSize() {
+ return clusterSize;
+ }
+
+ public String getDockerRegistryUserName() {
+ return dockerRegistryUserName;
+ }
+
+ public String getDockerRegistryPassword() {
+ return dockerRegistryPassword;
+ }
+
+ public String getDockerRegistryUrl() {
+ return dockerRegistryUrl;
+ }
+
+ public String getDockerRegistryEmail() {
+ return dockerRegistryEmail;
+ }
+
+ public Long getNodeRootDiskSize() {
+ return nodeRootDiskSize;
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + "response";
+ }
+
+ public static String getResultObjectName() {
+ return "kubernetescluster";
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ Long accountId = _accountService.finalyzeAccountId(accountName, domainId, projectId, true);
+ if (accountId == null) {
+ return CallContext.current().getCallingAccount().getId();
+ }
+
+ return accountId;
+ }
+
+ @Override
+ public String getEventType() {
+ return KubernetesClusterEventTypes.EVENT_KUBERNETES_CLUSTER_CREATE;
+ }
+
+ @Override
+ public String getCreateEventType() {
+ return KubernetesClusterEventTypes.EVENT_KUBERNETES_CLUSTER_CREATE;
+ }
+
+ @Override
+ public String getCreateEventDescription() {
+ return "creating Kubernetes cluster";
+ }
+
+ @Override
+ public String getEventDescription() {
+ return "creating Kubernetes cluster. Cluster Id: " + getEntityId();
+ }
+
+ @Override
+ public ApiCommandJobType getInstanceType() {
+ return ApiCommandJobType.VirtualMachine;
+ }
+
+ @Override
+ public void execute() {
+ try {
+ if (!kubernetesClusterService.startKubernetesCluster(getEntityId(), true)) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to start Kubernetes cluster");
+ }
+ KubernetesClusterResponse response = kubernetesClusterService.createKubernetesClusterResponse(getEntityId());
+ response.setResponseName(getCommandName());
+ setResponseObject(response);
+ } catch (CloudRuntimeException e) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
+ }
+ }
+
+ @Override
+ public void create() throws CloudRuntimeException {
+ try {
+ KubernetesCluster cluster = kubernetesClusterService.createKubernetesCluster(this);
+ if (cluster == null) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create Kubernetes cluster");
+ }
+ setEntityId(cluster.getId());
+ setEntityUuid(cluster.getUuid());
+ } catch (CloudRuntimeException e) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
+ }
+ }
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/DeleteKubernetesClusterCmd.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/DeleteKubernetesClusterCmd.java
new file mode 100644
index 0000000..4f32138
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/DeleteKubernetesClusterCmd.java
@@ -0,0 +1,109 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.command.user.kubernetes.cluster;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.KubernetesClusterResponse;
+import org.apache.cloudstack.api.response.SuccessResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.log4j.Logger;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.kubernetes.cluster.KubernetesCluster;
+import com.cloud.kubernetes.cluster.KubernetesClusterEventTypes;
+import com.cloud.kubernetes.cluster.KubernetesClusterService;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+@APICommand(name = DeleteKubernetesClusterCmd.APINAME,
+ description = "Deletes a Kubernetes cluster",
+ responseObject = SuccessResponse.class,
+ entityType = {KubernetesCluster.class},
+ authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
+public class DeleteKubernetesClusterCmd extends BaseAsyncCmd {
+ public static final Logger LOGGER = Logger.getLogger(DeleteKubernetesClusterCmd.class.getName());
+ public static final String APINAME = "deleteKubernetesCluster";
+
+ @Inject
+ public KubernetesClusterService kubernetesClusterService;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+
+ @Parameter(name = ApiConstants.ID,
+ type = CommandType.UUID,
+ entityType = KubernetesClusterResponse.class,
+ required = true,
+ description = "the ID of the Kubernetes cluster")
+ private Long id;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public Long getId() {
+ return id;
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ @Override
+ public void execute() throws ServerApiException, ConcurrentOperationException {
+ try {
+ if (!kubernetesClusterService.deleteKubernetesCluster(id)) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Failed to delete Kubernetes cluster ID: %d", getId()));
+ }
+ SuccessResponse response = new SuccessResponse(getCommandName());
+ setResponseObject(response);
+ } catch (CloudRuntimeException e) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
+ }
+ }
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + "response";
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ return CallContext.current().getCallingAccount().getId();
+ }
+
+
+ @Override
+ public String getEventType() {
+ return KubernetesClusterEventTypes.EVENT_KUBERNETES_CLUSTER_DELETE;
+ }
+
+ @Override
+ public String getEventDescription() {
+ KubernetesCluster cluster = _entityMgr.findById(KubernetesCluster.class, getId());
+ return String.format("Deleting Kubernetes cluster ID: %s", cluster.getUuid());
+ }
+
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/GetKubernetesClusterConfigCmd.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/GetKubernetesClusterConfigCmd.java
new file mode 100644
index 0000000..c88f0eb
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/GetKubernetesClusterConfigCmd.java
@@ -0,0 +1,98 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.command.user.kubernetes.cluster;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.KubernetesClusterConfigResponse;
+import org.apache.cloudstack.api.response.KubernetesClusterResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.log4j.Logger;
+
+import com.cloud.kubernetes.cluster.KubernetesClusterService;
+import com.cloud.user.Account;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+
+@APICommand(name = GetKubernetesClusterConfigCmd.APINAME,
+ description = "Get Kubernetes cluster config",
+ responseObject = KubernetesClusterConfigResponse.class,
+ responseView = ResponseObject.ResponseView.Restricted,
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = true,
+ authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
+public class GetKubernetesClusterConfigCmd extends BaseCmd {
+ public static final Logger LOGGER = Logger.getLogger(GetKubernetesClusterConfigCmd.class.getName());
+ public static final String APINAME = "getKubernetesClusterConfig";
+
+ @Inject
+ public KubernetesClusterService kubernetesClusterService;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+ @Parameter(name = ApiConstants.ID, type = CommandType.UUID,
+ entityType = KubernetesClusterResponse.class,
+ description = "the ID of the Kubernetes cluster")
+ private Long id;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public Long getId() {
+ return id;
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ @Override
+ public long getEntityOwnerId() {
+ Account account = CallContext.current().getCallingAccount();
+ if (account != null) {
+ return account.getId();
+ }
+
+ return Account.ACCOUNT_ID_SYSTEM; // no account info given, parent this command to SYSTEM so ERROR events are tracked
+ }
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + "response";
+ }
+
+ @Override
+ public void execute() throws ServerApiException {
+ try {
+ KubernetesClusterConfigResponse response = kubernetesClusterService.getKubernetesClusterConfig(this);
+ response.setResponseName(getCommandName());
+ setResponseObject(response);
+ } catch (CloudRuntimeException e) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
+ }
+ }
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/ListKubernetesClustersCmd.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/ListKubernetesClustersCmd.java
new file mode 100644
index 0000000..ef960d5
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/ListKubernetesClustersCmd.java
@@ -0,0 +1,100 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.command.user.kubernetes.cluster;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject.ResponseView;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.KubernetesClusterResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.log4j.Logger;
+
+import com.cloud.kubernetes.cluster.KubernetesClusterService;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+@APICommand(name = ListKubernetesClustersCmd.APINAME,
+ description = "Lists Kubernetes clusters",
+ responseObject = KubernetesClusterResponse.class,
+ responseView = ResponseView.Restricted,
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = true,
+ authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
+public class ListKubernetesClustersCmd extends BaseListProjectAndAccountResourcesCmd {
+ public static final Logger LOGGER = Logger.getLogger(ListKubernetesClustersCmd.class.getName());
+ public static final String APINAME = "listKubernetesClusters";
+
+ @Inject
+ public KubernetesClusterService kubernetesClusterService;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+ @Parameter(name = ApiConstants.ID, type = CommandType.UUID,
+ entityType = KubernetesClusterResponse.class,
+ description = "the ID of the Kubernetes cluster")
+ private Long id;
+
+ @Parameter(name = ApiConstants.STATE, type = CommandType.STRING, description = "state of the Kubernetes cluster")
+ private String state;
+
+ @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "name of the Kubernetes cluster" +
+ " (a substring match is made against the parameter value, data for all matching Kubernetes clusters will be returned)")
+ private String name;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public Long getId() {
+ return id;
+ }
+
+ public String getState() {
+ return state;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + "response";
+ }
+
+ @Override
+ public void execute() throws ServerApiException {
+ try {
+ ListResponse<KubernetesClusterResponse> response = kubernetesClusterService.listKubernetesClusters(this);
+ response.setResponseName(getCommandName());
+ setResponseObject(response);
+ } catch (CloudRuntimeException e) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
+ }
+ }
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/ScaleKubernetesClusterCmd.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/ScaleKubernetesClusterCmd.java
new file mode 100644
index 0000000..90ccfa4
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/ScaleKubernetesClusterCmd.java
@@ -0,0 +1,128 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.command.user.kubernetes.cluster;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.acl.SecurityChecker;
+import org.apache.cloudstack.api.ACL;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.KubernetesClusterResponse;
+import org.apache.cloudstack.api.response.ServiceOfferingResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.log4j.Logger;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.kubernetes.cluster.KubernetesCluster;
+import com.cloud.kubernetes.cluster.KubernetesClusterEventTypes;
+import com.cloud.kubernetes.cluster.KubernetesClusterService;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+@APICommand(name = ScaleKubernetesClusterCmd.APINAME,
+ description = "Scales a created, running or stopped Kubernetes cluster",
+ responseObject = KubernetesClusterResponse.class,
+ responseView = ResponseObject.ResponseView.Restricted,
+ entityType = {KubernetesCluster.class},
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = true,
+ authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
+public class ScaleKubernetesClusterCmd extends BaseAsyncCmd {
+ public static final Logger LOGGER = Logger.getLogger(StartKubernetesClusterCmd.class.getName());
+ public static final String APINAME = "scaleKubernetesCluster";
+
+ @Inject
+ public KubernetesClusterService kubernetesClusterService;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+ @Parameter(name = ApiConstants.ID, type = CommandType.UUID,
+ entityType = KubernetesClusterResponse.class,
+ description = "the ID of the Kubernetes cluster")
+ private Long id;
+
+ @ACL(accessType = SecurityChecker.AccessType.UseEntry)
+ @Parameter(name = ApiConstants.SERVICE_OFFERING_ID, type = CommandType.UUID, entityType = ServiceOfferingResponse.class,
+ description = "the ID of the service offering for the virtual machines in the cluster.")
+ private Long serviceOfferingId;
+
+ @Parameter(name=ApiConstants.SIZE, type = CommandType.LONG,
+ description = "number of Kubernetes cluster nodes")
+ private Long clusterSize;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public Long getId() {
+ return id;
+ }
+
+ public Long getServiceOfferingId() {
+ return serviceOfferingId;
+ }
+
+ public Long getClusterSize() {
+ return clusterSize;
+ }
+
+ @Override
+ public String getEventType() {
+ return KubernetesClusterEventTypes.EVENT_KUBERNETES_CLUSTER_SCALE;
+ }
+
+ @Override
+ public String getEventDescription() {
+ KubernetesCluster cluster = _entityMgr.findById(KubernetesCluster.class, getId());
+ return String.format("Scaling Kubernetes cluster ID: %s", cluster.getUuid());
+ }
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + "response";
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ return CallContext.current().getCallingAccount().getId();
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ @Override
+ public void execute() throws ServerApiException, ConcurrentOperationException {
+ try {
+ if (!kubernetesClusterService.scaleKubernetesCluster(this)) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Failed to scale Kubernetes cluster ID: %d", getId()));
+ }
+ final KubernetesClusterResponse response = kubernetesClusterService.createKubernetesClusterResponse(getId());
+ response.setResponseName(getCommandName());
+ setResponseObject(response);
+ } catch (CloudRuntimeException ex) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, ex.getMessage());
+ }
+ }
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/StartKubernetesClusterCmd.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/StartKubernetesClusterCmd.java
new file mode 100644
index 0000000..1ce2fe0
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/StartKubernetesClusterCmd.java
@@ -0,0 +1,120 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.command.user.kubernetes.cluster;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.KubernetesClusterResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.log4j.Logger;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.kubernetes.cluster.KubernetesCluster;
+import com.cloud.kubernetes.cluster.KubernetesClusterEventTypes;
+import com.cloud.kubernetes.cluster.KubernetesClusterService;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+@APICommand(name = StartKubernetesClusterCmd.APINAME, description = "Starts a stopped Kubernetes cluster",
+ responseObject = KubernetesClusterResponse.class,
+ responseView = ResponseObject.ResponseView.Restricted,
+ entityType = {KubernetesCluster.class},
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = true,
+ authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
+public class StartKubernetesClusterCmd extends BaseAsyncCmd {
+ public static final Logger LOGGER = Logger.getLogger(StartKubernetesClusterCmd.class.getName());
+ public static final String APINAME = "startKubernetesCluster";
+
+ @Inject
+ public KubernetesClusterService kubernetesClusterService;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+ @Parameter(name = ApiConstants.ID, type = CommandType.UUID,
+ entityType = KubernetesClusterResponse.class, required = true,
+ description = "the ID of the Kubernetes cluster")
+ private Long id;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public Long getId() {
+ return id;
+ }
+
+ @Override
+ public String getEventType() {
+ return KubernetesClusterEventTypes.EVENT_KUBERNETES_CLUSTER_START;
+ }
+
+ @Override
+ public String getEventDescription() {
+ KubernetesCluster cluster = _entityMgr.findById(KubernetesCluster.class, getId());
+ return String.format("Starting Kubernetes cluster ID: %s", cluster.getUuid());
+ }
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + "response";
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ return CallContext.current().getCallingAccount().getId();
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ public KubernetesCluster validateRequest() {
+ if (getId() == null || getId() < 1L) {
+ throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Invalid Kubernetes cluster ID provided");
+ }
+ final KubernetesCluster kubernetesCluster = kubernetesClusterService.findById(getId());
+ if (kubernetesCluster == null) {
+ throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Given Kubernetes cluster was not found");
+ }
+ return kubernetesCluster;
+ }
+
+ @Override
+ public void execute() throws ServerApiException, ConcurrentOperationException {
+ final KubernetesCluster kubernetesCluster = validateRequest();
+ try {
+ if (!kubernetesClusterService.startKubernetesCluster(kubernetesCluster.getId(), false)) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Failed to start Kubernetes cluster ID: %d", getId()));
+ }
+ final KubernetesClusterResponse response = kubernetesClusterService.createKubernetesClusterResponse(kubernetesCluster.getId());
+ response.setResponseName(getCommandName());
+ setResponseObject(response);
+ } catch (CloudRuntimeException ex) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, ex.getMessage());
+ }
+ }
+
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/StopKubernetesClusterCmd.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/StopKubernetesClusterCmd.java
new file mode 100644
index 0000000..ba2649f
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/StopKubernetesClusterCmd.java
@@ -0,0 +1,108 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.command.user.kubernetes.cluster;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.KubernetesClusterResponse;
+import org.apache.cloudstack.api.response.SuccessResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.log4j.Logger;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.kubernetes.cluster.KubernetesCluster;
+import com.cloud.kubernetes.cluster.KubernetesClusterEventTypes;
+import com.cloud.kubernetes.cluster.KubernetesClusterService;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+@APICommand(name = StopKubernetesClusterCmd.APINAME, description = "Stops a running Kubernetes cluster",
+ responseObject = SuccessResponse.class,
+ responseView = ResponseObject.ResponseView.Restricted,
+ entityType = {KubernetesCluster.class},
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = true,
+ authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
+public class StopKubernetesClusterCmd extends BaseAsyncCmd {
+ public static final Logger LOGGER = Logger.getLogger(StopKubernetesClusterCmd.class.getName());
+ public static final String APINAME = "stopKubernetesCluster";
+
+ @Inject
+ public KubernetesClusterService kubernetesClusterService;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+ @Parameter(name = ApiConstants.ID, type = CommandType.UUID,
+ entityType = KubernetesClusterResponse.class, required = true,
+ description = "the ID of the Kubernetes cluster")
+ private Long id;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public Long getId() {
+ return id;
+ }
+
+ @Override
+ public String getEventType() {
+ return KubernetesClusterEventTypes.EVENT_KUBERNETES_CLUSTER_STOP;
+ }
+
+ @Override
+ public String getEventDescription() {
+ KubernetesCluster cluster = _entityMgr.findById(KubernetesCluster.class, getId());
+ return String.format("Stopping Kubernetes cluster ID: %s", cluster.getUuid());
+ }
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + "response";
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ return CallContext.current().getCallingAccount().getId();
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ @Override
+ public void execute() throws ServerApiException, ConcurrentOperationException {
+ try {
+ if (!kubernetesClusterService.stopKubernetesCluster(getId())) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Failed to start Kubernetes cluster ID: %d", getId()));
+ }
+ final SuccessResponse response = new SuccessResponse(getCommandName());
+ setResponseObject(response);
+ } catch (CloudRuntimeException ex) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, ex.getMessage());
+ }
+ }
+
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/UpgradeKubernetesClusterCmd.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/UpgradeKubernetesClusterCmd.java
new file mode 100644
index 0000000..2c99b00
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/UpgradeKubernetesClusterCmd.java
@@ -0,0 +1,118 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.command.user.kubernetes.cluster;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.KubernetesClusterResponse;
+import org.apache.cloudstack.api.response.KubernetesSupportedVersionResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.log4j.Logger;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.kubernetes.cluster.KubernetesCluster;
+import com.cloud.kubernetes.cluster.KubernetesClusterEventTypes;
+import com.cloud.kubernetes.cluster.KubernetesClusterService;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+@APICommand(name = UpgradeKubernetesClusterCmd.APINAME, description = "Upgrades a running Kubernetes cluster",
+ responseObject = KubernetesClusterResponse.class,
+ responseView = ResponseObject.ResponseView.Restricted,
+ entityType = {KubernetesCluster.class},
+ requestHasSensitiveInfo = false,
+ responseHasSensitiveInfo = true,
+ authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
+public class UpgradeKubernetesClusterCmd extends BaseAsyncCmd {
+ public static final Logger LOGGER = Logger.getLogger(UpgradeKubernetesClusterCmd.class.getName());
+ public static final String APINAME = "upgradeKubernetesCluster";
+
+ @Inject
+ public KubernetesClusterService kubernetesClusterService;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+ @Parameter(name = ApiConstants.ID, type = CommandType.UUID,
+ entityType = KubernetesClusterResponse.class, required = true,
+ description = "the ID of the Kubernetes cluster")
+ private Long id;
+
+ @Parameter(name = ApiConstants.KUBERNETES_VERSION_ID, type = CommandType.UUID,
+ entityType = KubernetesSupportedVersionResponse.class, required = true,
+ description = "the ID of the Kubernetes version for upgrade")
+ private Long kubernetesVersionId;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+
+ public Long getId() {
+ return id;
+ }
+
+ public Long getKubernetesVersionId() {
+ return kubernetesVersionId;
+ }
+
+ @Override
+ public String getEventType() {
+ return KubernetesClusterEventTypes.EVENT_KUBERNETES_CLUSTER_UPGRADE;
+ }
+
+ @Override
+ public String getEventDescription() {
+ KubernetesCluster cluster = _entityMgr.findById(KubernetesCluster.class, getId());
+ return String.format("Upgrading Kubernetes cluster ID: %s", cluster.getUuid());
+ }
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + "response";
+ }
+
+ @Override
+ public long getEntityOwnerId() {
+ return CallContext.current().getCallingAccount().getId();
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+
+ @Override
+ public void execute() throws ServerApiException, ConcurrentOperationException {
+ try {
+ if (!kubernetesClusterService.upgradeKubernetesCluster(this)) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Failed to upgrade Kubernetes cluster ID: %d", getId()));
+ }
+ final KubernetesClusterResponse response = kubernetesClusterService.createKubernetesClusterResponse(getId());
+ response.setResponseName(getCommandName());
+ setResponseObject(response);
+ } catch (CloudRuntimeException ex) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, ex.getMessage());
+ }
+ }
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/version/ListKubernetesSupportedVersionsCmd.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/version/ListKubernetesSupportedVersionsCmd.java
new file mode 100644
index 0000000..efa029a
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/version/ListKubernetesSupportedVersionsCmd.java
@@ -0,0 +1,109 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.command.user.kubernetes.version;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseListCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ResponseObject;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.KubernetesSupportedVersionResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.ZoneResponse;
+import org.apache.log4j.Logger;
+
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.kubernetes.version.KubernetesVersionService;
+import com.google.common.base.Strings;
+
+@APICommand(name = ListKubernetesSupportedVersionsCmd.APINAME,
+ description = "Lists container clusters",
+ responseObject = KubernetesSupportedVersionResponse.class,
+ responseView = ResponseObject.ResponseView.Restricted,
+ authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
+public class ListKubernetesSupportedVersionsCmd extends BaseListCmd {
+ public static final Logger LOGGER = Logger.getLogger(ListKubernetesSupportedVersionsCmd.class.getName());
+ public static final String APINAME = "listKubernetesSupportedVersions";
+
+ @Inject
+ private KubernetesVersionService kubernetesVersionService;
+
+ /////////////////////////////////////////////////////
+ //////////////// API parameters /////////////////////
+ /////////////////////////////////////////////////////
+ @Parameter(name = ApiConstants.ID, type = CommandType.UUID,
+ entityType = KubernetesSupportedVersionResponse.class,
+ description = "the ID of the Kubernetes supported version")
+ private Long id;
+
+ @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID,
+ entityType = ZoneResponse.class,
+ description = "the ID of the zone in which Kubernetes supported version will be available")
+ private Long zoneId;
+
+ @Parameter(name = ApiConstants.MIN_SEMANTIC_VERSION, type = CommandType.STRING,
+ description = "the minimum semantic version for the Kubernetes supported version to be listed")
+ private String minimumSemanticVersion;
+
+ @Parameter(name = ApiConstants.MIN_KUBERNETES_VERSION_ID, type = CommandType.UUID,
+ entityType = KubernetesSupportedVersionResponse.class,
+ description = "the ID of the minimum Kubernetes supported version")
+ private Long minimumKubernetesVersionId;
+
+ /////////////////////////////////////////////////////
+ /////////////////// Accessors ///////////////////////
+ /////////////////////////////////////////////////////
+ public Long getId() {
+ return id;
+ }
+
+ public Long getZoneId() {
+ return zoneId;
+ }
+
+ public String getMinimumSemanticVersion() {
+ if(!Strings.isNullOrEmpty(minimumSemanticVersion) &&
+ !minimumSemanticVersion.matches("[0-9]+(\\.[0-9]+)*")) {
+ throw new IllegalArgumentException("Invalid version format");
+ }
+ return minimumSemanticVersion;
+ }
+
+ public Long getMinimumKubernetesVersionId() {
+ return minimumKubernetesVersionId;
+ }
+
+ @Override
+ public String getCommandName() {
+ return APINAME.toLowerCase() + "response";
+ }
+
+ /////////////////////////////////////////////////////
+ /////////////// API Implementation///////////////////
+ /////////////////////////////////////////////////////
+ @Override
+ public void execute() throws ServerApiException, ConcurrentOperationException {
+ ListResponse<KubernetesSupportedVersionResponse> response = kubernetesVersionService.listKubernetesSupportedVersions(this);
+ response.setResponseName(getCommandName());
+ setResponseObject(response);
+ }
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/response/KubernetesClusterConfigResponse.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/response/KubernetesClusterConfigResponse.java
new file mode 100644
index 0000000..0308518
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/response/KubernetesClusterConfigResponse.java
@@ -0,0 +1,61 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.response;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
+public class KubernetesClusterConfigResponse extends BaseResponse {
+ @SerializedName(ApiConstants.ID)
+ @Param(description = "the id of the container cluster")
+ private String id;
+
+ @SerializedName(ApiConstants.NAME)
+ @Param(description = "Name of the container cluster")
+ private String name;
+
+ @SerializedName("configdata")
+ @Param(description = "the config data of the cluster")
+ private String configData;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getConfigData() {
+ return configData;
+ }
+
+ public void setConfigData(String configData) {
+ this.configData = configData;
+ }
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/response/KubernetesClusterResponse.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/response/KubernetesClusterResponse.java
new file mode 100644
index 0000000..2c6fc81
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/response/KubernetesClusterResponse.java
@@ -0,0 +1,329 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.response;
+
+import java.util.List;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.EntityReference;
+
+import com.cloud.kubernetes.cluster.KubernetesCluster;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
+@SuppressWarnings("unused")
+@EntityReference(value = {KubernetesCluster.class})
+public class KubernetesClusterResponse extends BaseResponse implements ControlledEntityResponse {
+ @SerializedName(ApiConstants.ID)
+ @Param(description = "the id of the Kubernetes cluster")
+ private String id;
+
+ @SerializedName(ApiConstants.NAME)
+ @Param(description = "the name of the Kubernetes cluster")
+ private String name;
+
+ @SerializedName(ApiConstants.DESCRIPTION)
+ @Param(description = "the description of the Kubernetes cluster")
+ private String description;
+
+ @SerializedName(ApiConstants.ZONE_ID)
+ @Param(description = "the name of the zone of the Kubernetes cluster")
+ private String zoneId;
+
+ @SerializedName(ApiConstants.ZONE_NAME)
+ @Param(description = "the name of the zone of the Kubernetes cluster")
+ private String zoneName;
+
+ @SerializedName(ApiConstants.SERVICE_OFFERING_ID)
+ @Param(description = "the ID of the service offering of the Kubernetes cluster")
+ private String serviceOfferingId;
+
+ @SerializedName("serviceofferingname")
+ @Param(description = "the name of the service offering of the Kubernetes cluster")
+ private String serviceOfferingName;
+
+ @SerializedName(ApiConstants.TEMPLATE_ID)
+ @Param(description = "the ID of the template of the Kubernetes cluster")
+ private String templateId;
+
+ @SerializedName(ApiConstants.NETWORK_ID)
+ @Param(description = "the ID of the network of the Kubernetes cluster")
+ private String networkId;
+
+ @SerializedName(ApiConstants.ASSOCIATED_NETWORK_NAME)
+ @Param(description = "the name of the network of the Kubernetes cluster")
+ private String associatedNetworkName;
+
+ @SerializedName(ApiConstants.KUBERNETES_VERSION_ID)
+ @Param(description = "the ID of the Kubernetes version for the Kubernetes cluster")
+ private String kubernetesVersionId;
+
+ @SerializedName(ApiConstants.KUBERNETES_VERSION_NAME)
+ @Param(description = "the name of the Kubernetes version for the Kubernetes cluster")
+ private String kubernetesVersionName;
+
+ @SerializedName(ApiConstants.ACCOUNT)
+ @Param(description = "the account associated with the Kubernetes cluster")
+ private String accountName;
+
+ @SerializedName(ApiConstants.PROJECT_ID)
+ @Param(description = "the project id of the Kubernetes cluster")
+ private String projectId;
+
+ @SerializedName(ApiConstants.PROJECT)
+ @Param(description = "the project name of the Kubernetes cluster")
+ private String projectName;
+
+ @SerializedName(ApiConstants.DOMAIN_ID)
+ @Param(description = "the ID of the domain in which the Kubernetes cluster exists")
+ private String domainId;
+
+ @SerializedName(ApiConstants.DOMAIN)
+ @Param(description = "the name of the domain in which the Kubernetes cluster exists")
+ private String domainName;
+
+ @SerializedName(ApiConstants.SSH_KEYPAIR)
+ @Param(description = "keypair details")
+ private String keypair;
+
+ @SerializedName(ApiConstants.MASTER_NODES)
+ @Param(description = "the master nodes count for the Kubernetes cluster")
+ private Long masterNodes;
+
+ @SerializedName(ApiConstants.SIZE)
+ @Param(description = "the size (worker nodes count) of the Kubernetes cluster")
+ private Long clusterSize;
+
+ @SerializedName(ApiConstants.STATE)
+ @Param(description = "the state of the Kubernetes cluster")
+ private String state;
+
+ @SerializedName(ApiConstants.CPU_NUMBER)
+ @Param(description = "the cpu cores of the Kubernetes cluster")
+ private String cores;
+
+ @SerializedName(ApiConstants.MEMORY)
+ @Param(description = "the memory the Kubernetes cluster")
+ private String memory;
+
+ @SerializedName(ApiConstants.END_POINT)
+ @Param(description = "URL end point for the Kubernetes cluster")
+ private String endpoint;
+
+ @SerializedName(ApiConstants.CONSOLE_END_POINT)
+ @Param(description = "URL end point for the Kubernetes cluster dashboard UI")
+ private String consoleEndpoint;
+
+ @SerializedName(ApiConstants.VIRTUAL_MACHINE_IDS)
+ @Param(description = "the list of virtualmachine IDs associated with this Kubernetes cluster")
+ private List<String> virtualMachineIds;
+
+ public KubernetesClusterResponse() {
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getZoneId() {
+ return zoneId;
+ }
+
+ public void setZoneId(String zoneId) {
+ this.zoneId = zoneId;
+ }
+
+ public String getZoneName() {
+ return zoneName;
+ }
+
+ public void setZoneName(String zoneName) {
+ this.zoneName = zoneName;
+ }
+
+ public String getServiceOfferingId() {
+ return serviceOfferingId;
+ }
+
+ public void setServiceOfferingId(String serviceOfferingId) {
+ this.serviceOfferingId = serviceOfferingId;
+ }
+
+ public String getTemplateId() {
+ return templateId;
+ }
+
+ public void setTemplateId(String templateId) {
+ this.templateId = templateId;
+ }
+
+ public String getNetworkId() {
+ return networkId;
+ }
+
+ public void setNetworkId(String networkId) {
+ this.networkId = networkId;
+ }
+
+ public String getAssociatedNetworkName() {
+ return associatedNetworkName;
+ }
+
+ public void setAssociatedNetworkName(String associatedNetworkName) {
+ this.associatedNetworkName = associatedNetworkName;
+ }
+
+ public String getKubernetesVersionId() {
+ return kubernetesVersionId;
+ }
+
+ public void setKubernetesVersionId(String kubernetesVersionId) {
+ this.kubernetesVersionId = kubernetesVersionId;
+ }
+
+ public String getKubernetesVersionName() {
+ return kubernetesVersionName;
+ }
+
+ public void setKubernetesVersionName(String kubernetesVersionName) {
+ this.kubernetesVersionName = kubernetesVersionName;
+ }
+
+ public String getProjectId() {
+ return projectId;
+ }
+
+ @Override
+ public void setAccountName(String accountName) {
+ this.accountName = accountName;
+ }
+
+ @Override
+ public void setProjectId(String projectId) {
+ this.projectId = projectId;
+ }
+
+ @Override
+ public void setProjectName(String projectName) {
+ this.projectName = projectName;
+ }
+
+ @Override
+ public void setDomainId(String domainId) {
+ this.domainId = domainId;
+ }
+
+ @Override
+ public void setDomainName(String domainName) {
+ this.domainName = domainName;
+ }
+
+ public String getKeypair() {
+ return keypair;
+ }
+
+ public void setKeypair(String keypair) {
+ this.keypair = keypair;
+ }
+
+ public Long getMasterNodes() {
+ return masterNodes;
+ }
+
+ public void setMasterNodes(Long masterNodes) {
+ this.masterNodes = masterNodes;
+ }
+
+ public Long getClusterSize() {
+ return clusterSize;
+ }
+
+ public void setClusterSize(Long clusterSize) {
+ this.clusterSize = clusterSize;
+ }
+
+ public String getCores() {
+ return cores;
+ }
+
+ public void setCores(String cores) {
+ this.cores = cores;
+ }
+
+ public String getMemory() {
+ return memory;
+ }
+
+ public void setMemory(String memory) {
+ this.memory = memory;
+ }
+
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ public String getEndpoint() {
+ return endpoint;
+ }
+
+ public void setEndpoint(String endpoint) {
+ this.endpoint = endpoint;
+ }
+
+ public String getId() {
+ return this.id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getServiceOfferingName() {
+ return serviceOfferingName;
+ }
+
+ public void setServiceOfferingName(String serviceOfferingName) {
+ this.serviceOfferingName = serviceOfferingName;
+ }
+
+ public void setVirtualMachineIds(List<String> virtualMachineIds) {
+ this.virtualMachineIds = virtualMachineIds;
+ }
+
+ ;
+
+ public List<String> getVirtualMachineIds() {
+ return virtualMachineIds;
+ }
+}
diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/response/KubernetesSupportedVersionResponse.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/response/KubernetesSupportedVersionResponse.java
new file mode 100644
index 0000000..4deb50d
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/response/KubernetesSupportedVersionResponse.java
@@ -0,0 +1,174 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.api.response;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.EntityReference;
+
+import com.cloud.kubernetes.version.KubernetesSupportedVersion;
+import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
+
+@SuppressWarnings("unused")
+@EntityReference(value = {KubernetesSupportedVersion.class})
+public class KubernetesSupportedVersionResponse extends BaseResponse {
+ @SerializedName(ApiConstants.ID)
+ @Param(description = "the id of the Kubernetes supported version")
+ private String id;
+
+ @SerializedName(ApiConstants.NAME)
+ @Param(description = "Name of the Kubernetes supported version")
+ private String name;
+
+ @SerializedName(ApiConstants.SEMANTIC_VERSION)
+ @Param(description = "Kubernetes semantic version")
+ private String semanticVersion;
+
+ @SerializedName(ApiConstants.ISO_ID)
+ @Param(description = "the id of the binaries ISO for Kubernetes supported version")
+ private String isoId;
+
+ @SerializedName(ApiConstants.ISO_NAME)
+ @Param(description = "the name of the binaries ISO for Kubernetes supported version")
+ private String isoName;
+
+ @SerializedName(ApiConstants.ISO_STATE)
+ @Param(description = "the state of the binaries ISO for Kubernetes supported version")
+ private String isoState;
+
+ @SerializedName(ApiConstants.ZONE_ID)
+ @Param(description = "the id of the zone in which Kubernetes supported version is available")
+ private String zoneId;
+
+ @SerializedName(ApiConstants.ZONE_NAME)
+ @Param(description = "the name of the zone in which Kubernetes supported version is available")
+ private String zoneName;
+
+ @SerializedName(ApiConstants.SUPPORTS_HA)
+ @Param(description = "whether Kubernetes supported version supports HA, multi-master")
+ private Boolean supportsHA;
+
+ @SerializedName(ApiConstants.STATE)
+ @Param(description = "the enabled or disabled state of the Kubernetes supported version")
+ private String state;
+
+ @SerializedName(ApiConstants.MIN_CPU_NUMBER)
+ @Param(description = "the minimum number of CPUs needed for the Kubernetes supported version")
+ private Integer minimumCpu;
+
+ @SerializedName(ApiConstants.MIN_MEMORY)
+ @Param(description = "the minimum RAM size in MB needed for the Kubernetes supported version")
+ private Integer minimumRamSize;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getSemanticVersion() {
+ return semanticVersion;
+ }
+
+ public void setSemanticVersion(String semanticVersion) {
+ this.semanticVersion = semanticVersion;
+ }
+
+ public String getIsoId() {
+ return isoId;
+ }
+
+ public void setIsoId(String isoId) {
+ this.isoId = isoId;
+ }
+
+ public String getIsoName() {
+ return isoName;
+ }
+
+ public void setIsoName(String isoName) {
+ this.isoName = isoName;
+ }
+
+ public String getIsoState() {
+ return isoState;
+ }
+
+ public void setIsoState(String isoState) {
+ this.isoState = isoState;
+ }
+
+ public String getZoneId() {
+ return zoneId;
+ }
+
+ public void setZoneId(String zoneId) {
+ this.zoneId = zoneId;
+ }
+
+ public String getZoneName() {
+ return zoneName;
+ }
+
+ public void setZoneName(String zoneName) {
+ this.zoneName = zoneName;
+ }
+
+ public Boolean isSupportsHA() {
+ return supportsHA;
+ }
+
+ public void setSupportsHA(Boolean supportsHA) {
+ this.supportsHA = supportsHA;
+ }
+
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ public Integer getMinimumCpu() {
+ return minimumCpu;
+ }
+
+ public void setMinimumCpu(Integer minimumCpu) {
+ this.minimumCpu = minimumCpu;
+ }
+
+ public Integer getMinimumRamSize() {
+ return minimumRamSize;
+ }
+
+ public void setMinimumRamSize(Integer minimumRamSize) {
+ this.minimumRamSize = minimumRamSize;
+ }
+}
diff --git a/packaging/centos63/rhel7/cloudstack-management.conf b/plugins/integrations/kubernetes-service/src/main/resources/META-INF/cloudstack/kubernetes-service/module.properties
similarity index 92%
copy from packaging/centos63/rhel7/cloudstack-management.conf
copy to plugins/integrations/kubernetes-service/src/main/resources/META-INF/cloudstack/kubernetes-service/module.properties
index 881af1a..e6f02da 100644
--- a/packaging/centos63/rhel7/cloudstack-management.conf
+++ b/plugins/integrations/kubernetes-service/src/main/resources/META-INF/cloudstack/kubernetes-service/module.properties
@@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-
-f /var/run/cloudstack-management.pid 0644 cloud cloud -
\ No newline at end of file
+name=kubernetes-service
+parent=compute
diff --git a/plugins/integrations/kubernetes-service/src/main/resources/META-INF/cloudstack/kubernetes-service/spring-kubernetes-service-context.xml b/plugins/integrations/kubernetes-service/src/main/resources/META-INF/cloudstack/kubernetes-service/spring-kubernetes-service-context.xml
new file mode 100644
index 0000000..12f2a46
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/resources/META-INF/cloudstack/kubernetes-service/spring-kubernetes-service-context.xml
@@ -0,0 +1,37 @@
+<!--
+ 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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:aop="http://www.springframework.org/schema/aop"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd"
+ >
+
+ <bean id="kubernetesSupportedVersionDaoImpl" class="com.cloud.kubernetes.version.dao.KubernetesSupportedVersionDaoImpl" />
+ <bean id="kubernetesVersionManagerImpl" class="com.cloud.kubernetes.version.KubernetesVersionManagerImpl" />
+ <bean id="kubernetesClusterDaoImpl" class="com.cloud.kubernetes.cluster.dao.KubernetesClusterDaoImpl" />
+ <bean id="kubernetesClusterDetailsDaoImpl" class="com.cloud.kubernetes.cluster.dao.KubernetesClusterDetailsDaoImpl" />
+ <bean id="kubernetesClusterVmMapDaoImpl" class="com.cloud.kubernetes.cluster.dao.KubernetesClusterVmMapDaoImpl" />
+ <bean id="kubernetesClusterManagerImpl" class="com.cloud.kubernetes.cluster.KubernetesClusterManagerImpl" />
+
+</beans>
diff --git a/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-master-add.yml b/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-master-add.yml
new file mode 100644
index 0000000..787ea97
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-master-add.yml
@@ -0,0 +1,237 @@
+#cloud-config
+# 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.
+
+---
+ssh_authorized_keys:
+ {{ k8s.ssh.pub.key }}
+
+write-files:
+ - 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
+
+ ISO_MOUNT_DIR=/mnt/k8sdisk
+ BINARIES_DIR=${ISO_MOUNT_DIR}/
+ K8S_CONFIG_SCRIPTS_COPY_DIR=/tmp/k8sconfigscripts/
+ ATTEMPT_ONLINE_INSTALL=false
+ setup_complete=false
+
+ OFFLINE_INSTALL_ATTEMPT_SLEEP=15
+ MAX_OFFLINE_INSTALL_ATTEMPTS=100
+ offline_attempts=1
+ MAX_SETUP_CRUCIAL_CMD_ATTEMPTS=3
+ EJECT_ISO_FROM_OS={{ k8s.eject.iso }}
+ crucial_cmd_attempts=1
+ iso_drive_path=""
+ 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
+ iso_drive_path="${line}"
+ 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 [[ "$PATH" != *:/opt/bin && "$PATH" != *:/opt/bin:* ]]; then
+ export PATH=$PATH:/opt/bin
+ fi
+
+ 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}"
+ if [ "$EJECT_ISO_FROM_OS" = true ] && [ "$iso_drive_path" != "" ]; then
+ eject "${iso_drive_path}"
+ fi
+ 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/${CRICTL_VERSION}/crictl-${CRICTL_VERSION}-linux-amd64.tar.gz" | tar -C /opt/bin -xz
+
+ mkdir -p /opt/bin
+ cd /opt/bin
+ curl -L --remote-name-all https://storage.googleapis.com/kubernetes-release/release/${RELEASE}/bin/linux/amd64/{kubeadm,kubelet,kubectl}
+ chmod +x {kubeadm,kubelet,kubectl}
+
+ curl -sSL "https://raw.githubusercontent.com/kubernetes/kubernetes/${RELEASE}/build/debs/kubelet.service" | sed "s:/usr/bin:/opt/bin:g" > /etc/systemd/system/kubelet.service
+ mkdir -p /etc/systemd/system/kubelet.service.d
+ curl -sSL "https://raw.githubusercontent.com/kubernetes/kubernetes/${RELEASE}/build/debs/10-kubeadm.conf" | sed "s:/usr/bin:/opt/bin:g" > /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
+ fi
+
+ systemctl enable kubelet && systemctl start kubelet
+ modprobe br_netfilter && sysctl net.bridge.bridge-nf-call-iptables=1
+
+ if [ -d "$BINARIES_DIR" ] && [ "$ATTEMPT_ONLINE_INSTALL" = true ]; then
+ crucial_cmd_attempts=1
+ while true; do
+ if (( "$crucial_cmd_attempts" > "$MAX_SETUP_CRUCIAL_CMD_ATTEMPTS" )); then
+ echo "Warning: kubeadm pull images failed after multiple tries!"
+ break;
+ fi
+ retval=0
+ set +e
+ kubeadm config images pull
+ retval=$?
+ set -e
+ if [ $retval -eq 0 ]; then
+ break;
+ fi
+ crucial_cmd_attempts=$[$crucial_cmd_attempts + 1]
+ done
+ fi
+
+ - path: /opt/bin/deploy-kube-system
+ permissions: 0700
+ owner: root:root
+ content: |
+ #!/bin/bash -e
+
+ if [[ -f "/home/core/success" ]]; then
+ echo "Already provisioned!"
+ exit 0
+ fi
+
+ if [[ $(systemctl is-active setup-kube-system) != "inactive" ]]; then
+ echo "setup-kube-system is running!"
+ exit 1
+ fi
+ modprobe ip_vs
+ modprobe ip_vs_wrr
+ modprobe ip_vs_sh
+ modprobe nf_conntrack_ipv4
+ if [[ "$PATH" != *:/opt/bin && "$PATH" != *:/opt/bin:* ]]; then
+ export PATH=$PATH:/opt/bin
+ fi
+ kubeadm join {{ k8s_master.join_ip }}:6443 --token {{ k8s_master.cluster.token }} --control-plane --certificate-key {{ k8s_master.cluster.ha.certificate.key }} --discovery-token-unsafe-skip-ca-verification
+
+ sudo touch /home/core/success
+ echo "true" > /home/core/success
+
+coreos:
+ units:
+ - name: docker.service
+ command: start
+ enable: true
+
+ - name: setup-kube-system.service
+ command: start
+ content: |
+ [Unit]
+ Requires=docker.service
+ After=docker.service
+
+ [Service]
+ Type=simple
+ StartLimitInterval=0
+ ExecStart=/opt/bin/setup-kube-system
+
+ - name: deploy-kube-system.service
+ command: start
+ content: |
+ [Unit]
+ After=setup-kube-system.service
+
+ [Service]
+ Type=simple
+ StartLimitInterval=0
+ Restart=on-failure
+ ExecStartPre=/usr/bin/curl -k https://{{ k8s_master.join_ip }}:6443/version
+ ExecStart=/opt/bin/deploy-kube-system
+
+ update:
+ group: stable
+ reboot-strategy: off
diff --git a/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-master.yml b/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-master.yml
new file mode 100644
index 0000000..1482857
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-master.yml
@@ -0,0 +1,294 @@
+#cloud-config
+# 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.
+
+---
+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
+
+ ISO_MOUNT_DIR=/mnt/k8sdisk
+ BINARIES_DIR=${ISO_MOUNT_DIR}/
+ K8S_CONFIG_SCRIPTS_COPY_DIR=/tmp/k8sconfigscripts/
+ ATTEMPT_ONLINE_INSTALL=false
+ setup_complete=false
+
+ OFFLINE_INSTALL_ATTEMPT_SLEEP=15
+ MAX_OFFLINE_INSTALL_ATTEMPTS=100
+ offline_attempts=1
+ MAX_SETUP_CRUCIAL_CMD_ATTEMPTS=3
+ EJECT_ISO_FROM_OS={{ k8s.eject.iso }}
+ crucial_cmd_attempts=1
+ iso_drive_path=""
+ 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
+ iso_drive_path="${line}"
+ 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 [[ "$PATH" != *:/opt/bin && "$PATH" != *:/opt/bin:* ]]; then
+ export PATH=$PATH:/opt/bin
+ fi
+
+ 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
+ mkdir -p "${K8S_CONFIG_SCRIPTS_COPY_DIR}"
+ cp ${BINARIES_DIR}/*.yaml "${K8S_CONFIG_SCRIPTS_COPY_DIR}"
+ umount "${ISO_MOUNT_DIR}" && rmdir "${ISO_MOUNT_DIR}"
+ if [ "$EJECT_ISO_FROM_OS" = true ] && [ "$iso_drive_path" != "" ]; then
+ eject "${iso_drive_path}"
+ fi
+ 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/${CRICTL_VERSION}/crictl-${CRICTL_VERSION}-linux-amd64.tar.gz" | tar -C /opt/bin -xz
+
+ mkdir -p /opt/bin
+ cd /opt/bin
+ curl -L --remote-name-all https://storage.googleapis.com/kubernetes-release/release/${RELEASE}/bin/linux/amd64/{kubeadm,kubelet,kubectl}
+ chmod +x {kubeadm,kubelet,kubectl}
+
+ curl -sSL "https://raw.githubusercontent.com/kubernetes/kubernetes/${RELEASE}/build/debs/kubelet.service" | sed "s:/usr/bin:/opt/bin:g" > /etc/systemd/system/kubelet.service
+ mkdir -p /etc/systemd/system/kubelet.service.d
+ curl -sSL "https://raw.githubusercontent.com/kubernetes/kubernetes/${RELEASE}/build/debs/10-kubeadm.conf" | sed "s:/usr/bin:/opt/bin:g" > /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
+ fi
+
+ systemctl enable kubelet && systemctl start kubelet
+ modprobe br_netfilter && sysctl net.bridge.bridge-nf-call-iptables=1
+
+ if [ -d "$BINARIES_DIR" ] && [ "$ATTEMPT_ONLINE_INSTALL" = true ]; then
+ crucial_cmd_attempts=1
+ while true; do
+ if (( "$crucial_cmd_attempts" > "$MAX_SETUP_CRUCIAL_CMD_ATTEMPTS" )); then
+ echo "Warning: kubeadm pull images failed after multiple tries!"
+ break;
+ fi
+ retval=0
+ set +e
+ kubeadm config images pull
+ retval=$?
+ set -e
+ if [ $retval -eq 0 ]; then
+ break;
+ fi
+ crucial_cmd_attempts=$[$crucial_cmd_attempts + 1]
+ done
+ fi
+
+ crucial_cmd_attempts=1
+ while true; do
+ if (( "$crucial_cmd_attempts" > "$MAX_SETUP_CRUCIAL_CMD_ATTEMPTS" )); then
+ echo "Error: kubeadm init failed!"
+ exit 1
+ fi
+ retval=0
+ set +e
+ kubeadm init --token {{ k8s_master.cluster.token }} {{ k8s_master.cluster.initargs }}
+ retval=$?
+ set -e
+ if [ $retval -eq 0 ]; then
+ break;
+ fi
+ crucial_cmd_attempts=$[$crucial_cmd_attempts + 1]
+ done
+
+ - path: /opt/bin/deploy-kube-system
+ permissions: 0700
+ owner: root:root
+ content: |
+ #!/bin/bash -e
+
+ if [[ -f "/home/core/success" ]]; then
+ echo "Already provisioned!"
+ exit 0
+ fi
+
+ K8S_CONFIG_SCRIPTS_COPY_DIR=/tmp/k8sconfigscripts/
+
+ if [[ $(systemctl is-active setup-kube-system) != "inactive" ]]; then
+ echo "setup-kube-system is running!"
+ exit 1
+ fi
+ if [[ "$PATH" != *:/opt/bin && "$PATH" != *:/opt/bin:* ]]; then
+ export PATH=$PATH:/opt/bin
+ fi
+ export KUBECONFIG=/etc/kubernetes/admin.conf
+
+ mkdir -p /root/.kube
+ cp -i /etc/kubernetes/admin.conf /root/.kube/config
+ chown $(id -u):$(id -g) /root/.kube/config
+ echo export PATH=\$PATH:/opt/bin >> /root/.bashrc
+
+ if [ -d "$K8S_CONFIG_SCRIPTS_COPY_DIR" ]; then
+ ### Network, dashboard configs available offline ###
+ echo "Offline configs are available!"
+ kubectl apply -f ${K8S_CONFIG_SCRIPTS_COPY_DIR}/network.yaml
+ kubectl apply -f ${K8S_CONFIG_SCRIPTS_COPY_DIR}/dashboard.yaml
+ rm -rf "${K8S_CONFIG_SCRIPTS_COPY_DIR}"
+ else
+ kubectl apply -f "https://cloud.weave.works/k8s/net?k8s-version=$(kubectl version | base64 | tr -d '\n')"
+ kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.0.0-beta6/aio/deploy/recommended.yaml
+ fi
+
+ kubectl create rolebinding admin-binding --role=admin --user=admin || true
+ kubectl create clusterrolebinding cluster-admin-binding --clusterrole=cluster-admin --user=admin || true
+ kubectl create clusterrolebinding kubernetes-dashboard-ui --clusterrole=cluster-admin --serviceaccount=kubernetes-dashboard:kubernetes-dashboard || true
+
+ sudo touch /home/core/success
+ echo "true" > /home/core/success
+
+coreos:
+ units:
+ - name: docker.service
+ command: start
+ enable: true
+
+ - name: setup-kube-system.service
+ command: start
+ content: |
+ [Unit]
+ Requires=docker.service
+ After=docker.service
+
+ [Service]
+ Type=simple
+ StartLimitInterval=0
+ ExecStart=/opt/bin/setup-kube-system
+
+ - name: deploy-kube-system.service
+ command: start
+ content: |
+ [Unit]
+ After=setup-kube-system.service
+
+ [Service]
+ Type=simple
+ StartLimitInterval=0
+ Restart=on-failure
+ ExecStartPre=/usr/bin/curl -k https://127.0.0.1:6443/version
+ ExecStart=/opt/bin/deploy-kube-system
+
+ update:
+ group: stable
+ reboot-strategy: off
diff --git a/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-node.yml b/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-node.yml
new file mode 100644
index 0000000..d2f5454
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-node.yml
@@ -0,0 +1,237 @@
+#cloud-config
+# 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.
+
+---
+ssh_authorized_keys:
+ {{ k8s.ssh.pub.key }}
+
+write-files:
+ - 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
+
+ ISO_MOUNT_DIR=/mnt/k8sdisk
+ BINARIES_DIR=${ISO_MOUNT_DIR}/
+ K8S_CONFIG_SCRIPTS_COPY_DIR=/tmp/k8sconfigscripts/
+ ATTEMPT_ONLINE_INSTALL=false
+ setup_complete=false
+
+ OFFLINE_INSTALL_ATTEMPT_SLEEP=30
+ MAX_OFFLINE_INSTALL_ATTEMPTS=40
+ offline_attempts=1
+ MAX_SETUP_CRUCIAL_CMD_ATTEMPTS=3
+ EJECT_ISO_FROM_OS={{ k8s.eject.iso }}
+ crucial_cmd_attempts=1
+ iso_drive_path=""
+ 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
+ iso_drive_path="${line}"
+ 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 [[ "$PATH" != *:/opt/bin && "$PATH" != *:/opt/bin:* ]]; then
+ export PATH=$PATH:/opt/bin
+ fi
+
+ 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}"
+ if [ "$EJECT_ISO_FROM_OS" = true ] && [ "$iso_drive_path" != "" ]; then
+ eject "${iso_drive_path}"
+ fi
+ 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/${CRICTL_VERSION}/crictl-${CRICTL_VERSION}-linux-amd64.tar.gz" | tar -C /opt/bin -xz
+
+ mkdir -p /opt/bin
+ cd /opt/bin
+ curl -L --remote-name-all https://storage.googleapis.com/kubernetes-release/release/${RELEASE}/bin/linux/amd64/{kubeadm,kubelet,kubectl}
+ chmod +x {kubeadm,kubelet,kubectl}
+
+ curl -sSL "https://raw.githubusercontent.com/kubernetes/kubernetes/${RELEASE}/build/debs/kubelet.service" | sed "s:/usr/bin:/opt/bin:g" > /etc/systemd/system/kubelet.service
+ mkdir -p /etc/systemd/system/kubelet.service.d
+ curl -sSL "https://raw.githubusercontent.com/kubernetes/kubernetes/${RELEASE}/build/debs/10-kubeadm.conf" | sed "s:/usr/bin:/opt/bin:g" > /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
+ fi
+
+ systemctl enable kubelet && systemctl start kubelet
+ modprobe br_netfilter && sysctl net.bridge.bridge-nf-call-iptables=1
+
+ if [ -d "$BINARIES_DIR" ] && [ "$ATTEMPT_ONLINE_INSTALL" = true ]; then
+ crucial_cmd_attempts=1
+ while true; do
+ if (( "$crucial_cmd_attempts" > "$MAX_SETUP_CRUCIAL_CMD_ATTEMPTS" )); then
+ echo "Warning: kubeadm pull images failed after multiple tries!"
+ break;
+ fi
+ retval=0
+ set +e
+ kubeadm config images pull
+ retval=$?
+ set -e
+ if [ $retval -eq 0 ]; then
+ break;
+ fi
+ crucial_cmd_attempts=$[$crucial_cmd_attempts + 1]
+ done
+ fi
+
+ - path: /opt/bin/deploy-kube-system
+ permissions: 0700
+ owner: root:root
+ content: |
+ #!/bin/bash -e
+
+ if [[ -f "/home/core/success" ]]; then
+ echo "Already provisioned!"
+ exit 0
+ fi
+
+ if [[ $(systemctl is-active setup-kube-system) != "inactive" ]]; then
+ echo "setup-kube-system is running!"
+ exit 1
+ fi
+ modprobe ip_vs
+ modprobe ip_vs_wrr
+ modprobe ip_vs_sh
+ modprobe nf_conntrack_ipv4
+ if [[ "$PATH" != *:/opt/bin && "$PATH" != *:/opt/bin:* ]]; then
+ export PATH=$PATH:/opt/bin
+ fi
+ kubeadm join {{ k8s_master.join_ip }}:6443 --token {{ k8s_master.cluster.token }} --discovery-token-unsafe-skip-ca-verification
+
+ sudo touch /home/core/success
+ echo "true" > /home/core/success
+
+coreos:
+ units:
+ - name: docker.service
+ command: start
+ enable: true
+
+ - name: setup-kube-system.service
+ command: start
+ content: |
+ [Unit]
+ Requires=docker.service
+ After=docker.service
+
+ [Service]
+ Type=simple
+ StartLimitInterval=0
+ ExecStart=/opt/bin/setup-kube-system
+
+ - name: deploy-kube-system.service
+ command: start
+ content: |
+ [Unit]
+ After=setup-kube-system.service
+
+ [Service]
+ Type=simple
+ StartLimitInterval=0
+ Restart=on-failure
+ ExecStartPre=/usr/bin/curl -k https://{{ k8s_master.join_ip }}:6443/version
+ ExecStart=/opt/bin/deploy-kube-system
+
+ update:
+ group: stable
+ reboot-strategy: off
diff --git a/plugins/integrations/kubernetes-service/src/main/resources/script/upgrade-kubernetes.sh b/plugins/integrations/kubernetes-service/src/main/resources/script/upgrade-kubernetes.sh
new file mode 100644
index 0000000..ea36d7e
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/main/resources/script/upgrade-kubernetes.sh
@@ -0,0 +1,133 @@
+#!/bin/bash -e
+# 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.
+
+# Version 1.14 and below needs extra flags with kubeadm upgrade node
+if [ $# -lt 4 ]; then
+ echo "Invalid input. Valid usage: ./upgrade-kubernetes.sh UPGRADE_VERSION IS_MASTER IS_OLD_VERSION IS_EJECT_ISO"
+ echo "eg: ./upgrade-kubernetes.sh 1.16.3 true false false"
+ exit 1
+fi
+UPGRADE_VERSION="${1}"
+IS_MAIN_MASTER=""
+if [ $# -gt 1 ]; then
+ IS_MAIN_MASTER="${2}"
+fi
+IS_OLD_VERSION=""
+if [ $# -gt 2 ]; then
+ IS_OLD_VERSION="${3}"
+fi
+EJECT_ISO_FROM_OS=false
+if [ $# -gt 3 ]; then
+ EJECT_ISO_FROM_OS="${4}"
+fi
+
+export PATH=$PATH:/opt/bin
+
+ISO_MOUNT_DIR=/mnt/k8sdisk
+BINARIES_DIR=${ISO_MOUNT_DIR}/
+
+OFFLINE_INSTALL_ATTEMPT_SLEEP=5
+MAX_OFFLINE_INSTALL_ATTEMPTS=10
+offline_attempts=1
+iso_drive_path=""
+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
+ iso_drive_path="${line}"
+ 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}"
+
+ cd /opt/bin
+
+ cp ${BINARIES_DIR}/k8s/kubeadm /opt/bin
+ chmod +x kubeadm
+
+ output=`ls ${BINARIES_DIR}/docker/`
+ if [ "$output" != "" ]; then
+ while read -r line; do
+ docker load < "${BINARIES_DIR}/docker/$line"
+ done <<< "$output"
+ fi
+
+ tar -f "${BINARIES_DIR}/cni/cni-plugins-amd64.tgz" -C /opt/cni/bin -xz
+ tar -f "${BINARIES_DIR}/cri-tools/crictl-linux-amd64.tar.gz" -C /opt/bin -xz
+
+ if [ "${IS_MAIN_MASTER}" == 'true' ]; then
+ set +e
+ kubeadm upgrade apply ${UPGRADE_VERSION} -y
+ retval=$?
+ set -e
+ if [ $retval -ne 0 ]; then
+ kubeadm upgrade apply ${UPGRADE_VERSION} --ignore-preflight-errors=CoreDNSUnsupportedPlugins -y
+ fi
+ else
+ if [ "${IS_OLD_VERSION}" == 'true' ]; then
+ kubeadm upgrade node config --kubelet-version ${UPGRADE_VERSION}
+ else
+ kubeadm upgrade node
+ fi
+ fi
+
+ systemctl stop kubelet
+ cp -a ${BINARIES_DIR}/k8s/{kubelet,kubectl} /opt/bin
+ chmod +x {kubelet,kubectl}
+ systemctl restart kubelet
+
+ if [ "${IS_MAIN_MASTER}" == 'true' ]; then
+ kubectl apply -f ${BINARIES_DIR}/network.yaml
+ kubectl apply -f ${BINARIES_DIR}/dashboard.yaml
+ fi
+
+ umount "${ISO_MOUNT_DIR}" && rmdir "${ISO_MOUNT_DIR}"
+ if [ "$EJECT_ISO_FROM_OS" = true ] && [ "$iso_drive_path" != "" ]; then
+ eject "${iso_drive_path}"
+ fi
+fi
diff --git a/plugins/integrations/kubernetes-service/src/test/java/com/cloud/kubernetes/version/KubernetesVersionServiceTest.java b/plugins/integrations/kubernetes-service/src/test/java/com/cloud/kubernetes/version/KubernetesVersionServiceTest.java
new file mode 100644
index 0000000..6878c4c
--- /dev/null
+++ b/plugins/integrations/kubernetes-service/src/test/java/com/cloud/kubernetes/version/KubernetesVersionServiceTest.java
@@ -0,0 +1,253 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.kubernetes.version;
+
+import static org.mockito.Mockito.when;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import org.apache.cloudstack.api.command.admin.kubernetes.version.AddKubernetesSupportedVersionCmd;
+import org.apache.cloudstack.api.command.admin.kubernetes.version.DeleteKubernetesSupportedVersionCmd;
+import org.apache.cloudstack.api.command.admin.kubernetes.version.UpdateKubernetesSupportedVersionCmd;
+import org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd;
+import org.apache.cloudstack.api.command.user.iso.RegisterIsoCmd;
+import org.apache.cloudstack.api.command.user.kubernetes.version.ListKubernetesSupportedVersionsCmd;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import com.cloud.api.query.dao.TemplateJoinDao;
+import com.cloud.api.query.vo.TemplateJoinVO;
+import com.cloud.dc.DataCenterVO;
+import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.kubernetes.cluster.KubernetesClusterService;
+import com.cloud.kubernetes.cluster.KubernetesClusterVO;
+import com.cloud.kubernetes.cluster.dao.KubernetesClusterDao;
+import com.cloud.kubernetes.version.dao.KubernetesSupportedVersionDao;
+import com.cloud.storage.VMTemplateVO;
+import com.cloud.storage.dao.VMTemplateDao;
+import com.cloud.template.TemplateApiService;
+import com.cloud.template.VirtualMachineTemplate;
+import com.cloud.user.Account;
+import com.cloud.user.AccountManager;
+import com.cloud.user.AccountVO;
+import com.cloud.user.User;
+import com.cloud.user.UserVO;
+import com.cloud.utils.component.ComponentContext;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({ComponentContext.class})
+public class KubernetesVersionServiceTest {
+
+ @InjectMocks
+ private KubernetesVersionService kubernetesVersionService = new KubernetesVersionManagerImpl();
+
+ @Mock
+ private KubernetesSupportedVersionDao kubernetesSupportedVersionDao;
+ @Mock
+ private KubernetesClusterDao kubernetesClusterDao;
+ @Mock
+ private AccountManager accountManager;
+ @Mock
+ private VMTemplateDao templateDao;
+ @Mock
+ private TemplateJoinDao templateJoinDao;
+ @Mock
+ private DataCenterDao dataCenterDao;
+ @Mock
+ private TemplateApiService templateService;
+
+ private void overrideDefaultConfigValue(final ConfigKey configKey, final String name, final Object o) throws IllegalAccessException, NoSuchFieldException {
+ Field f = ConfigKey.class.getDeclaredField(name);
+ f.setAccessible(true);
+ f.set(configKey, o);
+ }
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+
+ overrideDefaultConfigValue(KubernetesClusterService.KubernetesServiceEnabled, "_defaultValue", "true");
+
+ DataCenterVO zone = Mockito.mock(DataCenterVO.class);
+ when(zone.getId()).thenReturn(1L);
+ when(dataCenterDao.findById(Mockito.anyLong())).thenReturn(zone);
+
+ TemplateJoinVO templateJoinVO = Mockito.mock(TemplateJoinVO.class);
+ when(templateJoinVO.getId()).thenReturn(1L);
+ when(templateJoinVO.getUrl()).thenReturn("https://download.cloudstack.com");
+ when(templateJoinVO.getState()).thenReturn(ObjectInDataStoreStateMachine.State.Ready);
+ when(templateJoinDao.findById(Mockito.anyLong())).thenReturn(templateJoinVO);
+
+ KubernetesSupportedVersionVO versionVO = Mockito.mock(KubernetesSupportedVersionVO.class);
+ when(versionVO.getSemanticVersion()).thenReturn(KubernetesVersionService.MIN_KUBERNETES_VERSION);
+ when(kubernetesSupportedVersionDao.persist(Mockito.any(KubernetesSupportedVersionVO.class))).thenReturn(versionVO);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ }
+
+ @Test
+ public void listKubernetesSupportedVersionsTest() {
+ ListKubernetesSupportedVersionsCmd cmd = Mockito.mock(ListKubernetesSupportedVersionsCmd.class);
+ List<KubernetesSupportedVersionVO> versionVOs = new ArrayList<>();
+ KubernetesSupportedVersionVO versionVO = Mockito.mock(KubernetesSupportedVersionVO.class);
+ when(versionVO.getSemanticVersion()).thenReturn(KubernetesVersionService.MIN_KUBERNETES_VERSION);
+ versionVOs.add(versionVO);
+ when(kubernetesSupportedVersionDao.listAll()).thenReturn(versionVOs);
+ when(kubernetesSupportedVersionDao.listAllInZone(Mockito.anyLong())).thenReturn(versionVOs);
+ when(kubernetesSupportedVersionDao.findById(Mockito.anyLong())).thenReturn(versionVO);
+ kubernetesVersionService.listKubernetesSupportedVersions(cmd);
+ }
+
+ @Test(expected = InvalidParameterValueException.class)
+ public void addKubernetesSupportedVersionLowerUnsupportedTest() {
+ AddKubernetesSupportedVersionCmd cmd = Mockito.mock(AddKubernetesSupportedVersionCmd.class);
+ when(cmd.getMinimumCpu()).thenReturn(KubernetesClusterService.MIN_KUBERNETES_CLUSTER_NODE_CPU);
+ when(cmd.getMinimumRamSize()).thenReturn(KubernetesClusterService.MIN_KUBERNETES_CLUSTER_NODE_RAM_SIZE);
+ AccountVO account = new AccountVO("admin", 1L, "", Account.ACCOUNT_TYPE_ADMIN, "uuid");
+ UserVO user = new UserVO(1, "adminuser", "password", "firstname", "lastName", "email", "timezone", UUID.randomUUID().toString(), User.Source.UNKNOWN);
+ CallContext.register(user, account);
+ when(cmd.getSemanticVersion()).thenReturn("1.1.1");
+ kubernetesVersionService.addKubernetesSupportedVersion(cmd);
+ }
+
+ @Test(expected = InvalidParameterValueException.class)
+ public void addKubernetesSupportedVersionInvalidCpuTest() {
+ AddKubernetesSupportedVersionCmd cmd = Mockito.mock(AddKubernetesSupportedVersionCmd.class);
+ when(cmd.getMinimumCpu()).thenReturn(KubernetesClusterService.MIN_KUBERNETES_CLUSTER_NODE_CPU-1);
+ when(cmd.getMinimumRamSize()).thenReturn(KubernetesClusterService.MIN_KUBERNETES_CLUSTER_NODE_RAM_SIZE);
+ AccountVO account = new AccountVO("admin", 1L, "", Account.ACCOUNT_TYPE_ADMIN, "uuid");
+ UserVO user = new UserVO(1, "adminuser", "password", "firstname", "lastName", "email", "timezone", UUID.randomUUID().toString(), User.Source.UNKNOWN);
+ when(cmd.getSemanticVersion()).thenReturn(KubernetesVersionService.MIN_KUBERNETES_VERSION);
+ CallContext.register(user, account);
+ kubernetesVersionService.addKubernetesSupportedVersion(cmd);
+ }
+
+ @Test(expected = InvalidParameterValueException.class)
+ public void addKubernetesSupportedVersionInvalidRamSizeTest() {
+ AddKubernetesSupportedVersionCmd cmd = Mockito.mock(AddKubernetesSupportedVersionCmd.class);
+ when(cmd.getMinimumCpu()).thenReturn(KubernetesClusterService.MIN_KUBERNETES_CLUSTER_NODE_CPU);
+ when(cmd.getMinimumRamSize()).thenReturn(KubernetesClusterService.MIN_KUBERNETES_CLUSTER_NODE_RAM_SIZE-10);
+ AccountVO account = new AccountVO("admin", 1L, "", Account.ACCOUNT_TYPE_ADMIN, "uuid");
+ UserVO user = new UserVO(1, "adminuser", "password", "firstname", "lastName", "email", "timezone", UUID.randomUUID().toString(), User.Source.UNKNOWN);
+ when(cmd.getSemanticVersion()).thenReturn(KubernetesVersionService.MIN_KUBERNETES_VERSION);
+ CallContext.register(user, account);
+ kubernetesVersionService.addKubernetesSupportedVersion(cmd);
+ }
+
+ @Test(expected = InvalidParameterValueException.class)
+ public void addKubernetesSupportedVersionEmptyUrlTest() {
+ AddKubernetesSupportedVersionCmd cmd = Mockito.mock(AddKubernetesSupportedVersionCmd.class);
+ when(cmd.getMinimumCpu()).thenReturn(KubernetesClusterService.MIN_KUBERNETES_CLUSTER_NODE_CPU);
+ when(cmd.getMinimumRamSize()).thenReturn(KubernetesClusterService.MIN_KUBERNETES_CLUSTER_NODE_RAM_SIZE);
+ AccountVO account = new AccountVO("admin", 1L, "", Account.ACCOUNT_TYPE_ADMIN, "uuid");
+ UserVO user = new UserVO(1, "adminuser", "password", "firstname", "lastName", "email", "timezone", UUID.randomUUID().toString(), User.Source.UNKNOWN);
+ when(cmd.getSemanticVersion()).thenReturn(KubernetesVersionService.MIN_KUBERNETES_VERSION);
+ CallContext.register(user, account);
+ when(cmd.getUrl()).thenReturn("");
+ kubernetesVersionService.addKubernetesSupportedVersion(cmd);
+ }
+
+ @Test
+ public void addKubernetesSupportedVersionIsoUrlTest() throws ResourceAllocationException, NoSuchFieldException {
+ AddKubernetesSupportedVersionCmd cmd = Mockito.mock(AddKubernetesSupportedVersionCmd.class);
+ AccountVO account = new AccountVO("admin", 1L, "", Account.ACCOUNT_TYPE_ADMIN, "uuid");
+ UserVO user = new UserVO(1, "adminuser", "password", "firstname", "lastName", "email", "timezone", UUID.randomUUID().toString(), User.Source.UNKNOWN);
+ CallContext.register(user, account);
+ when(cmd.getSemanticVersion()).thenReturn(KubernetesVersionService.MIN_KUBERNETES_VERSION);
+ when(cmd.getUrl()).thenReturn("https://download.cloudstack.com");
+ when(cmd.getChecksum()).thenReturn(null);
+ when(cmd.getMinimumCpu()).thenReturn(KubernetesClusterService.MIN_KUBERNETES_CLUSTER_NODE_CPU);
+ when(cmd.getMinimumRamSize()).thenReturn(KubernetesClusterService.MIN_KUBERNETES_CLUSTER_NODE_RAM_SIZE);
+ Account systemAccount = new AccountVO("system", 1L, "", Account.ACCOUNT_TYPE_ADMIN, "uuid");
+ when(accountManager.getSystemAccount()).thenReturn(systemAccount);
+ PowerMockito.mockStatic(ComponentContext.class);
+ when(ComponentContext.inject(Mockito.any(RegisterIsoCmd.class))).thenReturn(new RegisterIsoCmd());
+ when(templateService.registerIso(Mockito.any(RegisterIsoCmd.class))).thenReturn(Mockito.mock(VirtualMachineTemplate.class));
+ VMTemplateVO templateVO = Mockito.mock(VMTemplateVO.class);
+ when(templateVO.getId()).thenReturn(1L);
+ when(templateDao.findById(Mockito.anyLong())).thenReturn(templateVO);
+ kubernetesVersionService.addKubernetesSupportedVersion(cmd);
+ }
+
+ @Test(expected = CloudRuntimeException.class)
+ public void deleteKubernetesSupportedVersionExistingClustersTest() {
+ DeleteKubernetesSupportedVersionCmd cmd = Mockito.mock(DeleteKubernetesSupportedVersionCmd.class);
+ AccountVO account = new AccountVO("admin", 1L, "", Account.ACCOUNT_TYPE_ADMIN, "uuid");
+ UserVO user = new UserVO(1, "adminuser", "password", "firstname", "lastName", "email", "timezone", UUID.randomUUID().toString(), User.Source.UNKNOWN);
+ CallContext.register(user, account);
+ when(kubernetesSupportedVersionDao.findById(Mockito.anyLong())).thenReturn(Mockito.mock(KubernetesSupportedVersionVO.class));
+ List<KubernetesClusterVO> clusters = new ArrayList<>();
+ clusters.add(Mockito.mock(KubernetesClusterVO.class));
+ when(kubernetesClusterDao.listAllByKubernetesVersion(Mockito.anyLong())).thenReturn(clusters);
+ kubernetesVersionService.deleteKubernetesSupportedVersion(cmd);
+ }
+
+ @Test
+ public void deleteKubernetesSupportedVersionTest() {
+ DeleteKubernetesSupportedVersionCmd cmd = Mockito.mock(DeleteKubernetesSupportedVersionCmd.class);
+ AccountVO account = new AccountVO("admin", 1L, "", Account.ACCOUNT_TYPE_ADMIN, "uuid");
+ UserVO user = new UserVO(1, "adminuser", "password", "firstname", "lastName", "email", "timezone", UUID.randomUUID().toString(), User.Source.UNKNOWN);
+ CallContext.register(user, account);
+ when(kubernetesSupportedVersionDao.findById(Mockito.anyLong())).thenReturn(Mockito.mock(KubernetesSupportedVersionVO.class));
+ List<KubernetesClusterVO> clusters = new ArrayList<>();
+ when(kubernetesClusterDao.listAllByKubernetesVersion(Mockito.anyLong())).thenReturn(clusters);
+ when(templateDao.findById(Mockito.anyLong())).thenReturn(Mockito.mock(VMTemplateVO.class));
+ PowerMockito.mockStatic(ComponentContext.class);
+ when(ComponentContext.inject(Mockito.any(DeleteIsoCmd.class))).thenReturn(new DeleteIsoCmd());
+ when(templateService.deleteIso(Mockito.any(DeleteIsoCmd.class))).thenReturn(true);
+ when(kubernetesClusterDao.remove(Mockito.anyLong())).thenReturn(true);
+ kubernetesVersionService.deleteKubernetesSupportedVersion(cmd);
+ }
+
+ @Test
+ public void updateKubernetesSupportedVersionTest() {
+ UpdateKubernetesSupportedVersionCmd cmd = Mockito.mock(UpdateKubernetesSupportedVersionCmd.class);
+ when(cmd.getState()).thenReturn(KubernetesSupportedVersion.State.Disabled.toString());
+ AccountVO account = new AccountVO("admin", 1L, "", Account.ACCOUNT_TYPE_ADMIN, "uuid");
+ UserVO user = new UserVO(1, "adminuser", "password", "firstname", "lastName", "email", "timezone", UUID.randomUUID().toString(), User.Source.UNKNOWN);
+ CallContext.register(user, account);
+ when(kubernetesSupportedVersionDao.findById(Mockito.anyLong())).thenReturn(Mockito.mock(KubernetesSupportedVersionVO.class));
+ KubernetesSupportedVersionVO version = Mockito.mock(KubernetesSupportedVersionVO.class);
+ when(kubernetesSupportedVersionDao.createForUpdate(Mockito.anyLong())).thenReturn(version);
+ when(kubernetesSupportedVersionDao.update(Mockito.anyLong(), Mockito.any(KubernetesSupportedVersionVO.class))).thenReturn(true);
+ when(version.getState()).thenReturn(KubernetesSupportedVersion.State.Disabled);
+ when(version.getSemanticVersion()).thenReturn(KubernetesVersionService.MIN_KUBERNETES_VERSION);
+ when(kubernetesSupportedVersionDao.findById(Mockito.anyLong())).thenReturn(version);
+ kubernetesVersionService.updateKubernetesSupportedVersion(cmd);
+ }
+}
\ No newline at end of file
diff --git a/plugins/integrations/prometheus/pom.xml b/plugins/integrations/prometheus/pom.xml
index 0e1dcce..145a9c0 100644
--- a/plugins/integrations/prometheus/pom.xml
+++ b/plugins/integrations/prometheus/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/metrics/pom.xml b/plugins/metrics/pom.xml
index 04135d6..97853c2 100644
--- a/plugins/metrics/pom.xml
+++ b/plugins/metrics/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/metrics/src/main/java/org/apache/cloudstack/metrics/MetricsServiceImpl.java b/plugins/metrics/src/main/java/org/apache/cloudstack/metrics/MetricsServiceImpl.java
index 1a9cd27..14ee29c 100644
--- a/plugins/metrics/src/main/java/org/apache/cloudstack/metrics/MetricsServiceImpl.java
+++ b/plugins/metrics/src/main/java/org/apache/cloudstack/metrics/MetricsServiceImpl.java
@@ -286,6 +286,7 @@
metricsResponse.setCpuTotal(hostResponse.getCpuNumber(), hostResponse.getCpuSpeed(), cpuOvercommitRatio);
metricsResponse.setCpuUsed(hostResponse.getCpuUsed(), hostResponse.getCpuNumber(), hostResponse.getCpuSpeed());
metricsResponse.setCpuAllocated(hostResponse.getCpuAllocated(), hostResponse.getCpuNumber(), hostResponse.getCpuSpeed());
+ metricsResponse.setLoadAverage(hostResponse.getAverageLoad());
metricsResponse.setMemTotal(hostResponse.getMemoryTotal(), memoryOvercommitRatio);
metricsResponse.setMemAllocated(hostResponse.getMemoryAllocated());
metricsResponse.setMemUsed(hostResponse.getMemoryUsed());
diff --git a/plugins/metrics/src/main/java/org/apache/cloudstack/response/HostMetricsResponse.java b/plugins/metrics/src/main/java/org/apache/cloudstack/response/HostMetricsResponse.java
index 72e9f92..a7446af 100644
--- a/plugins/metrics/src/main/java/org/apache/cloudstack/response/HostMetricsResponse.java
+++ b/plugins/metrics/src/main/java/org/apache/cloudstack/response/HostMetricsResponse.java
@@ -43,6 +43,10 @@
@Param(description = "the total cpu allocated in Ghz")
private String cpuAllocated;
+ @SerializedName("cpuloadaverage")
+ @Param(description = "the average cpu load the last minute")
+ private Double loadAverage;
+
@SerializedName("memorytotalgb")
@Param(description = "the total cpu capacity in GiB")
private String memTotal;
@@ -117,6 +121,12 @@
}
}
+ public void setLoadAverage(final Double loadAverage) {
+ if (loadAverage != null) {
+ this.loadAverage = loadAverage;
+ }
+ }
+
public void setCpuAllocated(final String cpuAllocated, final Integer cpuNumber, final Long cpuSpeed) {
if (cpuAllocated != null && cpuNumber != null && cpuSpeed != null) {
this.cpuAllocated = String.format("%.2f Ghz", Double.valueOf(cpuAllocated.replace("%", "")) * cpuNumber * cpuSpeed / (100.0 * 1000.0));
diff --git a/plugins/network-elements/bigswitch/pom.xml b/plugins/network-elements/bigswitch/pom.xml
index 3498565..5e576bf 100644
--- a/plugins/network-elements/bigswitch/pom.xml
+++ b/plugins/network-elements/bigswitch/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/network-elements/brocade-vcs/pom.xml b/plugins/network-elements/brocade-vcs/pom.xml
index b778759..31ca915 100644
--- a/plugins/network-elements/brocade-vcs/pom.xml
+++ b/plugins/network-elements/brocade-vcs/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<build>
@@ -32,7 +32,7 @@
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
- <version>0.7.1</version>
+ <version>0.14.0</version>
<executions>
<execution>
<id>interface</id>
diff --git a/plugins/network-elements/cisco-vnmc/pom.xml b/plugins/network-elements/cisco-vnmc/pom.xml
index be277a5..bda9d5d 100644
--- a/plugins/network-elements/cisco-vnmc/pom.xml
+++ b/plugins/network-elements/cisco-vnmc/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/element/CiscoVnmcElement.java b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/element/CiscoVnmcElement.java
index 23c9c29..ed65002 100644
--- a/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/element/CiscoVnmcElement.java
+++ b/plugins/network-elements/cisco-vnmc/src/main/java/com/cloud/network/element/CiscoVnmcElement.java
@@ -353,7 +353,7 @@
try {
Account caller = CallContext.current().getCallingAccount();
long callerUserId = CallContext.current().getCallingUserId();
- outsideIp = _ipAddrMgr.allocateIp(owner, false, caller, callerUserId, zone, true);
+ outsideIp = _ipAddrMgr.allocateIp(owner, false, caller, callerUserId, zone, true, null);
} catch (ResourceAllocationException e) {
s_logger.error("Unable to allocate additional public Ip address. Exception details " + e);
throw new CloudRuntimeException("Unable to allocate additional public Ip address. Exception details " + e);
diff --git a/plugins/network-elements/dns-notifier/pom.xml b/plugins/network-elements/dns-notifier/pom.xml
index a77fad0..65dbabb 100644
--- a/plugins/network-elements/dns-notifier/pom.xml
+++ b/plugins/network-elements/dns-notifier/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>cloud-plugin-example-dns-notifier</artifactId>
diff --git a/plugins/network-elements/elastic-loadbalancer/pom.xml b/plugins/network-elements/elastic-loadbalancer/pom.xml
index d229513..523e796 100644
--- a/plugins/network-elements/elastic-loadbalancer/pom.xml
+++ b/plugins/network-elements/elastic-loadbalancer/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/network-elements/elastic-loadbalancer/src/test/java/com/cloud/network/lb/ElasticLoadBalancerManagerImplTest.java b/plugins/network-elements/elastic-loadbalancer/src/test/java/com/cloud/network/lb/ElasticLoadBalancerManagerImplTest.java
index 8928fd9..04f59bb 100644
--- a/plugins/network-elements/elastic-loadbalancer/src/test/java/com/cloud/network/lb/ElasticLoadBalancerManagerImplTest.java
+++ b/plugins/network-elements/elastic-loadbalancer/src/test/java/com/cloud/network/lb/ElasticLoadBalancerManagerImplTest.java
@@ -25,8 +25,8 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
-import org.mockito.internal.util.reflection.Whitebox;
import org.mockito.runners.MockitoJUnitRunner;
+import org.powermock.reflect.Whitebox;
import com.cloud.agent.api.check.CheckSshAnswer;
import com.cloud.agent.manager.Commands;
diff --git a/plugins/network-elements/elastic-loadbalancer/src/test/java/com/cloud/network/lb/LoadBalanceRuleHandlerTest.java b/plugins/network-elements/elastic-loadbalancer/src/test/java/com/cloud/network/lb/LoadBalanceRuleHandlerTest.java
index 17bae63..cde56c1 100644
--- a/plugins/network-elements/elastic-loadbalancer/src/test/java/com/cloud/network/lb/LoadBalanceRuleHandlerTest.java
+++ b/plugins/network-elements/elastic-loadbalancer/src/test/java/com/cloud/network/lb/LoadBalanceRuleHandlerTest.java
@@ -36,8 +36,8 @@
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import org.mockito.internal.util.reflection.Whitebox;
import org.mockito.runners.MockitoJUnitRunner;
+import org.powermock.reflect.Whitebox;
import com.cloud.dc.PodVlanMapVO;
import com.cloud.dc.dao.PodVlanMapDao;
diff --git a/plugins/network-elements/f5/pom.xml b/plugins/network-elements/f5/pom.xml
index 6e4d67d..226572c 100644
--- a/plugins/network-elements/f5/pom.xml
+++ b/plugins/network-elements/f5/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/network-elements/globodns/pom.xml b/plugins/network-elements/globodns/pom.xml
index e398084..40880a5 100644
--- a/plugins/network-elements/globodns/pom.xml
+++ b/plugins/network-elements/globodns/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/network-elements/internal-loadbalancer/pom.xml b/plugins/network-elements/internal-loadbalancer/pom.xml
index 6fa0718..0d4ef3a 100644
--- a/plugins/network-elements/internal-loadbalancer/pom.xml
+++ b/plugins/network-elements/internal-loadbalancer/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/internallbvmmgr/InternalLBVMManagerTest.java b/plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/internallbvmmgr/InternalLBVMManagerTest.java
index b24d511..103fcd9 100644
--- a/plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/internallbvmmgr/InternalLBVMManagerTest.java
+++ b/plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/internallbvmmgr/InternalLBVMManagerTest.java
@@ -16,6 +16,8 @@
// under the License.
package org.apache.cloudstack.internallbvmmgr;
+import static org.mockito.ArgumentMatchers.nullable;
+
import java.lang.reflect.Field;
import java.net.URI;
import java.net.URISyntaxException;
@@ -124,14 +126,13 @@
List<ServiceOfferingVO> list = new ArrayList<ServiceOfferingVO>();
list.add(off);
list.add(off);
- Mockito.when(_svcOffDao.createSystemServiceOfferings(Matchers.anyString(), Matchers.anyString(), Matchers.anyInt(), Matchers.anyInt(), Matchers.anyInt(),
- Matchers.anyInt(), Matchers.anyInt(), Matchers.anyBoolean(), Matchers.anyString(), Matchers.any(ProvisioningType.class), Matchers.anyBoolean(),
- Matchers.anyString(), Matchers.anyBoolean(), Matchers.any(VirtualMachine.Type.class), Matchers.anyBoolean())).thenReturn(list);
+ Mockito.when(_svcOffDao.createSystemServiceOfferings(nullable(String.class), nullable(String.class), nullable(Integer.class), nullable(Integer.class), nullable(Integer.class),
+ nullable(Integer.class), nullable(Integer.class), nullable(Boolean.class), nullable(String.class), nullable(ProvisioningType.class), nullable(Boolean.class),
+ nullable(String.class), nullable(Boolean.class), nullable(VirtualMachine.Type.class), nullable(Boolean.class))).thenReturn(list);
ComponentContext.initComponentsLifeCycle();
- vm =
- new DomainRouterVO(1L, off.getId(), 1, "alena", 1, HypervisorType.XenServer, 1, 1, 1, 1, false, null, false, false,
+ vm = new DomainRouterVO(1L, off.getId(), 1, "alena", 1, HypervisorType.XenServer, 1, 1, 1, 1, false, null, false, false,
VirtualMachine.Type.InternalLoadBalancerVm, null);
vm.setRole(Role.INTERNAL_LB_VM);
vm = setId(vm, 1);
@@ -154,7 +155,7 @@
answers[0] = answer;
try {
- Mockito.when(_agentMgr.send(Matchers.anyLong(), Matchers.any(Commands.class))).thenReturn(answers);
+ Mockito.when(_agentMgr.send(nullable(Long.class), nullable(Commands.class))).thenReturn(answers);
} catch (final AgentUnavailableException e) {
// TODO Auto-generated catch block
e.printStackTrace();
diff --git a/plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/internallbvmmgr/InternalLBVMServiceTest.java b/plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/internallbvmmgr/InternalLBVMServiceTest.java
index 84c5f1b..898b7e5 100644
--- a/plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/internallbvmmgr/InternalLBVMServiceTest.java
+++ b/plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/internallbvmmgr/InternalLBVMServiceTest.java
@@ -16,14 +16,14 @@
// under the License.
package org.apache.cloudstack.internallbvmmgr;
+import static org.mockito.ArgumentMatchers.nullable;
+
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
import javax.inject.Inject;
-import junit.framework.TestCase;
-
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.network.lb.InternalLoadBalancerVMService;
import org.junit.After;
@@ -57,6 +57,8 @@
import com.cloud.vm.VirtualMachineManager;
import com.cloud.vm.dao.DomainRouterDao;
+import junit.framework.TestCase;
+
/**
* Set of unittests for InternalLoadBalancerVMService
*
@@ -96,9 +98,9 @@
List<ServiceOfferingVO> list = new ArrayList<ServiceOfferingVO>();
list.add(off);
list.add(off);
- Mockito.when(_svcOffDao.createSystemServiceOfferings(Matchers.anyString(), Matchers.anyString(), Matchers.anyInt(), Matchers.anyInt(), Matchers.anyInt(),
- Matchers.anyInt(), Matchers.anyInt(), Matchers.anyBoolean(), Matchers.anyString(), Matchers.any(ProvisioningType.class), Matchers.anyBoolean(),
- Matchers.anyString(), Matchers.anyBoolean(), Matchers.any(VirtualMachine.Type.class), Matchers.anyBoolean())).thenReturn(list);
+ Mockito.when(_svcOffDao.createSystemServiceOfferings(nullable(String.class), nullable(String.class), nullable(Integer.class), nullable(Integer.class), nullable(Integer.class),
+ nullable(Integer.class), nullable(Integer.class), nullable(Boolean.class), nullable(String.class), nullable(ProvisioningType.class), nullable(Boolean.class),
+ nullable(String.class), nullable(Boolean.class), nullable(VirtualMachine.Type.class), nullable(Boolean.class))).thenReturn(list);
ComponentContext.initComponentsLifeCycle();
diff --git a/plugins/network-elements/internal-loadbalancer/src/test/resources/lb_element.xml b/plugins/network-elements/internal-loadbalancer/src/test/resources/lb_element.xml
index 9ed5a31..0529392 100644
--- a/plugins/network-elements/internal-loadbalancer/src/test/resources/lb_element.xml
+++ b/plugins/network-elements/internal-loadbalancer/src/test/resources/lb_element.xml
@@ -20,10 +20,10 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd">
- <context:annotation-config />
+ <context:annotation-config />
- <!-- @DB support -->
-
+ <!-- @DB support -->
+
<bean id="componentContext" class="com.cloud.utils.component.ComponentContext" />
<bean id="transactionContextBuilder" class="com.cloud.utils.db.TransactionContextBuilder" />
@@ -37,10 +37,10 @@
</property>
</bean>
- <bean id="InternalLoadBalancerElementService" class="org.apache.cloudstack.network.element.InternalLoadBalancerElement">
- <property name="name" value="InternalLoadBalancerElementService"/>
- </bean>
-
- <bean class="org.apache.cloudstack.internallbelement.ElementChildTestConfiguration" />
-
+ <bean id="InternalLoadBalancerElementService" class="org.apache.cloudstack.network.element.InternalLoadBalancerElement">
+ <property name="name" value="InternalLoadBalancerElementService"/>
+ </bean>
+
+ <bean class="org.apache.cloudstack.internallbelement.ElementChildTestConfiguration" />
+
</beans>
diff --git a/plugins/network-elements/juniper-contrail/pom.xml b/plugins/network-elements/juniper-contrail/pom.xml
index 828c451..112bded 100644
--- a/plugins/network-elements/juniper-contrail/pom.xml
+++ b/plugins/network-elements/juniper-contrail/pom.xml
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<repositories>
<repository>
<id>juniper-contrail</id>
- <url>http://juniper.github.io/contrail-maven/snapshots</url>
+ <url>https://juniper.github.io/contrail-maven/snapshots</url>
</repository>
</repositories>
<dependencies>
diff --git a/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/VirtualMachineModel.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/VirtualMachineModel.java
index 4b64c80..c44fcac 100644
--- a/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/VirtualMachineModel.java
+++ b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/VirtualMachineModel.java
@@ -224,7 +224,7 @@
case Migrating:
case Starting:
case Running:
- case Shutdowned:
+ case Shutdown:
case Stopped:
case Stopping:
return true;
diff --git a/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/NetworkProviderTest.java b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/NetworkProviderTest.java
index 9520490..f9a4787 100644
--- a/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/NetworkProviderTest.java
+++ b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/NetworkProviderTest.java
@@ -24,30 +24,6 @@
import javax.inject.Inject;
-import junit.framework.TestCase;
-import net.juniper.contrail.api.ApiConnector;
-import net.juniper.contrail.api.ApiConnectorFactory;
-import net.juniper.contrail.api.ApiConnectorMock;
-import net.juniper.contrail.api.types.InstanceIp;
-import net.juniper.contrail.api.types.NetworkIpam;
-import net.juniper.contrail.api.types.Project;
-import net.juniper.contrail.api.types.SubnetType;
-import net.juniper.contrail.api.types.VirtualMachine;
-import net.juniper.contrail.api.types.VirtualMachineInterface;
-import net.juniper.contrail.api.types.VirtualNetwork;
-import net.juniper.contrail.api.types.VnSubnetsType;
-
-import org.apache.log4j.Logger;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.command.user.address.AssociateIPAddrCmd;
@@ -58,6 +34,16 @@
import org.apache.cloudstack.api.command.user.project.DeleteProjectCmd;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.utils.identity.ManagementServerNode;
+import org.apache.log4j.Logger;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import com.cloud.agent.AgentManager;
import com.cloud.dc.DataCenter;
@@ -84,6 +70,19 @@
import com.cloud.utils.mgmt.JmxUtil;
import com.cloud.vm.VirtualMachineManager;
+import junit.framework.TestCase;
+import net.juniper.contrail.api.ApiConnector;
+import net.juniper.contrail.api.ApiConnectorFactory;
+import net.juniper.contrail.api.ApiConnectorMock;
+import net.juniper.contrail.api.types.InstanceIp;
+import net.juniper.contrail.api.types.NetworkIpam;
+import net.juniper.contrail.api.types.Project;
+import net.juniper.contrail.api.types.SubnetType;
+import net.juniper.contrail.api.types.VirtualMachine;
+import net.juniper.contrail.api.types.VirtualMachineInterface;
+import net.juniper.contrail.api.types.VirtualNetwork;
+import net.juniper.contrail.api.types.VnSubnetsType;
+
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = "classpath:/providerContext.xml")
/**
diff --git a/plugins/network-elements/juniper-srx/pom.xml b/plugins/network-elements/juniper-srx/pom.xml
index 4cb61b8..6526f8e 100644
--- a/plugins/network-elements/juniper-srx/pom.xml
+++ b/plugins/network-elements/juniper-srx/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/network-elements/netscaler/pom.xml b/plugins/network-elements/netscaler/pom.xml
index 3918baa..776f811 100644
--- a/plugins/network-elements/netscaler/pom.xml
+++ b/plugins/network-elements/netscaler/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/network-elements/nicira-nvp/pom.xml b/plugins/network-elements/nicira-nvp/pom.xml
index a46e090..41e81e8 100644
--- a/plugins/network-elements/nicira-nvp/pom.xml
+++ b/plugins/network-elements/nicira-nvp/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/element/NiciraNvpElementTest.java b/plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/element/NiciraNvpElementTest.java
index 858e908..a694f7a 100644
--- a/plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/element/NiciraNvpElementTest.java
+++ b/plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/element/NiciraNvpElementTest.java
@@ -259,11 +259,8 @@
verify(agentManager, atLeast(1)).easySend(eq(NETWORK_ID), argThat(new ArgumentMatcher<ConfigurePublicIpsOnLogicalRouterCommand>() {
@Override
- public boolean matches(final Object argument) {
- final ConfigurePublicIpsOnLogicalRouterCommand command = (ConfigurePublicIpsOnLogicalRouterCommand)argument;
- if (command.getPublicCidrs().size() == 1)
- return true;
- return false;
+ public boolean matches(final ConfigurePublicIpsOnLogicalRouterCommand command) {
+ return command.getPublicCidrs().size() == 1;
}
}));
}
diff --git a/plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/nicira/NiciraNvpApiIT.java b/plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/nicira/NiciraNvpApiIT.java
index a95a8d6..60c521a 100644
--- a/plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/nicira/NiciraNvpApiIT.java
+++ b/plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/nicira/NiciraNvpApiIT.java
@@ -45,11 +45,11 @@
final String user = System.getProperty("nvp.admin.user");
final String pass = System.getProperty("nvp.admin.pwd");
api = NiciraNvpApi.create()
- .host(host)
- .username(user)
- .password(pass)
- .httpClient(HttpClientHelper.createHttpClient(5))
- .build();
+ .host(host)
+ .username(user)
+ .password(pass)
+ .httpClient(HttpClientHelper.createHttpClient(5))
+ .build();
}
@Test
@@ -209,7 +209,7 @@
api.updateLogicalSwitchPortAttachment(logicalSwitch.getUuid(), logicalSwitchPort.getUuid(), vifAttachment);
assertEquals("Read a LogicalSwitchPort by vifAttachment different than expected",
- api.findLogicalSwitchPortUuidByVifAttachmentUuid(logicalSwitch.getUuid(), vifAttachment.getVifUuid()), logicalSwitchPort.getUuid());
+ api.findLogicalSwitchPortUuidByVifAttachmentUuid(logicalSwitch.getUuid(), vifAttachment.getVifUuid()), logicalSwitchPort.getUuid());
api.deleteLogicalSwitchPort(logicalSwitch.getUuid(), logicalSwitchPort.getUuid());
@@ -225,7 +225,7 @@
logicalRouter.setNatSynchronizationEnabled(true);
logicalRouter.setReplicationMode(LogicalRouter.REPLICATION_MODE_SERVICE);
final RoutingConfig routingConfig = new SingleDefaultRouteImplicitRoutingConfig(
- new RouterNextHop("192.168.10.20"));
+ new RouterNextHop("192.168.10.20"));
logicalRouter.setRoutingConfig(routingConfig);
// In the creation we don't get to specify UUID, href or schema: they don't exist yet
@@ -312,7 +312,7 @@
final ControlClusterStatus controlClusterStatus = api.getControlClusterStatus();
final String clusterStatus = controlClusterStatus.getClusterStatus();
final boolean correctStatus = clusterStatus.equalsIgnoreCase("stable") ||
- clusterStatus.equalsIgnoreCase("joining") || clusterStatus.equalsIgnoreCase("unstable");
+ clusterStatus.equalsIgnoreCase("joining") || clusterStatus.equalsIgnoreCase("unstable");
assertTrue("Not recognizable cluster status", correctStatus);
}
diff --git a/plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/nicira/NiciraRestClientTest.java b/plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/nicira/NiciraRestClientTest.java
index 3c5160c..d23c4dc 100644
--- a/plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/nicira/NiciraRestClientTest.java
+++ b/plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/nicira/NiciraRestClientTest.java
@@ -47,6 +47,7 @@
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
@@ -57,6 +58,7 @@
@RunWith(PowerMockRunner.class)
@PrepareForTest(NiciraRestClient.class)
+@PowerMockIgnore({"javax.xml.*", "org.w3c.dom.*", "org.apache.xerces.*", "org.apache.log4j.*"})
public class NiciraRestClientTest {
private static final int HTTPS_PORT = 443;
diff --git a/plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/resource/NiciraNvpResourceTest.java b/plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/resource/NiciraNvpResourceTest.java
index c0dedd2..417a846 100644
--- a/plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/resource/NiciraNvpResourceTest.java
+++ b/plugins/network-elements/nicira-nvp/src/test/java/com/cloud/network/resource/NiciraNvpResourceTest.java
@@ -21,9 +21,9 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.atLeast;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doThrow;
@@ -465,8 +465,8 @@
assertTrue(a.getResult());
verify(nvpApi, atLeast(2)).createLogicalRouterNatRule(eq("aaaaa"), argThat(new ArgumentMatcher<NatRule>() {
@Override
- public boolean matches(final Object argument) {
- final NatRule rule = (NatRule) argument;
+ public boolean matches(final NatRule argument) {
+ final NatRule rule = argument;
if (rule.getType().equals("DestinationNatRule") && ((DestinationNatRule) rule).getToDestinationIpAddress().equals("10.10.10.10")) {
return true;
}
@@ -508,8 +508,8 @@
assertTrue(a.getResult());
verify(nvpApi, never()).createLogicalRouterNatRule(eq("aaaaa"), argThat(new ArgumentMatcher<NatRule>() {
@Override
- public boolean matches(final Object argument) {
- final NatRule rule = (NatRule) argument;
+ public boolean matches(final NatRule argument) {
+ final NatRule rule = argument;
if (rule.getType().equals("DestinationNatRule") && ((DestinationNatRule) rule).getToDestinationIpAddress().equals("10.10.10.10")) {
return true;
}
@@ -553,8 +553,7 @@
assertTrue(a.getResult());
verify(nvpApi, atLeast(2)).deleteLogicalRouterNatRule(eq("aaaaa"), argThat(new ArgumentMatcher<UUID>() {
@Override
- public boolean matches(final Object argument) {
- final UUID uuid = (UUID) argument;
+ public boolean matches(final UUID uuid) {
if (rule0Uuid.equals(uuid) || rule1Uuid.equals(uuid)) {
return true;
}
@@ -626,8 +625,7 @@
assertTrue(a.getResult());
verify(nvpApi, atLeast(2)).createLogicalRouterNatRule(eq("aaaaa"), argThat(new ArgumentMatcher<NatRule>() {
@Override
- public boolean matches(final Object argument) {
- final NatRule rule = (NatRule) argument;
+ public boolean matches(final NatRule rule) {
if (rule.getType().equals("DestinationNatRule") && ((DestinationNatRule) rule).getToDestinationIpAddress().equals("10.10.10.10")) {
return true;
}
@@ -669,8 +667,7 @@
assertTrue(a.getResult());
verify(nvpApi, never()).createLogicalRouterNatRule(eq("aaaaa"), argThat(new ArgumentMatcher<NatRule>() {
@Override
- public boolean matches(final Object argument) {
- final NatRule rule = (NatRule) argument;
+ public boolean matches(final NatRule rule) {
if (rule.getType().equals("DestinationNatRule") && ((DestinationNatRule) rule).getToDestinationIpAddress().equals("10.10.10.10")) {
return true;
}
@@ -714,8 +711,7 @@
assertTrue(a.getResult());
verify(nvpApi, atLeast(2)).deleteLogicalRouterNatRule(eq("aaaaa"), argThat(new ArgumentMatcher<UUID>() {
@Override
- public boolean matches(final Object argument) {
- final UUID uuid = (UUID) argument;
+ public boolean matches(final UUID uuid) {
if (rule0Uuid.equals(uuid) || rule1Uuid.equals(uuid)) {
return true;
}
diff --git a/plugins/network-elements/nicira-nvp/src/test/resources/config.properties b/plugins/network-elements/nicira-nvp/src/test/resources/config.properties
index 4006e38d..04cf76b 100644
--- a/plugins/network-elements/nicira-nvp/src/test/resources/config.properties
+++ b/plugins/network-elements/nicira-nvp/src/test/resources/config.properties
@@ -17,7 +17,6 @@
# under the License.
#
-
-nvp.host=${nvp-host}
-nvp.admin.user=${nvp-admin-user}
-nvp.admin.pwd=${nvp-admin-pwd}
+nvp.host=localhost
+nvp.admin.user=admin
+nvp.admin.pwd=adminpassword
diff --git a/plugins/network-elements/opendaylight/pom.xml b/plugins/network-elements/opendaylight/pom.xml
index 217eb32..6872dd6 100644
--- a/plugins/network-elements/opendaylight/pom.xml
+++ b/plugins/network-elements/opendaylight/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<profiles>
diff --git a/plugins/network-elements/ovs/pom.xml b/plugins/network-elements/ovs/pom.xml
index 1a21c5a..d1df693 100644
--- a/plugins/network-elements/ovs/pom.xml
+++ b/plugins/network-elements/ovs/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/network-elements/palo-alto/pom.xml b/plugins/network-elements/palo-alto/pom.xml
index ced1c66..d66945a 100644
--- a/plugins/network-elements/palo-alto/pom.xml
+++ b/plugins/network-elements/palo-alto/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/network-elements/stratosphere-ssp/pom.xml b/plugins/network-elements/stratosphere-ssp/pom.xml
index 145e281..7e09fbc 100644
--- a/plugins/network-elements/stratosphere-ssp/pom.xml
+++ b/plugins/network-elements/stratosphere-ssp/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/network-elements/vxlan/pom.xml b/plugins/network-elements/vxlan/pom.xml
index 6484efc..eba7c08 100644
--- a/plugins/network-elements/vxlan/pom.xml
+++ b/plugins/network-elements/vxlan/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/outofbandmanagement-drivers/ipmitool/pom.xml b/plugins/outofbandmanagement-drivers/ipmitool/pom.xml
index 22d3aab..9ffdf44 100644
--- a/plugins/outofbandmanagement-drivers/ipmitool/pom.xml
+++ b/plugins/outofbandmanagement-drivers/ipmitool/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/outofbandmanagement-drivers/nested-cloudstack/pom.xml b/plugins/outofbandmanagement-drivers/nested-cloudstack/pom.xml
index 7245b32..415510a 100644
--- a/plugins/outofbandmanagement-drivers/nested-cloudstack/pom.xml
+++ b/plugins/outofbandmanagement-drivers/nested-cloudstack/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 0790b35..7124ea9 100755
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
</parent>
<build>
<plugins>
@@ -58,6 +58,8 @@
<module>api/rate-limit</module>
<module>api/solidfire-intg-test</module>
+ <module>backup/dummy</module>
+
<module>ca/root-ca</module>
<module>database/quota</module>
@@ -86,6 +88,7 @@
<module>integrations/cloudian</module>
<module>integrations/prometheus</module>
+ <module>integrations/kubernetes-service</module>
<module>metrics</module>
@@ -187,22 +190,13 @@
</property>
</activation>
<modules>
+ <module>api/vmware-sioc</module>
+ <module>backup/veeam</module>
<module>hypervisors/vmware</module>
<module>network-elements/cisco-vnmc</module>
</modules>
</profile>
<profile>
- <id>vmware-sioc</id>
- <activation>
- <property>
- <name>noredist</name>
- </property>
- </activation>
- <modules>
- <module>api/vmware-sioc</module>
- </modules>
- </profile>
- <profile>
<id>mysqlha</id>
<activation>
<property>
diff --git a/plugins/storage-allocators/random/pom.xml b/plugins/storage-allocators/random/pom.xml
index de1934e..f619529 100644
--- a/plugins/storage-allocators/random/pom.xml
+++ b/plugins/storage-allocators/random/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage/image/default/pom.xml b/plugins/storage/image/default/pom.xml
index f12c711..a001358 100644
--- a/plugins/storage/image/default/pom.xml
+++ b/plugins/storage/image/default/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage/image/s3/pom.xml b/plugins/storage/image/s3/pom.xml
index 319d8c6..9ee1434 100644
--- a/plugins/storage/image/s3/pom.xml
+++ b/plugins/storage/image/s3/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage/image/sample/pom.xml b/plugins/storage/image/sample/pom.xml
index 37f18bf..d8c5c20 100644
--- a/plugins/storage/image/sample/pom.xml
+++ b/plugins/storage/image/sample/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage/image/swift/pom.xml b/plugins/storage/image/swift/pom.xml
index 9429236..17d79f0 100644
--- a/plugins/storage/image/swift/pom.xml
+++ b/plugins/storage/image/swift/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage/volume/cloudbyte/pom.xml b/plugins/storage/volume/cloudbyte/pom.xml
index 646f75e..80696bb 100644
--- a/plugins/storage/volume/cloudbyte/pom.xml
+++ b/plugins/storage/volume/cloudbyte/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage/volume/datera/pom.xml b/plugins/storage/volume/datera/pom.xml
index 3c6f91d..8b68c84 100644
--- a/plugins/storage/volume/datera/pom.xml
+++ b/plugins/storage/volume/datera/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage/volume/datera/src/main/java/org/apache/cloudstack/storage/datastore/provider/DateraHostListener.java b/plugins/storage/volume/datera/src/main/java/org/apache/cloudstack/storage/datastore/provider/DateraHostListener.java
index 2cb4e8c..8639db6 100644
--- a/plugins/storage/volume/datera/src/main/java/org/apache/cloudstack/storage/datastore/provider/DateraHostListener.java
+++ b/plugins/storage/volume/datera/src/main/java/org/apache/cloudstack/storage/datastore/provider/DateraHostListener.java
@@ -18,6 +18,23 @@
*/
package org.apache.cloudstack.storage.datastore.provider;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
+import org.apache.cloudstack.engine.subsystem.api.storage.HypervisorHostListener;
+import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
+import org.apache.cloudstack.storage.datastore.util.DateraObject;
+import org.apache.cloudstack.storage.datastore.util.DateraUtil;
+import org.apache.log4j.Logger;
+
import com.cloud.agent.AgentManager;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.ModifyStoragePoolAnswer;
@@ -41,21 +58,6 @@
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.dao.VMInstanceDao;
-import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
-import org.apache.cloudstack.engine.subsystem.api.storage.HypervisorHostListener;
-import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
-import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
-import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
-import org.apache.cloudstack.storage.datastore.util.DateraObject;
-import org.apache.cloudstack.storage.datastore.util.DateraUtil;
-import org.apache.log4j.Logger;
-
-import javax.inject.Inject;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
public class DateraHostListener implements HypervisorHostListener {
private static final Logger s_logger = Logger.getLogger(DateraHostListener.class);
diff --git a/plugins/storage/volume/default/pom.xml b/plugins/storage/volume/default/pom.xml
index a5240a3..e0891a2 100644
--- a/plugins/storage/volume/default/pom.xml
+++ b/plugins/storage/volume/default/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage/volume/default/src/main/java/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java b/plugins/storage/volume/default/src/main/java/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
index 4153ba1..5863ef9 100644
--- a/plugins/storage/volume/default/src/main/java/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
+++ b/plugins/storage/volume/default/src/main/java/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
@@ -82,7 +82,7 @@
@Override
public Map<String, String> getCapabilities() {
Map<String, String> caps = new HashMap<String, String>();
- caps.put(DataStoreCapabilities.VOLUME_SNAPSHOT_QUIESCEVM.toString(), "false");
+ caps.put(DataStoreCapabilities.VOLUME_SNAPSHOT_QUIESCEVM.toString(), Boolean.FALSE.toString());
return caps;
}
diff --git a/plugins/storage/volume/nexenta/pom.xml b/plugins/storage/volume/nexenta/pom.xml
index d27f354..28bf93d 100644
--- a/plugins/storage/volume/nexenta/pom.xml
+++ b/plugins/storage/volume/nexenta/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage/volume/sample/pom.xml b/plugins/storage/volume/sample/pom.xml
index 6c2feb3..0cd998c 100644
--- a/plugins/storage/volume/sample/pom.xml
+++ b/plugins/storage/volume/sample/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage/volume/solidfire/pom.xml b/plugins/storage/volume/solidfire/pom.xml
index 39c3aa1..ec39221 100644
--- a/plugins/storage/volume/solidfire/pom.xml
+++ b/plugins/storage/volume/solidfire/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/storage/volume/solidfire/src/main/java/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java b/plugins/storage/volume/solidfire/src/main/java/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java
index 19b678e..aa277cd 100644
--- a/plugins/storage/volume/solidfire/src/main/java/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java
+++ b/plugins/storage/volume/solidfire/src/main/java/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java
@@ -24,6 +24,33 @@
import javax.inject.Inject;
+import org.apache.cloudstack.engine.subsystem.api.storage.ChapInfo;
+import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult;
+import org.apache.cloudstack.engine.subsystem.api.storage.CreateCmdResult;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreCapabilities;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
+import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine;
+import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreDriver;
+import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo;
+import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo;
+import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory;
+import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
+import org.apache.cloudstack.framework.async.AsyncCompletionCallback;
+import org.apache.cloudstack.storage.command.CommandResult;
+import org.apache.cloudstack.storage.command.CreateObjectAnswer;
+import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDao;
+import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreVO;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailVO;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
+import org.apache.cloudstack.storage.datastore.util.SolidFireUtil;
+import org.apache.cloudstack.storage.to.SnapshotObjectTO;
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.to.DataObjectType;
import com.cloud.agent.api.to.DataStoreTO;
@@ -39,12 +66,12 @@
import com.cloud.storage.ResizeVolumePayload;
import com.cloud.storage.Snapshot.State;
import com.cloud.storage.SnapshotVO;
+import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.StoragePool;
import com.cloud.storage.VMTemplateStoragePoolVO;
import com.cloud.storage.Volume;
import com.cloud.storage.VolumeDetailVO;
import com.cloud.storage.VolumeVO;
-import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.dao.SnapshotDao;
import com.cloud.storage.dao.SnapshotDetailsDao;
import com.cloud.storage.dao.SnapshotDetailsVO;
@@ -57,36 +84,8 @@
import com.cloud.user.dao.AccountDao;
import com.cloud.utils.db.GlobalLock;
import com.cloud.utils.exception.CloudRuntimeException;
-
import com.google.common.base.Preconditions;
-import org.apache.cloudstack.engine.subsystem.api.storage.ChapInfo;
-import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult;
-import org.apache.cloudstack.engine.subsystem.api.storage.CreateCmdResult;
-import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
-import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
-import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreCapabilities;
-import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
-import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreDriver;
-import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo;
-import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo;
-import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory;
-import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
-import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine;
-import org.apache.cloudstack.framework.async.AsyncCompletionCallback;
-import org.apache.cloudstack.storage.command.CommandResult;
-import org.apache.cloudstack.storage.command.CreateObjectAnswer;
-import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
-import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDao;
-import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreVO;
-import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailVO;
-import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
-import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
-import org.apache.cloudstack.storage.datastore.util.SolidFireUtil;
-import org.apache.cloudstack.storage.to.SnapshotObjectTO;
-import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
-
public class SolidFirePrimaryDataStoreDriver implements PrimaryDataStoreDriver {
private static final Logger LOGGER = Logger.getLogger(SolidFirePrimaryDataStoreDriver.class);
private static final int LOWEST_HYPERVISOR_SNAPSHOT_RESERVE = 10;
diff --git a/plugins/user-authenticators/ldap/pom.xml b/plugins/user-authenticators/ldap/pom.xml
index 2bfde47..d315a5a 100644
--- a/plugins/user-authenticators/ldap/pom.xml
+++ b/plugins/user-authenticators/ldap/pom.xml
@@ -24,17 +24,29 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
+
+ <properties>
+ <ads.version>2.0.0.AM25</ads.version>
+ <gmaven.version>1.5</gmaven.version>
+ <ldap-maven.version>1.1.3</ldap-maven.version>
+ <ldapunit.version>1.1.3</ldapunit.version>
+ <groovy.version>1.1-groovy-2.4</groovy.version>
+ <zapdot.version>0.7</zapdot.version>
+ <unboundedid.version>4.0.14</unboundedid.version>
+ </properties>
+
<build>
<plugins>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
- <version>1.3</version>
+ <version>${gmaven.version}</version>
<configuration>
<providerSelection>1.7</providerSelection>
+ <source/>
</configuration>
<executions>
<execution>
@@ -58,7 +70,7 @@
<dependency>
<groupId>org.codehaus.gmaven.runtime</groupId>
<artifactId>gmaven-runtime-1.7</artifactId>
- <version>1.3</version>
+ <version>${gmaven.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.groovy</groupId>
@@ -81,38 +93,137 @@
<include>**/*Spec.groovy</include>
<include>**/*Test.java</include>
</includes>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
</configuration>
</plugin>
<plugin>
<groupId>com.btmatthews.maven.plugins</groupId>
<artifactId>ldap-maven-plugin</artifactId>
- <version>1.1.0</version>
+ <version>${ldap-maven.version}</version>
<configuration>
<monitorPort>11389</monitorPort>
<monitorKey>ldap</monitorKey>
<daemon>false</daemon>
<rootDn>dc=cloudstack,dc=org</rootDn>
<ldapPort>10389</ldapPort>
- <ldifFile>test/resources/cloudstack.org.ldif</ldifFile>
+ <ldifFile>src/test/resources/cloudstack.org.ldif</ldifFile>
</configuration>
</plugin>
</plugins>
- <testSourceDirectory>test</testSourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
</build>
<dependencies>
<!-- Mandatory dependencies for using Spock -->
<dependency>
+ <groupId>com.btmatthews.ldapunit</groupId>
+ <artifactId>ldapunit</artifactId>
+ <version>${ldapunit.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.spockframework</groupId>
<artifactId>spock-core</artifactId>
- <version>1.1-groovy-2.4</version>
+ <version>${groovy.version}</version>
<scope>test</scope>
</dependency>
-
<!-- Optional dependencies for using Spock -->
<dependency> <!-- enables mocking of classes (in addition to interfaces) -->
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.zapodot</groupId>
+ <artifactId>embedded-ldap-junit</artifactId>
+ <version>${zapdot.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.unboundid</groupId>
+ <artifactId>unboundid-ldapsdk</artifactId>
+ <version>${unboundedid.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${cs.mockito.version}</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ <version>1.10.5</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${cs.junit.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-server-integ</artifactId>
+ <version>${ads.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <!--
+ shared-ldap-schema module needs to be excluded to avoid multiple schema resources on the classpath
+ -->
+ <exclusion>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-schema</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core-constants</artifactId>
+ <version>${ads.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core-annotations</artifactId>
+ <version>${ads.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core</artifactId>
+ <version>${ads.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-protocol-ldap</artifactId>
+ <version>${ads.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-jdbm-partition</artifactId>
+ <version>${ads.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-ldif-partition</artifactId>
+ <version>${ads.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${cs.commons-io.version}</version>
+ </dependency>
</dependencies>
</project>
diff --git a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/LdapConstants.java
similarity index 60%
rename from agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
rename to plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/LdapConstants.java
index b244d02..21574d5 100644
--- a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/LdapConstants.java
@@ -1,4 +1,3 @@
-//
// 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
@@ -15,22 +14,8 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-//
-package com.cloud.agent.direct.download;
+package org.apache.cloudstack.api;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
-
-@RunWith(MockitoJUnitRunner.class)
-public class DirectTemplateDownloaderImplTest {
-
- private static final Long templateId = 202l;
-
- @Test
- public void testGetDirectDownloadTempPath() {
- String path = DirectTemplateDownloaderImpl.getDirectDownloadTempPath(templateId);
- Assert.assertEquals("template/2/202", path);
- }
+public interface LdapConstants {
+ String PRINCIPAL = "principal";
}
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapListUsersCmd.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapListUsersCmd.java
index b2266dc..ae60174 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapListUsersCmd.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapListUsersCmd.java
@@ -16,18 +16,26 @@
// under the License.
package org.apache.cloudstack.api.command;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
import javax.inject.Inject;
+import com.cloud.domain.Domain;
+import com.cloud.user.User;
+import com.cloud.utils.exception.CloudRuntimeException;
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.response.DomainResponse;
+import org.apache.cloudstack.context.CallContext;
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.command.admin.user.ListUsersCmd;
import org.apache.cloudstack.api.response.LdapUserResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.UserResponse;
@@ -38,8 +46,37 @@
import com.cloud.user.Account;
-@APICommand(name = "listLdapUsers", responseObject = LdapUserResponse.class, description = "Lists all LDAP Users", since = "4.2.0",
- requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
+/**
+ * a short flow, use plantuml to view (see http://plantuml.com)
+ * @startuml
+ * start
+ * :list ldap users request;
+ * :get ldap binding;
+ * if (domain == null) then (true)
+ * :get global trust domain;
+ * else (false)
+ * :get trustdomain for domain;
+ * endif
+ * :get ldap users\n using trust domain;
+ * if (filter == 'NoFilter') then (pass as is)
+ * elseif (filter == 'AnyDomain') then (anydomain)
+ * :filterList = all\n\t\tcloudstack\n\t\tusers;
+ * elseif (filter == 'LocalDomain')
+ * :filterList = local users\n\t\tfor domain;
+ * elseif (filter == 'PotentialImport') then (address account\nsynchronisation\nconfigurations)
+ * :query\n the account\n bindings;
+ * :check and markup\n ldap users\n for bound OUs\n with usersource;
+ * else ( unknown value for filter )
+ * :throw invalid parameter;
+ * stop
+ * endif
+ * :remove users in filterList\nfrom ldap users list;
+ * :return remaining;
+ * stop
+ * @enduml
+ */
+@APICommand(name = "listLdapUsers", responseObject = LdapUserResponse.class, description = "Lists LDAP Users according to the specifications from the user request.", since = "4.2.0",
+ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {RoleType.Admin,RoleType.DomainAdmin})
public class LdapListUsersCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(LdapListUsersCmd.class.getName());
@@ -47,15 +84,29 @@
@Inject
private LdapManager _ldapManager;
- @Inject
- private QueryService _queryService;
-
@Parameter(name = "listtype",
- type = CommandType.STRING,
- required = false,
- description = "Determines whether all ldap users are returned or just non-cloudstack users")
+ type = CommandType.STRING,
+ required = false,
+ description = "Determines whether all ldap users are returned or just non-cloudstack users. This option is deprecated in favour for the more option rich 'userfilter' parameter")
+ @Deprecated
private String listType;
+ @Parameter(name = ApiConstants.USER_FILTER,
+ type = CommandType.STRING,
+ required = false,
+ since = "4.13",
+ description = "Determines what type of filter is applied on the list of users returned from LDAP.\n"
+ + "\tvalid values are\n"
+ + "\t'NoFilter'\t no filtering is done,\n"
+ + "\t'LocalDomain'\tusers already in the current or requested domain will be filtered out of the result list,\n"
+ + "\t'AnyDomain'\tusers that already exist anywhere in cloudstack will be filtered out, and\n"
+ + "\t'PotentialImport'\tall users that would be automatically imported from the listing will be shown,"
+ + " including those that are already in cloudstack, the later will be annotated with their userSource")
+ private String userFilter;
+
+ @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, required = false, entityType = DomainResponse.class, description = "linked domain")
+ private Long domainId;
+
public LdapListUsersCmd() {
super();
}
@@ -66,27 +117,35 @@
_queryService = queryService;
}
+ /**
+ * (as a check for isACloudstackUser is done) only non cloudstack users should be shown
+ * @param users a list of {@code LdapUser}s
+ * @return a (filtered?) list of user response objects
+ */
private List<LdapUserResponse> createLdapUserResponse(final List<LdapUser> users) {
final List<LdapUserResponse> ldapResponses = new ArrayList<LdapUserResponse>();
for (final LdapUser user : users) {
- if (getListType().equals("all") || !isACloudstackUser(user)) {
- final LdapUserResponse ldapResponse = _ldapManager.createLdapUserResponse(user);
- ldapResponse.setObjectName("LdapUser");
- ldapResponses.add(ldapResponse);
- }
+ final LdapUserResponse ldapResponse = _ldapManager.createLdapUserResponse(user);
+ ldapResponse.setObjectName("LdapUser");
+ ldapResponses.add(ldapResponse);
}
return ldapResponses;
}
+ private List<UserResponse> cloudstackUsers = null;
+
@Override
public void execute() throws ServerApiException {
- List<LdapUserResponse> ldapResponses = null;
+ cloudstackUsers = null;
+ List<LdapUserResponse> ldapResponses = new ArrayList<LdapUserResponse>();
final ListResponse<LdapUserResponse> response = new ListResponse<LdapUserResponse>();
try {
- final List<LdapUser> users = _ldapManager.getUsers(null);
+ final List<LdapUser> users = _ldapManager.getUsers(domainId);
ldapResponses = createLdapUserResponse(users);
+// now filter and annotate
+ ldapResponses = applyUserFilter(ldapResponses);
} catch (final NoLdapUserMatchingQueryException ex) {
- ldapResponses = new ArrayList<LdapUserResponse>();
+ // ok, we'll make do with the empty list ldapResponses = new ArrayList<LdapUserResponse>();
} finally {
response.setResponses(ldapResponses);
response.setResponseName(getCommandName());
@@ -94,6 +153,43 @@
}
}
+ /**
+ * get a list of relevant cloudstack users, depending on the userFilter
+ */
+ private List<UserResponse> getCloudstackUsers() {
+ if (cloudstackUsers == null) {
+ try {
+ cloudstackUsers = getUserFilter().getCloudstackUserList(this).getResponses();
+ } catch (IllegalArgumentException e) {
+ throw new CloudRuntimeException("error in program login; we are not filtering but still querying users to filter???", e);
+ }
+ traceUserList();
+ }
+ return cloudstackUsers;
+ }
+
+ private void traceUserList() {
+ if(s_logger.isTraceEnabled()) {
+ StringBuilder users = new StringBuilder();
+ for (UserResponse user : cloudstackUsers) {
+ if (users.length()> 0) {
+ users.append(", ");
+ }
+ users.append(user.getUsername());
+ }
+
+ s_logger.trace(String.format("checking against %d cloudstackusers: %s.", this.cloudstackUsers.size(), users.toString()));
+ }
+ }
+
+ private List<LdapUserResponse> applyUserFilter(List<LdapUserResponse> ldapResponses) {
+ if(s_logger.isTraceEnabled()) {
+ s_logger.trace(String.format("applying filter: %s or %s.", this.getListTypeString(), this.getUserFilter()));
+ }
+ List<LdapUserResponse> responseList = getUserFilter().filter(this,ldapResponses);
+ return responseList;
+ }
+
@Override
public String getCommandName() {
return s_name;
@@ -104,20 +200,306 @@
return Account.ACCOUNT_ID_SYSTEM;
}
- private String getListType() {
+ String getListTypeString() {
return listType == null ? "all" : listType;
}
- private boolean isACloudstackUser(final LdapUser ldapUser) {
- final ListResponse<UserResponse> response = _queryService.searchForUsers(new ListUsersCmd());
- final List<UserResponse> cloudstackUsers = response.getResponses();
- if (cloudstackUsers != null && cloudstackUsers.size() != 0) {
- for (final UserResponse cloudstackUser : response.getResponses()) {
+ String getUserFilterString() {
+ return userFilter == null ? getListTypeString() == null ? "NoFilter" : getListTypeString().equals("all") ? "NoFilter" : "AnyDomain" : userFilter;
+ }
+
+ UserFilter getUserFilter() {
+ return UserFilter.fromString(getUserFilterString());
+ }
+
+ boolean isACloudstackUser(final LdapUser ldapUser) {
+ boolean rc = false;
+ final List<UserResponse> cloudstackUsers = getCloudstackUsers();
+ if (cloudstackUsers != null) {
+ for (final UserResponse cloudstackUser : cloudstackUsers) {
if (ldapUser.getUsername().equals(cloudstackUser.getUsername())) {
+ if(s_logger.isTraceEnabled()) {
+ s_logger.trace(String.format("found user %s in cloudstack", ldapUser.getUsername()));
+ }
+
+ rc = true;
+ } else {
+ if(s_logger.isTraceEnabled()) {
+ s_logger.trace(String.format("ldap user %s does not match cloudstack user", ldapUser.getUsername(), cloudstackUser.getUsername()));
+ }
+ }
+ }
+ }
+ return rc;
+ }
+
+ boolean isACloudstackUser(final LdapUserResponse ldapUser) {
+ if(s_logger.isTraceEnabled()) {
+ s_logger.trace("checking response : " + ldapUser.toString());
+ }
+ final List<UserResponse> cloudstackUsers = getCloudstackUsers();
+ if (cloudstackUsers != null && cloudstackUsers.size() != 0) {
+ for (final UserResponse cloudstackUser : cloudstackUsers) {
+ if (ldapUser.getUsername().equals(cloudstackUser.getUsername())) {
+ if(s_logger.isTraceEnabled()) {
+ s_logger.trace(String.format("found user %s in cloudstack", ldapUser.getUsername()));
+ }
return true;
+ } else {
+ if(s_logger.isTraceEnabled()) {
+ s_logger.trace(String.format("ldap user %s does not match cloudstack user", ldapUser.getUsername(), cloudstackUser.getUsername()));
+ }
}
}
}
return false;
}
+ /**
+ * typecheck for userfilter values and filter type dependend functionalities.
+ * This could have been in two switch statements elsewhere in the code.
+ * Arguably this is a cleaner solution.
+ */
+ enum UserFilter {
+ NO_FILTER("NoFilter"){
+ @Override public List<LdapUserResponse> filter(LdapListUsersCmd cmd, List<LdapUserResponse> input) {
+ return cmd.filterNoFilter(input);
+ }
+
+ /**
+ * in case of no filter we should find all users in the current domain for annotation.
+ */
+ @Override public ListResponse<UserResponse> getCloudstackUserList(LdapListUsersCmd cmd) {
+ return cmd._queryService.searchForUsers(cmd.domainId,true);
+
+ }
+ },
+ LOCAL_DOMAIN("LocalDomain"){
+ @Override public List<LdapUserResponse> filter(LdapListUsersCmd cmd, List<LdapUserResponse> input) {
+ return cmd.filterLocalDomain(input);
+ }
+
+ /**
+ * if we are filtering for local domain, only get users for the current domain
+ */
+ @Override public ListResponse<UserResponse> getCloudstackUserList(LdapListUsersCmd cmd) {
+ return cmd._queryService.searchForUsers(cmd.domainId,false);
+ }
+ },
+ ANY_DOMAIN("AnyDomain"){
+ @Override public List<LdapUserResponse> filter(LdapListUsersCmd cmd, List<LdapUserResponse> input) {
+ return cmd.filterAnyDomain(input);
+ }
+
+ /*
+ * if we are filtering for any domain, get recursive all users for the root domain
+ */
+ @Override public ListResponse<UserResponse> getCloudstackUserList(LdapListUsersCmd cmd) {
+ return cmd._queryService.searchForUsers(CallContext.current().getCallingAccount().getDomainId(), true);
+ }
+ },
+ POTENTIAL_IMPORT("PotentialImport"){
+ @Override public List<LdapUserResponse> filter(LdapListUsersCmd cmd, List<LdapUserResponse> input) {
+ return cmd.filterPotentialImport(input);
+ }
+
+ /**
+ * if we are filtering for potential imports,
+ * we are only looking for users in the linked domains/accounts,
+ * which is only relevant if we ask ldap users for this domain.
+ * So we are asking for all users in the current domain as well
+ */
+ @Override public ListResponse<UserResponse> getCloudstackUserList(LdapListUsersCmd cmd) {
+ return cmd._queryService.searchForUsers(cmd.domainId,false);
+ }
+ };
+
+ private final String value;
+
+ UserFilter(String val) {
+ this.value = val;
+ }
+
+ public abstract List<LdapUserResponse> filter(LdapListUsersCmd cmd, List<LdapUserResponse> input);
+
+ public abstract ListResponse<UserResponse> getCloudstackUserList(LdapListUsersCmd cmd);
+
+ static UserFilter fromString(String val) {
+ if(NO_FILTER.toString().equalsIgnoreCase(val)) {
+ return NO_FILTER;
+ } else if (LOCAL_DOMAIN.toString().equalsIgnoreCase(val)) {
+ return LOCAL_DOMAIN;
+ } else if(ANY_DOMAIN.toString().equalsIgnoreCase(val)) {
+ return ANY_DOMAIN;
+ } else if(POTENTIAL_IMPORT.toString().equalsIgnoreCase(val)) {
+ return POTENTIAL_IMPORT;
+ } else {
+ throw new IllegalArgumentException(String.format("%s is not a legal 'UserFilter' value", val));
+ }
+ }
+
+ @Override public String toString() {
+ return value;
+ }
+ }
+
+ /**
+ * no filtering but improve with annotation of source for existing ACS users
+ * @param input ldap response list of users
+ * @return unfiltered list of the input list of ldap users
+ */
+ public List<LdapUserResponse> filterNoFilter(List<LdapUserResponse> input) {
+ if(s_logger.isTraceEnabled()) {
+ s_logger.trace("returning unfiltered list of ldap users");
+ }
+ annotateUserListWithSources(input);
+ return input;
+ }
+
+ /**
+ * filter the list of ldap users. no users visible to the caller should be in the returned list
+ * @param input ldap response list of users
+ * @return a list of ldap users not already in ACS
+ */
+ public List<LdapUserResponse> filterAnyDomain(List<LdapUserResponse> input) {
+ if(s_logger.isTraceEnabled()) {
+ s_logger.trace("filtering existing users");
+ }
+ final List<LdapUserResponse> ldapResponses = new ArrayList<LdapUserResponse>();
+ for (final LdapUserResponse user : input) {
+ if (isNotAlreadyImportedInTheCurrentDomain(user)) {
+ ldapResponses.add(user);
+ }
+ }
+ annotateUserListWithSources(ldapResponses);
+
+ return ldapResponses;
+ }
+
+ /**
+ * @return true unless the the user is imported in the specified cloudstack domain from LDAP
+ */
+ private boolean isNotAlreadyImportedInTheCurrentDomain(LdapUserResponse user) {
+ UserResponse cloudstackUser = getCloudstackUser(user);
+ String domainId = getCurrentDomainId();
+
+ return cloudstackUser == null /*doesn't exist in cloudstack*/
+ || ! (
+ cloudstackUser.getUserSource().equalsIgnoreCase(User.Source.LDAP.toString())
+ && domainId.equals(cloudstackUser.getDomainId())); /* is from another source */
+ }
+
+ /**
+ * filter the list of ldap users. no users visible to the caller already in the domain specified should be in the returned list
+ * @param input ldap response list of users
+ * @return a list of ldap users not already in ACS
+ */
+ public List<LdapUserResponse> filterLocalDomain(List<LdapUserResponse> input) {
+ if(s_logger.isTraceEnabled()) {
+ s_logger.trace("filtering local domain users");
+ }
+ final List<LdapUserResponse> ldapResponses = new ArrayList<LdapUserResponse>();
+ String domainId = getCurrentDomainId();
+ for (final LdapUserResponse user : input) {
+ UserResponse cloudstackUser = getCloudstackUser(user);
+ if (cloudstackUser == null /*doesn't exist in cloudstack*/
+ || !domainId.equals(cloudstackUser.getDomainId()) /* doesn't exist in this domain */
+ || !cloudstackUser.getUserSource().equalsIgnoreCase(User.Source.LDAP.toString()) /* is from another source */
+ ) {
+ ldapResponses.add(user);
+ }
+ }
+ annotateUserListWithSources(ldapResponses);
+ return ldapResponses;
+ }
+
+ private String getCurrentDomainId() {
+ String domainId = null;
+ if (this.domainId != null) {
+ Domain domain = _domainService.getDomain(this.domainId);
+ domainId = domain.getUuid();
+ } else {
+ final CallContext callContext = CallContext.current();
+ domainId = _domainService.getDomain(callContext.getCallingAccount().getDomainId()).getUuid();
+ }
+ return domainId;
+ }
+
+ /**
+ *
+ * @param input a list of ldap users
+ * @return annotated list of the users of the input list, that will be automatically imported or synchronised
+ */
+ public List<LdapUserResponse> filterPotentialImport(List<LdapUserResponse> input) {
+ if(s_logger.isTraceEnabled()) {
+ s_logger.trace("should be filtering potential imports!!!");
+ }
+ // functional possibility do not add only users not yet in cloudstack but include users that would be moved if they are so in ldap?
+ // this means if they are part of a account linked to an ldap group/ou
+ input.removeIf(ldapUser ->
+ (
+ (isACloudstackUser(ldapUser))
+ && (getCloudstackUser(ldapUser).getUserSource().equalsIgnoreCase(User.Source.LDAP.toString()))
+ )
+ );
+ annotateUserListWithSources(input);
+ return input;
+ }
+
+ private void annotateUserListWithSources(List<LdapUserResponse> input) {
+ for (final LdapUserResponse user : input) {
+ annotateCloudstackSource(user);
+ }
+ }
+
+ private void annotateCloudstackSource(LdapUserResponse user) {
+ final UserResponse cloudstackUser = getCloudstackUser(user);
+ if (cloudstackUser != null) {
+ user.setUserSource(cloudstackUser.getUserSource());
+ } else {
+ user.setUserSource("");
+ }
+ }
+
+ private UserResponse getCloudstackUser(LdapUserResponse user) {
+ UserResponse returnObject = null;
+ final List<UserResponse> cloudstackUsers = getCloudstackUsers();
+ if (cloudstackUsers != null) {
+ for (final UserResponse cloudstackUser : cloudstackUsers) {
+ if (user.getUsername().equals(cloudstackUser.getUsername())) {
+ returnObject = cloudstackUser;
+ if (returnObject.getDomainId() == this.getCurrentDomainId()) {
+ break;
+ }
+ }
+ }
+ }
+ return returnObject;
+ }
+
+ private void checkFilterMethodType(Type returnType) {
+ String msg = null;
+ if (returnType instanceof ParameterizedType) {
+ ParameterizedType type = (ParameterizedType) returnType;
+ if(type.getRawType().equals(List.class)) {
+ Type[] typeArguments = type.getActualTypeArguments();
+ if (typeArguments.length == 1) {
+ if (typeArguments[0].equals(LdapUserResponse.class)) {
+ // we're good'
+ } else {
+ msg = new String("list of return type contains " + typeArguments[0].getTypeName());
+ }
+ } else {
+ msg = String.format("type %s has to the wrong number of arguments", type.getRawType());
+ }
+ } else {
+ msg = String.format("type %s is not a List<>", type.getTypeName());
+ }
+ } else {
+ msg = new String("can't even begin to explain; review your method signature");
+ }
+ if(msg != null) {
+ throw new IllegalArgumentException(msg);
+ }
+ }
+
}
\ No newline at end of file
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/response/LdapUserResponse.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/response/LdapUserResponse.java
index 5648a55..e8a4229 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/response/LdapUserResponse.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/response/LdapUserResponse.java
@@ -18,35 +18,41 @@
import com.google.gson.annotations.SerializedName;
+import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
+import org.apache.cloudstack.api.LdapConstants;
public class LdapUserResponse extends BaseResponse {
- @SerializedName("email")
+ @SerializedName(ApiConstants.EMAIL)
@Param(description = "The user's email")
private String email;
- @SerializedName("principal")
+ @SerializedName(LdapConstants.PRINCIPAL)
@Param(description = "The user's principle")
private String principal;
- @SerializedName("firstname")
+ @SerializedName(ApiConstants.FIRSTNAME)
@Param(description = "The user's firstname")
private String firstname;
- @SerializedName("lastname")
+ @SerializedName(ApiConstants.LASTNAME)
@Param(description = "The user's lastname")
private String lastname;
- @SerializedName("username")
+ @SerializedName(ApiConstants.USERNAME)
@Param(description = "The user's username")
private String username;
- @SerializedName("domain")
+ @SerializedName(ApiConstants.DOMAIN)
@Param(description = "The user's domain")
private String domain;
+ @SerializedName(ApiConstants.USER_CONFLICT_SOURCE)
+ @Param(description = "The authentication source for this user as known to the system or empty if the user is not yet in cloudstack.")
+ private String userSource;
+
public LdapUserResponse() {
super();
}
@@ -61,6 +67,11 @@
this.domain = domain;
}
+ public LdapUserResponse(final String username, final String email, final String firstname, final String lastname, final String principal, String domain, String userSource) {
+ this(username, email, firstname, lastname, principal, domain);
+ setUserSource(userSource);
+ }
+
public String getEmail() {
return email;
}
@@ -85,6 +96,10 @@
return domain;
}
+ public String getUserSource() {
+ return userSource;
+ }
+
public void setEmail(final String email) {
this.email = email;
}
@@ -108,4 +123,67 @@
public void setDomain(String domain) {
this.domain = domain;
}
+
+ public void setUserSource(String userSource) {
+ this.userSource = userSource;
+ }
+
+ public String toString() {
+ final String COLUMN = ": ";
+ final String COMMA = ", ";
+ StringBuilder selfRepresentation = new StringBuilder();
+ selfRepresentation.append(this.getClass().getName());
+ selfRepresentation.append('{');
+ boolean hascontent = false;
+ if (this.getUsername() != null) {
+ selfRepresentation.append(ApiConstants.USERNAME);
+ selfRepresentation.append(COLUMN);
+ selfRepresentation.append(this.getUsername());
+ hascontent = true;
+ }
+ if (this.getFirstname() != null) {
+ if(hascontent) selfRepresentation.append(COMMA);
+ selfRepresentation.append(ApiConstants.FIRSTNAME);
+ selfRepresentation.append(COLUMN);
+ selfRepresentation.append(this.getFirstname());
+ hascontent = true;
+ }
+ if (this.getLastname() != null) {
+ if(hascontent) selfRepresentation.append(COMMA);
+ selfRepresentation.append(ApiConstants.LASTNAME);
+ selfRepresentation.append(COLUMN);
+ selfRepresentation.append(this.getLastname());
+ hascontent = true;
+ }
+ if(this.getDomain() != null) {
+ if(hascontent) selfRepresentation.append(COMMA);
+ selfRepresentation.append(ApiConstants.DOMAIN);
+ selfRepresentation.append(COLUMN);
+ selfRepresentation.append(this.getDomain());
+ hascontent = true;
+ }
+ if (this.getEmail() != null) {
+ if(hascontent) selfRepresentation.append(COMMA);
+ selfRepresentation.append(ApiConstants.EMAIL);
+ selfRepresentation.append(COLUMN);
+ selfRepresentation.append(this.getEmail());
+ hascontent = true;
+ }
+ if (this.getPrincipal() != null) {
+ if(hascontent) selfRepresentation.append(COMMA);
+ selfRepresentation.append(LdapConstants.PRINCIPAL);
+ selfRepresentation.append(COLUMN);
+ selfRepresentation.append(this.getPrincipal());
+ hascontent = true;
+ }
+ if (this.getUserSource() != null) {
+ if (hascontent) selfRepresentation.append(COMMA);
+ selfRepresentation.append(ApiConstants.USER_CONFLICT_SOURCE);
+ selfRepresentation.append(COLUMN);
+ selfRepresentation.append(this.getUserSource());
+ }
+ selfRepresentation.append('}');
+
+ return selfRepresentation.toString();
+ }
}
\ No newline at end of file
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapAuthenticator.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapAuthenticator.java
index 2d8fe53..2cd035e 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapAuthenticator.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapAuthenticator.java
@@ -38,7 +38,7 @@
import com.cloud.utils.exception.CloudRuntimeException;
public class LdapAuthenticator extends AdapterBase implements UserAuthenticator {
- private static final Logger s_logger = Logger.getLogger(LdapAuthenticator.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(LdapAuthenticator.class.getName());
@Inject
private LdapManager _ldapManager;
@@ -61,32 +61,51 @@
public Pair<Boolean, ActionOnFailedAuthentication> authenticate(final String username, final String password, final Long domainId, final Map<String, Object[]> requestParameters) {
Pair<Boolean, ActionOnFailedAuthentication> rc = new Pair<Boolean, ActionOnFailedAuthentication>(false, null);
- // TODO not allowing an empty password is a policy we shouldn't decide on. A private cloud may well want to allow this.
- if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password)) {
- s_logger.debug("Username or Password cannot be empty");
- return rc;
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Retrieving ldap user: " + username);
}
- if (_ldapManager.isLdapEnabled()) {
- final UserAccount user = _userAccountDao.getUserAccount(username, domainId);
- List<LdapTrustMapVO> ldapTrustMapVOs = _ldapManager.getDomainLinkage(domainId);
- if(ldapTrustMapVOs != null && ldapTrustMapVOs.size() > 0) {
- if(ldapTrustMapVOs.size() == 1 && ldapTrustMapVOs.get(0).getAccountId() == 0) {
- // We have a single mapping of a domain to an ldap group or ou
- return authenticate(username, password, domainId, user, ldapTrustMapVOs.get(0));
- } else {
- // we are dealing with mapping of accounts in a domain to ldap groups
- return authenticate(username, password, domainId, user, ldapTrustMapVOs);
+ // TODO not allowing an empty password is a policy we shouldn't decide on. A private cloud may well want to allow this.
+ if (!StringUtils.isEmpty(username) && !StringUtils.isEmpty(password)) {
+ if (_ldapManager.isLdapEnabled(domainId) || _ldapManager.isLdapEnabled()) {
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace("LDAP is enabled in the ldapManager");
}
- } else {
- //domain is not linked to ldap follow normal authentication
- return authenticate(username, password, domainId, user);
+ final UserAccount user = _userAccountDao.getUserAccount(username, domainId);
+ if (user != null && ! User.Source.LDAP.equals(user.getSource())) {
+ return rc;
+ }
+ List<LdapTrustMapVO> ldapTrustMapVOs = getLdapTrustMapVOS(domainId);
+ if(ldapTrustMapVOs != null && ldapTrustMapVOs.size() > 0) {
+ if(ldapTrustMapVOs.size() == 1 && ldapTrustMapVOs.get(0).getAccountId() == 0) {
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace("We have a single mapping of a domain to an ldap group or ou");
+ }
+ rc = authenticate(username, password, domainId, user, ldapTrustMapVOs.get(0));
+ } else {
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace("we are dealing with mapping of accounts in a domain to ldap groups");
+ }
+ rc = authenticate(username, password, domainId, user, ldapTrustMapVOs);
+ }
+ } else {
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace(String.format("'this' domain (%d) is not linked to ldap follow normal authentication", domainId));
+ }
+ rc = authenticate(username, password, domainId, user);
+ }
}
+ } else {
+ LOGGER.debug("Username or Password cannot be empty");
}
return rc;
}
+ private List<LdapTrustMapVO> getLdapTrustMapVOS(Long domainId) {
+ return _ldapManager.getDomainLinkage(domainId);
+ }
+
/**
* checks if the user exists in ldap and create in cloudstack if needed.
*
@@ -97,13 +116,16 @@
* @param ldapTrustMapVOs the trust mappings of accounts in the domain to ldap groups
* @return false if the ldap user object does not exist, is not mapped to an account, is mapped to multiple accounts or if authenitication fails
*/
- private Pair<Boolean, ActionOnFailedAuthentication> authenticate(String username, String password, Long domainId, UserAccount userAccount, List<LdapTrustMapVO> ldapTrustMapVOs) {
+ Pair<Boolean, ActionOnFailedAuthentication> authenticate(String username, String password, Long domainId, UserAccount userAccount, List<LdapTrustMapVO> ldapTrustMapVOs) {
Pair<Boolean, ActionOnFailedAuthentication> rc = new Pair<Boolean, ActionOnFailedAuthentication>(false, null);
try {
LdapUser ldapUser = _ldapManager.getUser(username, domainId);
List<String> memberships = ldapUser.getMemberships();
+ tracelist("memberships for " + username, memberships);
List<String> mappedGroups = getMappedGroups(ldapTrustMapVOs);
+ tracelist("mappedgroups for " + username, mappedGroups);
mappedGroups.retainAll(memberships);
+ tracelist("actual groups for " + username, mappedGroups);
// check membership, there must be only one match in this domain
if(ldapUser.isDisabled()) {
logAndDisable(userAccount, "attempt to log on using disabled ldap user " + userAccount.getUsername(), false);
@@ -115,9 +137,16 @@
// a valid ldap configured user exists
LdapTrustMapVO mapping = _ldapManager.getLinkedLdapGroup(domainId,mappedGroups.get(0));
// we could now assert that ldapTrustMapVOs.contains(mapping);
- // createUser in Account can only be done by account name not by account id
- String accountName = _accountManager.getAccount(mapping.getAccountId()).getAccountName();
+ // createUser in Account can only be done by account name not by account id;
+ Account account = _accountManager.getAccount(mapping.getAccountId());
+ if(null == account) {
+ throw new CloudRuntimeException(String.format("account for user (%s) not found by id %d", username, mapping.getAccountId()));
+ }
+ String accountName = account.getAccountName();
rc.first(_ldapManager.canAuthenticate(ldapUser.getPrincipal(), password, domainId));
+ if (! rc.first()) {
+ rc.second(ActionOnFailedAuthentication.INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT);
+ }
// for security reasons we keep processing on faulty login attempt to not give a way information on userid existence
if (userAccount == null) {
// new user that is in ldap; authenticate and create
@@ -146,16 +175,29 @@
}
}
} catch (NoLdapUserMatchingQueryException e) {
- s_logger.debug(e.getMessage());
+ LOGGER.debug(e.getMessage());
disableUserInCloudStack(userAccount);
}
return rc;
}
+ private void tracelist(String msg, List<String> listToTrace) {
+ if (LOGGER.isTraceEnabled()) {
+ StringBuilder logMsg = new StringBuilder();
+ logMsg.append(msg);
+ logMsg.append(':');
+ for (String listMember : listToTrace) {
+ logMsg.append(' ');
+ logMsg.append(listMember);
+ }
+ LOGGER.trace(logMsg.toString());
+ }
+ }
+
private void logAndDisable(UserAccount userAccount, String msg, boolean remove) {
- if (s_logger.isInfoEnabled()) {
- s_logger.info(msg);
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(msg);
}
if(remove) {
removeUserInCloudStack(userAccount);
@@ -164,7 +206,7 @@
}
}
- private List<String> getMappedGroups(List<LdapTrustMapVO> ldapTrustMapVOs) {
+ List<String> getMappedGroups(List<LdapTrustMapVO> ldapTrustMapVOs) {
List<String> groups = new ArrayList<>();
for (LdapTrustMapVO vo : ldapTrustMapVOs) {
groups.add(vo.getName());
@@ -188,7 +230,9 @@
final short accountType = ldapTrustMapVO.getAccountType();
processLdapUser(password, domainId, user, rc, ldapUser, accountType);
} catch (NoLdapUserMatchingQueryException e) {
- s_logger.debug(e.getMessage());
+ LOGGER.debug(e.getMessage());
+ // no user in ldap ==>> disable user in cloudstack
+ disableUserInCloudStack(user);
}
return rc;
}
@@ -229,12 +273,16 @@
if(!ldapUser.isDisabled()) {
result = _ldapManager.canAuthenticate(ldapUser.getPrincipal(), password, domainId);
} else {
- s_logger.debug("user with principal "+ ldapUser.getPrincipal() + " is disabled in ldap");
+ LOGGER.debug("user with principal "+ ldapUser.getPrincipal() + " is disabled in ldap");
}
} catch (NoLdapUserMatchingQueryException e) {
- s_logger.debug(e.getMessage());
+ LOGGER.debug(e.getMessage());
}
}
+ return processResultAndAction(user, result);
+ }
+
+ private Pair<Boolean, ActionOnFailedAuthentication> processResultAndAction(UserAccount user, boolean result) {
return (!result && user != null) ?
new Pair<Boolean, ActionOnFailedAuthentication>(result, ActionOnFailedAuthentication.INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT):
new Pair<Boolean, ActionOnFailedAuthentication>(result, null);
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManager.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManager.java
index 2dceae1..fa337bc 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManager.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManager.java
@@ -38,7 +38,6 @@
LdapConfigurationResponse addConfiguration(final LdapAddConfigurationCmd cmd) throws InvalidParameterValueException;
- @Deprecated
LdapConfigurationResponse addConfiguration(String hostname, int port, Long domainId) throws InvalidParameterValueException;
boolean canAuthenticate(String principal, String password, final Long domainId);
@@ -62,6 +61,8 @@
boolean isLdapEnabled();
+ boolean isLdapEnabled(long domainId);
+
Pair<List<? extends LdapConfigurationVO>, Integer> listConfigurations(LdapListConfigurationCmd cmd);
List<LdapUser> searchUsers(String query) throws NoLdapUserMatchingQueryException;
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManagerImpl.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManagerImpl.java
index 547c10b..910d06e 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManagerImpl.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManagerImpl.java
@@ -25,6 +25,7 @@
import javax.naming.ldap.LdapContext;
import java.util.UUID;
+import com.cloud.utils.exception.CloudRuntimeException;
import org.apache.cloudstack.api.LdapValidator;
import org.apache.cloudstack.api.command.LDAPConfigCmd;
import org.apache.cloudstack.api.command.LDAPRemoveCmd;
@@ -57,7 +58,7 @@
@Component
public class LdapManagerImpl implements LdapManager, LdapValidator {
- private static final Logger s_logger = Logger.getLogger(LdapManagerImpl.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(LdapManagerImpl.class.getName());
@Inject
private LdapConfigurationDao _ldapConfigurationDao;
@@ -79,14 +80,13 @@
@Inject
LdapTrustMapDao _ldapTrustMapDao;
-
public LdapManagerImpl() {
super();
}
public LdapManagerImpl(final LdapConfigurationDao ldapConfigurationDao, final LdapContextFactory ldapContextFactory, final LdapUserManagerFactory ldapUserManagerFactory,
final LdapConfiguration ldapConfiguration) {
- super();
+ this();
_ldapConfigurationDao = ldapConfigurationDao;
_ldapContextFactory = ldapContextFactory;
_ldapUserManagerFactory = ldapUserManagerFactory;
@@ -118,10 +118,10 @@
context = _ldapContextFactory.createBindContext(providerUrl,domainId);
configuration = new LdapConfigurationVO(hostname, port, domainId);
_ldapConfigurationDao.persist(configuration);
- s_logger.info("Added new ldap server with url: " + providerUrl + (domainId == null ? "": " for domain " + domainId));
+ LOGGER.info("Added new ldap server with url: " + providerUrl + (domainId == null ? "": " for domain " + domainId));
return createLdapConfigurationResponse(configuration);
} catch (NamingException | IOException e) {
- s_logger.debug("NamingException while doing an LDAP bind", e);
+ LOGGER.debug("NamingException while doing an LDAP bind", e);
throw new InvalidParameterValueException("Unable to bind to the given LDAP server");
} finally {
closeContext(context);
@@ -142,12 +142,15 @@
public boolean canAuthenticate(final String principal, final String password, final Long domainId) {
try {
// TODO return the right account for this user
- final LdapContext context = _ldapContextFactory.createUserContext(principal, password,domainId);
+ final LdapContext context = _ldapContextFactory.createUserContext(principal, password, domainId);
closeContext(context);
+ if(LOGGER.isTraceEnabled()) {
+ LOGGER.trace(String.format("User(%s) authenticated for domain(%s)", principal, domainId));
+ }
return true;
- } catch (NamingException | IOException e) {
- s_logger.debug("Exception while doing an LDAP bind for user "+" "+principal, e);
- s_logger.info("Failed to authenticate user: " + principal + ". incorrect password.");
+ } catch (NamingException | IOException e) {/* AuthenticationException is caught as NamingException */
+ LOGGER.debug("Exception while doing an LDAP bind for user "+" "+principal, e);
+ LOGGER.info("Failed to authenticate user: " + principal + ". incorrect password.");
return false;
}
}
@@ -158,7 +161,7 @@
context.close();
}
} catch (final NamingException e) {
- s_logger.warn(e.getMessage(), e);
+ LOGGER.warn(e.getMessage(), e);
}
}
@@ -166,7 +169,10 @@
public LdapConfigurationResponse createLdapConfigurationResponse(final LdapConfigurationVO configuration) {
String domainUuid = null;
if(configuration.getDomainId() != null) {
- domainUuid = domainDao.findById(configuration.getDomainId()).getUuid();
+ DomainVO domain = domainDao.findById(configuration.getDomainId());
+ if (domain != null) {
+ domainUuid = domain.getUuid();
+ }
}
return new LdapConfigurationResponse(configuration.getHostname(), configuration.getPort(), domainUuid);
}
@@ -199,7 +205,7 @@
throw new InvalidParameterValueException("Cannot find configuration with hostname " + hostname);
} else {
_ldapConfigurationDao.remove(configuration.getId());
- s_logger.info("Removed ldap server with url: " + hostname + ':' + port + (domainId == null ? "" : " for domain id " + domainId));
+ LOGGER.info("Removed ldap server with url: " + hostname + ':' + port + (domainId == null ? "" : " for domain id " + domainId));
return createLdapConfigurationResponse(configuration);
}
}
@@ -231,7 +237,7 @@
return _ldapUserManagerFactory.getInstance(_ldapConfiguration.getLdapProvider(null)).getUser(escapedUsername, context, domainId);
} catch (NamingException | IOException e) {
- s_logger.debug("ldap Exception: ",e);
+ LOGGER.debug("ldap Exception: ",e);
throw new NoLdapUserMatchingQueryException("No Ldap User found for username: "+username);
} finally {
closeContext(context);
@@ -244,9 +250,15 @@
try {
context = _ldapContextFactory.createBindContext(domainId);
final String escapedUsername = LdapUtils.escapeLDAPSearchFilter(username);
- return _ldapUserManagerFactory.getInstance(_ldapConfiguration.getLdapProvider(null)).getUser(escapedUsername, type, name, context, domainId);
+ LdapUserManager.Provider ldapProvider = _ldapConfiguration.getLdapProvider(domainId);
+ if (ldapProvider == null) {
+ // feeble second attempt?
+ ldapProvider = _ldapConfiguration.getLdapProvider(null);
+ }
+ LdapUserManager userManagerFactory = _ldapUserManagerFactory.getInstance(ldapProvider);
+ return userManagerFactory.getUser(escapedUsername, type, name, context, domainId);
} catch (NamingException | IOException e) {
- s_logger.debug("ldap Exception: ",e);
+ LOGGER.debug("ldap Exception: ",e);
throw new NoLdapUserMatchingQueryException("No Ldap User found for username: "+username + " in group: " + name + " of type: " + type);
} finally {
closeContext(context);
@@ -260,7 +272,7 @@
context = _ldapContextFactory.createBindContext(domainId);
return _ldapUserManagerFactory.getInstance(_ldapConfiguration.getLdapProvider(domainId)).getUsers(context, domainId);
} catch (NamingException | IOException e) {
- s_logger.debug("ldap Exception: ",e);
+ LOGGER.debug("ldap Exception: ",e);
throw new NoLdapUserMatchingQueryException("*");
} finally {
closeContext(context);
@@ -274,7 +286,7 @@
context = _ldapContextFactory.createBindContext(domainId);
return _ldapUserManagerFactory.getInstance(_ldapConfiguration.getLdapProvider(domainId)).getUsersInGroup(groupName, context, domainId);
} catch (NamingException | IOException e) {
- s_logger.debug("ldap NamingException: ",e);
+ LOGGER.debug("ldap NamingException: ",e);
throw new NoLdapUserMatchingQueryException("groupName=" + groupName);
} finally {
closeContext(context);
@@ -287,6 +299,13 @@
}
@Override
+ public boolean isLdapEnabled(long domainId) {
+ LdapListConfigurationCmd cmd = new LdapListConfigurationCmd(this);
+ cmd.setDomainId(domainId);
+ return listConfigurations(cmd).second() > 0;
+ }
+
+ @Override
public Pair<List<? extends LdapConfigurationVO>, Integer> listConfigurations(final LdapListConfigurationCmd cmd) {
final String hostname = cmd.getHostname();
final int port = cmd.getPort();
@@ -304,7 +323,7 @@
final String escapedUsername = LdapUtils.escapeLDAPSearchFilter(username);
return _ldapUserManagerFactory.getInstance(_ldapConfiguration.getLdapProvider(null)).getUsers("*" + escapedUsername + "*", context, null);
} catch (NamingException | IOException e) {
- s_logger.debug("ldap Exception: ",e);
+ LOGGER.debug("ldap Exception: ",e);
throw new NoLdapUserMatchingQueryException(username);
} finally {
closeContext(context);
@@ -313,9 +332,13 @@
@Override
public LinkDomainToLdapResponse linkDomainToLdap(LinkDomainToLdapCmd cmd) {
- Validate.isTrue(_ldapConfiguration.getBaseDn(cmd.getDomainId()) == null, "can not link a domain unless a basedn is configured for it.");
- Validate.notEmpty(cmd.getLdapDomain(), "ldapDomain cannot be empty, please supply a GROUP or OU name");
- return linkDomainToLdap(cmd.getDomainId(),cmd.getType(),cmd.getLdapDomain(),cmd.getAccountType());
+ final Long domainId = cmd.getDomainId();
+ final String baseDn = _ldapConfiguration.getBaseDn(domainId);
+ final String ldapDomain = cmd.getLdapDomain();
+
+ Validate.isTrue(baseDn != null, String.format("can not link a domain (with id = %d) unless a basedn (%s) is configured for it.", domainId, baseDn));
+ Validate.notEmpty(ldapDomain, "ldapDomain cannot be empty, please supply a GROUP or OU name");
+ return linkDomainToLdap(cmd.getDomainId(),cmd.getType(), ldapDomain,cmd.getAccountType());
}
private LinkDomainToLdapResponse linkDomainToLdap(Long domainId, String type, String name, short accountType) {
@@ -329,7 +352,7 @@
DomainVO domain = domainDao.findById(vo.getDomainId());
String domainUuid = "<unknown>";
if (domain == null) {
- s_logger.error("no domain in database for id " + vo.getDomainId());
+ LOGGER.error("no domain in database for id " + vo.getDomainId());
} else {
domainUuid = domain.getUuid();
}
@@ -371,12 +394,14 @@
account = new AccountVO(cmd.getAccountName(), cmd.getDomainId(), null, cmd.getAccountType(), UUID.randomUUID().toString());
accountDao.persist((AccountVO)account);
}
+
Long accountId = account.getAccountId();
+ clearOldAccountMapping(cmd);
LdapTrustMapVO vo = _ldapTrustMapDao.persist(new LdapTrustMapVO(cmd.getDomainId(), linkType, cmd.getLdapDomain(), cmd.getAccountType(), accountId));
DomainVO domain = domainDao.findById(vo.getDomainId());
String domainUuid = "<unknown>";
if (domain == null) {
- s_logger.error("no domain in database for id " + vo.getDomainId());
+ LOGGER.error("no domain in database for id " + vo.getDomainId());
} else {
domainUuid = domain.getUuid();
}
@@ -384,4 +409,29 @@
LinkAccountToLdapResponse response = new LinkAccountToLdapResponse(domainUuid, vo.getType().toString(), vo.getName(), vo.getAccountType(), account.getUuid(), cmd.getAccountName());
return response;
}
+
+ private void clearOldAccountMapping(LinkAccountToLdapCmd cmd) {
+ // first find if exists log warning and update
+ LdapTrustMapVO oldVo = _ldapTrustMapDao.findGroupInDomain(cmd.getDomainId(), cmd.getLdapDomain());
+ if(oldVo != null) {
+ // deal with edge cases, i.e. check if the old account is indeed deleted etc.
+ if (oldVo.getAccountId() != 0l) {
+ AccountVO oldAcount = accountDao.findByIdIncludingRemoved(oldVo.getAccountId());
+ String msg = String.format("group %s is mapped to account %d in the current domain (%s)", cmd.getLdapDomain(), oldVo.getAccountId(), cmd.getDomainId());
+ if (null == oldAcount.getRemoved()) {
+ msg += ", delete the old map before mapping a new account to the same group.";
+ LOGGER.error(msg);
+ throw new CloudRuntimeException(msg);
+ } else {
+ msg += ", the old map is deleted.";
+ LOGGER.warn(msg);
+ _ldapTrustMapDao.expunge(oldVo.getId());
+ }
+ } else {
+ String msg = String.format("group %s is mapped to the current domain (%s) for autoimport and can not be used for autosync", cmd.getLdapDomain(), cmd.getDomainId());
+ LOGGER.error(msg);
+ throw new CloudRuntimeException(msg);
+ }
+ }
+ }
}
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapUserManagerFactory.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapUserManagerFactory.java
index f796ce2..a6217dc 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapUserManagerFactory.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapUserManagerFactory.java
@@ -32,7 +32,7 @@
public static final Logger s_logger = Logger.getLogger(LdapUserManagerFactory.class.getName());
- private static Map<LdapUserManager.Provider, LdapUserManager> ldapUserManagerMap = new HashMap<>();
+ static Map<LdapUserManager.Provider, LdapUserManager> ldapUserManagerMap = new HashMap<>();
private ApplicationContext applicationCtx;
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/OpenLdapUserManagerImpl.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/OpenLdapUserManagerImpl.java
index cb3824a..5fe27e5 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/OpenLdapUserManagerImpl.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/OpenLdapUserManagerImpl.java
@@ -33,16 +33,20 @@
import javax.naming.ldap.PagedResultsControl;
import javax.naming.ldap.PagedResultsResponseControl;
+import org.apache.cloudstack.ldap.dao.LdapTrustMapDao;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
public class OpenLdapUserManagerImpl implements LdapUserManager {
- private static final Logger s_logger = Logger.getLogger(OpenLdapUserManagerImpl.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(OpenLdapUserManagerImpl.class.getName());
@Inject
protected LdapConfiguration _ldapConfiguration;
+ @Inject
+ LdapTrustMapDao _ldapTrustMapDao;
+
public OpenLdapUserManagerImpl() {
}
@@ -82,25 +86,62 @@
usernameFilter.append((username == null ? "*" : username));
usernameFilter.append(")");
- final StringBuilder memberOfFilter = new StringBuilder();
- if (_ldapConfiguration.getSearchGroupPrinciple(domainId) != null) {
- if(s_logger.isDebugEnabled()) {
- s_logger.debug("adding search filter for '" + _ldapConfiguration.getSearchGroupPrinciple(domainId) +
- "', using " + _ldapConfiguration.getUserMemberOfAttribute(domainId));
+ String memberOfAttribute = _ldapConfiguration.getUserMemberOfAttribute(domainId);
+ StringBuilder ldapGroupsFilter = new StringBuilder();
+ // this should get the trustmaps for this domain
+ List<String> ldapGroups = getMappedLdapGroups(domainId);
+ if (null != ldapGroups && ldapGroups.size() > 0) {
+ ldapGroupsFilter.append("(|");
+ for (String ldapGroup : ldapGroups) {
+ ldapGroupsFilter.append(getMemberOfGroupString(ldapGroup, memberOfAttribute));
}
- memberOfFilter.append("(" + _ldapConfiguration.getUserMemberOfAttribute(domainId) + "=");
- memberOfFilter.append(_ldapConfiguration.getSearchGroupPrinciple(domainId));
- memberOfFilter.append(")");
+ ldapGroupsFilter.append(')');
}
-
+ // make sure only users in the principle group are retrieved
+ String pricipleGroup = _ldapConfiguration.getSearchGroupPrinciple(domainId);
+ final StringBuilder principleGroupFilter = new StringBuilder();
+ if (null != pricipleGroup) {
+ principleGroupFilter.append(getMemberOfGroupString(pricipleGroup, memberOfAttribute));
+ }
final StringBuilder result = new StringBuilder();
result.append("(&");
result.append(userObjectFilter);
result.append(usernameFilter);
- result.append(memberOfFilter);
+ result.append(ldapGroupsFilter);
+ result.append(principleGroupFilter);
result.append(")");
- return result.toString();
+ String returnString = result.toString();
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.trace("constructed ldap query: " + returnString);
+ }
+ return returnString;
+ }
+
+ private List<String> getMappedLdapGroups(Long domainId) {
+ List <String> ldapGroups = new ArrayList<>();
+ // first get the trustmaps
+ if (null != domainId) {
+ for (LdapTrustMapVO trustMap : _ldapTrustMapDao.searchByDomainId(domainId)) {
+ // then retrieve the string from it
+ ldapGroups.add(trustMap.getName());
+ }
+ }
+ return ldapGroups;
+ }
+
+ private String getMemberOfGroupString(String group, String memberOfAttribute) {
+ final StringBuilder memberOfFilter = new StringBuilder();
+ if (null != group) {
+ if(LOGGER.isDebugEnabled()) {
+ LOGGER.debug("adding search filter for '" + group +
+ "', using '" + memberOfAttribute + "'");
+ }
+ memberOfFilter.append("(" + memberOfAttribute + "=");
+ memberOfFilter.append(group);
+ memberOfFilter.append(")");
+ }
+ return memberOfFilter.toString();
}
private String generateGroupSearchFilter(final String groupName, Long domainId) {
@@ -212,7 +253,7 @@
try{
users.add(getUserForDn(userdn, context, domainId));
} catch (NamingException e){
- s_logger.info("Userdn: " + userdn + " Not Found:: Exception message: " + e.getMessage());
+ LOGGER.info("Userdn: " + userdn + " Not Found:: Exception message: " + e.getMessage());
}
}
}
@@ -251,8 +292,8 @@
searchControls.setReturningAttributes(_ldapConfiguration.getReturnAttributes(domainId));
NamingEnumeration<SearchResult> results = context.search(basedn, searchString, searchControls);
- if(s_logger.isDebugEnabled()) {
- s_logger.debug("searching user(s) with filter: \"" + searchString + "\"");
+ if(LOGGER.isDebugEnabled()) {
+ LOGGER.debug("searching user(s) with filter: \"" + searchString + "\"");
}
final List<LdapUser> users = new ArrayList<LdapUser>();
while (results.hasMoreElements()) {
@@ -277,7 +318,7 @@
String basedn = _ldapConfiguration.getBaseDn(domainId);
if (StringUtils.isBlank(basedn)) {
- throw new IllegalArgumentException("ldap basedn is not configured");
+ throw new IllegalArgumentException(String.format("ldap basedn is not configured (for domain: %s)", domainId));
}
byte[] cookie = null;
int pageSize = _ldapConfiguration.getLdapPageSize(domainId);
@@ -301,7 +342,7 @@
}
}
} else {
- s_logger.info("No controls were sent from the ldap server");
+ LOGGER.info("No controls were sent from the ldap server");
}
context.setRequestControls(new Control[] {new PagedResultsControl(pageSize, cookie, Control.CRITICAL)});
} while (cookie != null);
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/dao/LdapConfigurationDaoImpl.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/dao/LdapConfigurationDaoImpl.java
index fa4c0af..b591e3a 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/dao/LdapConfigurationDaoImpl.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/dao/LdapConfigurationDaoImpl.java
@@ -75,7 +75,7 @@
private SearchCriteria<LdapConfigurationVO> getSearchCriteria(String hostname, int port, Long domainId) {
SearchCriteria<LdapConfigurationVO> sc;
if (domainId == null) {
- sc = listDomainConfigurationsSearch.create();
+ sc = listGlobalConfigurationsSearch.create();
} else {
sc = listDomainConfigurationsSearch.create();
sc.setParameters("domain_id", domainId);
diff --git a/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LdapCreateAccountCmdTest.java b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LdapCreateAccountCmdTest.java
index 55d7f62..5e7728b 100644
--- a/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LdapCreateAccountCmdTest.java
+++ b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LdapCreateAccountCmdTest.java
@@ -27,11 +27,11 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.isNull;
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.ArgumentMatchers.nullable;
import static org.powermock.api.mockito.PowerMockito.spy;
import static org.powermock.api.mockito.PowerMockito.when;
@@ -56,7 +56,7 @@
@Test(expected = ServerApiException.class)
public void failureToRetrieveLdapUser() throws Exception {
// We have an LdapManager, AccountService and LdapCreateAccountCmd and LDAP user that doesn't exist
- when(ldapManager.getUser(anyString(), isNull(Long.class))).thenThrow(NoLdapUserMatchingQueryException.class);
+ when(ldapManager.getUser(nullable(String.class), isNull())).thenThrow(NoLdapUserMatchingQueryException.class);
ldapCreateAccountCmd.execute();
fail("An exception should have been thrown: " + ServerApiException.class);
}
@@ -65,7 +65,7 @@
public void failedCreationDueToANullResponseFromCloudstackAccountCreator() throws Exception {
// We have an LdapManager, AccountService and LdapCreateAccountCmd
LdapUser mrMurphy = new LdapUser("rmurphy", "rmurphy@cloudstack.org", "Ryan", "Murphy", "cn=rmurphy,ou=engineering,dc=cloudstack,dc=org", "engineering", false, null);
- when(ldapManager.getUser(anyString(), isNull(Long.class))).thenReturn(mrMurphy).thenReturn(mrMurphy);
+ when(ldapManager.getUser(nullable(String.class), isNull())).thenReturn(mrMurphy).thenReturn(mrMurphy);
ldapCreateAccountCmd.execute();
fail("An exception should have been thrown: " + ServerApiException.class);
}
diff --git a/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LdapImportUsersCmdTest.java b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LdapImportUsersCmdTest.java
index 8db2673..dd871df 100644
--- a/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LdapImportUsersCmdTest.java
+++ b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LdapImportUsersCmdTest.java
@@ -27,10 +27,10 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
import org.apache.cloudstack.api.response.LdapUserResponse;
import org.apache.cloudstack.ldap.LdapManager;
import org.apache.cloudstack.ldap.LdapUser;
+import org.mockito.junit.MockitoJUnitRunner;
import java.util.ArrayList;
import java.util.List;
diff --git a/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LdapListUsersCmdTest.java b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LdapListUsersCmdTest.java
new file mode 100644
index 0000000..001265d
--- /dev/null
+++ b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LdapListUsersCmdTest.java
@@ -0,0 +1,467 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.command;
+
+import com.cloud.domain.Domain;
+import com.cloud.domain.DomainVO;
+import com.cloud.user.Account;
+import com.cloud.user.AccountVO;
+import com.cloud.user.DomainService;
+import com.cloud.user.User;
+import org.apache.cloudstack.api.ResponseObject;
+import org.apache.cloudstack.api.response.LdapUserResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.UserResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.ldap.LdapManager;
+import org.apache.cloudstack.ldap.LdapUser;
+import org.apache.cloudstack.ldap.NoLdapUserMatchingQueryException;
+import org.apache.cloudstack.query.QueryService;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.powermock.api.mockito.PowerMockito.doReturn;
+import static org.powermock.api.mockito.PowerMockito.doThrow;
+import static org.powermock.api.mockito.PowerMockito.spy;
+import static org.powermock.api.mockito.PowerMockito.when;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest(CallContext.class)
+@PowerMockIgnore({"javax.xml.*", "org.w3c.dom.*", "org.apache.xerces.*", "org.xml.*"})
+public class LdapListUsersCmdTest implements LdapConfigurationChanger {
+
+ public static final String LOCAL_DOMAIN_ID = "12345678-90ab-cdef-fedc-ba0987654321";
+ public static final String LOCAL_DOMAIN_NAME = "engineering";
+ @Mock
+ LdapManager ldapManager;
+ @Mock
+ QueryService queryService;
+ @Mock
+ DomainService domainService;
+
+ LdapListUsersCmd ldapListUsersCmd;
+ LdapListUsersCmd cmdSpy;
+
+ Domain localDomain;
+
+ @Before
+ public void setUp() throws NoSuchFieldException, IllegalAccessException {
+ ldapListUsersCmd = new LdapListUsersCmd(ldapManager, queryService);
+ cmdSpy = spy(ldapListUsersCmd);
+
+ PowerMockito.mockStatic(CallContext.class);
+ CallContext callContextMock = PowerMockito.mock(CallContext.class);
+ PowerMockito.when(CallContext.current()).thenReturn(callContextMock);
+ Account accountMock = PowerMockito.mock(Account.class);
+ PowerMockito.when(accountMock.getDomainId()).thenReturn(1l);
+ PowerMockito.when(callContextMock.getCallingAccount()).thenReturn(accountMock);
+
+ ldapListUsersCmd._domainService = domainService;
+
+// no need to setHiddenField(ldapListUsersCmd, .... );
+ }
+
+ /**
+ * given: "We have an LdapManager, QueryService and LdapListUsersCmd"
+ * when: "Get entity owner id is called"
+ * then: "a 1 should be returned"
+ *
+ */
+ @Test
+ public void getEntityOwnerIdisOne() {
+ long ownerId = ldapListUsersCmd.getEntityOwnerId();
+ assertEquals(ownerId, 1);
+ }
+
+ /**
+ * given: "We have an LdapManager with no users, QueryService and a LdapListUsersCmd"
+ * when: "LdapListUsersCmd is executed"
+ * then: "An array of size 0 is returned"
+ *
+ * @throws NoLdapUserMatchingQueryException
+ */
+ @Test
+ public void successfulEmptyResponseFromExecute() throws NoLdapUserMatchingQueryException {
+ doThrow(new NoLdapUserMatchingQueryException("")).when(ldapManager).getUsers(null);
+ ldapListUsersCmd.execute();
+ assertEquals(0, ((ListResponse)ldapListUsersCmd.getResponseObject()).getResponses().size());
+ }
+
+ /**
+ * given: "We have an LdapManager, one user, QueryService and a LdapListUsersCmd"
+ * when: "LdapListUsersCmd is executed"
+ * then: "a list of size not 0 is returned"
+ */
+ @Test
+ public void successfulResponseFromExecute() throws NoLdapUserMatchingQueryException {
+ mockACSUserSearch();
+
+ mockResponseCreation();
+
+ useSubdomain();
+
+ ldapListUsersCmd.execute();
+
+ verify(queryService, times(1)).searchForUsers(nullable(Long.class), nullable(Boolean.class));
+ assertNotEquals(0, ((ListResponse)ldapListUsersCmd.getResponseObject()).getResponses().size());
+ }
+
+ /**
+ * given: "We have an LdapManager, QueryService and a LdapListUsersCmd"
+ * when: "Get command name is called"
+ * then: "ldapuserresponse is returned"
+ */
+ @Test
+ public void successfulReturnOfCommandName() {
+ String commandName = ldapListUsersCmd.getCommandName();
+
+ assertEquals("ldapuserresponse", commandName);
+ }
+
+ /**
+ * given: "We have an LdapUser and a CloudStack user whose username match"
+ * when: "isACloudstackUser is executed"
+ * then: "The result is true"
+ *
+ * TODO: is this really the valid behaviour? shouldn't the user also be linked to ldap and not accidentally match?
+ */
+ @Test
+ public void isACloudstackUser() {
+ mockACSUserSearch();
+
+ LdapUser ldapUser = new LdapUser("rmurphy", "rmurphy@cloudstack.org", "Ryan", "Murphy", "cn=rmurphy,dc=cloudstack,dc=org", null, false, null);
+
+ boolean result = ldapListUsersCmd.isACloudstackUser(ldapUser);
+
+ assertTrue(result);
+ }
+
+ /**
+ * given: "We have an LdapUser and not a matching CloudstackUser"
+ * when: "isACloudstackUser is executed"
+ * then: "The result is false"
+ */
+ @Test
+ public void isNotACloudstackUser() {
+ doReturn(new ListResponse<UserResponse>()).when(queryService).searchForUsers(nullable(Long.class), nullable(Boolean.class));
+
+ LdapUser ldapUser = new LdapUser("rmurphy", "rmurphy@cloudstack.org", "Ryan", "Murphy", "cn=rmurphy,dc=cloudstack,dc=org", null, false, null);
+
+ boolean result = ldapListUsersCmd.isACloudstackUser(ldapUser);
+
+ assertFalse(result);
+ }
+
+ /**
+ * test whether a value other than 'any' for 'listtype' leads to a good 'userfilter' value
+ */
+ @Test
+ public void getListtypeOther() {
+ when(cmdSpy.getListTypeString()).thenReturn("otHer", "anY");
+
+ String userfilter = cmdSpy.getUserFilterString();
+ assertEquals("AnyDomain", userfilter);
+
+ userfilter = cmdSpy.getUserFilterString();
+ assertEquals("AnyDomain", userfilter);
+ }
+
+ /**
+ * test whether a value of 'any' for 'listtype' leads to a good 'userfilter' value
+ */
+ @Test
+ public void getListtypeAny() {
+ when(cmdSpy.getListTypeString()).thenReturn("all");
+ String userfilter = cmdSpy.getUserFilterString();
+ assertEquals("NoFilter", userfilter);
+ }
+
+ /**
+ * test whether values for 'userfilter' yield the right filter
+ */
+ @Test
+ public void getUserFilter() throws NoSuchFieldException, IllegalAccessException {
+ when(cmdSpy.getListTypeString()).thenReturn("otHer");
+ LdapListUsersCmd.UserFilter userfilter = cmdSpy.getUserFilter();
+
+ assertEquals(LdapListUsersCmd.UserFilter.ANY_DOMAIN, userfilter);
+
+ when(cmdSpy.getListTypeString()).thenReturn("anY");
+ userfilter = cmdSpy.getUserFilter();
+ assertEquals(LdapListUsersCmd.UserFilter.ANY_DOMAIN, userfilter);
+ }
+
+ /**
+ * test if the right exception is thrown on invalid input.
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void getInvalidUserFilterValues() throws NoSuchFieldException, IllegalAccessException {
+ setHiddenField(ldapListUsersCmd, "userFilter", "flase");
+// unused output: LdapListUsersCmd.UserFilter userfilter =
+ ldapListUsersCmd.getUserFilter();
+ }
+
+ @Test
+ public void getUserFilterValues() {
+ assertEquals("PotentialImport", LdapListUsersCmd.UserFilter.POTENTIAL_IMPORT.toString());
+ assertEquals(LdapListUsersCmd.UserFilter.POTENTIAL_IMPORT, LdapListUsersCmd.UserFilter.fromString("PotentialImport"));
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+ public void getInvalidUserFilterStringValue() {
+ LdapListUsersCmd.UserFilter.fromString("PotentImport");
+ }
+
+ /**
+ * apply no filter
+ *
+ * @throws NoSuchFieldException
+ * @throws IllegalAccessException
+ */
+ @Test
+ public void applyNoFilter() throws NoSuchFieldException, IllegalAccessException, NoLdapUserMatchingQueryException {
+ mockACSUserSearch();
+ mockResponseCreation();
+
+ useSubdomain();
+
+ setHiddenField(ldapListUsersCmd, "userFilter", "NoFilter");
+ ldapListUsersCmd.execute();
+
+ assertEquals(3, ((ListResponse)ldapListUsersCmd.getResponseObject()).getResponses().size());
+ }
+
+ /**
+ * filter all acs users
+ *
+ * @throws NoSuchFieldException
+ * @throws IllegalAccessException
+ */
+ @Test
+ public void applyAnyDomain() throws NoSuchFieldException, IllegalAccessException, NoLdapUserMatchingQueryException {
+ mockACSUserSearch();
+ mockResponseCreation();
+
+ useSubdomain();
+
+ setHiddenField(ldapListUsersCmd, "userFilter", "AnyDomain");
+ setHiddenField(ldapListUsersCmd, "domainId", 2l /* not root */);
+ ldapListUsersCmd.execute();
+
+ // 'rmurphy' annotated with native
+ // 'bob' still in
+ // 'abhi' is filtered out
+ List<ResponseObject> responses = ((ListResponse)ldapListUsersCmd.getResponseObject()).getResponses();
+ assertEquals(2, responses.size());
+ for(ResponseObject response : responses) {
+ if(!(response instanceof LdapUserResponse)) {
+ fail("unexpected return-type from API backend method");
+ } else {
+ LdapUserResponse userResponse = (LdapUserResponse)response;
+ // further validate this user
+ if ("rmurphy".equals(userResponse.getUsername()) &&
+ ! User.Source.NATIVE.toString().equalsIgnoreCase(userResponse.getUserSource())) {
+ fail("expected murphy from ldap");
+ }
+ if ("bob".equals(userResponse.getUsername()) &&
+ ! "".equals(userResponse.getUserSource())) {
+ fail("expected bob from without usersource");
+ }
+ }
+ }
+ }
+
+ /**
+ * filter out acs users for the requested domain
+ *
+ * @throws NoSuchFieldException
+ * @throws IllegalAccessException
+ */
+ @Test
+ public void applyLocalDomainForASubDomain() throws NoSuchFieldException, IllegalAccessException, NoLdapUserMatchingQueryException {
+ mockACSUserSearch();
+ mockResponseCreation();
+
+ setHiddenField(ldapListUsersCmd, "userFilter", "LocalDomain");
+ setHiddenField(ldapListUsersCmd, "domainId", 2l /* not root */);
+
+ localDomain = useSubdomain();
+
+ ldapListUsersCmd.execute();
+
+ // 'rmurphy' filtered out 'bob' still in
+ assertEquals(2, ((ListResponse)ldapListUsersCmd.getResponseObject()).getResponses().size());
+ // todo: assert user sources
+ }
+
+ /**
+ * filter out acs users for the default domain
+ *
+ * @throws NoSuchFieldException
+ * @throws IllegalAccessException
+ */
+ @Test
+ public void applyLocalDomainForTheCallersDomain() throws NoSuchFieldException, IllegalAccessException, NoLdapUserMatchingQueryException {
+ mockACSUserSearch();
+ mockResponseCreation();
+
+ setHiddenField(ldapListUsersCmd, "userFilter", "LocalDomain");
+
+ AccountVO account = new AccountVO();
+ setHiddenField(account, "accountName", "admin");
+ setHiddenField(account, "domainId", 1l);
+ final CallContext callContext = CallContext.current();
+ setHiddenField(callContext, "account", account);
+ DomainVO domainVO = useDomain("ROOT", 1l);
+ localDomain = domainVO;
+
+ ldapListUsersCmd.execute();
+
+ // 'rmurphy' filtered out 'bob' still in
+ assertEquals(2, ((ListResponse)ldapListUsersCmd.getResponseObject()).getResponses().size());
+ // todo: assert usersources
+ }
+
+ /**
+ * todo generate an extensive configuration and check with an extensive user list
+ *
+ * @throws NoSuchFieldException
+ * @throws IllegalAccessException
+ */
+ @Test
+ public void applyPotentialImport() throws NoSuchFieldException, IllegalAccessException, NoLdapUserMatchingQueryException {
+ mockACSUserSearch();
+ mockResponseCreation();
+
+ useSubdomain();
+
+ setHiddenField(ldapListUsersCmd, "userFilter", "PotentialImport");
+ ldapListUsersCmd.execute();
+
+ assertEquals(2, ((ListResponse)ldapListUsersCmd.getResponseObject()).getResponses().size());
+ }
+
+ /**
+ * unknown filter
+ *
+ * @throws NoSuchFieldException
+ * @throws IllegalAccessException
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void applyUnknownFilter() throws NoSuchFieldException, IllegalAccessException {
+ setHiddenField(ldapListUsersCmd, "userFilter", "UnknownFilter");
+ ldapListUsersCmd.execute();
+ }
+
+ /**
+ * make sure there are no unimplemented filters
+ *
+ * This was created to deal with the possible {code}NoSuchMethodException{code} that won't be dealt with in regular coverage
+ *
+ * @throws NoSuchFieldException
+ * @throws IllegalAccessException
+ */
+ @Test
+ public void applyUnimplementedFilter() throws NoSuchFieldException, IllegalAccessException {
+ useSubdomain();
+ for (LdapListUsersCmd.UserFilter UNIMPLEMENTED_FILTER : LdapListUsersCmd.UserFilter.values()) {
+ setHiddenField(ldapListUsersCmd, "userFilter", UNIMPLEMENTED_FILTER.toString());
+ ldapListUsersCmd.getUserFilter().filter(ldapListUsersCmd,new ArrayList<LdapUserResponse>());
+ }
+ }
+
+ // helper methods //
+ ////////////////////
+ private DomainVO useSubdomain() {
+ DomainVO domainVO = useDomain(LOCAL_DOMAIN_NAME, 2l);
+ return domainVO;
+ }
+
+ private DomainVO useDomain(String domainName, long domainId) {
+ DomainVO domainVO = new DomainVO();
+ domainVO.setName(domainName);
+ domainVO.setId(domainId);
+ domainVO.setUuid(LOCAL_DOMAIN_ID);
+ when(domainService.getDomain(nullable(Long.class))).thenReturn(domainVO);
+ return domainVO;
+ }
+
+ private void mockACSUserSearch() {
+ UserResponse rmurphy = createMockUserResponse("rmurphy", User.Source.NATIVE);
+ UserResponse rohit = createMockUserResponse("rohit", User.Source.SAML2);
+ UserResponse abhi = createMockUserResponse("abhi", User.Source.LDAP);
+
+ ArrayList<UserResponse> responses = new ArrayList<>();
+ responses.add(rmurphy);
+ responses.add(rohit);
+ responses.add(abhi);
+
+ ListResponse<UserResponse> queryServiceResponse = new ListResponse<>();
+ queryServiceResponse.setResponses(responses);
+
+ doReturn(queryServiceResponse).when(queryService).searchForUsers(nullable(Long.class), nullable(Boolean.class));
+ }
+
+ private UserResponse createMockUserResponse(String uid, User.Source source) {
+ UserResponse userResponse = new UserResponse();
+ userResponse.setUsername(uid);
+ userResponse.setUserSource(source);
+
+ // for now:
+ userResponse.setDomainId(LOCAL_DOMAIN_ID);
+ userResponse.setDomainName(LOCAL_DOMAIN_NAME);
+
+ return userResponse;
+ }
+
+ private void mockResponseCreation() throws NoLdapUserMatchingQueryException {
+ List<LdapUser> users = new ArrayList();
+ LdapUser murphy = new LdapUser("rmurphy", "rmurphy@test.com", "Ryan", "Murphy", "cn=rmurphy,dc=cloudstack,dc=org", "mythical", false, null);
+ LdapUser bob = new LdapUser("bob", "bob@test.com", "Robert", "Young", "cn=bob,ou=engineering,dc=cloudstack,dc=org", LOCAL_DOMAIN_NAME, false, null);
+ LdapUser abhi = new LdapUser("abhi", "abhi@test.com", "Abhi", "YoungOrOld", "cn=abhi,ou=engineering,dc=cloudstack,dc=org", LOCAL_DOMAIN_NAME, false, null);
+ users.add(murphy);
+ users.add(bob);
+ users.add(abhi);
+
+ doReturn(users).when(ldapManager).getUsers(any());
+
+ LdapUserResponse response = new LdapUserResponse("rmurphy", "rmurphy@test.com", "Ryan", "Murphy", "cn=rmurphy,dc=cloudstack,dc=org", null);
+ doReturn(response).when(ldapManager).createLdapUserResponse(murphy);
+ LdapUserResponse bobResponse = new LdapUserResponse("bob", "bob@test.com", "Robert", "Young", "cn=bob,ou=engineering,dc=cloudstack,dc=org", LOCAL_DOMAIN_NAME);
+ doReturn(bobResponse).when(ldapManager).createLdapUserResponse(bob);
+ LdapUserResponse abhiResponse = new LdapUserResponse("abhi", "abhi@test.com", "Abhi", "YoungOrOld", "cn=abhi,ou=engineering,dc=cloudstack,dc=org", LOCAL_DOMAIN_NAME);
+ doReturn(abhiResponse).when(ldapManager).createLdapUserResponse(abhi);
+ }
+}
diff --git a/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/ADLdapUserManagerImplTest.java b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/ADLdapUserManagerImplTest.java
index c2fc7ee..bf9d743 100644
--- a/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/ADLdapUserManagerImplTest.java
+++ b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/ADLdapUserManagerImplTest.java
@@ -20,13 +20,14 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import javax.naming.directory.SearchControls;
import javax.naming.ldap.LdapContext;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
@@ -78,9 +79,9 @@
@Test(expected = IllegalArgumentException.class)
public void testGetUsersInGroupUsingNullGroup() throws Exception {
String[] returnAttributes = {"username", "firstname", "lastname", "email"};
- when(ldapConfiguration.getScope()).thenReturn(SearchControls.SUBTREE_SCOPE);
- when(ldapConfiguration.getReturnAttributes(null)).thenReturn(returnAttributes);
- when(ldapConfiguration.getBaseDn(any())).thenReturn(null).thenReturn(null).thenReturn("DC=cloud,DC=citrix,DC=com");
+ lenient().when(ldapConfiguration.getScope()).thenReturn(SearchControls.SUBTREE_SCOPE);
+ lenient().when(ldapConfiguration.getReturnAttributes(null)).thenReturn(returnAttributes);
+ lenient().when(ldapConfiguration.getBaseDn(any())).thenReturn(null).thenReturn(null).thenReturn("DC=cloud,DC=citrix,DC=com");
LdapContext context = ldapContext;
String [] groups = {null, "group", null};
diff --git a/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/EmbeddedLdapServer.java b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/EmbeddedLdapServer.java
new file mode 100644
index 0000000..2b71985
--- /dev/null
+++ b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/EmbeddedLdapServer.java
@@ -0,0 +1,326 @@
+/*-
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cloudstack.ldap;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.exception.LdapException;
+import org.apache.directory.api.ldap.model.schema.registries.DefaultSchema;
+import org.apache.directory.api.ldap.model.schema.registries.Schema;
+import org.apache.directory.api.ldap.schema.loader.JarLdifSchemaLoader;
+import org.apache.directory.api.ldap.schema.loader.LdifSchemaLoader;
+import org.apache.directory.server.core.api.CoreSession;
+import org.apache.directory.server.core.api.DirectoryService;
+import org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory;
+import org.apache.directory.server.core.factory.JdbmPartitionFactory;
+import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
+import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
+import org.apache.directory.server.ldap.LdapServer;
+import org.apache.directory.server.protocol.shared.transport.TcpTransport;
+import org.apache.directory.server.xdbm.Index;
+import org.apache.directory.server.xdbm.IndexNotFoundException;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Call init() to start the server and destroy() to shut it down.
+ */
+public class EmbeddedLdapServer {
+ // API References:
+ // http://directory.apache.org/apacheds/gen-docs/latest/apidocs/
+ // http://directory.apache.org/api/gen-docs/latest/apidocs/
+
+ private static final String BASE_PARTITION_NAME = "mydomain";
+ private static final String BASE_DOMAIN = "org";
+ private static final String BASE_STRUCTURE = "dc=" + BASE_PARTITION_NAME + ",dc=" + BASE_DOMAIN;
+
+ private static final int LDAP_SERVER_PORT = 10389;
+ private static final int BASE_CACHE_SIZE = 1000;
+ private static final List<String> ATTR_NAMES_TO_INDEX = new ArrayList<String>(Arrays.asList("uid"));
+
+ private DirectoryService _directoryService;
+ private LdapServer _ldapServer;
+ private JdbmPartition _basePartition;
+ private boolean _deleteInstanceDirectoryOnStartup = true;
+ private boolean _deleteInstanceDirectoryOnShutdown = true;
+
+ public String getBasePartitionName() {
+ return BASE_PARTITION_NAME;
+ }
+
+ public String getBaseStructure() {
+ return BASE_STRUCTURE;
+ }
+
+ public int getBaseCacheSize() {
+ return BASE_CACHE_SIZE;
+ }
+
+ public int getLdapServerPort() {
+ return LDAP_SERVER_PORT;
+ }
+
+ public List<String> getAttrNamesToIndex() {
+ return ATTR_NAMES_TO_INDEX;
+ }
+
+ protected void addSchemaExtensions() throws LdapException, IOException {
+ // override to add custom attributes to the schema
+ }
+
+ public void init() throws Exception {
+ if (getDirectoryService() == null) {
+ if (getDeleteInstanceDirectoryOnStartup()) {
+ deleteDirectory(getGuessedInstanceDirectory());
+ }
+
+ DefaultDirectoryServiceFactory serviceFactory = new DefaultDirectoryServiceFactory();
+ serviceFactory.init(getDirectoryServiceName());
+ setDirectoryService(serviceFactory.getDirectoryService());
+
+ getDirectoryService().getChangeLog().setEnabled(false);
+ getDirectoryService().setDenormalizeOpAttrsEnabled(true);
+
+ createBasePartition();
+
+ getDirectoryService().startup();
+
+ createRootEntry();
+ }
+
+ if (getLdapServer() == null) {
+ setLdapServer(new LdapServer());
+ getLdapServer().setDirectoryService(getDirectoryService());
+ getLdapServer().setTransports(new TcpTransport(getLdapServerPort()));
+ getLdapServer().start();
+ }
+ }
+
+ public void destroy() throws Exception {
+ File instanceDirectory = getDirectoryService().getInstanceLayout().getInstanceDirectory();
+ getLdapServer().stop();
+ getDirectoryService().shutdown();
+ setLdapServer(null);
+ setDirectoryService(null);
+ if (getDeleteInstanceDirectoryOnShutdown()) {
+ deleteDirectory(instanceDirectory);
+ }
+ }
+
+ public String getDirectoryServiceName() {
+ return getBasePartitionName() + "DirectoryService";
+ }
+
+ private static void deleteDirectory(File path) throws IOException {
+ FileUtils.deleteDirectory(path);
+ }
+
+ protected void createBasePartition() throws Exception {
+ JdbmPartitionFactory jdbmPartitionFactory = new JdbmPartitionFactory();
+ setBasePartition(jdbmPartitionFactory.createPartition(getDirectoryService().getSchemaManager(), getDirectoryService().getDnFactory(), getBasePartitionName(), getBaseStructure(), getBaseCacheSize(), getBasePartitionPath()));
+ addSchemaExtensions();
+ createBaseIndices();
+ getDirectoryService().addPartition(getBasePartition());
+ }
+
+ protected void createBaseIndices() throws Exception {
+ //
+ // Default indices, that can be seen with getSystemIndexMap() and
+ // getUserIndexMap(), are minimal. There are no user indices by
+ // default and the default system indices are:
+ //
+ // apacheOneAlias, entryCSN, apacheSubAlias, apacheAlias,
+ // objectClass, apachePresence, apacheRdn, administrativeRole
+ //
+ for (String attrName : getAttrNamesToIndex()) {
+ getBasePartition().addIndex(createIndexObjectForAttr(attrName));
+ }
+ }
+
+ protected JdbmIndex<?> createIndexObjectForAttr(String attrName, boolean withReverse) throws LdapException {
+ String oid = getOidByAttributeName(attrName);
+ if (oid == null) {
+ throw new RuntimeException("OID could not be found for attr " + attrName);
+ }
+ return new JdbmIndex(oid, withReverse);
+ }
+
+ protected JdbmIndex<?> createIndexObjectForAttr(String attrName) throws LdapException {
+ return createIndexObjectForAttr(attrName, false);
+ }
+
+ protected void createRootEntry() throws LdapException {
+ Entry entry = getDirectoryService().newEntry(getDirectoryService().getDnFactory().create(getBaseStructure()));
+ entry.add("objectClass", "top", "domain", "extensibleObject");
+ entry.add("dc", getBasePartitionName());
+ CoreSession session = getDirectoryService().getAdminSession();
+ try {
+ session.add(entry);
+ } finally {
+ session.unbind();
+ }
+ }
+
+ /**
+ * @return A map where the key is the attribute name the value is the
+ * oid.
+ */
+ public Map<String, String> getSystemIndexMap() throws IndexNotFoundException {
+ Map<String, String> result = new LinkedHashMap<>();
+ Iterator<String> it = getBasePartition().getSystemIndices();
+ while (it.hasNext()) {
+ String oid = it.next();
+ Index<?, String> index = getBasePartition().getSystemIndex(getDirectoryService().getSchemaManager().getAttributeType(oid));
+ result.put(index.getAttribute().getName(), index.getAttributeId());
+ }
+ return result;
+ }
+
+ /**
+ * @return A map where the key is the attribute name the value is the
+ * oid.
+ */
+ public Map<String, String> getUserIndexMap() throws IndexNotFoundException {
+ Map<String, String> result = new LinkedHashMap<>();
+ Iterator<String> it = getBasePartition().getUserIndices();
+ while (it.hasNext()) {
+ String oid = it.next();
+ Index<?, String> index = getBasePartition().getUserIndex(getDirectoryService().getSchemaManager().getAttributeType(oid));
+ result.put(index.getAttribute().getName(), index.getAttributeId());
+ }
+ return result;
+ }
+
+ public File getPartitionsDirectory() {
+ return getDirectoryService().getInstanceLayout().getPartitionsDirectory();
+ }
+
+ public File getBasePartitionPath() {
+ return new File(getPartitionsDirectory(), getBasePartitionName());
+ }
+
+ /**
+ * Used at init time to clear out the likely instance directory before
+ * anything is created.
+ */
+ public File getGuessedInstanceDirectory() {
+ // See source code for DefaultDirectoryServiceFactory
+ // buildInstanceDirectory. ApacheDS looks at the workingDirectory
+ // system property first and then defers to the java.io.tmpdir
+ // system property.
+ final String property = System.getProperty("workingDirectory");
+ return new File(property != null ? property : System.getProperty("java.io.tmpdir") + File.separator + "server-work-" + getDirectoryServiceName());
+ }
+
+ public String getOidByAttributeName(String attrName) throws LdapException {
+ return getDirectoryService().getSchemaManager().getAttributeTypeRegistry().getOidByName(attrName);
+ }
+
+ /**
+ * Add additional schemas to the directory server. This takes a path to
+ * the schema directory and uses the LdifSchemaLoader.
+ *
+ * @param schemaLocation The path to the directory containing the
+ * "ou=schema" directory for an additional schema
+ * @param schemaName The name of the schema
+ * @return true if the schemas have been loaded and the registries is
+ * consistent
+ */
+ public boolean addSchemaFromPath(File schemaLocation, String schemaName) throws LdapException, IOException {
+ LdifSchemaLoader schemaLoader = new LdifSchemaLoader(schemaLocation);
+ DefaultSchema schema = new DefaultSchema(schemaLoader, schemaName);
+ return getDirectoryService().getSchemaManager().load(schema);
+ }
+
+ /**
+ * Add additional schemas to the directory server. This uses
+ * JarLdifSchemaLoader, which will search for the "ou=schema" directory
+ * within "/schema" on the classpath. If packaging the schema as part of
+ * a jar using Gradle or Maven, you'd probably want to put your
+ * "ou=schema" directory in src/main/resources/schema.
+ * <p/>
+ * It's also required that a META-INF/apacheds-schema.index be present in
+ * your classpath that lists each LDIF file in your schema directory.
+ *
+ * @param schemaName The name of the schema
+ * @return true if the schemas have been loaded and the registries is
+ * consistent
+ */
+ public boolean addSchemaFromClasspath(String schemaName) throws LdapException, IOException {
+ // To debug if your apacheds-schema.index isn't found:
+ // Enumeration<URL> indexes = getClass().getClassLoader().getResources("META-INF/apacheds-schema.index");
+ JarLdifSchemaLoader schemaLoader = new JarLdifSchemaLoader();
+ Schema schema = schemaLoader.getSchema(schemaName);
+ return schema != null && getDirectoryService().getSchemaManager().load(schema);
+ }
+
+ public DirectoryService getDirectoryService() {
+ return _directoryService;
+ }
+
+ public void setDirectoryService(DirectoryService directoryService) {
+ this._directoryService = directoryService;
+ }
+
+ public LdapServer getLdapServer() {
+ return _ldapServer;
+ }
+
+ public void setLdapServer(LdapServer ldapServer) {
+ this._ldapServer = ldapServer;
+ }
+
+ public JdbmPartition getBasePartition() {
+ return _basePartition;
+ }
+
+ public void setBasePartition(JdbmPartition basePartition) {
+ this._basePartition = basePartition;
+ }
+
+ public boolean getDeleteInstanceDirectoryOnStartup() {
+ return _deleteInstanceDirectoryOnStartup;
+ }
+
+ public void setDeleteInstanceDirectoryOnStartup(boolean deleteInstanceDirectoryOnStartup) {
+ this._deleteInstanceDirectoryOnStartup = deleteInstanceDirectoryOnStartup;
+ }
+
+ public boolean getDeleteInstanceDirectoryOnShutdown() {
+ return _deleteInstanceDirectoryOnShutdown;
+ }
+
+ public void setDeleteInstanceDirectoryOnShutdown(boolean deleteInstanceDirectoryOnShutdown) {
+ this._deleteInstanceDirectoryOnShutdown = deleteInstanceDirectoryOnShutdown;
+ }
+
+ public static void main (String[] args) {
+ EmbeddedLdapServer embeddedLdapServer = new EmbeddedLdapServer();
+ try {
+ embeddedLdapServer.init();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+}
diff --git a/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapAuthenticatorTest.java b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapAuthenticatorTest.java
index 85fd01a..2e57580 100644
--- a/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapAuthenticatorTest.java
+++ b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapAuthenticatorTest.java
@@ -18,6 +18,9 @@
import com.cloud.server.auth.UserAuthenticator;
+import com.cloud.user.AccountManager;
+import com.cloud.user.AccountVO;
+import com.cloud.user.User;
import com.cloud.user.UserAccount;
import com.cloud.user.UserAccountVO;
import com.cloud.user.dao.UserAccountDao;
@@ -25,13 +28,21 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -43,9 +54,12 @@
@Mock
UserAccountDao userAccountDao;
@Mock
+ AccountManager accountManager;
+ @Mock
UserAccount user = new UserAccountVO();
- LdapAuthenticator ldapAuthenticator;
+ @InjectMocks
+ LdapAuthenticator ldapAuthenticator = new LdapAuthenticator();
private String username = "bbanner";
private String principal = "cd=bbanner";
private String hardcoded = "password";
@@ -53,7 +67,18 @@
@Before
public void setUp() throws Exception {
- ldapAuthenticator = new LdapAuthenticator(ldapManager, userAccountDao);
+ }
+
+ @Test
+ public void authenticateAsNativeUser() throws Exception {
+ final UserAccountVO user = new UserAccountVO();
+ user.setSource(User.Source.NATIVE);
+
+ lenient().when(userAccountDao.getUserAccount(username, domainId)).thenReturn(user);
+ Pair<Boolean, UserAuthenticator.ActionOnFailedAuthentication> rc;
+ rc = ldapAuthenticator.authenticate(username, "password", domainId, (Map<String, Object[]>)null);
+ assertFalse("authentication succeeded when it should have failed", rc.first());
+ assertEquals("We should not have tried to authenticate", null,rc.second());
}
@Test
@@ -62,9 +87,39 @@
Pair<Boolean, UserAuthenticator.ActionOnFailedAuthentication> rc;
when(ldapManager.getUser(username, domainId)).thenReturn(ldapUser);
rc = ldapAuthenticator.authenticate(username, "password", domainId, user);
- assertFalse("authentication succeded when it should have failed", rc.first());
+ assertFalse("authentication succeeded when it should have failed", rc.first());
assertEquals("", UserAuthenticator.ActionOnFailedAuthentication.INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT,rc.second());
}
+
+ @Test
+ public void authenticateFailingOnSyncedAccount() throws Exception {
+ Pair<Boolean, UserAuthenticator.ActionOnFailedAuthentication> rc;
+
+ List<String> memberships = new ArrayList<>();
+ memberships.add("g1");
+ List<String> mappedGroups = new ArrayList<>();
+ mappedGroups.add("g1");
+ mappedGroups.add("g2");
+
+ LdapUser ldapUser = new LdapUser(username,"a@b","b","banner",principal,"",false,null);
+ LdapUser userSpy = spy(ldapUser);
+ when(userSpy.getMemberships()).thenReturn(memberships);
+
+ List<LdapTrustMapVO> maps = new ArrayList<>();
+ LdapAuthenticator auth = spy(ldapAuthenticator);
+ when(auth.getMappedGroups(maps)).thenReturn(mappedGroups);
+
+ LdapTrustMapVO trustMap = new LdapTrustMapVO(domainId, LdapManager.LinkType.GROUP, "cn=name", (short)2, 1l);
+
+ AccountVO account = new AccountVO("accountName" , domainId, "domain.net", (short)2, "final String uuid");
+ when(accountManager.getAccount(anyLong())).thenReturn(account);
+ when(ldapManager.getUser(username, domainId)).thenReturn(userSpy);
+ when(ldapManager.getLinkedLdapGroup(domainId, "g1")).thenReturn(trustMap);
+ rc = auth.authenticate(username, "password", domainId, user, maps);
+ assertFalse("authentication succeeded when it should have failed", rc.first());
+ assertEquals("", UserAuthenticator.ActionOnFailedAuthentication.INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT,rc.second());
+ }
+
@Test
public void authenticate() throws Exception {
LdapUser ldapUser = new LdapUser(username, "a@b", "b", "banner", principal, "", false, null);
diff --git a/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapConfigurationTest.java b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapConfigurationTest.java
index 52c70ac..2af20e7 100644
--- a/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapConfigurationTest.java
+++ b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapConfigurationTest.java
@@ -16,7 +16,6 @@
// under the License.
package org.apache.cloudstack.ldap;
-import org.apache.cloudstack.framework.config.ConfigKey;
import org.apache.cloudstack.ldap.dao.LdapConfigurationDao;
import org.apache.cloudstack.ldap.dao.LdapConfigurationDaoImpl;
import org.junit.Before;
@@ -24,118 +23,98 @@
import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@RunWith(MockitoJUnitRunner.class)
public class LdapConfigurationTest {
+ private final LdapTestConfigTool ldapTestConfigTool = new LdapTestConfigTool();
LdapConfigurationDao ldapConfigurationDao;
LdapConfiguration ldapConfiguration;
- private void overrideConfigValue(final String configKeyName, final Object o) throws IllegalAccessException, NoSuchFieldException {
- Field configKey = LdapConfiguration.class.getDeclaredField(configKeyName);
- configKey.setAccessible(true);
-
- ConfigKey key = (ConfigKey)configKey.get(ldapConfiguration);
-
- Field modifiersField = Field.class.getDeclaredField("modifiers");
- modifiersField.setAccessible(true);
- modifiersField.setInt(configKey, configKey.getModifiers() & ~Modifier.FINAL);
-
- Field f = ConfigKey.class.getDeclaredField("_value");
- f.setAccessible(true);
- modifiersField.setInt(f, f.getModifiers() & ~Modifier.FINAL);
- f.set(key, o);
-
- Field dynamic = ConfigKey.class.getDeclaredField("_isDynamic");
- dynamic.setAccessible(true);
- modifiersField.setInt(dynamic, dynamic.getModifiers() & ~Modifier.FINAL);
- dynamic.setBoolean(key, false);
+ private void overrideConfigValue(LdapConfiguration ldapConfiguration, final String configKeyName, final Object o) throws IllegalAccessException, NoSuchFieldException
+ {
+ ldapTestConfigTool.overrideConfigValue(ldapConfiguration, configKeyName, o);
}
- @Before
- public void init() throws Exception {
- ldapConfigurationDao = new LdapConfigurationDaoImpl();
- ldapConfiguration = new LdapConfiguration(ldapConfigurationDao);;
+ @Before public void init() throws Exception {
+ ldapConfigurationDao = new LdapConfigurationDaoImpl();
+ ldapConfiguration = new LdapConfiguration(ldapConfigurationDao);
+ ;
}
- @Test
- public void getAuthenticationReturnsSimple() throws Exception {
- overrideConfigValue("ldapBindPrincipal", "cn=bla");
- overrideConfigValue("ldapBindPassword", "pw");
+ @Test public void getAuthenticationReturnsSimple() throws Exception {
+ ldapTestConfigTool.overrideConfigValue(ldapConfiguration, "ldapBindPrincipal", "cn=bla");
+ ldapTestConfigTool.overrideConfigValue(ldapConfiguration, "ldapBindPassword", "pw");
String authentication = ldapConfiguration.getAuthentication(null);
assertEquals("authentication should be set to simple", "simple", authentication);
}
-
- @Test
- public void getBaseDnReturnsABaseDn() throws Exception {
- overrideConfigValue("ldapBaseDn", "dc=cloudstack,dc=org");
+ @Test public void getBaseDnReturnsABaseDn() throws Exception {
+ ldapTestConfigTool.overrideConfigValue(ldapConfiguration, "ldapBaseDn", "dc=cloudstack,dc=org");
String baseDn = ldapConfiguration.getBaseDn(null);
- assertEquals("The set baseDn should be returned","dc=cloudstack,dc=org", baseDn);
+ assertEquals("The set baseDn should be returned", "dc=cloudstack,dc=org", baseDn);
}
- @Test
- public void getGroupUniqueMemberAttribute() throws Exception {
- String [] groupNames = {"bla", "uniquemember", "memberuid", "", null};
- for (String groupObject: groupNames) {
- overrideConfigValue("ldapGroupUniqueMemberAttribute", groupObject);
+ @Test public void getGroupUniqueMemberAttribute() throws Exception {
+ String[] groupNames = {"bla", "uniquemember", "memberuid", "", null};
+ for (String groupObject : groupNames) {
+ ldapTestConfigTool.overrideConfigValue(ldapConfiguration, "ldapGroupUniqueMemberAttribute", groupObject);
String expectedResult = null;
- if(groupObject == null) {
+ if (groupObject == null) {
expectedResult = "uniquemember";
} else {
expectedResult = groupObject;
- };
+ }
+ ;
String result = ldapConfiguration.getGroupUniqueMemberAttribute(null);
assertEquals("testing for " + groupObject, expectedResult, result);
}
}
- @Test
- public void getSSLStatusCanBeTrue() throws Exception {
+ @Test public void getSSLStatusCanBeTrue() throws Exception {
// given: "We have a ConfigDao with values for truststore and truststore password set"
- overrideConfigValue("ldapTrustStore", "/tmp/ldap.ts");
- overrideConfigValue("ldapTrustStorePassword", "password");
+ ldapTestConfigTool.overrideConfigValue(ldapConfiguration, "ldapTrustStore", "/tmp/ldap.ts");
+ ldapTestConfigTool.overrideConfigValue(ldapConfiguration, "ldapTrustStorePassword", "password");
assertTrue("A request is made to get the status of SSL should result in true", ldapConfiguration.getSSLStatus());
}
- @Test
- public void getSearchGroupPrincipleReturnsSuccessfully() throws Exception {
+
+ @Test public void getSearchGroupPrincipleReturnsSuccessfully() throws Exception {
// We have a ConfigDao with a value for ldap.search.group.principle and an LdapConfiguration
- overrideConfigValue("ldapSearchGroupPrinciple", "cn=cloudstack,cn=users,dc=cloudstack,dc=org");
+ ldapTestConfigTool.overrideConfigValue(ldapConfiguration, "ldapSearchGroupPrinciple", "cn=cloudstack,cn=users,dc=cloudstack,dc=org");
String result = ldapConfiguration.getSearchGroupPrinciple(null);
- assertEquals("The result holds the same value configDao did", "cn=cloudstack,cn=users,dc=cloudstack,dc=org",result);
+ assertEquals("The result holds the same value configDao did", "cn=cloudstack,cn=users,dc=cloudstack,dc=org", result);
}
- @Test
- public void getTrustStorePasswordResopnds() throws Exception {
+ @Test public void getTrustStorePasswordResopnds() throws Exception {
// We have a ConfigDao with a value for truststore password
- overrideConfigValue("ldapTrustStorePassword", "password");
+ ldapTestConfigTool.overrideConfigValue(ldapConfiguration, "ldapTrustStorePassword", "password");
String result = ldapConfiguration.getTrustStorePassword();
assertEquals("The result is password", "password", result);
}
-
- @Test
- public void getGroupObject() throws Exception {
- String [] groupNames = {"bla", "groupOfUniqueNames", "groupOfNames", "", null};
- for (String groupObject: groupNames) {
- overrideConfigValue("ldapGroupObject", groupObject);
+ @Test public void getGroupObject() throws Exception {
+ String[] groupNames = {"bla", "groupOfUniqueNames", "groupOfNames", "", null};
+ for (String groupObject : groupNames) {
+ ldapTestConfigTool.overrideConfigValue(ldapConfiguration, "ldapGroupObject", groupObject);
String expectedResult = null;
- if(groupObject == null) {
+ if (groupObject == null) {
expectedResult = "groupOfUniqueNames";
} else {
expectedResult = groupObject;
- };
+ }
+ ;
String result = ldapConfiguration.getGroupObject(null);
assertEquals("testing for " + groupObject, expectedResult, result);
}
}
+
+ @Test public void getNullLdapProvider() {
+ assertEquals(LdapUserManager.Provider.OPENLDAP, ldapConfiguration.getLdapProvider(null));
+ }
}
\ No newline at end of file
diff --git a/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapDirectoryServerConnectionTest.java b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapDirectoryServerConnectionTest.java
new file mode 100644
index 0000000..2d2690f
--- /dev/null
+++ b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapDirectoryServerConnectionTest.java
@@ -0,0 +1,210 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cloudstack.ldap;
+
+import com.cloud.utils.Pair;
+import org.apache.cloudstack.ldap.dao.LdapConfigurationDao;
+import org.apache.directory.api.ldap.model.entry.DefaultEntry;
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.exception.LdapException;
+import org.apache.directory.api.ldap.model.message.AddRequest;
+import org.apache.directory.api.ldap.model.message.AddRequestImpl;
+import org.apache.directory.api.ldap.model.message.AddResponse;
+import org.apache.directory.ldap.client.api.LdapConnection;
+import org.apache.directory.ldap.client.api.LdapNetworkConnection;
+import org.apache.directory.server.core.api.DirectoryService;
+import org.apache.directory.server.core.api.changelog.ChangeLog;
+import org.apache.directory.server.ldap.LdapServer;
+import org.apache.directory.server.xdbm.IndexNotFoundException;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.lenient;
+
+@RunWith(MockitoJUnitRunner.class)
+public class LdapDirectoryServerConnectionTest {
+
+ static EmbeddedLdapServer embeddedLdapServer;
+
+ @Mock
+ LdapConfigurationDao configurationDao;
+
+ LdapContextFactory contextFactory;
+
+ @Mock
+ LdapUserManagerFactory userManagerFactory;
+
+ @InjectMocks
+ LdapConfiguration configuration;
+
+ @InjectMocks
+ private LdapManagerImpl ldapManager;
+
+ private final LdapTestConfigTool ldapTestConfigTool = new LdapTestConfigTool();
+
+ @BeforeClass
+ public static void start() throws Exception {
+ embeddedLdapServer = new EmbeddedLdapServer();
+ embeddedLdapServer.init();
+ }
+ @Before
+ public void setup() throws Exception {
+ LdapConfigurationVO configurationVO = new LdapConfigurationVO("localhost",10389,null);
+ lenient().when(configurationDao.find("localhost",10389,null)).thenReturn(configurationVO);
+ ldapTestConfigTool.overrideConfigValue(configuration, "ldapBaseDn", "ou=system");
+ ldapTestConfigTool.overrideConfigValue(configuration, "ldapBindPassword", "secret");
+ ldapTestConfigTool.overrideConfigValue(configuration, "ldapBindPrincipal", "uid=admin,ou=system");
+ ldapTestConfigTool.overrideConfigValue(configuration, "ldapMemberOfAttribute", "memberOf");
+ lenient().when(userManagerFactory.getInstance(LdapUserManager.Provider.OPENLDAP)).thenReturn(new OpenLdapUserManagerImpl(configuration));
+ // construct an ellaborate structure around a single object
+ Pair<List<LdapConfigurationVO>, Integer> vos = new Pair<List<LdapConfigurationVO>, Integer>( Collections.singletonList(configurationVO),1);
+ lenient().when(configurationDao.searchConfigurations(null, 0, 1L)).thenReturn(vos);
+
+ contextFactory = new LdapContextFactory(configuration);
+ ldapManager = new LdapManagerImpl(configurationDao, contextFactory, userManagerFactory, configuration);
+ }
+
+ @After
+ public void cleanup() throws Exception {
+ contextFactory = null;
+ ldapManager = null;
+ }
+
+ @AfterClass
+ public static void stop() throws Exception {
+ embeddedLdapServer.destroy();
+ }
+
+ @Test
+ public void testEmbeddedLdapServerInitialization() throws IndexNotFoundException {
+ LdapServer ldapServer = embeddedLdapServer.getLdapServer();
+ assertNotNull(ldapServer);
+
+ DirectoryService directoryService = embeddedLdapServer.getDirectoryService();
+ assertNotNull(directoryService);
+ assertNotNull(directoryService.getSchemaPartition());
+ assertNotNull(directoryService.getSystemPartition());
+ assertNotNull(directoryService.getSchemaManager());
+ assertNotNull(directoryService.getDnFactory());
+
+ assertNotNull(directoryService.isDenormalizeOpAttrsEnabled());
+
+ ChangeLog changeLog = directoryService.getChangeLog();
+
+ assertNotNull(changeLog);
+ assertFalse(changeLog.isEnabled());
+
+ assertNotNull(directoryService.isStarted());
+ assertNotNull(ldapServer.isStarted());
+
+ List userList = new ArrayList(embeddedLdapServer.getUserIndexMap().keySet());
+ java.util.Collections.sort(userList);
+ List checkList = Arrays.asList("uid");
+ assertEquals(userList, checkList);
+ }
+
+// @Test
+ public void testEmbeddedLdapAvailable() {
+ try {
+ List<LdapUser> usahs = ldapManager.getUsers(1L);
+ assertFalse("should find at least the admin user", usahs.isEmpty());
+ } catch (NoLdapUserMatchingQueryException e) {
+ fail(e.getLocalizedMessage());
+ }
+ }
+
+ @Test
+ public void testSchemaLoading() {
+ try {
+ assertTrue("standard not loaded", embeddedLdapServer.addSchemaFromClasspath("other"));
+// we need member of in ACS nowadays (backwards comptability broken):
+// assertTrue("memberOf schema not loaded", embeddedLdapServer.addSchemaFromPath(new File("src/test/resources/memberOf"), "microsoft"));
+ } catch (LdapException | IOException e) {
+ fail(e.getLocalizedMessage());
+ }
+ }
+
+// @Test
+ public void testUserCreation() {
+ LdapConnection connection = new LdapNetworkConnection( "localhost", 10389 );
+ try {
+ connection.bind( "uid=admin,ou=system", "secret" );
+
+ connection.add(new DefaultEntry(
+ "ou=acsadmins,ou=users,ou=system",
+ "objectClass: organizationalUnit",
+// might also need to be objectClass: top
+ "ou: acsadmins"
+ ));
+ connection.add(new DefaultEntry(
+ "uid=dahn,ou=acsadmins,ou=users,ou=system",
+ "objectClass: inetOrgPerson",
+ "objectClass: top",
+ "cn: dahn",
+ "sn: Hoogland",
+ "givenName: Daan",
+ "mail: d@b.c",
+ "uid: dahn"
+ ));
+
+ connection.add(
+ new DefaultEntry(
+ "cn=JuniorAdmins,ou=groups,ou=system", // The Dn
+ "objectClass: groupOfUniqueNames",
+ "ObjectClass: top",
+ "cn: JuniorAdmins",
+ "uniqueMember: uid=dahn,ou=acsadmins,ou=system,ou=users") );
+
+ assertTrue( connection.exists( "cn=JuniorAdmins,ou=groups,ou=system" ) );
+ assertTrue( connection.exists( "uid=dahn,ou=acsadmins,ou=users,ou=system" ) );
+
+ Entry ourUser = connection.lookup("uid=dahn,ou=acsadmins,ou=users,ou=system");
+ ourUser.add("memberOf", "cn=JuniorAdmins,ou=groups,ou=system");
+ AddRequest addRequest = new AddRequestImpl();
+ addRequest.setEntry( ourUser );
+ AddResponse response = connection.add( addRequest );
+ assertNotNull( response );
+ // We would need to either
+// assertEquals( ResultCodeEnum.SUCCESS, response.getLdapResult().getResultCode() );
+ // or have the automatic virtual attribute
+
+ List<LdapUser> usahs = ldapManager.getUsers(1L);
+ assertEquals("now an admin and a normal user should be present",2, usahs.size());
+
+ } catch (LdapException | NoLdapUserMatchingQueryException e) {
+ fail(e.getLocalizedMessage());
+ }
+ }
+}
diff --git a/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapTestConfigTool.java b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapTestConfigTool.java
new file mode 100644
index 0000000..0507a01
--- /dev/null
+++ b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapTestConfigTool.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cloudstack.ldap;
+
+import org.apache.cloudstack.framework.config.ConfigKey;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+
+public class LdapTestConfigTool {
+ public LdapTestConfigTool() {
+ }
+
+ void overrideConfigValue(LdapConfiguration ldapConfiguration, final String configKeyName, final Object o) throws IllegalAccessException, NoSuchFieldException {
+ Field configKey = LdapConfiguration.class.getDeclaredField(configKeyName);
+ configKey.setAccessible(true);
+
+ ConfigKey key = (ConfigKey)configKey.get(ldapConfiguration);
+
+ Field modifiersField = Field.class.getDeclaredField("modifiers");
+ modifiersField.setAccessible(true);
+ modifiersField.setInt(configKey, configKey.getModifiers() & ~Modifier.FINAL);
+
+ Field f = ConfigKey.class.getDeclaredField("_value");
+ f.setAccessible(true);
+ modifiersField.setInt(f, f.getModifiers() & ~Modifier.FINAL);
+ f.set(key, o);
+
+ Field dynamic = ConfigKey.class.getDeclaredField("_isDynamic");
+ dynamic.setAccessible(true);
+ modifiersField.setInt(dynamic, dynamic.getModifiers() & ~Modifier.FINAL);
+ dynamic.setBoolean(key, false);
+ }
+}
\ No newline at end of file
diff --git a/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapUnboundidZapdotConnectionTest.java b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapUnboundidZapdotConnectionTest.java
new file mode 100644
index 0000000..3acc7c5
--- /dev/null
+++ b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapUnboundidZapdotConnectionTest.java
@@ -0,0 +1,89 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.ldap;
+
+import com.google.common.collect.Iterators;
+import com.unboundid.ldap.sdk.LDAPConnection;
+import com.unboundid.ldap.sdk.LDAPInterface;
+import com.unboundid.ldap.sdk.SearchResult;
+import com.unboundid.ldap.sdk.SearchScope;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.zapodot.junit.ldap.EmbeddedLdapRule;
+import org.zapodot.junit.ldap.EmbeddedLdapRuleBuilder;
+
+import javax.naming.Context;
+import javax.naming.NamingEnumeration;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.SearchControls;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(MockitoJUnitRunner.class)
+public class LdapUnboundidZapdotConnectionTest {
+ private static final String DOMAIN_DSN;
+
+ static {
+ DOMAIN_DSN = "dc=cloudstack,dc=org";
+ }
+
+ @Rule
+ public EmbeddedLdapRule embeddedLdapRule = EmbeddedLdapRuleBuilder
+ .newInstance()
+ .usingDomainDsn(DOMAIN_DSN)
+ .importingLdifs("unboundid.ldif")
+ .build();
+
+ @Test
+ public void testLdapInteface() throws Exception {
+ // Test using the UnboundID LDAP SDK directly
+ final LDAPInterface ldapConnection = embeddedLdapRule.ldapConnection();
+ final SearchResult searchResult = ldapConnection.search(DOMAIN_DSN, SearchScope.SUB, "(objectClass=person)");
+ assertEquals(24, searchResult.getEntryCount());
+ }
+
+ @Test
+ public void testUnsharedLdapConnection() throws Exception {
+ // Test using the UnboundID LDAP SDK directly by using the UnboundID LDAPConnection type
+ final LDAPConnection ldapConnection = embeddedLdapRule.unsharedLdapConnection();
+ final SearchResult searchResult = ldapConnection.search(DOMAIN_DSN, SearchScope.SUB, "(objectClass=person)");
+ assertEquals(24, searchResult.getEntryCount());
+ }
+
+ @Test
+ public void testDirContext() throws Exception {
+
+ // Test using the good ol' JDNI-LDAP integration
+ final DirContext dirContext = embeddedLdapRule.dirContext();
+ final SearchControls searchControls = new SearchControls();
+ searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE);
+ final NamingEnumeration<javax.naming.directory.SearchResult> resultNamingEnumeration =
+ dirContext.search(DOMAIN_DSN, "(objectClass=person)", searchControls);
+ assertEquals(24, Iterators.size(Iterators.forEnumeration(resultNamingEnumeration)));
+ }
+ @Test
+ public void testContext() throws Exception {
+
+ // Another test using the good ol' JDNI-LDAP integration, this time with the Context interface
+ final Context context = embeddedLdapRule.context();
+ final Object user = context.lookup("cn=Cammy Petri,dc=cloudstack,dc=org");
+ assertNotNull(user);
+ }
+}
\ No newline at end of file
diff --git a/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapUnitConnectionTest.java b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapUnitConnectionTest.java
new file mode 100644
index 0000000..667d14e
--- /dev/null
+++ b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapUnitConnectionTest.java
@@ -0,0 +1,62 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.ldap;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import com.btmatthews.ldapunit.DirectoryTester;
+import com.btmatthews.ldapunit.DirectoryServerConfiguration;
+import com.btmatthews.ldapunit.DirectoryServerRule;
+
+@RunWith(MockitoJUnitRunner.class)
+@DirectoryServerConfiguration(ldifFiles = {LdapUnitConnectionTest.LDIF_FILE_NAME},
+ baseDN = LdapUnitConnectionTest.DOMAIN_DSN,
+ port = LdapUnitConnectionTest.PORT,
+ authDN = LdapUnitConnectionTest.BIND_DN,
+authPassword = LdapUnitConnectionTest.SECRET)
+public class LdapUnitConnectionTest {
+ static final String LDIF_FILE_NAME = "ldapunit.ldif";
+ static final String DOMAIN_DSN = "dc=am,dc=echt,dc=net";
+ static final String BIND_DN = "uid=admin,ou=cloudstack";
+ static final String SECRET = "secretzz";
+ static final int PORT =11389;
+
+ @Rule
+ public DirectoryServerRule directoryServerRule = new DirectoryServerRule();
+
+ private DirectoryTester directoryTester;
+
+ @Before
+ public void setUp() {
+ directoryTester = new DirectoryTester("localhost", PORT, BIND_DN, SECRET);
+ }
+
+ @After
+ public void tearDown() {
+ directoryTester.disconnect();
+ }
+
+ @Test
+ public void testLdapInteface() throws Exception {
+ directoryTester.assertDNExists("dc=am,dc=echt,dc=net");
+ }
+}
\ No newline at end of file
diff --git a/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapUserManagerFactoryTest.java b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapUserManagerFactoryTest.java
new file mode 100644
index 0000000..a3ece8d
--- /dev/null
+++ b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapUserManagerFactoryTest.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cloudstack.ldap;
+
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Spy;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
+import org.springframework.context.ApplicationContext;
+
+import static org.junit.Assert.assertTrue;
+
+@RunWith(MockitoJUnitRunner.class)
+public class LdapUserManagerFactoryTest {
+
+ @Mock
+ ApplicationContext applicationCtx;
+
+ @Mock
+ AutowireCapableBeanFactory autowireCapableBeanFactory;
+
+ @Mock
+ protected LdapConfiguration _ldapConfiguration;
+
+ @Spy
+ @InjectMocks
+ static LdapUserManagerFactory ldapUserManagerFactory = new LdapUserManagerFactory();
+
+ /**
+ * circumvent springframework for these {code ManagerImpl}
+ */
+ @BeforeClass
+ public static void init()
+ {
+ ldapUserManagerFactory.ldapUserManagerMap.put(LdapUserManager.Provider.MICROSOFTAD, new ADLdapUserManagerImpl());
+ ldapUserManagerFactory.ldapUserManagerMap.put(LdapUserManager.Provider.OPENLDAP, new OpenLdapUserManagerImpl());
+ }
+
+ @Before
+ public void setup() {
+
+ }
+ @Test
+ public void getOpenLdapInstance() {
+ LdapUserManager userManager = ldapUserManagerFactory.getInstance(LdapUserManager.Provider.OPENLDAP);
+ assertTrue("x dude", userManager instanceof OpenLdapUserManagerImpl);
+ }
+
+ @Test
+ public void getMSADInstance() {
+ LdapUserManager userManager = ldapUserManagerFactory.getInstance(LdapUserManager.Provider.MICROSOFTAD);
+ assertTrue("wrong dude", userManager instanceof ADLdapUserManagerImpl);
+ }
+}
\ No newline at end of file
diff --git a/plugins/user-authenticators/ldap/src/test/resources/ldapunit.ldif b/plugins/user-authenticators/ldap/src/test/resources/ldapunit.ldif
new file mode 100644
index 0000000..a6c1da1
--- /dev/null
+++ b/plugins/user-authenticators/ldap/src/test/resources/ldapunit.ldif
@@ -0,0 +1,151 @@
+# 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.
+version: 1
+
+dn: ou=groups,dc=am,dc=echt,dc=net
+objectClass: organizationalUnit
+objectClass: top
+ou: Groups
+
+dn: cn=JuniorAdmins,ou=groups,dc=am,dc=echt,dc=net
+objectClass: groupOfUniqueNames
+objectClass: top
+cn: JuniorAdmins
+uniqueMember: uid=demo,ou=acsadmins,dc=am,dc=echt,dc=net
+uniqueMember: uid=demo2,ou=acsadmins,dc=am,dc=echt,dc=net
+uniqueMember: uid=double,ou=acsadmins,dc=am,dc=echt,dc=net
+
+dn: ou=acsadmins,dc=am,dc=echt,dc=net
+objectClass: organizationalUnit
+objectClass: top
+ou: acsadmins
+
+dn: uid=dahn,ou=acsadmins,dc=am,dc=echt,dc=net
+objectClass: person
+objectClass: organizationalPerson
+objectClass: top
+objectClass: inetOrgPerson
+cn: dahn
+sn: Hoogland
+givenName: Daan
+mail: d@b.c
+uid: dahn
+
+dn: uid=demo,ou=acsadmins,dc=am,dc=echt,dc=net
+objectClass: person
+objectClass: organizationalPerson
+objectClass: top
+objectClass: inetOrgPerson
+cn: demo
+sn: User
+givenName: demo
+mail: d@b.c
+uid: demo
+
+dn: cn=SeniorAdmins,ou=groups,dc=am,dc=echt,dc=net
+objectClass: groupOfUniqueNames
+objectClass: top
+cn: SeniorAdmins
+uniqueMember: uid=pga,ou=acsadmins,dc=am,dc=echt,dc=net
+uniqueMember: uid=demo4,ou=acsadmins,dc=am,dc=echt,dc=net
+
+dn: cn=admins,ou=acsadmins,dc=am,dc=echt,dc=net
+objectClass: groupOfNames
+objectClass: top
+cn: admins
+member: uid=dahn,ou=acsadmins,dc=am,dc=echt,dc=net
+member: uid=demo,ou=acsadmins,dc=am,dc=echt,dc=net
+member: uid=demo2,ou=acsadmins,dc=am,dc=echt,dc=net
+member: uid=demo3,ou=acsadmins,dc=am,dc=echt,dc=net
+member: uid=demo4,ou=acsadmins,dc=am,dc=echt,dc=net
+member: uid=pga,ou=acsadmins,dc=am,dc=echt,dc=net
+member: uid=double,ou=acsadmins,dc=am,dc=echt,dc=net
+
+dn: uid=pga,ou=acsadmins,dc=am,dc=echt,dc=net
+objectClass: person
+objectClass: organizationalperson
+objectClass: top
+objectClass: inetorgperson
+cn: Paul Angus
+sn: angus
+givenName: paul
+mail: paul.angus@shapeblue.com
+uid: pga
+
+dn: uid=demo2,ou=acsadmins,dc=am,dc=echt,dc=net
+objectClass: person
+objectClass: organizationalPerson
+objectClass: top
+objectClass: inetOrgPerson
+cn: demo
+sn: User
+givenName: demo
+mail: d@b.c
+uid: demo2
+
+dn: uid=demo3,ou=acsadmins,dc=am,dc=echt,dc=net
+objectClass: person
+objectClass: organizationalPerson
+objectClass: top
+objectClass: inetOrgPerson
+cn: demo
+sn: User
+givenName: demo
+mail: d@b.c
+uid: demo3
+
+dn: uid=demo4,ou=acsadmins,dc=am,dc=echt,dc=net
+objectClass: person
+objectClass: organizationalPerson
+objectClass: top
+objectClass: inetOrgPerson
+cn: demo
+sn: User
+givenName: demo
+mail: d@b.c
+uid: demo4
+
+dn: cn=Admins,ou=groups,dc=am,dc=echt,dc=net
+objectClass: groupOfUniqueNames
+objectClass: top
+cn: Admins
+uniqueMember: uid=dahn,ou=acsadmins,dc=am,dc=echt,dc=net
+uniqueMember: uid=demo3,ou=acsadmins,dc=am,dc=echt,dc=net
+uniqueMember: uid=double,ou=acsadmins,dc=am,dc=echt,dc=net
+uniqueMember: uid=noadmin,ou=acsadmins,dc=am,dc=echt,dc=net
+
+dn: uid=double,ou=acsadmins,dc=am,dc=echt,dc=net
+objectClass: person
+objectClass: organizationalPerson
+objectClass: top
+objectClass: inetOrgPerson
+cn: demo
+sn: User
+givenName: demo
+mail: d@b.c
+uid: double
+
+dn: uid=noadmin,ou=acsadmins,dc=am,dc=echt,dc=net
+objectClass: person
+objectClass: organizationalPerson
+objectClass: top
+objectClass: inetOrgPerson
+cn: demo
+sn: User
+givenName: demo
+mail: d@b.c
+uid: noadmin
\ No newline at end of file
diff --git a/plugins/user-authenticators/ldap/src/test/resources/log4j.xml b/plugins/user-authenticators/ldap/src/test/resources/log4j.xml
new file mode 100755
index 0000000..031d228
--- /dev/null
+++ b/plugins/user-authenticators/ldap/src/test/resources/log4j.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <throwableRenderer class="com.cloud.utils.log.CglibThrowableRenderer"/>
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Target" value="System.out"/>
+ <param name="Threshold" value="TRACE"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{3}] (%t:%x) %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <category name="com.cloud">
+ <priority value="DEBUG"/>
+ </category>
+
+ <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
+ <category name="org.apache.cloudstack">
+ <priority value="DEBUG"/>
+ </category>
+
+ <category name="org.apache.directory">
+ <priority value="WARN"/>
+ </category>
+
+ <category name="org.apache.directory.api.ldap.model.entry.Value">
+ <priority value="FATAL"/>
+ </category>
+
+ <category name="org.apache.directory.api.ldap.model.entry.DefaultAttribute">
+ <priority value="FATAL"/>
+ </category>
+
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <level value="INFO"/>
+ <appender-ref ref="CONSOLE"/>
+ </root>
+
+</log4j:configuration>
diff --git a/plugins/user-authenticators/ldap/src/test/resources/minimal.ldif b/plugins/user-authenticators/ldap/src/test/resources/minimal.ldif
new file mode 100644
index 0000000..46e87c2
--- /dev/null
+++ b/plugins/user-authenticators/ldap/src/test/resources/minimal.ldif
@@ -0,0 +1,243 @@
+# 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.
+version: 1
+
+dn: dc=am,dc=echt,dc=net
+objectClass: domain
+objectClass: top
+dc: am
+
+dn: ou=groups,dc=am,dc=echt,dc=net
+objectClass: organizationalUnit
+objectClass: top
+ou: Groups
+
+dn: cn=JuniorAdmins,ou=groups,dc=am,dc=echt,dc=net
+objectClass: groupOfUniqueNames
+objectClass: top
+cn: JuniorAdmins
+uniqueMember: uid=demo,ou=acsadmins,dc=am,dc=echt,dc=net
+uniqueMember: uid=demo2,ou=acsadmins,dc=am,dc=echt,dc=net
+uniqueMember: uid=double,ou=acsadmins,dc=am,dc=echt,dc=net
+
+dn: ou=acsadmins,dc=am,dc=echt,dc=net
+objectClass: organizationalUnit
+objectClass: top
+ou: acsadmins
+
+dn: uid=dahn,ou=acsadmins,dc=am,dc=echt,dc=net
+objectClass: person
+objectClass: organizationalPerson
+objectClass: top
+objectClass: inetOrgPerson
+objectClass: sunFederationManagerDataStore
+cn: dahn
+sn: Hoogland
+givenName: Daan
+inetUserStatus: Active
+mail: d@b.c
+uid: dahn
+
+dn: uid=demo,ou=acsadmins,dc=am,dc=echt,dc=net
+objectClass: iplanet-am-user-service
+objectClass: person
+objectClass: organizationalPerson
+objectClass: sunAMAuthAccountLockout
+objectClass: iPlanetPreferences
+objectClass: top
+objectClass: sunIdentityServerLibertyPPService
+objectClass: sunFMSAML2NameIdentifier
+objectClass: forgerock-am-dashboard-service
+objectClass: inetOrgPerson
+objectClass: sunFederationManagerDataStore
+objectClass: devicePrintProfilesContainer
+objectClass: iplanet-am-auth-configuration-service
+objectClass: iplanet-am-managed-person
+objectClass: inetuser
+cn: demo
+sn: User
+givenName: demo
+inetUserStatus: Active
+mail: d@b.c
+uid: demo
+
+dn: cn=SeniorAdmins,ou=groups,dc=am,dc=echt,dc=net
+objectClass: groupOfUniqueNames
+objectClass: top
+cn: SeniorAdmins
+uniqueMember: uid=pga,ou=acsadmins,dc=am,dc=echt,dc=net
+uniqueMember: uid=demo4,ou=acsadmins,dc=am,dc=echt,dc=net
+
+dn: cn=admins,ou=acsadmins,dc=am,dc=echt,dc=net
+objectClass: groupOfNames
+objectClass: top
+cn: admins
+member: uid=dahn,ou=acsadmins,dc=am,dc=echt,dc=net
+member: uid=demo,ou=acsadmins,dc=am,dc=echt,dc=net
+member: uid=demo2,ou=acsadmins,dc=am,dc=echt,dc=net
+member: uid=demo3,ou=acsadmins,dc=am,dc=echt,dc=net
+member: uid=demo4,ou=acsadmins,dc=am,dc=echt,dc=net
+member: uid=pga,ou=acsadmins,dc=am,dc=echt,dc=net
+member: uid=double,ou=acsadmins,dc=am,dc=echt,dc=net
+
+dn: uid=pga,ou=acsadmins,dc=am,dc=echt,dc=net
+objectClass: iplanet-am-user-service
+objectClass: person
+objectClass: organizationalperson
+objectClass: sunAMAuthAccountLockout
+objectClass: iPlanetPreferences
+objectClass: top
+objectClass: sunIdentityServerLibertyPPService
+objectClass: sunFMSAML2NameIdentifier
+objectClass: forgerock-am-dashboard-service
+objectClass: inetorgperson
+objectClass: sunFederationManagerDataStore
+objectClass: devicePrintProfilesContainer
+objectClass: iplanet-am-auth-configuration-service
+objectClass: iplanet-am-managed-person
+objectClass: inetuser
+cn: Paul Angus
+sn: angus
+givenName: paul
+inetUserStatus: Active
+mail: paul.angus@shapeblue.com
+uid: pga
+
+dn: uid=demo2,ou=acsadmins,dc=am,dc=echt,dc=net
+objectClass: iplanet-am-user-service
+objectClass: person
+objectClass: organizationalPerson
+objectClass: sunAMAuthAccountLockout
+objectClass: iPlanetPreferences
+objectClass: top
+objectClass: sunIdentityServerLibertyPPService
+objectClass: sunFMSAML2NameIdentifier
+objectClass: forgerock-am-dashboard-service
+objectClass: inetOrgPerson
+objectClass: sunFederationManagerDataStore
+objectClass: devicePrintProfilesContainer
+objectClass: iplanet-am-auth-configuration-service
+objectClass: iplanet-am-managed-person
+objectClass: inetuser
+cn: demo
+sn: User
+givenName: demo
+inetUserStatus: Active
+mail: d@b.c
+uid: demo2
+
+dn: uid=demo3,ou=acsadmins,dc=am,dc=echt,dc=net
+objectClass: iplanet-am-user-service
+objectClass: person
+objectClass: organizationalPerson
+objectClass: sunAMAuthAccountLockout
+objectClass: iPlanetPreferences
+objectClass: top
+objectClass: sunIdentityServerLibertyPPService
+objectClass: sunFMSAML2NameIdentifier
+objectClass: forgerock-am-dashboard-service
+objectClass: inetOrgPerson
+objectClass: sunFederationManagerDataStore
+objectClass: devicePrintProfilesContainer
+objectClass: iplanet-am-auth-configuration-service
+objectClass: iplanet-am-managed-person
+objectClass: inetuser
+cn: demo
+sn: User
+givenName: demo
+inetUserStatus: Active
+mail: d@b.c
+uid: demo3
+
+dn: uid=demo4,ou=acsadmins,dc=am,dc=echt,dc=net
+objectClass: iplanet-am-user-service
+objectClass: person
+objectClass: organizationalPerson
+objectClass: sunAMAuthAccountLockout
+objectClass: iPlanetPreferences
+objectClass: top
+objectClass: sunIdentityServerLibertyPPService
+objectClass: sunFMSAML2NameIdentifier
+objectClass: forgerock-am-dashboard-service
+objectClass: inetOrgPerson
+objectClass: sunFederationManagerDataStore
+objectClass: devicePrintProfilesContainer
+objectClass: iplanet-am-auth-configuration-service
+objectClass: iplanet-am-managed-person
+objectClass: inetuser
+cn: demo
+sn: User
+givenName: demo
+inetUserStatus: Active
+mail: d@b.c
+uid: demo4
+
+dn: cn=Admins,ou=groups,dc=am,dc=echt,dc=net
+objectClass: groupOfUniqueNames
+objectClass: top
+cn: Admins
+uniqueMember: uid=dahn,ou=acsadmins,dc=am,dc=echt,dc=net
+uniqueMember: uid=demo3,ou=acsadmins,dc=am,dc=echt,dc=net
+uniqueMember: uid=double,ou=acsadmins,dc=am,dc=echt,dc=net
+uniqueMember: uid=noadmin,ou=acsadmins,dc=am,dc=echt,dc=net
+
+dn: uid=double,ou=acsadmins,dc=am,dc=echt,dc=net
+objectClass: iplanet-am-user-service
+objectClass: person
+objectClass: organizationalPerson
+objectClass: sunAMAuthAccountLockout
+objectClass: iPlanetPreferences
+objectClass: top
+objectClass: sunIdentityServerLibertyPPService
+objectClass: sunFMSAML2NameIdentifier
+objectClass: forgerock-am-dashboard-service
+objectClass: inetOrgPerson
+objectClass: sunFederationManagerDataStore
+objectClass: devicePrintProfilesContainer
+objectClass: iplanet-am-auth-configuration-service
+objectClass: iplanet-am-managed-person
+objectClass: inetuser
+cn: demo
+sn: User
+givenName: demo
+inetUserStatus: Active
+mail: d@b.c
+uid: double
+
+dn: uid=noadmin,ou=acsadmins,dc=am,dc=echt,dc=net
+objectClass: iplanet-am-user-service
+objectClass: person
+objectClass: organizationalPerson
+objectClass: sunAMAuthAccountLockout
+objectClass: iPlanetPreferences
+objectClass: top
+objectClass: sunIdentityServerLibertyPPService
+objectClass: sunFMSAML2NameIdentifier
+objectClass: forgerock-am-dashboard-service
+objectClass: inetOrgPerson
+objectClass: sunFederationManagerDataStore
+objectClass: devicePrintProfilesContainer
+objectClass: iplanet-am-auth-configuration-service
+objectClass: iplanet-am-managed-person
+objectClass: inetuser
+cn: demo
+sn: User
+givenName: demo
+inetUserStatus: Active
+mail: d@b.c
+uid: noadmin
+
diff --git a/plugins/user-authenticators/ldap/src/test/resources/testContext.xml b/plugins/user-authenticators/ldap/src/test/resources/testContext.xml
new file mode 100644
index 0000000..357a14f
--- /dev/null
+++ b/plugins/user-authenticators/ldap/src/test/resources/testContext.xml
@@ -0,0 +1,37 @@
+<!--
+ 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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+ <bean id="LdapAuthenticator" class="org.apache.cloudstack.ldap.LdapAuthenticator">
+ <property name="name" value="LDAP" />
+ </bean>
+
+ <bean id="LdapManager" class="org.apache.cloudstack.ldap.LdapManagerImpl" />
+ <bean id="LdapUserManagerFactory" class="org.apache.cloudstack.ldap.LdapUserManagerFactory" />
+ <bean id="LdapContextFactory" class="org.apache.cloudstack.ldap.LdapContextFactory" />
+ <bean id="LdapConfigurationDao"
+ class="org.apache.cloudstack.ldap.dao.LdapConfigurationDaoImpl" />
+ <bean id="LdapConfiguration" class="org.apache.cloudstack.ldap.LdapConfiguration" />
+ <bean id="LdapTrustMapDao" class="org.apache.cloudstack.ldap.dao.LdapTrustMapDaoImpl" />
+
+</beans>
diff --git a/plugins/user-authenticators/ldap/src/test/resources/unboundid.ldif b/plugins/user-authenticators/ldap/src/test/resources/unboundid.ldif
new file mode 100644
index 0000000..4078372
--- /dev/null
+++ b/plugins/user-authenticators/ldap/src/test/resources/unboundid.ldif
@@ -0,0 +1,311 @@
+# 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.
+version: 1
+
+dn: dc=cloudstack,dc=org
+objectClass: dcObject
+objectClass: organization
+dc: cloudstack
+o: cloudstack
+
+dn: cn=Ryan Murphy,dc=cloudstack,dc=org
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: Ryan Murphy
+sn: Murphy
+givenName: Ryan
+mail: rmurphy@cloudstack.org
+uid: rmurphy
+userpassword:: cGFzc3dvcmQ=
+
+dn: cn=Barbara Brewer,dc=cloudstack,dc=org
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: Barbara Brewer
+sn: Brewer
+mail: bbrewer@cloudstack.org
+uid: bbrewer
+userpassword:: cGFzc3dvcmQ=
+
+dn: cn=Zak Wilkinson,dc=cloudstack,dc=org
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: Zak Wilkinson
+givenname: Zak
+sn: Wilkinson
+uid: zwilkinson
+userpassword:: cGFzc3dvcmQ=
+
+dn: cn=Archie Shingleton,dc=cloudstack,dc=org
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: Archie Shingleton
+sn: Shingleton
+givenName: Archie
+mail: ashingleton@cloudstack.org
+uid: ashingleton
+userpassword:: cGFzc3dvcmQ=
+
+dn: cn=Cletus Pears,dc=cloudstack,dc=org
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: Cletus Pears
+sn: Pears
+givenName: Cletus
+mail: cpears@cloudstack.org
+uid: cpears
+userpassword:: cGFzc3dvcmQ=
+
+dn: cn=Teisha Milewski,dc=cloudstack,dc=org
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: Teisha Milewski
+sn: Milewski
+givenName: Teisha
+mail: tmilewski@cloudstack.org
+uid: tmilewski
+userpassword:: cGFzc3dvcmQ=
+
+dn: cn=Eloy Para,dc=cloudstack,dc=org
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: Eloy Para
+sn: Para
+givenName: Eloy
+mail: epara@cloudstack.org
+uid: epara
+userpassword:: cGFzc3dvcmQ=
+
+dn: cn=Elaine Lamb,dc=cloudstack,dc=org
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: Elaine Lamb
+sn: Lamb
+givenName: Elaine
+mail: elamb@cloudstack.org
+uid: elamb
+userpassword:: cGFzc3dvcmQ=
+
+dn: cn=Soon Griffen,dc=cloudstack,dc=org
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: Soon Griffen
+sn: Griffen
+givenName: Soon
+mail: sgriffen@cloudstack.org
+uid: sgriffen
+userpassword:: cGFzc3dvcmQ=
+
+dn: cn=Tran Neisler,dc=cloudstack,dc=org
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: Tran Neisler
+sn: Neisler
+givenName: Tran
+mail: tneisler@cloudstack.org
+uid: tneisler
+userpassword:: cGFzc3dvcmQ=
+
+dn: cn=Mirella Zeck,dc=cloudstack,dc=org
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: Mirella Zeck
+sn: Zeck
+givenName: Mirella
+mail: mzeck@cloudstack.org
+uid: mzeck
+userpassword:: cGFzc3dvcmQ=
+
+dn: cn=Greg Hoskin,dc=cloudstack,dc=org
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: Greg Hoskin
+sn: Hoskin
+givenName: Greg
+mail: ghoskin@cloudstack.org
+uid: ghoskin
+userpassword:: cGFzc3dvcmQ=
+
+dn: cn=Johanne Runyon,dc=cloudstack,dc=org
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: Johanne Runyon
+sn: Runyon
+givenName: Johanne
+mail: jrunyon@cloudstack.org
+uid: jrunyon
+userpassword:: cGFzc3dvcmQ=
+
+dn: cn=Mabelle Waiters,dc=cloudstack,dc=org
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: Mabelle Waiters
+sn: Waiters
+givenName: Mabelle
+mail: mwaiters@cloudstack.org
+uid: mwaiters
+userpassword:: cGFzc3dvcmQ=
+
+dn: cn=Phillip Fruge,dc=cloudstack,dc=org
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: Phillip Fruge
+sn: Fruge
+givenName: Phillip
+mail: pfruge@cloudstack.org
+uid: pfruge
+userpassword:: cGFzc3dvcmQ=
+
+dn: cn=Jayna Ridenhour,dc=cloudstack,dc=org
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: Jayna Ridenhour
+sn: Ridenhour
+givenName: Jayna
+mail: jridenhour@cloudstack.org
+uid: jridenhour
+userpassword:: cGFzc3dvcmQ=
+
+dn: cn=Marlyn Mandujano,dc=cloudstack,dc=org
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: Marlyn Mandujano
+sn: Mandujano
+givenName: Marlyn
+mail: mmandujano@cloudstack.org
+uid: mmandujano
+userpassword:: cGFzc3dvcmQ=
+
+dn: cn=Shaunna Scherer,dc=cloudstack,dc=org
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: Shaunna Scherer
+sn: Scherer
+givenName: Shaunna
+mail: sscherer@cloudstack.org
+uid: sscherer
+userpassword:: cGFzc3dvcmQ=
+
+dn: cn=Adriana Bozek,dc=cloudstack,dc=org
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: Adriana Bozek
+sn: Bozek
+givenName: Adriana
+mail: abozek@cloudstack.org
+uid: abozek
+userpassword:: cGFzc3dvcmQ=
+
+dn: cn=Silvana Chipman,dc=cloudstack,dc=org
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: Silvana Chipman
+sn: Chipman
+givenName: Silvana
+mail: schipman@cloudstack.org
+uid: schipman
+userpassword:: cGFzc3dvcmQ=
+
+dn: cn=Marion Wasden,dc=cloudstack,dc=org
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: Marion Wasden
+sn: Wasden
+givenName: Marion
+mail: mwasden@cloudstack.org
+uid: mwasden
+userpassword:: cGFzc3dvcmQ=
+
+dn: cn=Anisa Casson,dc=cloudstack,dc=org
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: Anisa Casson
+sn: Casson
+givenName: Anisa
+mail: acasson@cloudstack.org
+uid: acasson
+userpassword:: cGFzc3dvcmQ=
+
+dn: cn=Noel King,dc=cloudstack,dc=org
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: Noel King
+sn: King
+givenName: Noel
+mail: nking@cloudstack.org
+uid: nking
+userpassword:: cGFzc3dvcmQ=
+
+
+dn: cn=Cammy Petri,dc=cloudstack,dc=org
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+cn: Cammy Petri
+sn: Petri
+givenName: Cammy
+mail: cpetri@cloudstack.org
+uid: cpetri
+userpassword:: cGFzc3dvcmQ=
+
diff --git a/plugins/user-authenticators/md5/pom.xml b/plugins/user-authenticators/md5/pom.xml
index 14ca571..f95bbef 100644
--- a/plugins/user-authenticators/md5/pom.xml
+++ b/plugins/user-authenticators/md5/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/user-authenticators/pbkdf2/pom.xml b/plugins/user-authenticators/pbkdf2/pom.xml
index aa81dbf..fe95467 100644
--- a/plugins/user-authenticators/pbkdf2/pom.xml
+++ b/plugins/user-authenticators/pbkdf2/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/user-authenticators/plain-text/pom.xml b/plugins/user-authenticators/plain-text/pom.xml
index 50f11c0..339d24c 100644
--- a/plugins/user-authenticators/plain-text/pom.xml
+++ b/plugins/user-authenticators/plain-text/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/plugins/user-authenticators/saml2/pom.xml b/plugins/user-authenticators/saml2/pom.xml
index cff07ce..103f832 100644
--- a/plugins/user-authenticators/saml2/pom.xml
+++ b/plugins/user-authenticators/saml2/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/SAML2AuthManagerImplTest.java b/plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/SAML2AuthManagerImplTest.java
index b06a137..94bf3f0 100644
--- a/plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/SAML2AuthManagerImplTest.java
+++ b/plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/SAML2AuthManagerImplTest.java
@@ -19,11 +19,8 @@
package org.apache.cloudstack;
-import com.cloud.user.DomainManager;
-import com.cloud.user.User;
-import com.cloud.user.UserVO;
-import com.cloud.user.dao.UserDao;
-import junit.framework.TestCase;
+import java.lang.reflect.Field;
+
import org.apache.cloudstack.framework.security.keystore.KeystoreDao;
import org.apache.cloudstack.saml.SAML2AuthManagerImpl;
import org.apache.cloudstack.saml.SAMLTokenDao;
@@ -35,7 +32,12 @@
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
-import java.lang.reflect.Field;
+import com.cloud.user.DomainManager;
+import com.cloud.user.User;
+import com.cloud.user.UserVO;
+import com.cloud.user.dao.UserDao;
+
+import junit.framework.TestCase;
@RunWith(MockitoJUnitRunner.class)
public class SAML2AuthManagerImplTest extends TestCase {
@@ -164,7 +166,7 @@
assertTrue(saml2AuthManager.getCommands().size() == 0);
assertTrue(saml2AuthManager.getAuthCommands().size() == 0);
// Re-enable the plugin
- Mockito.doReturn(true).when(saml2AuthManager).isSAMLPluginEnabled();
+ Mockito.lenient().doReturn(true).when(saml2AuthManager).isSAMLPluginEnabled();
}
@Test
diff --git a/plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/SAML2UserAuthenticatorTest.java b/plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/SAML2UserAuthenticatorTest.java
index 5b37388..c0f61d7 100644
--- a/plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/SAML2UserAuthenticatorTest.java
+++ b/plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/SAML2UserAuthenticatorTest.java
@@ -19,24 +19,25 @@
package org.apache.cloudstack;
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.cloudstack.saml.SAML2UserAuthenticator;
+import org.apache.cloudstack.saml.SAMLPluginConstants;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+
import com.cloud.server.auth.UserAuthenticator.ActionOnFailedAuthentication;
import com.cloud.user.UserAccountVO;
import com.cloud.user.UserVO;
import com.cloud.user.dao.UserAccountDao;
import com.cloud.user.dao.UserDao;
import com.cloud.utils.Pair;
-import org.apache.cloudstack.saml.SAMLPluginConstants;
-import org.apache.cloudstack.saml.SAML2UserAuthenticator;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
-
-import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.Map;
@RunWith(MockitoJUnitRunner.class)
public class SAML2UserAuthenticatorTest {
@@ -69,7 +70,7 @@
UserVO user = new UserVO();
Mockito.when(userAccountDao.getUserAccount(Mockito.anyString(), Mockito.anyLong())).thenReturn(account);
- Mockito.when(userDao.getUser(Mockito.anyLong())).thenReturn(user);
+ Mockito.lenient().when(userDao.getUser(Mockito.anyLong())).thenReturn(user);
Pair<Boolean, ActionOnFailedAuthentication> pair;
Map<String, Object[]> params = new HashMap<String, Object[]>();
diff --git a/plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmdTest.java b/plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmdTest.java
index 8985a0f..5c902b2 100644
--- a/plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmdTest.java
+++ b/plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/api/command/ListAndSwitchSAMLAccountCmdTest.java
@@ -19,17 +19,18 @@
package org.apache.cloudstack.api.command;
-import com.cloud.domain.DomainVO;
-import com.cloud.domain.dao.DomainDao;
-import com.cloud.user.Account;
-import com.cloud.user.AccountService;
-import com.cloud.user.User;
-import com.cloud.user.UserAccountVO;
-import com.cloud.user.UserVO;
-import com.cloud.user.dao.UserAccountDao;
-import com.cloud.user.dao.UserDao;
-import com.cloud.utils.HttpUtils;
-import junit.framework.TestCase;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.nullable;
+
+import java.lang.reflect.Field;
+import java.net.InetAddress;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.ApiServerService;
@@ -45,13 +46,18 @@
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.lang.reflect.Field;
-import java.net.InetAddress;
-import java.util.HashMap;
-import java.util.Map;
+import com.cloud.domain.DomainVO;
+import com.cloud.domain.dao.DomainDao;
+import com.cloud.user.Account;
+import com.cloud.user.AccountService;
+import com.cloud.user.User;
+import com.cloud.user.UserAccountVO;
+import com.cloud.user.UserVO;
+import com.cloud.user.dao.UserAccountDao;
+import com.cloud.user.dao.UserDao;
+import com.cloud.utils.HttpUtils;
+
+import junit.framework.TestCase;
@RunWith(MockitoJUnitRunner.class)
public class ListAndSwitchSAMLAccountCmdTest extends TestCase {
@@ -91,8 +97,8 @@
Mockito.when(session.getAttribute("userid")).thenReturn(2L);
params.put(ApiConstants.USER_ID, new String[]{"2"});
params.put(ApiConstants.DOMAIN_ID, new String[]{"1"});
- Mockito.when(userDao.findByUuid(Mockito.anyString())).thenReturn(new UserVO(2L));
- Mockito.when(domainDao.findByUuid(Mockito.anyString())).thenReturn(new DomainVO());
+ Mockito.when(userDao.findByUuid(anyString())).thenReturn(new UserVO(2L));
+ Mockito.when(domainDao.findByUuid(anyString())).thenReturn(new DomainVO());
// Mock/field setup
ListAndSwitchSAMLAccountCmd cmd = new ListAndSwitchSAMLAccountCmd();
@@ -181,8 +187,9 @@
loginCmdResponse.setFirstName("firstName");
loginCmdResponse.setLastName("lastName");
loginCmdResponse.setSessionKey("newSessionKeyString");
- Mockito.when(apiServer.loginUser(Mockito.any(HttpSession.class), Mockito.anyString(), Mockito.anyString(),
- Mockito.anyLong(), Mockito.anyString(), Mockito.any(InetAddress.class), Mockito.anyMap())).thenReturn(loginCmdResponse);
+ Mockito.when(apiServer.loginUser(nullable(HttpSession.class), nullable(String.class), nullable(String.class),
+ nullable(Long.class), nullable(String.class), nullable(InetAddress.class), nullable(Map.class))).thenReturn(loginCmdResponse);
+ Mockito.doNothing().when(resp).sendRedirect(nullable(String.class));
try {
cmd.authenticate("command", params, session, null, HttpUtils.RESPONSE_TYPE_JSON, new StringBuilder(), req, resp);
} catch (ServerApiException exception) {
@@ -190,7 +197,7 @@
} finally {
// accountService should have been called 4 times by now, for this case twice and 2 for cases above
Mockito.verify(accountService, Mockito.times(4)).getUserAccountById(Mockito.anyLong());
- Mockito.verify(resp, Mockito.times(1)).sendRedirect(Mockito.anyString());
+ Mockito.verify(resp, Mockito.times(1)).sendRedirect(anyString());
}
}
diff --git a/plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmdTest.java b/plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmdTest.java
index cc45cbb..39c8c23 100644
--- a/plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmdTest.java
+++ b/plugins/user-authenticators/saml2/src/test/java/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmdTest.java
@@ -20,6 +20,7 @@
package org.apache.cloudstack.api.command;
import static org.junit.Assert.assertFalse;
+import static org.mockito.ArgumentMatchers.nullable;
import java.io.IOException;
import java.lang.reflect.Field;
@@ -51,7 +52,7 @@
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.Spy;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import org.opensaml.common.SAMLVersion;
import org.opensaml.saml2.core.Assertion;
import org.opensaml.saml2.core.AttributeStatement;
@@ -178,16 +179,16 @@
providerMetadata.setSsoUrl("http://test.local");
providerMetadata.setSloUrl("http://test.local");
- Mockito.when(session.getAttribute(Mockito.anyString())).thenReturn(null);
+ Mockito.lenient().when(session.getAttribute(Mockito.anyString())).thenReturn(null);
- Mockito.when(domain.getId()).thenReturn(1L);
- Mockito.when(domainMgr.getDomain(Mockito.anyString())).thenReturn(domain);
+ Mockito.lenient().when(domain.getId()).thenReturn(1L);
+ Mockito.lenient().when(domainMgr.getDomain(Mockito.anyString())).thenReturn(domain);
UserAccountVO user = new UserAccountVO();
user.setId(1000L);
- Mockito.when(userAccountDao.getUserAccount(Mockito.anyString(), Mockito.anyLong())).thenReturn(user);
- Mockito.when(apiServer.verifyUser(Mockito.anyLong())).thenReturn(false);
+ Mockito.lenient().when(userAccountDao.getUserAccount(Mockito.anyString(), Mockito.anyLong())).thenReturn(user);
+ Mockito.lenient().when(apiServer.verifyUser(nullable(Long.class))).thenReturn(false);
Mockito.when(samlAuthManager.getSPMetadata()).thenReturn(providerMetadata);
- Mockito.when(samlAuthManager.getIdPMetadata(Mockito.anyString())).thenReturn(providerMetadata);
+ Mockito.when(samlAuthManager.getIdPMetadata(nullable(String.class))).thenReturn(providerMetadata);
Map<String, Object[]> params = new HashMap<String, Object[]>();
@@ -197,7 +198,7 @@
// SSO SAMLResponse verification test, this should throw ServerApiException for auth failure
params.put(SAMLPluginConstants.SAML_RESPONSE, new String[]{"Some String"});
- Mockito.stub(cmd.processSAMLResponse(Mockito.anyString())).toReturn(buildMockResponse());
+ Mockito.when(cmd.processSAMLResponse(Mockito.anyString())).thenReturn(buildMockResponse());
boolean failing = true;
try {
cmd.authenticate("command", params, session, InetAddress.getByName("127.0.0.1"), HttpUtils.RESPONSE_TYPE_JSON, new StringBuilder(), req, resp);
@@ -272,7 +273,7 @@
private UserAccountVO configureTestWhenFailToAuthenticateThrowExceptionOrRedirectToUrl(String entity, String configurationValue, Boolean isUserAuthorized)
throws IOException {
- Mockito.when(samlAuthManager.isUserAuthorized(Mockito.anyLong(), Mockito.anyString())).thenReturn(isUserAuthorized);
+ Mockito.when(samlAuthManager.isUserAuthorized(nullable(Long.class), nullable(String.class))).thenReturn(isUserAuthorized);
SAML2LoginAPIAuthenticatorCmd.saml2FailedLoginRedirectUrl = new ConfigKey<String>("Advanced", String.class, "saml2.failed.login.redirect.url", configurationValue,
"The URL to redirect the SAML2 login failed message (the default vaulue is empty).", true);
UserAccountVO userAccount = new UserAccountVO();
diff --git a/plugins/user-authenticators/sha256salted/pom.xml b/plugins/user-authenticators/sha256salted/pom.xml
index f97da63..6f89254 100644
--- a/plugins/user-authenticators/sha256salted/pom.xml
+++ b/plugins/user-authenticators/sha256salted/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
diff --git a/pom.xml b/pom.xml
index c38b840..7bc6396 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache CloudStack</name>
<description>Apache CloudStack is an IaaS ("Infrastructure as a Service") cloud orchestration platform.</description>
@@ -51,26 +51,29 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- Build properties -->
- <cs.jdk.version>1.8</cs.jdk.version>
+ <cs.jdk.version>11</cs.jdk.version>
<cs.target.dir>target</cs.target.dir>
<cs.replace.properties>build/replace.properties</cs.replace.properties>
<!-- Plugins versions -->
<cs.antrun-plugin.version>1.8</cs.antrun-plugin.version>
<cs.builder-helper-plugin.version>3.0.0</cs.builder-helper-plugin.version>
- <cs.checkstyle-plugin.version>3.0.0</cs.checkstyle-plugin.version>
- <cs.cobertura-plugin.version>2.7</cs.cobertura-plugin.version>
- <cs.compiler-plugin.version>3.7.0</cs.compiler-plugin.version>
- <cs.dependency-plugin.version>3.1.0</cs.dependency-plugin.version>
- <cs.failsafe-plugin.version>2.21.0</cs.failsafe-plugin.version>
- <cs.findbugs-plugin.version>3.0.5</cs.findbugs-plugin.version>
- <cs.jar-plugin.version>3.1.0</cs.jar-plugin.version>
- <cs.pmd-plugin.version>3.9.0</cs.pmd-plugin.version>
- <cs.project-info-plugin.version>2.9</cs.project-info-plugin.version>
+ <cs.checkstyle-plugin.version>3.1.0</cs.checkstyle-plugin.version>
+ <cs.jacoco-plugin.version>0.8.3</cs.jacoco-plugin.version>
+ <cs.compiler-plugin.version>3.8.1</cs.compiler-plugin.version>
+ <cs.dependency-plugin.version>3.1.1</cs.dependency-plugin.version>
+ <cs.failsafe-plugin.version>2.22.2</cs.failsafe-plugin.version>
+ <cs.spotbugs.version>3.1.12</cs.spotbugs.version>
+ <cs.spotbugs-maven-plugin.version>3.1.12.2</cs.spotbugs-maven-plugin.version>
+ <cs.jar-plugin.version>3.2.0</cs.jar-plugin.version>
+ <cs.pmd-plugin.version>3.12.0</cs.pmd-plugin.version>
+ <cs.project-info-plugin.version>3.0.0</cs.project-info-plugin.version>
+ <cs.owasp.dependency-checker-plugin.version>5.3.0</cs.owasp.dependency-checker-plugin.version>
<cs.release-plugin.version>2.5.3</cs.release-plugin.version>
<cs.resources-plugin.version>3.1.0</cs.resources-plugin.version>
- <cs.site-plugin.version>3.7.1</cs.site-plugin.version>
- <cs.surefire-plugin.version>2.21.0</cs.surefire-plugin.version>
+ <cs.site-plugin.version>3.8.2</cs.site-plugin.version>
+ <cs.surefire-plugin.version>2.22.2</cs.surefire-plugin.version>
+ <cs.clover-maven-plugin.version>4.4.1</cs.clover-maven-plugin.version>
<!-- Logging versions -->
<cs.log4j.version>1.2.17</cs.log4j.version>
@@ -78,101 +81,102 @@
<cs.logging.version>1.1.1</cs.logging.version>
<!-- Apache Commons versions -->
- <cs.codec.version>1.11</cs.codec.version>
- <cs.commons-collections.version>4.1</cs.commons-collections.version>
- <cs.commons-compress.version>1.15</cs.commons-compress.version>
+ <cs.codec.version>1.14</cs.codec.version>
+ <cs.commons-collections.version>4.4</cs.commons-collections.version>
+ <cs.commons-compress.version>1.19</cs.commons-compress.version>
<cs.commons-exec.version>1.3</cs.commons-exec.version>
- <cs.commons-fileupload.version>1.3.3</cs.commons-fileupload.version>
+ <cs.commons-fileupload.version>1.4</cs.commons-fileupload.version>
<cs.commons-httpclient.version>3.1</cs.commons-httpclient.version>
<cs.commons-io.version>2.6</cs.commons-io.version>
- <cs.commons-lang3.version>3.6</cs.commons-lang3.version>
+ <cs.commons-lang3.version>3.9</cs.commons-lang3.version>
+ <cs.commons-logging.version>1.2</cs.commons-logging.version>
<cs.commons-net.version>3.6</cs.commons-net.version>
<cs.commons-validator.version>1.6</cs.commons-validator.version>
<cs.configuration.version>1.10</cs.configuration.version>
- <cs.daemon.version>1.1.0</cs.daemon.version>
- <cs.dbcp.version>2.2.0</cs.dbcp.version>
+ <cs.daemon.version>1.2.2</cs.daemon.version>
+ <cs.dbcp.version>2.7.0</cs.dbcp.version>
<cs.discovery.version>0.5</cs.discovery.version>
<cs.lang.version>2.6</cs.lang.version>
- <cs.pool.version>2.4.3</cs.pool.version>
+ <cs.pool.version>2.7.0</cs.pool.version>
<!-- Testing versions -->
<!-- do not forget to also upgrade hamcrest library with junit -->
<cs.dbunit.version>2.5.4</cs.dbunit.version>
<cs.hamcrest.version>1.3</cs.hamcrest.version>
- <cs.junit.version>4.12</cs.junit.version>
+ <cs.junit.version>4.13</cs.junit.version>
<cs.junit.dataprovider.version>1.13.1</cs.junit.dataprovider.version>
<cs.guava-testlib.version>18.0</cs.guava-testlib.version>
- <cs.mockito.version>1.10.19</cs.mockito.version>
- <cs.powermock.version>1.6.4</cs.powermock.version>
+ <cs.mockito.version>3.2.4</cs.mockito.version>
+ <cs.powermock.version>2.0.5</cs.powermock.version>
<cs.selenium.server.version>1.0-20081010.060147</cs.selenium.server.version>
<cs.selenium-java-client-driver.version>1.0.1</cs.selenium-java-client-driver.version>
- <cs.testng.version>6.1.1</cs.testng.version>
+ <cs.testng.version>7.1.0</cs.testng.version>
<cs.wiremock.version>2.11.0</cs.wiremock.version>
- <cs.xercesImpl.version>2.11.0</cs.xercesImpl.version>
+ <cs.xercesImpl.version>2.12.0</cs.xercesImpl.version>
<!-- Dependencies versions -->
- <cs.amqp-client.version>5.1.1</cs.amqp-client.version>
+ <cs.amqp-client.version>5.8.0</cs.amqp-client.version>
<cs.apache-cloudstack-java-client.version>1.0.9</cs.apache-cloudstack-java-client.version>
- <cs.aspectjrt.version>1.7.1</cs.aspectjrt.version>
- <cs.aws.sdk.version>1.11.213</cs.aws.sdk.version>
+ <cs.aspectjrt.version>1.9.5</cs.aspectjrt.version>
+ <cs.aws.sdk.version>1.11.717</cs.aws.sdk.version>
<cs.axiom.version>1.2.8</cs.axiom.version>
<cs.axis.version>1.4</cs.axis.version>
- <cs.axis2.version>1.5.6</cs.axis2.version>
- <cs.batik.version>1.9.1</cs.batik.version>
- <cs.bcprov.version>1.59</cs.bcprov.version>
- <cs.cglib.version>3.2.5</cs.cglib.version>
- <cs.checkstyle-lib.version>8.7</cs.checkstyle-lib.version>
- <cs.cxf.version>3.2.0</cs.cxf.version>
+ <cs.batik.version>1.12</cs.batik.version>
+ <cs.bcprov.version>1.64</cs.bcprov.version>
+ <cs.cglib.version>3.3.0</cs.cglib.version>
+ <cs.checkstyle-lib.version>8.18</cs.checkstyle-lib.version>
+ <cs.cxf.version>3.2.6</cs.cxf.version>
<cs.ehcache.version>2.6.11</cs.ehcache.version>
- <cs.globodns-client.version>0.0.23</cs.globodns-client.version>
- <cs.groovy.version>2.4.12</cs.groovy.version>
+ <cs.globodns-client.version>0.0.27</cs.globodns-client.version>
+ <cs.google-http-client>1.34.2</cs.google-http-client>
+ <cs.groovy.version>2.4.17</cs.groovy.version>
<cs.gson.version>1.7.2</cs.gson.version>
- <cs.guava.version>23.6-jre</cs.guava.version>
- <cs.httpclient.version>4.5.4</cs.httpclient.version>
- <cs.httpcore.version>4.4.8</cs.httpcore.version>
- <cs.influxdb-java.version>2.15</cs.influxdb-java.version>
- <cs.jackson.version>2.9.2</cs.jackson.version>
- <cs.jasypt.version>1.9.2</cs.jasypt.version>
- <cs.java-ipv6.version>0.16</cs.java-ipv6.version>
- <cs.javassist.version>3.22.0-GA</cs.javassist.version>
- <cs.javadoc.version>2.10.3</cs.javadoc.version>
+ <cs.guava.version>28.2-jre</cs.guava.version>
+ <cs.httpclient.version>4.5.11</cs.httpclient.version>
+ <cs.httpcore.version>4.4.13</cs.httpcore.version>
+ <cs.influxdb-java.version>2.17</cs.influxdb-java.version>
+ <cs.jackson.version>2.10.3</cs.jackson.version>
+ <cs.jasypt.version>1.9.3</cs.jasypt.version>
+ <cs.java-ipv6.version>0.17</cs.java-ipv6.version>
+ <cs.javassist.version>3.26.0-GA</cs.javassist.version>
+ <cs.maven-javadoc-plugin.version>3.1.1</cs.maven-javadoc-plugin.version>
+ <cs.javax.annotation.version>1.3.2</cs.javax.annotation.version>
+ <cs.jaxb.version>2.3.0</cs.jaxb.version>
+ <cs.jaxws.version>2.3.2-1</cs.jaxws.version>
<cs.jersey-bundle.version>1.19.4</cs.jersey-bundle.version>
- <cs.jetty.version>9.4.8.v20171121</cs.jetty.version>
- <cs.jetty-maven-plugin.version>9.2.22.v20170606</cs.jetty-maven-plugin.version>
+ <cs.jetty.version>9.4.26.v20200117</cs.jetty.version>
+ <cs.jetty-maven-plugin.version>9.4.26.v20200117</cs.jetty-maven-plugin.version>
<cs.jna.version>4.0.0</cs.jna.version>
- <cs.joda-time.version>2.8.1</cs.joda-time.version>
- <cs.jpa.version>2.2.0</cs.jpa.version>
- <cs.jsch.version>0.1.54</cs.jsch.version>
+ <cs.joda-time.version>2.10.5</cs.joda-time.version>
+ <cs.jpa.version>2.2.1</cs.jpa.version>
+ <cs.jsch.version>0.1.55</cs.jsch.version>
<cs.json.version>20090211</cs.json.version>
<cs.jstl.version>1.2</cs.jstl.version>
- <cs.jstl-api.version>1.2.1</cs.jstl-api.version>
- <cs.kafka-clients.version>0.11.0.1</cs.kafka-clients.version>
+ <cs.kafka-clients.version>0.11.0.3</cs.kafka-clients.version>
<cs.libvirt-java.version>0.5.1</cs.libvirt-java.version>
<cs.mail.version>1.5.0-b01</cs.mail.version>
- <cs.mysql.version>5.1.34</cs.mysql.version>
+ <cs.mysql.version>8.0.19</cs.mysql.version>
<cs.neethi.version>2.0.4</cs.neethi.version>
<cs.nitro.version>10.1</cs.nitro.version>
<cs.opensaml.version>2.6.4</cs.opensaml.version>
<cs.rados-java.version>0.5.0</cs.rados-java.version>
- <cs.rampart.version>1.5.1</cs.rampart.version>
- <cs.reflections.version>0.9.11</cs.reflections.version>
- <cs.servicemix.version>2.5.8_1</cs.servicemix.version>
- <cs.servlet.version>4.0.0</cs.servlet.version>
- <cs.tomcat-embed-core.version>8.0.30</cs.tomcat-embed-core.version>
- <cs.trilead.version>1.0.0-build221</cs.trilead.version>
+ <cs.reflections.version>0.9.12</cs.reflections.version>
+ <cs.servicemix.version>3.3.3_1</cs.servicemix.version>
+ <cs.servlet.version>4.0.1</cs.servlet.version>
+ <cs.tomcat-embed-core.version>8.5.47</cs.tomcat-embed-core.version>
+ <cs.trilead.version>1.0.0-build222</cs.trilead.version>
<cs.vmware.api.version>6.7</cs.vmware.api.version>
+ <cs.winrm4j.version>0.5.0</cs.winrm4j.version>
<cs.xapi.version>6.2.0-3.1</cs.xapi.version>
- <cs.xml-apis.version>1.4.01</cs.xml-apis.version>
<cs.xmlrpc.version>3.1.3</cs.xmlrpc.version>
- <cs.xstream.version>1.4.10</cs.xstream.version>
- <cs.slf4j.version>1.7.22</cs.slf4j.version>
- <org.springframework.version>5.0.2.RELEASE</org.springframework.version>
+ <cs.xstream.version>1.4.11.1</cs.xstream.version>
+ <cs.slf4j.version>1.7.29</cs.slf4j.version>
+ <org.springframework.version>5.2.3.RELEASE</org.springframework.version>
</properties>
<distributionManagement>
<site>
<id>apache.cloudstack.site</id>
- <url>${site.deploy.url}</url>
</site>
</distributionManagement>
@@ -279,6 +283,12 @@
<version>${cs.aws.sdk.version}</version>
</dependency>
<dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${cs.jackson.version}</version>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
<groupId>com.globo.globodns</groupId>
<artifactId>globodns-client</artifactId>
<version>${cs.globodns-client.version}</version>
@@ -294,6 +304,11 @@
<version>${cs.guava.version}</version>
</dependency>
<dependency>
+ <groupId>com.google.http-client</groupId>
+ <artifactId>google-http-client</artifactId>
+ <version>${cs.google-http-client}</version>
+ </dependency>
+ <dependency>
<groupId>com.googlecode.java-ipv6</groupId>
<artifactId>java-ipv6</artifactId>
<version>${cs.java-ipv6.version}</version>
@@ -370,6 +385,11 @@
<version>${cs.lang.version}</version>
</dependency>
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${cs.commons-logging.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>${cs.commons-net.version}</version>
@@ -385,6 +405,11 @@
<version>${cs.commons-validator.version}</version>
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${cs.javax.annotation.version}</version>
+ </dependency>
+ <dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>${cs.mail.version}</version>
@@ -395,6 +420,11 @@
<version>${cs.servlet.version}</version>
</dependency>
<dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>${cs.joda-time.version}</version>
+ </dependency>
+ <dependency>
<groupId>jstl</groupId>
<artifactId>jstl</artifactId>
<version>${cs.jstl.version}</version>
@@ -419,7 +449,7 @@
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${cs.mysql.version}</version>
- <scope>provided,test</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
@@ -472,6 +502,11 @@
<version>${cs.kafka-clients.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-site-renderer</artifactId>
+ <version>1.9.1</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.snmp4j</artifactId>
<version>${cs.servicemix.version}</version>
@@ -632,6 +667,16 @@
<artifactId>wsdl4j</artifactId>
<version>1.6.3</version>
</dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesimpl</artifactId>
+ <version>2.12.0</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>2.0.2</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -645,7 +690,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<version>${cs.mockito.version}</version>
<scope>test</scope>
<exclusions>
@@ -675,12 +720,19 @@
</dependency>
<dependency>
<groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
+ <artifactId>powermock-core</artifactId>
<version>${cs.powermock.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <version>${cs.powermock.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito2</artifactId>
<version>${cs.powermock.version}</version>
<scope>test</scope>
</dependency>
@@ -712,11 +764,12 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ <version>${cs.spotbugs-maven-plugin.version}</version>
<executions>
<execution>
- <id>cloudstack-findbugs</id>
+ <id>cloudstack-spotbugs</id>
<phase>none</phase>
<goals>
<goal>check</goal>
@@ -1002,7 +1055,12 @@
<fork>true</fork>
<meminitial>128m</meminitial>
<maxmem>512m</maxmem>
- <compilerArgument>-XDignore.symbol.file=true</compilerArgument>
+ <compilerArgs>
+ <arg>-XDignore.symbol.file=true</arg>
+ <arg>--add-opens=java.base/java.lang=ALL-UNNAMED</arg>
+ <arg>--add-exports=java.base/sun.security.x509=ALL-UNNAMED</arg>
+ <arg>--add-exports=java.base/sun.security.provider=ALL-UNNAMED</arg>
+ </compilerArgs>
</configuration>
</plugin>
<plugin>
@@ -1041,19 +1099,9 @@
<version>${cs.dependency-plugin.version}</version>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <configuration>
- <formats>
- <format>html</format>
- <format>xml</format>
- </formats>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>${cs.findbugs-plugin.version}</version>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ <version>${cs.spotbugs-maven-plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.apache.cloudstack</groupId>
@@ -1067,11 +1115,10 @@
<xmlOutput>true</xmlOutput>
<failOnError>false</failOnError>
<maxHeap>2048</maxHeap>
- <excludeFilterFile>findbugsExcludeFilter.xml</excludeFilterFile>
</configuration>
<executions>
<execution>
- <id>cloudstack-findbugs</id>
+ <id>cloudstack-spotbugs</id>
<goals>
<goal>check</goal>
</goals>
@@ -1119,42 +1166,27 @@
<artifactId>maven-failsafe-plugin</artifactId>
<version>${cs.failsafe-plugin.version}</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>${cs.site-plugin.version}</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
<reporting>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>${cs.findbugs-plugin.version}</version>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ <version>${cs.spotbugs-maven-plugin.version}</version>
<configuration>
<threshold>Low</threshold><!-- High|Normal|Low|Exp|Ignore -->
<effort>Default</effort><!-- Min|Default|Max -->
- <excludeFilterFile>${basedir}/findbugsExcludeFilter.xml</excludeFilterFile>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${cs.javadoc.version}</version>
- <configuration>
- <minmemory>128m</minmemory>
- <maxmemory>1g</maxmemory>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>${cs.project-info-plugin.version}</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>${cs.cobertura-plugin.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>${cs.site-plugin.version}</version>
</plugin>
@@ -1215,6 +1247,125 @@
</modules>
</profile>
<profile>
+ <id>quality</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${cs.jacoco-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.openclover</groupId>
+ <artifactId>clover-maven-plugin</artifactId>
+ <version>${cs.clover-maven-plugin.version}</version>
+ <configuration>
+ <flushPolicy>threaded</flushPolicy>
+ <flushInterval>100</flushInterval>
+ <targetPercentage>0%</targetPercentage>
+ <generateHtml>true</generateHtml>
+ <generateXml>true</generateXml>
+ <generateHistorical>true</generateHistorical>
+ </configuration>
+ <executions>
+ <execution>
+ <id>main</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>instrument</goal>
+ <goal>aggregate</goal>
+ <goal>check</goal>
+ <goal>log</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>site</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>instrument</goal>
+ <goal>aggregate</goal>
+ <!-- We save a history point in order to have data to generate a historical report -->
+ <goal>save-history</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.owasp</groupId>
+ <artifactId>dependency-check-maven</artifactId>
+ <version>${cs.owasp.dependency-checker-plugin.version}</version>
+ <configuration>
+ <skipProvidedScope>true</skipProvidedScope>
+ <skipRuntimeScope>true</skipRuntimeScope>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${cs.jacoco-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>prepare-coverage-agent</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>produce-coverage-reports</id>
+ <phase>test</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.owasp</groupId>
+ <artifactId>dependency-check-maven</artifactId>
+ <version>${cs.owasp.dependency-checker-plugin.version}</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${cs.jacoco-plugin.version}</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <!-- select non-aggregate reports -->
+ <report>report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+ <profile>
<id>disablecheckstyle</id>
<build>
<plugins>
@@ -1236,21 +1387,26 @@
<id>enablefindbugs</id>
<build>
<plugins>
-<!-- <plugin> -->
-<!-- <groupId>org.apache.maven.plugins</groupId> -->
-<!-- <artifactId>maven-pmd-plugin</artifactId> -->
-<!-- </plugin> -->
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
<executions>
<execution>
- <id>cloudstack-findbugs</id>
+ <id>cloudstack-spotbugs</id>
<phase>process-classes</phase>
<inherited>true</inherited>
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.openclover</groupId>
+ <artifactId>clover-maven-plugin</artifactId>
+ <version>${cs.clover-maven-plugin.version}</version>
+ <configuration>
+ <generateHistorical>true</generateHistorical>
+ <generateHtml>true</generateHtml>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
diff --git a/quickcloud/pom.xml b/quickcloud/pom.xml
index e9ac0f2..3fb5519 100644
--- a/quickcloud/pom.xml
+++ b/quickcloud/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
</project>
diff --git a/scripts/storage/secondary/cloud-install-sys-tmplt b/scripts/storage/secondary/cloud-install-sys-tmplt
index 91b3a7c..cc44354 100755
--- a/scripts/storage/secondary/cloud-install-sys-tmplt
+++ b/scripts/storage/secondary/cloud-install-sys-tmplt
@@ -1,5 +1,4 @@
#!/bin/bash
-# $Id: installrtng.sh 11251 2010-07-23 23:40:44Z abhishek $ $HeadURL: svn://svn.lab.vmops.com/repos/vmdev/java/scripts/storage/secondary/installrtng.sh $
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -20,15 +19,30 @@
usage() {
- printf "Usage: %s: -m <secondary storage mount point> -f <system vm template file> [-h <hypervisor name: kvm|vmware|xenserver|hyperv|ovm3> ] [ -s <mgmt server secret key, if you specified any when running cloudstack-setup-database, default is password>][-u <Url to system vm template>] [-F <clean up system templates of specified hypervisor>] [-e <Template suffix, e.g vhd, ova, qcow2>] [-o <Database server hostname or ip, e.g localhost>] [-r <Database user name, e.g root>] [-p <mysql database port>] [-d <Database password. Fllowed by nothing if the password is empty>]\n" $(basename $0) >&2
- printf "or\n" >&2
- printf "%s: -m <secondary storage mount point> -u <http url for system vm template> [-h <hypervisor name: kvm|vmware|xenserver|hyperv|ovm3> ] [ -s <mgmt server secret key>]\n" $(basename $0) >&2
+ printf "\nUsage: %s:\n\t-m secondary storage mount point\n\t-f system vm template file\n\t-h hypervisor name: kvm|vmware|xenserver|hyperv|ovm3\n\t-s mgmt server secret key, if you specified any when running cloudstack-setup-database, default is password\n\t-u Url to system vm template\n\t-F clean up system templates of specified hypervisor\n\t-e Template suffix, e.g vhd, ova, qcow2\n\t-o Database server hostname or ip, e.g localhost\n\t-r Database user name, e.g root\n\t-p mysql database port\n\t-d Database password. Followed by nothing if the password is empty\n\n" $(basename $0) >&2
+ printf "\tor\n"
+ printf "\nUsage: %s:\n\t-m secondary storage mount point\n\t-u http url for system vm template\n\t-h hypervisor name: kvm|vmware|xenserver|hyperv|ovm3\n\t-s mgmt server secret key\n\n" $(basename $0) >&2
}
+# Usage: e.g. failed $? "this is an error"
failed() {
- echo "Installation failed"
- exit $1
+ local returnval=$1
+ local returnmsg=$2
+
+ # check for an message, if there is no one dont print anything
+ if [[ -z $returnmsg ]]; then
+ :
+ else
+ echo -e $returnmsg
+ fi
+ if [[ $returnval -eq 0 ]]; then
+ return 0
+ else
+ echo "Installation failed"
+ exit $returnval
+ fi
}
+
#set -x
mflag=
fflag=
@@ -41,8 +55,16 @@
dbUser="root"
dbPassword=
dbPort=3306
-jasypt='/usr/share/cloudstack-common/lib/jasypt-1.9.2.jar'
-while getopts 'm:h:f:u:Ft:e:s:o:r:d:p:'# OPTION
+jasypt='/usr/share/cloudstack-common/lib/jasypt-1.9.3.jar'
+
+# check if first parameter is not a dash (-) then print the usage block
+if [[ ! $@ =~ ^\-.+ ]]; then
+ usage
+ exit 0
+fi
+
+OPTERR=0
+while getopts 'm:h:f:u:Ft:e:Ms:o:r:d:p:'# OPTION
do
case $OPTION in
m) mflag=1
@@ -78,121 +100,94 @@
dbPort="$OPTARG"
;;
?) usage
- failed 2
+ exit 0
+ ;;
+ *) usage
+ exit 0
;;
esac
done
-if [[ "$mflag$fflag" != "11" && "$mflag$uflag" != "11" ]]
-then
- usage
- failed 2
+if [[ "$mflag$fflag" != "11" && "$mflag$uflag" != "11" ]]; then
+ failed 2 "Please add a mount point and a system vm template file"
fi
-if [ -z "$hyper" ]
-then
- usage
- failed 2
+if [[ -z "$hyper" ]]; then
+ failed 2 "Please add a correct hypervisor name like: kvm|vmware|xenserver|hyperv|ovm3"
fi
-if [ ! -d $mntpoint ]
-then
- echo "mount point $mntpoint doesn't exist\n"
- failed 4
+if [[ ! -d $mntpoint ]]; then
+ failed 2 "mount point $mntpoint doesn't exist\n"
fi
-if [[ "$fflag" == "1" && ! -f $tmpltimg ]]
-then
- echo "template image file $tmpltimg doesn't exist"
- failed 3
+if [[ "$fflag" == "1" && ! -f $tmpltimg ]]; then
+ failed 2 "template image file $tmpltimg doesn't exist"
fi
-if [ -f /etc/cloudstack/management/db.properties ]
-then
- if [ "$pflag" != 1 ]
- then
- dbPort=$(sed '/^\#/d' /etc/cloudstack/management/db.properties | grep 'db.cloud.port' | tail -n 1 | cut -d "=" -f2- | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
+if [[ -f /etc/cloudstack/management/db.properties ]]; then
+ if [[ "$pflag" != 1 ]]; then
+ dbPort=$(sed '/^\#/d' /etc/cloudstack/management/db.properties | grep 'db.cloud.port' | tail -n 1 | cut -d "=" -f2- | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
+ fi
+
+ if [[ "$oflag" != 1 ]]; then
+ dbHost=$(sed '/^\#/d' /etc/cloudstack/management/db.properties | grep 'db.cloud.host' | tail -n 1 | cut -d "=" -f2- | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
+ fi
+
+ if [[ "$rflag" != 1 ]]; then
+ dbUser=$(sed '/^\#/d' /etc/cloudstack/management/db.properties | grep 'db.cloud.username' | tail -n 1 | cut -d "=" -f2- | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
+ fi
+
+ encType=$(sed '/^\#/d' /etc/cloudstack/management/db.properties | grep 'db.cloud.encryption.type' | tail -n 1 | cut -d "=" -f2- | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
+ if [[ "$encType" == "file" ]]; then
+ msKey=$(cat /etc/cloudstack/management/key)
+ elif [[ "$encType" == "web" ]]; then
+ if [[ ! "$sflag" == "1" ]]; then
+ failed 2 "Encryption type web requires mgmt secret key using -s option"
fi
+ fi
- if [ "$oflag" != 1 ]
- then
- dbHost=$(sed '/^\#/d' /etc/cloudstack/management/db.properties | grep 'db.cloud.host' | tail -n 1 | cut -d "=" -f2- | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
+ if [[ "$encType" == "file" || "$encType" == "web" ]]; then
+ encPassword=$(sed '/^\#/d' /etc/cloudstack/management/db.properties | grep 'db.cloud.password' | tail -n 1 | cut -d "=" -f2- | sed 's/^[[:space:]]*//;s/[[:space:]]*$//'i | sed 's/^ENC(\(.*\))/\1/')
+ if [[ ! $encPassword == "" ]]; then
+ dbPassword=(`java -classpath $jasypt org.jasypt.intf.cli.JasyptPBEStringDecryptionCLI decrypt.sh input=$encPassword password=$msKey verbose=false`)
+ if [[ ! $dbPassword ]]; then
+ failed 2 "Failed to decrypt DB password from db.properties"
+ fi
fi
-
- if [ "$rflag" != 1 ]
- then
- dbUser=$(sed '/^\#/d' /etc/cloudstack/management/db.properties | grep 'db.cloud.username' | tail -n 1 | cut -d "=" -f2- | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
+ else
+ if [[ "$dflag" != 1 ]]; then
+ dbPassword=$(sed '/^\#/d' /etc/cloudstack/management/db.properties | grep 'db.cloud.password' | tail -n 1 | cut -d "=" -f2- | sed 's/^[[:space:]]*//;s/[[:space:]]*$//'i )
fi
-
- encType=$(sed '/^\#/d' /etc/cloudstack/management/db.properties | grep 'db.cloud.encryption.type' | tail -n 1 | cut -d "=" -f2- | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
- if [ "$encType" == "file" ]
- then
- msKey=$(cat /etc/cloudstack/management/key)
- elif [ "$encType" == "web" ]
- then
- if [ ! "$sflag" == "1" ]
- then
- echo "Encryption type web requires mgmt secret key using -s option"
- failed 9
- fi
- fi
-
- if [[ "$encType" == "file" || "$encType" == "web" ]]
- then
- encPassword=$(sed '/^\#/d' /etc/cloudstack/management/db.properties | grep 'db.cloud.password' | tail -n 1 | cut -d "=" -f2- | sed 's/^[[:space:]]*//;s/[[:space:]]*$//'i | sed 's/^ENC(\(.*\))/\1/')
- if [ ! $encPassword == "" ]
- then
- dbPassword=(`java -classpath $jasypt org.jasypt.intf.cli.JasyptPBEStringDecryptionCLI decrypt.sh input=$encPassword password=$msKey verbose=false`)
- if [ ! $dbPassword ]
- then
- echo "Failed to decrypt DB password from db.properties"
- failed 9
- fi
- fi
- else
- if [ "$dflag" != 1 ]
- then
- dbPassword=$(sed '/^\#/d' /etc/cloudstack/management/db.properties | grep 'db.cloud.password' | tail -n 1 | cut -d "=" -f2- | sed 's/^[[:space:]]*//;s/[[:space:]]*$//'i )
- fi
- fi
+ fi
fi
-if [ "$templateId" == "" ]
-then
- if [ "$hyper" == "kvm" ]
- then
- ext="qcow2"
- templateId=(`mysql -P $dbPort -h $dbHost --user=$dbUser --password=$dbPassword --skip-column-names -U cloud -e "select max(id) from cloud.vm_template where type = \"SYSTEM\" and hypervisor_type = \"KVM\" and removed is null"`)
- elif [ "$hyper" == "xenserver" ]
- then
- ext="vhd"
- templateId=(`mysql -P $dbPort -h $dbHost --user=$dbUser --password=$dbPassword --skip-column-names -U cloud -e "select max(id) from cloud.vm_template where type = \"SYSTEM\" and hypervisor_type = \"XenServer\" and removed is null"`)
- elif [ "$hyper" == "vmware" ]
- then
- ext="ova"
- templateId=(`mysql -P $dbPort -h $dbHost --user=$dbUser --password=$dbPassword --skip-column-names -U cloud -e "select max(id) from cloud.vm_template where type = \"SYSTEM\" and hypervisor_type = \"VMware\" and removed is null"`)
- elif [ "$hyper" == "lxc" ]
- then
- ext="qcow2"
- templateId=(`mysql -P $dbPort -h $dbHost --user=$dbUser --password=$dbPassword --skip-column-names -U cloud -e "select max(id) from cloud.vm_template where type = \"SYSTEM\" and hypervisor_type = \"LXC\" and removed is null"`)
- elif [ "$hyper" == "hyperv" ]
- then
- ext="vhd"
- templateId=(`mysql -P $dbPort -h $dbHost --user=$dbUser --password=$dbPassword --skip-column-names -U cloud -e "select max(id) from cloud.vm_template where type = \"SYSTEM\" and hypervisor_type = \"Hyperv\" and removed is null"`)
- elif [ "$hyper" == "ovm3" ]
- then
- ext="raw"
- templateId=(`mysql -P $dbPort -h $dbHost --user=$dbUser --password=$dbPassword --skip-column-names -U cloud -e "select max(id) from cloud.vm_template where type = \"SYSTEM\" and hypervisor_type = \"Ovm3\" and removed is null"`)
- else
- usage
- failed 2
- fi
+if [[ "$templateId" == "" ]]; then
+ if [[ "$hyper" == "kvm" ]]; then
+ ext="qcow2"
+ templateId=(`mysql -P $dbPort -h $dbHost --user=$dbUser --password=$dbPassword --skip-column-names -U cloud -e "select max(id) from cloud.vm_template where type = \"SYSTEM\" and hypervisor_type = \"KVM\" and removed is null"`)
+ qemuimgcmd=$(which qemu-img)
+ elif [[ "$hyper" == "xenserver" ]]; then
+ ext="vhd"
+ templateId=(`mysql -P $dbPort -h $dbHost --user=$dbUser --password=$dbPassword --skip-column-names -U cloud -e "select max(id) from cloud.vm_template where type = \"SYSTEM\" and hypervisor_type = \"XenServer\" and removed is null"`)
+ elif [[ "$hyper" == "vmware" ]]; then
+ ext="ova"
+ templateId=(`mysql -P $dbPort -h $dbHost --user=$dbUser --password=$dbPassword --skip-column-names -U cloud -e "select max(id) from cloud.vm_template where type = \"SYSTEM\" and hypervisor_type = \"VMware\" and removed is null"`)
+ elif [[ "$hyper" == "lxc" ]]; then
+ ext="qcow2"
+ templateId=(`mysql -P $dbPort -h $dbHost --user=$dbUser --password=$dbPassword --skip-column-names -U cloud -e "select max(id) from cloud.vm_template where type = \"SYSTEM\" and hypervisor_type = \"LXC\" and removed is null"`)
+ elif [[ "$hyper" == "hyperv" ]]; then
+ ext="vhd"
+ templateId=(`mysql -P $dbPort -h $dbHost --user=$dbUser --password=$dbPassword --skip-column-names -U cloud -e "select max(id) from cloud.vm_template where type = \"SYSTEM\" and hypervisor_type = \"Hyperv\" and removed is null"`)
+ elif [[ "$hyper" == "ovm3" ]]; then
+ ext="raw"
+ templateId=(`mysql -P $dbPort -h $dbHost --user=$dbUser --password=$dbPassword --skip-column-names -U cloud -e "select max(id) from cloud.vm_template where type = \"SYSTEM\" and hypervisor_type = \"Ovm3\" and removed is null"`)
+ else
+ failed 2 "Please add a correct hypervisor name like: kvm|vmware|xenserver|hyperv|ovm3"
+ fi
fi
-if [ ! $templateId ]
-then
- echo "Unable to get template Id from database"
- failed 8
+if [[ ! $templateId ]]; then
+ failed 2 "Unable to get template Id from database"
fi
_uuid=$(uuidgen)
@@ -205,43 +200,31 @@
destdir=$mntpoint/template/tmpl/1/$templateId/
mkdir -p $destdir
-if [ $? -ne 0 ]
-then
- printf "Failed to write to mount point $mntpoint -- is it mounted?\n"
- failed 3
+if [[ $? -ne 0 ]]; then
+ failed 2 "Failed to write to mount point $mntpoint -- is it mounted?\n"
fi
-if [ "$Fflag" == "1" ]
-then
+if [[ "$Fflag" == "1" ]]; then
rm -rf $destdir/*
- if [ $? -ne 0 ]
- then
- echo "Failed to clean up template directory $destdir -- check permissions?"
- failed 2
+ if [[ $? -ne 0 ]]; then
+ failed 2 "Failed to clean up template directory $destdir -- check permissions?"
fi
fi
-if [ -f $destdir/template.properties ]
-then
- echo "Data already exists at destination $destdir -- use -F to force cleanup of old template"
- echo "IF YOU ARE ATTEMPTING AN UPGRADE, YOU MAY NEED TO SPECIFY A TEMPLATE ID USING THE -t FLAG"
- failed 4
+if [[ -f $destdir/template.properties ]]; then
+ failed 2 "Data already exists at destination $destdir -- use -F to force cleanup of old template\nIF YOU ARE ATTEMPTING AN UPGRADE, YOU MAY NEED TO SPECIFY A TEMPLATE ID USING THE -t FLAG"
fi
-destvhdfiles=$(find $destdir -name \*.$ext)
-if [ "$destvhdfiles" != "" ]
-then
- echo "Data already exists at destination $destdir -- use -F to force cleanup of old template"
- failed 5
+destfiles=$(find $destdir -name \*.$ext)
+if [[ "$destfiles" != "" ]]; then
+ failed 2 "Data already exists at destination $destdir -- use -F to force cleanup of old template"
fi
-tmpfile=$(dirname $0)/$localfile
+tmplfile=$(dirname $0)/$localfile
-touch $tmpfile
-if [ $? -ne 0 ]
-then
- printf "Failed to create temporary file in directory $(dirname $0) -- is it read-only or full?\n"
- failed 4
+touch $tmplfile
+if [[ $? -ne 0 ]]; then
+ failed 2 "Failed to create temporary file in directory $(dirname $0) -- is it read-only or full?\n"
fi
destcap=$(df -P $destdir | awk '{print $4}' | tail -1 )
@@ -250,34 +233,24 @@
localcap=$(df -P $(dirname $0) | awk '{print $4}' | tail -1 )
[ $localcap -lt $DISKSPACE ] && echo "Insufficient free disk space for local temporary folder $(dirname $0): avail=${localcap}k req=${DISKSPACE}k" && failed 4
-if [ "$uflag" == "1" ]
-then
- wget -O $tmpfile $url
- if [ $? -ne 0 ]
- then
- echo "Failed to fetch system vm template from $url"
- failed 5
+if [[ "$uflag" == "1" ]]; then
+ wget -O $tmplfile $url
+ if [[ $? -ne 0 ]]; then
+ failed 2 "Failed to fetch system vm template from $url"
fi
fi
-
-if [ "$fflag" == "1" ]
-then
- cp $tmpltimg $tmpfile
- if [ $? -ne 0 ]
- then
- printf "Failed to create temporary file in directory $(dirname $0) -- is it read-only or full?\n"
- failed 6
+if [[ "$fflag" == "1" ]]; then
+ cp $tmpltimg $tmplfile
+ if [[ $? -ne 0 ]]; then
+ failed 2 "Failed to create temporary file in directory $(dirname $0) -- is it read-only or full?\n"
fi
fi
+installrslt=$($(dirname $0)/createtmplt.sh -s 2 -d 'SystemVM Template' -n $localfile -t $destdir/ -f $tmplfile -u -v)
-installrslt=$($(dirname $0)/createtmplt.sh -s 2 -d 'SystemVM Template' -n $localfile -t $destdir/ -f $tmpfile -u -v)
-
-if [ $? -ne 0 ]
-then
- echo "Failed to install system vm template $tmpltimg to $destdir: $installrslt"
- failed 7
+if [[ $? -ne 0 ]]; then
+ failed 2 "Failed to install system vm template $tmpltimg to $destdir: $installrslt"
fi
if [ "$ext" == "ova" ]
@@ -286,15 +259,20 @@
fi
tmpltfile=$destdir/$localfile
-tmpltsize=$(ls -l $tmpltfile| awk -F" " '{print $5}')
+tmpltsize=$(ls -l $tmpltfile | awk -F" " '{print $5}')
+if [[ "$ext" == "qcow2" ]]; then
+ vrtmpltsize=$($qemuimgcmd info $tmpltfile | grep -i 'virtual size' | sed -ne 's/.*(\([0-9]*\).*/\1/p' | xargs)
+else
+ vrtmpltsize=$tmpltsize
+fi
echo "$ext=true" >> $destdir/template.properties
echo "id=$templateId" >> $destdir/template.properties
echo "public=true" >> $destdir/template.properties
echo "$ext.filename=$localfile" >> $destdir/template.properties
echo "uniquename=routing-$templateId" >> $destdir/template.properties
-echo "$ext.virtualsize=$tmpltsize" >> $destdir/template.properties
-echo "virtualsize=$tmpltsize" >> $destdir/template.properties
+echo "$ext.virtualsize=$vrtmpltsize" >> $destdir/template.properties
+echo "virtualsize=$vrtmpltsize" >> $destdir/template.properties
echo "$ext.size=$tmpltsize" >> $destdir/template.properties
-echo "Successfully installed system VM template $tmpltimg to $destdir"
+echo "Successfully installed system VM template $tmpltimg and template.properties to $destdir"
diff --git a/scripts/storage/secondary/createtmplt.sh b/scripts/storage/secondary/createtmplt.sh
index 4e8db46..391b291 100755
--- a/scripts/storage/secondary/createtmplt.sh
+++ b/scripts/storage/secondary/createtmplt.sh
@@ -210,7 +210,6 @@
echo "description=$descr" >> /$tmpltfs/template.properties
# we need to rethink this property as it might get changed after download due to decompression
# option is to recalcutate it here
-echo "checksum=$cksum" >> /$tmpltfs/template.properties
echo "hvm=$hvm" >> /$tmpltfs/template.properties
echo "size=$imgsize" >> /$tmpltfs/template.properties
diff --git a/scripts/util/create-kubernetes-binaries-iso.sh b/scripts/util/create-kubernetes-binaries-iso.sh
new file mode 100755
index 0000000..bf97f06
--- /dev/null
+++ b/scripts/util/create-kubernetes-binaries-iso.sh
@@ -0,0 +1,106 @@
+#!/bin/bash
+# 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.
+
+if [ $# -lt 6 ]; then
+ echo "Invalid input. Valid usage: ./create-kubernetes-binaries-iso.sh OUTPUT_PATH KUBERNETES_VERSION CNI_VERSION CRICTL_VERSION WEAVENET_NETWORK_YAML_CONFIG DASHBOARD_YAML_CONFIG"
+ echo "eg: ./create-kubernetes-binaries-iso.sh ./ 1.11.4 0.7.1 1.11.1 https://github.com/weaveworks/weave/releases/download/latest_release/weave-daemonset-k8s-1.11.yaml https://raw.githubusercontent.com/kubernetes/dashboard/v1.10.0/src/deploy/recommended/kubernetes-dashboard.yaml"
+ exit 1
+fi
+
+RELEASE="v${2}"
+output_dir="${1}"
+start_dir="$PWD"
+iso_dir="/tmp/iso"
+working_dir="${iso_dir}/"
+mkdir -p "${working_dir}"
+
+CNI_VERSION="v${3}"
+echo "Downloading CNI ${CNI_VERSION}..."
+cni_dir="${working_dir}/cni/"
+mkdir -p "${cni_dir}"
+curl -L "https://github.com/containernetworking/plugins/releases/download/${CNI_VERSION}/cni-plugins-amd64-${CNI_VERSION}.tgz" -o "${cni_dir}/cni-plugins-amd64.tgz"
+
+CRICTL_VERSION="v${4}"
+echo "Downloading CRI tools ${CRICTL_VERSION}..."
+crictl_dir="${working_dir}/cri-tools/"
+mkdir -p "${crictl_dir}"
+curl -L "https://github.com/kubernetes-incubator/cri-tools/releases/download/${CRICTL_VERSION}/crictl-${CRICTL_VERSION}-linux-amd64.tar.gz" -o "${crictl_dir}/crictl-linux-amd64.tar.gz"
+
+echo "Downloading Kubernetes tools ${RELEASE}..."
+k8s_dir="${working_dir}/k8s"
+mkdir -p "${k8s_dir}"
+cd "${k8s_dir}"
+curl -L --remote-name-all https://storage.googleapis.com/kubernetes-release/release/${RELEASE}/bin/linux/amd64/{kubeadm,kubelet,kubectl}
+kubeadm_file_permissions=`stat --format '%a' kubeadm`
+chmod +x kubeadm
+
+echo "Downloading kubelet.service ${RELEASE}..."
+cd $start_dir
+kubelet_service_file="${working_dir}/kubelet.service"
+touch "${kubelet_service_file}"
+curl -sSL "https://raw.githubusercontent.com/kubernetes/kubernetes/${RELEASE}/build/debs/kubelet.service" | sed "s:/usr/bin:/opt/bin:g" > ${kubelet_service_file}
+
+echo "Downloading 10-kubeadm.conf ${RELEASE}..."
+kubeadm_conf_file="${working_dir}/10-kubeadm.conf"
+touch "${kubeadm_conf_file}"
+curl -sSL "https://raw.githubusercontent.com/kubernetes/kubernetes/${RELEASE}/build/debs/10-kubeadm.conf" | sed "s:/usr/bin:/opt/bin:g" > ${kubeadm_conf_file}
+
+NETWORK_CONFIG_URL="${5}"
+echo "Downloading network config ${NETWORK_CONFIG_URL}"
+network_conf_file="${working_dir}/network.yaml"
+curl -sSL ${NETWORK_CONFIG_URL} -o ${network_conf_file}
+
+DASHBORAD_CONFIG_URL="${6}"
+echo "Downloading dashboard config ${DASHBORAD_CONFIG_URL}"
+dashboard_conf_file="${working_dir}/dashboard.yaml"
+curl -sSL ${DASHBORAD_CONFIG_URL} -o ${dashboard_conf_file}
+
+echo "Fetching k8s docker images..."
+docker -v
+if [ $? -ne 0 ]; then
+ echo "Installing docker..."
+ if [ -f /etc/redhat-release ]; then
+ sudo yum -y remove docker-common docker container-selinux docker-selinux docker-engine
+ sudo yum -y install lvm2 device-mapper device-mapper-persistent-data device-mapper-event device-mapper-libs device-mapper-event-libs
+ sudo yum install -y http://mirror.centos.org/centos/7/extras/x86_64/Packages/container-selinux-2.107-3.el7.noarch.rpm
+ sudo wget https://download.docker.com/linux/centos/docker-ce.repo -O /etc/yum.repos.d/docker-ce.repo && sudo yum -y install docker-ce
+ sudo systemctl enable docker && sudo systemctl start docker
+ elif [ -f /etc/lsb-release ]; then
+ sudo apt update && sudo apt install docker.io -y
+ sudo systemctl enable docker && sudo systemctl start docker
+ fi
+fi
+mkdir -p "${working_dir}/docker"
+output=`${k8s_dir}/kubeadm config images list`
+while read -r line; do
+ echo "Downloading docker image $line ---"
+ sudo docker pull "$line"
+ image_name=`echo "$line" | grep -oE "[^/]+$"`
+ sudo docker save "$line" > "${working_dir}/docker/$image_name.tar"
+ sudo docker image rm "$line"
+done <<< "$output"
+
+echo "Restore kubeadm permissions..."
+if [ "${kubeadm_file_permissions}" -eq "" ]; then
+ kubeadm_file_permissions=644
+fi
+chmod ${kubeadm_file_permissions} "${working_dir}/k8s/kubeadm"
+
+mkisofs -o "${output_dir}/setup-${RELEASE}.iso" -J -R -l "${iso_dir}"
+
+rm -rf "${iso_dir}"
diff --git a/scripts/util/keystore-cert-import b/scripts/util/keystore-cert-import
index 459f836..a2b57bf 100755
--- a/scripts/util/keystore-cert-import
+++ b/scripts/util/keystore-cert-import
@@ -56,6 +56,11 @@
done
rm -f cloudca.*
+# Stop cloud service in systemvm
+if [ "$MODE" == "ssh" ] && [ -f $SYSTEM_FILE ]; then
+ systemctl stop cloud > /dev/null 2>&1
+fi
+
# Import private key if available
if [ ! -z "${PRIVKEY// }" ]; then
echo "$PRIVKEY" > "$PRIVKEY_FILE"
@@ -93,6 +98,11 @@
chmod 755 /usr/local/share/ca-certificates/cloudstack
chmod 644 /usr/local/share/ca-certificates/cloudstack/ca.crt
update-ca-certificates > /dev/null 2>&1 || true
+
+ # Ensure cloud service is running in systemvm
+ if [ "$MODE" == "ssh" ]; then
+ systemctl start cloud > /dev/null 2>&1
+ fi
fi
# Fix file permission
diff --git a/scripts/vm/hypervisor/vmware/discover_networks.py b/scripts/vm/hypervisor/vmware/discover_networks.py
new file mode 100755
index 0000000..d19e784
--- /dev/null
+++ b/scripts/vm/hypervisor/vmware/discover_networks.py
@@ -0,0 +1,288 @@
+#!/usr/bin/env python3
+# 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 __future__ import print_function
+from pyVim.connect import SmartConnect, SmartConnectNoSSL, Disconnect
+from pyVmomi import vim
+import atexit
+import sys
+import argparse
+import json
+
+isDebugLogs = False
+hostClusterNameDict = {}
+pgHostNameDict = {}
+networksDict = {}
+
+def log_message(msg):
+ if isDebugLogs == True:
+ print(msg)
+
+def get_clusters(content, cluster=None):
+ if cluster is not None:
+ log_message("Getting clusters (name=" + cluster + ") ...")
+ else:
+ log_message("Getting clusters ...")
+ cluster_view = content.viewManager.CreateContainerView(content.rootFolder,
+ [vim.ClusterComputeResource],
+ True)
+ clusters = []
+ if cluster is not None:
+ for c in cluster_view.view:
+ if c.name == cluster:
+ clusters.append(c)
+ hosts = c.host
+ for host in hosts:
+ hostClusterNameDict[host.name] = c.name
+ break
+ else:
+ for c in cluster_view.view:
+ clusters.append(c)
+ hosts = c.host
+ for host in hosts:
+ hostClusterNameDict[host.name] = c.name
+ cluster_view.Destroy()
+ log_message('\t{} cluster(s) found'.format(len(clusters)))
+ for c in clusters:
+ log_message('\t' + c.name)
+ return clusters
+
+
+def get_vm_hosts(clusters):
+ log_message("Getting ESX hosts ...")
+ hosts = []
+ for cluster in clusters:
+ hosts.extend(cluster.host)
+ log_message('\t{} host(s) found'.format(len(hosts)))
+ for host in hosts:
+ log_message('\t' + host.name)
+ return hosts
+
+
+def get_vms(content):
+ log_message("Getting VMs ...")
+ vm_view = content.viewManager.CreateContainerView(content.rootFolder,
+ [vim.VirtualMachine],
+ True)
+ obj = [vm for vm in vm_view.view]
+ vm_view.Destroy()
+ return obj
+
+
+def get_hosts_port_groups(hosts):
+ log_message("Collecting portGroups on hosts. This may take a while ...")
+ hostPgDict = {}
+ for host in hosts:
+ pgs = host.config.network.portgroup
+ hostPgDict[host] = pgs
+ for pg in pgs:
+ pgHostNameDict[pg.spec.name] = host.name
+ log_message("\tHost {} done.".format(host.name))
+ log_message("\tPortgroup collection complete.")
+ return hostPgDict
+
+
+def get_vm_info(vm, hostPgDict):
+ vmPowerState = vm.runtime.powerState
+ log_message('\tVM: ' + vm.name + '(' + vmPowerState + ')')
+ get_vm_nics(vm, hostPgDict)
+
+
+def get_vm_nics(vm, hostPgDict):
+ try:
+ for dev in vm.config.hardware.device:
+ if isinstance(dev, vim.vm.device.VirtualEthernetCard):
+ dev_backing = dev.backing
+ portGroup = None
+ vlanId = None
+ isolatedPvlan = None
+ isolatedPvlanType = None
+ vSwitch = None
+ if hasattr(dev_backing, 'port'):
+ portGroupKey = dev.backing.port.portgroupKey
+ dvsUuid = dev.backing.port.switchUuid
+ try:
+ dvs = content.dvSwitchManager.QueryDvsByUuid(dvsUuid)
+ except:
+ log_message('\tError: Unable retrieve details for distributed vSwitch ' + dvsUuid)
+ portGroup = ''
+ vlanId = ''
+ vSwitch = ''
+ else:
+ pgObj = dvs.LookupDvPortGroup(portGroupKey)
+ portGroup = pgObj.config.name
+ try:
+ if isinstance(pgObj.config.defaultPortConfig.vlan, vim.dvs.VmwareDistributedVirtualSwitch.PvlanSpec):
+ for pvlanConfig in dvs.config.pvlanConfig:
+ if pvlanConfig.secondaryVlanId == pgObj.config.defaultPortConfig.vlan.pvlanId:
+ vlanId = str(pvlanConfig.primaryVlanId)
+ isolatedPvlanType = pvlanConfig.pvlanType
+ isolatedPvlan = str(pgObj.config.defaultPortConfig.vlan.pvlanId)
+ break
+ else:
+ vlanId = str(pgObj.config.defaultPortConfig.vlan.vlanId)
+ except AttributeError:
+ log_message('\tError: Unable retrieve details for portgroup ' + portGroup)
+ vlanId = ''
+ vSwitch = str(dvs.name)
+ else:
+ portGroup = dev.backing.network.name
+ vmHost = vm.runtime.host
+ # global variable hostPgDict stores portGroups per host
+ pgs = hostPgDict[vmHost]
+ for p in pgs:
+ if portGroup in p.key:
+ vlanId = str(p.spec.vlanId)
+ vSwitch = str(p.spec.vswitchName)
+ if portGroup is None:
+ portGroup = ''
+ if vlanId is None:
+ vlanId = ''
+ vmHostName = None
+ vmClusterName = None
+ try:
+ vmHostName = vm.runtime.host.name
+ except AttributeError:
+ vmHostName = ''
+ try:
+ vmClusterName = vm.runtime.host.parent.name
+ except AttributeError:
+ vmClusterName = ''
+ add_network(portGroup, vlanId, isolatedPvlanType, isolatedPvlan, vSwitch, vm.name, dev.deviceInfo.label, dev.macAddress, vmClusterName, vmHostName)
+ log_message('\t\t' + dev.deviceInfo.label + '->' + dev.macAddress +
+ ' @ ' + vSwitch + '->' + portGroup +
+ ' (VLAN ' + vlanId + ')')
+ except AttributeError:
+ log_message('\tError: Unable retrieve details for ' + vm.name)
+
+def add_network(portGroup, vlanId, isolatedPvlanType, isolatedPvlan, vSwitch, vmName, vmDeviceLabel, vmMacAddress, vmClusterName, vmHostName):
+ key = vSwitch + '->' + portGroup + ' (VLAN ' + vlanId + ')'
+ device = {"label": vmDeviceLabel, "macaddress": vmMacAddress}
+ vm = {"name":vmName, "device": device}
+ if key in networksDict:
+ network = networksDict[key]
+ network["virtualmachines"].append(vm)
+ networksDict[key] = network
+ else:
+ vms = [vm]
+ try:
+ host = pgHostNameDict[portGroup]
+ except KeyError:
+ host = vmHostName
+ try:
+ cluster = hostClusterNameDict[host]
+ except KeyError:
+ cluster = vmClusterName
+
+ network = {"portgroup": portGroup, "cluster": cluster, "host": host, "switch": vSwitch, "virtualmachines": vms}
+ if vlanId != '':
+ network["vlanid"] = vlanId
+ if isolatedPvlan is not None:
+ network["isolatedpvlan"] = isolatedPvlan
+ if isolatedPvlanType is not None:
+ network["isolatedpvlantype"] = isolatedPvlanType
+ networksDict[key] = network
+
+
+def get_args():
+ parser = argparse.ArgumentParser(
+ description='Arguments for talking to vCenter')
+
+ parser.add_argument('-s', '--host',
+ required=True,
+ action='store',
+ help='vSpehre service to connect to')
+
+ parser.add_argument('-o', '--port',
+ type=int,
+ default=443,
+ action='store',
+ help='Port to connect on')
+
+ parser.add_argument('-u', '--user',
+ required=True,
+ action='store',
+ help='User name to use')
+
+ parser.add_argument('-p', '--password',
+ required=False,
+ action='store',
+ help='Password to use')
+
+ parser.add_argument('-c', '--cluster',
+ required=False,
+ action='store',
+ help='Cluster for which discover networks')
+
+ parser.add_argument('-S', '--disable_ssl_verification',
+ required=False,
+ action='store_true',
+ help='Disable ssl host certificate verification')
+
+ parser.add_argument('-d', '--debug',
+ required=False,
+ action='store_true',
+ help='Debug log messages')
+
+ args = parser.parse_args()
+ return args
+
+
+def main():
+ global content, isDebugLogs, hostClusterNameDict, pgHostNameDict, networksDict
+ args = get_args()
+ if args.password:
+ password = args.password
+ else:
+ password = getpass.getpass(prompt='Enter password for host %s and '
+ 'user %s: ' % (args.host, args.user))
+ if args.debug:
+ isDebugLogs = True
+ if args.disable_ssl_verification:
+ serviceInstance = SmartConnectNoSSL(host=args.host,
+ user=args.user,
+ pwd=password,
+ port=int(args.port))
+ else:
+ serviceInstance = SmartConnect(host=args.host,
+ user=args.user,
+ pwd=password,
+ port=int(args.port))
+
+ atexit.register(Disconnect, serviceInstance)
+ content = serviceInstance.RetrieveContent()
+ if args.cluster:
+ clusters = get_clusters(content, args.cluster)
+ else:
+ clusters = get_clusters(content)
+ hosts = []
+ if len(clusters) > 0:
+ hosts = get_vm_hosts(clusters)
+ if len(hosts) > 0:
+ hostPgDict = get_hosts_port_groups(hosts)
+ vms = get_vms(content)
+ log_message('\t{} VM(s) found'.format(len(vms)))
+ for vm in vms:
+ get_vm_info(vm, hostPgDict)
+ networks = list(networksDict.values())
+ response = {"count": len(networks), "networks": networks}
+ print(json.dumps(response, indent=2, sort_keys=True))
+
+# Main section
+if __name__ == "__main__":
+ sys.exit(main())
diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops
index d87edff..dd03ded 100755
--- a/scripts/vm/hypervisor/xenserver/vmops
+++ b/scripts/vm/hypervisor/xenserver/vmops
@@ -204,6 +204,33 @@
return txt
@echo
+def secureCopyToHost(session, args):
+ host_filepath = args['hostfilepath']
+ src_ip = args['srcip']
+ src_filepath = args['srcfilepath']
+ src_target = "root@" + src_ip + ":" + src_filepath
+ # Make any directories as needed
+ if not os.path.isdir(host_filepath):
+ try:
+ os.makedirs(host_filepath)
+ except OSError, (errno, strerror):
+ if not os.path.isdir(host_filepath):
+ errMsg = "OSError while creating " + host_filepath + " with errno: " + str(errno) + " and strerr: " + strerror
+ logging.debug(errMsg)
+ return "fail# Cannot create the directory to copy file to " + host_filepath
+
+ # Copy file to created directory
+ txt=""
+ try:
+ txt = util.pread2(['scp','-P','3922','-q','-o','StrictHostKeyChecking=no','-i','/root/.ssh/id_rsa.cloud', src_target, host_filepath])
+ util.pread2(['chmod', 'a+r', os.path.join(host_filepath, os.path.basename(src_filepath))])
+ txt = 'success#' + txt
+ except:
+ logging.error("failed to scp source target " + src_target + " to host at file path " + host_filepath)
+ txt = 'fail#' + txt
+ return txt
+
+@echo
def createFileInDomr(session, args):
src_filepath = args['srcfilepath']
dst_path = args['dstfilepath']
@@ -1560,4 +1587,5 @@
"setLinkLocalIP":setLinkLocalIP,
"cleanup_rules":cleanup_rules,
"createFileInDomr":createFileInDomr,
- "kill_copy_process":kill_copy_process})
+ "kill_copy_process":kill_copy_process,
+ "secureCopyToHost":secureCopyToHost})
diff --git a/scripts/vm/network/security_group.py b/scripts/vm/network/security_group.py
index 1cb4a84..680177e 100755
--- a/scripts/vm/network/security_group.py
+++ b/scripts/vm/network/security_group.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# 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
@@ -26,9 +26,7 @@
import libvirt
import fcntl
import time
-from netaddr import IPAddress, IPNetwork
-from netaddr.core import AddrFormatError
-
+import ipaddress
logpath = "/var/run/cloud/" # FIXME: Logs should reside in /var/log/cloud
lock_file = "/var/lock/cloudstack_security_group.lock"
@@ -52,7 +50,7 @@
def execute(cmd):
logging.debug(cmd)
try:
- return check_output(cmd, shell=True)
+ return check_output(cmd, shell=True).decode()
except CalledProcessError as e:
logging.exception('Command exited non-zero: %s', cmd)
raise
@@ -103,8 +101,8 @@
conn = get_libvirt_connection()
- alldomains = map(conn.lookupByID, conn.listDomainsID())
- alldomains += map(conn.lookupByName, conn.listDefinedDomains())
+ alldomains = [domain for domain in map(conn.lookupByID, conn.listDomainsID())]
+ alldomains += [domain for domain in map(conn.lookupByName, conn.listDefinedDomains())]
domains = []
for domain in alldomains:
@@ -130,7 +128,7 @@
eui64 = re.sub(r'[.:-]', '', mac).lower()
eui64 = eui64[0:6] + 'fffe' + eui64[6:]
eui64 = hex(int(eui64[0:2], 16) ^ 2)[2:].zfill(2) + eui64[2:]
- return IPAddress('fe80::' + ':'.join(re.findall(r'.{4}', eui64)))
+ return ipaddress.ip_address('fe80::' + ':'.join(re.findall(r'.{4}', eui64)))
def split_ips_by_family(ips):
@@ -140,13 +138,51 @@
ip4s = []
ip6s = []
for ip in ips:
- version = IPNetwork(ip).version
- if version == 4:
+ network = ipaddress.ip_network(ip)
+ if network.version == 4:
ip4s.append(ip)
- elif version == 6:
+ elif network.version == 6:
ip6s.append(ip)
return ip4s, ip6s
+def destroy_network_rules_for_nic(vm_name, vm_ip, vm_mac, vif, sec_ips):
+ try:
+ rules = execute("""iptables-save -t filter | awk '/ %s / { sub(/-A/, "-D", $1) ; print }'""" % vif ).split("\n")
+ for rule in filter(None, rules):
+ try:
+ execute("iptables " + rule)
+ except:
+ logging.debug("Ignoring failure to delete rule: " + rule)
+ except:
+ pass
+
+ try:
+ dnats = execute("""iptables-save -t nat | awk '/ %s / { sub(/-A/, "-D", $1) ; print }'""" % vif ).split("\n")
+ for dnat in filter(None, dnats):
+ try:
+ execute("iptables -t nat " + dnat)
+ except:
+ logging.debug("Ignoring failure to delete dnat: " + dnat)
+ except:
+ pass
+
+ ips = sec_ips.split(';')
+ ips.pop()
+ ips.append(vm_ip)
+ add_to_ipset(vm_name, ips, "-D")
+ ebtables_rules_vmip(vm_name, vm_mac, ips, "-D")
+
+ vmchain_in = vm_name + "-in"
+ vmchain_out = vm_name + "-out"
+ vmchain_in_src = vm_name + "-in-src"
+ vmchain_out_dst = vm_name + "-out-dst"
+ try:
+ execute("ebtables -t nat -D " + vmchain_in_src + " -s " + vm_mac + " -j RETURN")
+ execute("ebtables -t nat -D " + vmchain_out_dst + " -p ARP --arp-op Reply --arp-mac-dst " + vm_mac + " -j RETURN")
+ execute("ebtables -t nat -D PREROUTING -i " + vif + " -j " + vmchain_in)
+ execute("ebtables -t nat -D POSTROUTING -o " + vif + " -j " + vmchain_out)
+ except:
+ logging.debug("Ignoring failure to delete ebtable rules for vm: " + vm_name)
def get_bridge_physdev(brname):
physdev = execute("bridge -o link show | awk '/master %s / && !/^[0-9]+: vnet/ {print $2}' | head -1" % brname)
@@ -160,6 +196,9 @@
vm_ipsetname=ipset_chain_name(vm_name)
delete_rules_for_vm_in_bridge_firewall_chain(vm_name)
+ if 1 in [vm_name.startswith(c) for c in ['r-', 's-', 'v-']]:
+ return True
+
if vm_name.startswith('i-'):
vmchain_default = '-'.join(vm_name.split('-')[:-1]) + "-def"
@@ -200,9 +239,6 @@
remove_rule_log_for_vm(vm_name)
remove_secip_log_for_vm(vm_name)
- if 1 in [vm_name.startswith(c) for c in ['r-', 's-', 'v-']]:
- return True
-
return True
@@ -230,7 +266,7 @@
execute("ebtables -t nat " + cmd)
except:
logging.debug("Ignoring failure to delete ebtables rules for vm " + vm_name)
- chains = [eb_vm_chain+"-in", eb_vm_chain+"-out", eb_vm_chain+"-in-ips", eb_vm_chain+"-out-ips"]
+ chains = [eb_vm_chain+"-in", eb_vm_chain+"-out", eb_vm_chain+"-in-ips", eb_vm_chain+"-out-ips", eb_vm_chain+"-in-src", eb_vm_chain+"-out-dst"]
for chain in chains:
try:
execute("ebtables -t nat -F " + chain)
@@ -239,14 +275,33 @@
logging.debug("Ignoring failure to delete ebtables chain for vm " + vm_name)
-def default_ebtables_rules(vm_name, vm_ip, vm_mac, vif):
+def default_ebtables_rules(vm_name, vm_ip, vm_mac, vif, is_first_nic=False):
eb_vm_chain=ebtables_chain_name(vm_name)
vmchain_in = eb_vm_chain + "-in"
vmchain_out = eb_vm_chain + "-out"
vmchain_in_ips = eb_vm_chain + "-in-ips"
vmchain_out_ips = eb_vm_chain + "-out-ips"
+ vmchain_in_src = eb_vm_chain + "-in-src"
+ vmchain_out_dst = eb_vm_chain + "-out-dst"
- for chain in [vmchain_in, vmchain_out, vmchain_in_ips, vmchain_out_ips]:
+ if not is_first_nic:
+ try:
+ execute("ebtables -t nat -A PREROUTING -i " + vif + " -j " + vmchain_in)
+ execute("ebtables -t nat -A POSTROUTING -o " + vif + " -j " + vmchain_out)
+ execute("ebtables -t nat -I " + vmchain_in_src + " -s " + vm_mac + " -j RETURN")
+ if vm_ip:
+ execute("ebtables -t nat -I " + vmchain_in_ips + " -p ARP -s " + vm_mac + " --arp-mac-src " + vm_mac + " --arp-ip-src " + vm_ip + " -j RETURN")
+ execute("ebtables -t nat -I " + vmchain_out_dst + " -p ARP --arp-op Reply --arp-mac-dst " + vm_mac + " -j RETURN")
+ if vm_ip:
+ execute("ebtables -t nat -I " + vmchain_out_ips + " -p ARP --arp-ip-dst " + vm_ip + " -j RETURN")
+ except:
+ logging.debug("Failed to program rules for additional nic " + vif)
+ return False
+ return
+
+ destroy_ebtables_rules(vm_name, vif)
+
+ for chain in [vmchain_in, vmchain_out, vmchain_in_ips, vmchain_out_ips, vmchain_in_src, vmchain_out_dst]:
try:
execute("ebtables -t nat -N " + chain)
except:
@@ -258,17 +313,19 @@
execute("ebtables -t nat -A POSTROUTING -o " + vif + " -j " + vmchain_out)
execute("ebtables -t nat -A " + vmchain_in_ips + " -j DROP")
execute("ebtables -t nat -A " + vmchain_out_ips + " -j DROP")
+ execute("ebtables -t nat -A " + vmchain_in_src + " -j DROP")
+ execute("ebtables -t nat -A " + vmchain_out_dst + " -p ARP --arp-op Reply -j DROP")
+
except:
logging.debug("Failed to program default rules")
return False
try:
- execute("ebtables -t nat -A " + vmchain_in + " -s ! " + vm_mac + " -j DROP")
- execute("ebtables -t nat -A " + vmchain_in + " -p ARP -s ! " + vm_mac + " -j DROP")
- execute("ebtables -t nat -A " + vmchain_in + " -p ARP --arp-mac-src ! " + vm_mac + " -j DROP")
+ execute("ebtables -t nat -A " + vmchain_in + " -j " + vmchain_in_src)
+ execute("ebtables -t nat -I " + vmchain_in_src + " -s " + vm_mac + " -j RETURN")
+ execute("ebtables -t nat -A " + vmchain_in + " -p ARP -j " + vmchain_in_ips)
if vm_ip:
- execute("ebtables -t nat -A " + vmchain_in + " -p ARP -j " + vmchain_in_ips)
- execute("ebtables -t nat -I " + vmchain_in_ips + " -p ARP --arp-ip-src " + vm_ip + " -j RETURN")
+ execute("ebtables -t nat -I " + vmchain_in_ips + " -p ARP -s " + vm_mac + " --arp-mac-src " + vm_mac + " --arp-ip-src " + vm_ip + " -j RETURN")
execute("ebtables -t nat -A " + vmchain_in + " -p ARP --arp-op Request -j ACCEPT")
execute("ebtables -t nat -A " + vmchain_in + " -p ARP --arp-op Reply -j ACCEPT")
execute("ebtables -t nat -A " + vmchain_in + " -p ARP -j DROP")
@@ -277,9 +334,10 @@
return False
try:
- execute("ebtables -t nat -A " + vmchain_out + " -p ARP --arp-op Reply --arp-mac-dst ! " + vm_mac + " -j DROP")
+ execute("ebtables -t nat -A " + vmchain_out + " -p ARP --arp-op Reply -j " + vmchain_out_dst)
+ execute("ebtables -t nat -I " + vmchain_out_dst + " -p ARP --arp-op Reply --arp-mac-dst " + vm_mac + " -j RETURN")
+ execute("ebtables -t nat -A " + vmchain_out + " -p ARP -j " + vmchain_out_ips )
if vm_ip:
- execute("ebtables -t nat -A " + vmchain_out + " -p ARP -j " + vmchain_out_ips )
execute("ebtables -t nat -I " + vmchain_out_ips + " -p ARP --arp-ip-dst " + vm_ip + " -j RETURN")
execute("ebtables -t nat -A " + vmchain_out + " -p ARP --arp-op Request -j ACCEPT")
execute("ebtables -t nat -A " + vmchain_out + " -p ARP --arp-op Reply -j ACCEPT")
@@ -288,6 +346,28 @@
logging.debug("Failed to program default ebtables OUT rules")
return False
+def refactor_ebtable_rules(vm_name):
+ vmchain_in = vm_name + "-in"
+ vmchain_in_ips = vm_name + "-in-ips"
+ vmchain_in_src = vm_name + "-in-src"
+
+ try:
+ execute("ebtables -t nat -L " + vmchain_in_src)
+ logging.debug("Chain '" + vmchain_in_src + "' exists, ebtables rules have newer version, skip refactoring")
+ return True
+ except:
+ logging.debug("Chain '" + vmchain_in_src + "' does not exist, ebtables rules have old version, start refactoring")
+
+ vif = execute("ebtables -t nat -L PREROUTING | grep " + vmchain_in + " | awk '{print $2}'").strip()
+ vm_mac = execute("ebtables -t nat -L " + vmchain_in + " | grep arp-mac-src | awk '{print $5}'").strip()
+ vm_ips = execute("ebtables -t nat -L " + vmchain_in_ips + " | grep arp-ip-src | awk '{print $4}'").split('\n')
+
+ destroy_ebtables_rules(vm_name, vif)
+ default_ebtables_rules(vm_name, None, vm_mac, vif, True)
+ ebtables_rules_vmip(vm_name, vm_mac, vm_ips, "-A")
+
+ logging.debug("Refactoring ebtables rules for vm " + vm_name + " is done")
+ return True
def default_network_rules_systemvm(vm_name, localbrname):
bridges = get_bridges(vm_name)
@@ -384,8 +464,9 @@
return result
-def network_rules_vmSecondaryIp(vm_name, ip_secondary, action):
+def network_rules_vmSecondaryIp(vm_name, vm_mac, ip_secondary, action):
logging.debug("vmName = "+ vm_name)
+ logging.debug("vmMac = " + vm_mac)
logging.debug("action = "+ action)
vmchain = vm_name
@@ -395,16 +476,16 @@
add_to_ipset(vmchain, ip4s, action)
- #add ebtables rules for the secondary ips
- ebtables_rules_vmip(vm_name, ip4s, action)
-
#add ipv6 addresses to ipv6 ipset
add_to_ipset(vmchain6, ip6s, action)
+ #add ebtables rules for the secondary ip
+ refactor_ebtable_rules(vm_name)
+ ebtables_rules_vmip(vm_name, vm_mac, [ip_secondary], action)
+
return True
-
-def ebtables_rules_vmip (vmname, ips, action):
+def ebtables_rules_vmip (vmname, vmmac, ips, action):
eb_vm_chain=ebtables_chain_name(vmname)
vmchain_inips = eb_vm_chain + "-in-ips"
vmchain_outips = eb_vm_chain + "-out-ips"
@@ -417,46 +498,75 @@
if ip == 0 or ip == "0":
continue
try:
- execute("ebtables -t nat " + action + " " + vmchain_inips + " -p ARP --arp-ip-src " + ip + " -j RETURN")
+ execute("ebtables -t nat " + action + " " + vmchain_inips + " -p ARP -s " + vmmac + " --arp-mac-src " + vmmac + " --arp-ip-src " + ip + " -j RETURN")
execute("ebtables -t nat " + action + " " + vmchain_outips + " -p ARP --arp-ip-dst " + ip + " -j RETURN")
except:
logging.debug("Failed to program ebtables rules for secondary ip %s for vm %s with action %s" % (ip, vmname, action))
+def check_default_network_rules(vm_name, vm_id, vm_ip, vm_ip6, vm_mac, vif, brname, sec_ips, is_first_nic=False):
+ brfw = get_br_fw(brname)
+ vmchain_default = '-'.join(vm_name.split('-')[:-1]) + "-def"
+ try:
+ rules = execute("iptables-save |grep -w %s |grep -w %s |grep -w %s" % (brfw, vif, vmchain_default))
+ except:
+ rules = None
+ if rules is None or rules is "":
+ logging.debug("iptables rules do not exist, programming default rules for %s %s" % (vm_name,vif))
+ default_network_rules(vm_name, vm_id, vm_ip, vm_ip6, vm_mac, vif, brname, sec_ips, is_first_nic)
+ else:
+ vmchain_in = vm_name + "-in"
+ try:
+ rules = execute("ebtables -t nat -L PREROUTING | grep %s |grep -w %s" % (vmchain_in, vif))
+ except:
+ rules = None
+ if rules is None or rules is "":
+ logging.debug("ebtables rules do not exist, programming default ebtables rules for %s %s" % (vm_name,vif))
+ default_ebtables_rules(vm_name, vm_ip, vm_mac, vif, is_first_nic)
+ ips = sec_ips.split(';')
+ ips.pop()
+ ebtables_rules_vmip(vm_name, vm_mac, ips, "-I")
+ return True
-def default_network_rules(vm_name, vm_id, vm_ip, vm_ip6, vm_mac, vif, brname, sec_ips):
+def default_network_rules(vm_name, vm_id, vm_ip, vm_ip6, vm_mac, vif, brname, sec_ips, is_first_nic=False):
if not add_fw_framework(brname):
return False
vmName = vm_name
brfw = get_br_fw(brname)
domID = get_vm_id(vm_name)
- delete_rules_for_vm_in_bridge_firewall_chain(vmName)
+
vmchain = iptables_chain_name(vm_name)
vmchain_egress = egress_chain_name(vm_name)
vmchain_default = '-'.join(vmchain.split('-')[:-1]) + "-def"
ipv6_link_local = ipv6_link_local_addr(vm_mac)
- destroy_ebtables_rules(vm_name, vif)
-
- for chain in [vmchain, vmchain_egress, vmchain_default]:
- try:
- execute('iptables -N ' + chain)
- except:
- execute('iptables -F ' + chain)
-
- try:
- execute('ip6tables -N ' + chain)
- except:
- execute('ip6tables -F ' + chain)
-
action = "-A"
vmipsetName = ipset_chain_name(vm_name)
vmipsetName6 = vmipsetName + '-6'
- #create ipset and add vm ips to that ip set
- if not create_ipset_forvm(vmipsetName):
- logging.debug("failed to create ipset for rule %s", vmipsetName)
- return False
+ if is_first_nic:
+ delete_rules_for_vm_in_bridge_firewall_chain(vmName)
+ destroy_ebtables_rules(vmName, vif)
+
+ for chain in [vmchain, vmchain_egress, vmchain_default]:
+ try:
+ execute('iptables -N ' + chain)
+ except:
+ execute('iptables -F ' + chain)
+
+ try:
+ execute('ip6tables -N ' + chain)
+ except:
+ execute('ip6tables -F ' + chain)
+
+ #create ipset and add vm ips to that ip set
+ if not create_ipset_forvm(vmipsetName):
+ logging.debug("failed to create ipset for rule %s", vmipsetName)
+ return False
+
+ if not create_ipset_forvm(vmipsetName6, family='inet6', type='hash:net'):
+ logging.debug("failed to create ivp6 ipset for rule %s", vmipsetName6)
+ return False
#add primary nic ip to ipset
if not add_to_ipset(vmipsetName, [vm_ip], action ):
@@ -489,37 +599,36 @@
#allow dhcp
execute("iptables -A " + vmchain_default + " -m physdev --physdev-is-bridged --physdev-in " + vif + " -p udp --dport 67 --sport 68 -j ACCEPT")
execute("iptables -A " + vmchain_default + " -m physdev --physdev-is-bridged --physdev-out " + vif + " -p udp --dport 68 --sport 67 -j ACCEPT")
+ execute("iptables -A " + vmchain_default + " -m physdev --physdev-is-bridged --physdev-in " + vif + " -p udp --sport 67 -j DROP")
#don't let vm spoof its ip address
if vm_ip:
execute("iptables -A " + vmchain_default + " -m physdev --physdev-is-bridged --physdev-in " + vif + " -m set ! --match-set " + vmipsetName + " src -j DROP")
+ execute("iptables -A " + vmchain_default + " -m physdev --physdev-is-bridged --physdev-out " + vif + " -m set ! --match-set " + vmipsetName + " dst -j DROP")
execute("iptables -A " + vmchain_default + " -m physdev --physdev-is-bridged --physdev-in " + vif + " -m set --match-set " + vmipsetName + " src -p udp --dport 53 -j RETURN ")
execute("iptables -A " + vmchain_default + " -m physdev --physdev-is-bridged --physdev-in " + vif + " -m set --match-set " + vmipsetName + " src -p tcp --dport 53 -j RETURN ")
execute("iptables -A " + vmchain_default + " -m physdev --physdev-is-bridged --physdev-in " + vif + " -m set --match-set " + vmipsetName + " src -j " + vmchain_egress)
+
execute("iptables -A " + vmchain_default + " -m physdev --physdev-is-bridged --physdev-out " + vif + " -j " + vmchain)
execute("iptables -A " + vmchain + " -j DROP")
except:
logging.debug("Failed to program default rules for vm " + vm_name)
return False
- default_ebtables_rules(vm_name, vm_ip, vm_mac, vif)
+ default_ebtables_rules(vmchain, vm_ip, vm_mac, vif, is_first_nic)
#default ebtables rules for vm secondary ips
- ebtables_rules_vmip(vm_name, ip4s, "-I")
+ ebtables_rules_vmip(vm_name, vm_mac, ip4s, "-I")
- if vm_ip:
+ if vm_ip and is_first_nic:
if not write_rule_log_for_vm(vmName, vm_id, vm_ip, domID, '_initial_', '-1'):
logging.debug("Failed to log default network rules, ignoring")
- if not create_ipset_forvm(vmipsetName6, family='inet6', type='hash:net'):
- logging.debug(" failed to create ivp6 ipset for rule " + str(tokens))
- return False
-
vm_ip6_addr = [ipv6_link_local]
try:
- ip6 = IPAddress(vm_ip6)
+ ip6 = ipaddress.ip_address(vm_ip6)
if ip6.version == 6:
vm_ip6_addr.append(ip6)
- except AddrFormatError:
+ except (ipaddress.AddressValueError, ValueError):
pass
add_to_ipset(vmipsetName6, vm_ip6_addr, action)
@@ -765,7 +874,8 @@
name = name.rstrip()
if 1 not in [name.startswith(c) for c in ['r-', 's-', 'v-', 'i-'] ]:
continue
- network_rules_for_rebooted_vm(name)
+ # Move actions on rebooted vm to java code
+ # network_rules_for_rebooted_vm(name)
if name.startswith('i-'):
log = get_rule_log_for_vm(name)
result.append(log)
@@ -969,7 +1079,7 @@
ipv6 = []
for ip in cidrs.split(","):
try:
- network = IPNetwork(ip)
+ network = ipaddress.ip_network(ip, False)
if network.version == 4:
ipv4.append(ip)
else:
@@ -994,8 +1104,10 @@
logging.debug("Rules already programmed for vm " + vm_name)
return True
- if changes[0] or changes[1] or changes[2] or changes[3]:
- default_network_rules(vmName, vm_id, vm_ip, vm_ip6, vmMac, vif, brname, sec_ips)
+ if rules == "" or rules == None:
+ lines = []
+ else:
+ lines = rules.split(';')[:-1]
logging.debug("programming network rules for IP: " + vm_ip + " vmname=%s", vm_name)
@@ -1009,7 +1121,7 @@
execute('ip6tables -F ' + chain)
except:
logging.debug("Error flushing iptables rules for " + vm_name + ". Presuming firewall rules deleted, re-initializing." )
- default_network_rules(vm_name, vm_id, vm_ip, vm_ip6, vmMac, vif, brname, sec_ips)
+ default_network_rules(vm_name, vm_id, vm_ip, vm_ip6, vmMac, vif, brname, sec_ips, True)
egressrule_v4 = 0
egressrule_v6 = 0
@@ -1034,7 +1146,18 @@
action = "ACCEPT"
direction = "-s"
- range = str(start) + ':' + str(end)
+ if start == 0 and end == 0:
+ dport = ""
+ else:
+ dport = " --dport " + str(start) + ":" + str(end)
+
+ if protocol != 'all' and protocol != 'icmp' and protocol != 'tcp' and protocol != 'udp':
+ protocol_all = " -p " + protocol
+ protocol_state = " "
+ else:
+ protocol_all = " -p " + protocol + " -m " + protocol
+ protocol_state = " -m state --state NEW "
+
if 'icmp' == protocol:
range = str(start) + '/' + str(end)
if start == -1:
@@ -1043,16 +1166,16 @@
for ip in rule['ipv4']:
if protocol == 'all':
execute('iptables -I ' + vmchain + ' -m state --state NEW ' + direction + ' ' + ip + ' -j ' + action)
- elif protocol != 'icmp':
- execute('iptables -I ' + vmchain + ' -p ' + protocol + ' -m ' + protocol + ' --dport ' + range + ' -m state --state NEW ' + direction + ' ' + ip + ' -j ' + action)
+ elif protocol == 'icmp':
+ execute("iptables -I " + vmchain + " -p icmp --icmp-type " + range + " " + direction + " " + ip + " -j " + action)
else:
- execute('iptables -I ' + vmchain + ' -p icmp --icmp-type ' + range + ' ' + direction + ' ' + ip + ' -j ' + action)
+ execute("iptables -I " + vmchain + protocol_all + dport + protocol_state + direction + " " + ip + " -j "+ action)
for ip in rule['ipv6']:
if protocol == 'all':
execute('ip6tables -I ' + vmchain + ' -m state --state NEW ' + direction + ' ' + ip + ' -j ' + action)
elif 'icmp' != protocol:
- execute('ip6tables -I ' + vmchain + ' -p ' + protocol + ' -m ' + protocol + ' --dport ' + range + ' -m state --state NEW ' + direction + ' ' + ip + ' -j ' + action)
+ execute("ip6tables -I " + vmchain + protocol_all + dport + protocol_state + direction + " " + ip + " -j "+ action)
else:
# ip6tables does not allow '--icmpv6-type any', allowing all ICMPv6 is done by not allowing a specific type
if range == 'any':
@@ -1154,6 +1277,11 @@
def add_fw_framework(brname):
try:
+ execute("modprobe br_netfilter")
+ except:
+ logging.debug("failed to load kernel module br_netfilter")
+
+ try:
execute("sysctl -w net.bridge.bridge-nf-call-arptables=1")
execute("sysctl -w net.bridge.bridge-nf-call-iptables=1")
execute("sysctl -w net.bridge.bridge-nf-call-ip6tables=1")
@@ -1230,6 +1358,236 @@
return False
return False
+def verify_network_rules(vm_name, vm_id, vm_ip, vm_ip6, vm_mac, vif, brname, sec_ips):
+ if vm_name is None or vm_ip is None or vm_mac is None:
+ print("vm_name, vm_ip and vm_mac must be specifed")
+ sys.exit(1)
+
+ if vm_id is None:
+ vm_id = vm_name.split("-")[-2]
+
+ if brname is None:
+ brname = execute("virsh domiflist %s |grep -w '%s' |tr -s ' '|cut -d ' ' -f3" % (vm_name, vm_mac)).strip()
+ if brname is None or brname == "":
+ print("Cannot find bridge")
+ sys.exit(1)
+
+ if vif is None:
+ vif = execute("virsh domiflist %s |grep -w '%s' |tr -s ' '|cut -d ' ' -f1" % (vm_name, vm_mac)).strip()
+ if vif is None or vif == "":
+ print("Cannot find vif")
+ sys.exit(1)
+
+ #vm_name = "i-2-55-VM"
+ #vm_id = 55
+ #vm_ip = "10.11.118.128"
+ #vm_ip6 = "fe80::1c00:b4ff:fe00:5"
+ #vm_mac = "1e:00:b4:00:00:05"
+ #vif = "vnet11"
+ #brname = "cloudbr0"
+ #sec_ips = "10.11.118.133;10.11.118.135;10.11.118.138;" # end with ";" and seperated by ";"
+
+ vm_ips = []
+ if sec_ips is not None:
+ vm_ips = sec_ips.split(';')
+ vm_ips.pop()
+ vm_ips.reverse()
+ vm_ips.append(vm_ip)
+
+ if not verify_ipset_for_vm(vm_name, vm_id, vm_ips, vm_ip6):
+ sys.exit(2)
+ if not verify_iptables_rules_for_bridge(brname):
+ sys.exit(3)
+ if not verify_default_iptables_rules_for_vm(vm_name, vm_id, vm_ips, vm_ip6, vm_mac, vif, brname):
+ sys.exit(4)
+ if not verify_ebtables_rules_for_vm(vm_name, vm_id, vm_ips, vm_ip6, vm_mac, vif, brname):
+ sys.exit(5)
+
+ sys.exit(0)
+
+def verify_ipset_for_vm(vm_name, vm_id, vm_ips, vm_ip6):
+ vmipsetName = ipset_chain_name(vm_name)
+ vmipsetName6 = vmipsetName + '-6'
+
+ rules = []
+ for rule in execute("ipset list %s" % vmipsetName).split('\n'):
+ rules.append(rule)
+
+ # Check if all vm ips and ip6 exist
+ for vm_ip in vm_ips:
+ found = False
+ for rule in rules:
+ if rule == vm_ip:
+ found = True
+ break
+ if not found:
+ print("vm ip %s is not found" % vm_ip)
+ return False
+
+ rules = []
+ for rule in execute("ipset list %s" % vmipsetName6).split('\n'):
+ rules.append(rule)
+
+ if vm_ip6 is not None:
+ found = False
+ for rule in rules:
+ if rule == vm_ip6:
+ found = True
+ break
+ if not found:
+ print("vm ipv6 %s is not found" % vm_ip6)
+ return False
+
+ return True
+
+def verify_iptables_rules_for_bridge(brname):
+ brfw = get_br_fw(brname)
+ brfwin = brfw + "-IN"
+ brfwout = brfw + "-OUT"
+
+ expected_rules = []
+ expected_rules.append("-A FORWARD -o %s -m physdev --physdev-is-bridged -j %s" % (brname, brfw))
+ expected_rules.append("-A FORWARD -i %s -m physdev --physdev-is-bridged -j %s" % (brname, brfw))
+ expected_rules.append("-A %s -m state --state RELATED,ESTABLISHED -j ACCEPT" % (brfw))
+ expected_rules.append("-A %s -m physdev --physdev-is-in --physdev-is-bridged -j %s" % (brfw, brfwin))
+ expected_rules.append("-A %s -m physdev --physdev-is-out --physdev-is-bridged -j %s" % (brfw, brfwout))
+ phydev = execute("brctl show | awk '/^%s[ \t]/ {print $4}'" % brname ).strip()
+ expected_rules.append("-A %s -m physdev --physdev-out %s --physdev-is-bridged -j ACCEPT" % (brfw, phydev))
+
+ rules = execute("iptables-save |grep -w %s |grep -v \"^:\"" % brfw).split('\n')
+
+ return verify_expected_rules_exist(expected_rules, rules)
+
+def verify_default_iptables_rules_for_vm(vm_name, vm_id, vm_ips, vm_ip6, vm_mac, vif, brname):
+ brfw = get_br_fw(brname)
+ brfwin = brfw + "-IN"
+ brfwout = brfw + "-OUT"
+ vmchain = iptables_chain_name(vm_name)
+ vmchain_egress = egress_chain_name(vm_name)
+ vm_def = '-'.join(vm_name.split('-')[:-1]) + "-def"
+
+ expected_rules = []
+ expected_rules.append("-A %s -m physdev --physdev-in %s --physdev-is-bridged -j %s" % (brfwin, vif, vm_def))
+ expected_rules.append("-A %s -m physdev --physdev-out %s --physdev-is-bridged -j %s" % (brfwout, vif, vm_def))
+ expected_rules.append("-A %s -m state --state RELATED,ESTABLISHED -j ACCEPT" % (vm_def))
+ expected_rules.append("-A %s -p udp -m physdev --physdev-in %s --physdev-is-bridged -m udp --sport 68 --dport 67 -j ACCEPT" % (vm_def, vif))
+ expected_rules.append("-A %s -p udp -m physdev --physdev-out %s --physdev-is-bridged -m udp --sport 67 --dport 68 -j ACCEPT" % (vm_def, vif))
+ expected_rules.append("-A %s -p udp -m physdev --physdev-in %s --physdev-is-bridged -m udp --sport 67 -j DROP" % (vm_def, vif))
+ expected_rules.append("-A %s -m physdev --physdev-in %s --physdev-is-bridged -m set ! --match-set %s src -j DROP" % (vm_def, vif, vm_name))
+ expected_rules.append("-A %s -m physdev --physdev-out %s --physdev-is-bridged -m set ! --match-set %s dst -j DROP" % (vm_def, vif, vm_name))
+ expected_rules.append("-A %s -p udp -m physdev --physdev-in %s --physdev-is-bridged -m set --match-set %s src -m udp --dport 53 -j RETURN" % (vm_def, vif, vm_name))
+ expected_rules.append("-A %s -p tcp -m physdev --physdev-in %s --physdev-is-bridged -m set --match-set %s src -m tcp --dport 53 -j RETURN" % (vm_def, vif, vm_name))
+ expected_rules.append("-A %s -m physdev --physdev-in %s --physdev-is-bridged -m set --match-set %s src -j %s" % (vm_def, vif, vm_name, vmchain_egress))
+ expected_rules.append("-A %s -m physdev --physdev-out %s --physdev-is-bridged -j %s" % (vm_def, vif, vmchain))
+
+ rules = execute("iptables-save |grep -E \"%s|%s\" |grep -v \"^:\"" % (vm_name, vm_def)).split('\n')
+
+ return verify_expected_rules_in_order(expected_rules, rules)
+
+def verify_ebtables_rules_for_vm(vm_name, vm_id, vm_ips, vm_ip6, vm_mac, vif, brname):
+ vmchain_in = vm_name + "-in"
+ vmchain_out = vm_name + "-out"
+ vmchain_in_ips = vm_name + "-in-ips"
+ vmchain_out_ips = vm_name + "-out-ips"
+ vmchain_in_src = vm_name + "-in-src"
+ vmchain_out_dst = vm_name + "-out-dst"
+
+ new_mac = trim_mac_address(vm_mac)
+
+ # PREROUTING/POSTROUTING
+ expected_rules = []
+ expected_rules.append("-A PREROUTING -i %s -j %s" % (vif, vmchain_in))
+ expected_rules.append("-A POSTROUTING -o %s -j %s" % (vif, vmchain_out))
+ rules = execute("ebtables-save |grep -E \"PREROUTING|POSTROUTING\" | grep %s" % vm_name).split('\n')
+ if not verify_expected_rules_exist(expected_rules, rules):
+ return False
+
+ rules = execute("ebtables-save | grep %s" % vm_name).split('\n')
+
+ # vmchain_in
+ expected_rules = []
+ expected_rules.append("-A %s -j %s" % (vmchain_in, vmchain_in_src))
+ expected_rules.append("-A %s -p ARP -j %s" % (vmchain_in, vmchain_in_ips))
+ expected_rules.append("-A %s -p ARP --arp-op Request -j ACCEPT" % (vmchain_in))
+ expected_rules.append("-A %s -p ARP --arp-op Reply -j ACCEPT" % (vmchain_in))
+ expected_rules.append("-A %s -p ARP -j DROP" % (vmchain_in))
+ if not verify_expected_rules_in_order(expected_rules, rules):
+ return False
+
+ # vmchain_in_src
+ expected_rules = []
+ expected_rules.append("-A %s -s %s -j RETURN" % (vmchain_in_src, new_mac))
+ expected_rules.append("-A %s -j DROP" % (vmchain_in_src))
+ if not verify_expected_rules_in_order(expected_rules, rules):
+ return False
+
+ # vmchain_in_ips
+ expected_rules = []
+ for vm_ip in vm_ips:
+ expected_rules.append("-A %s -p ARP -s %s --arp-ip-src %s --arp-mac-src %s -j RETURN" % (vmchain_in_ips, new_mac, vm_ip, new_mac))
+ expected_rules.append("-A %s -j DROP" % (vmchain_in_ips))
+ if not verify_expected_rules_in_order(expected_rules, rules):
+ return False
+
+ # vmchain_out
+ expected_rules = []
+ expected_rules.append("-A %s -p ARP --arp-op Reply -j %s" % (vmchain_out, vmchain_out_dst))
+ expected_rules.append("-A %s -p ARP -j %s" % (vmchain_out, vmchain_out_ips))
+ expected_rules.append("-A %s -p ARP --arp-op Request -j ACCEPT" % (vmchain_out))
+ expected_rules.append("-A %s -p ARP --arp-op Reply -j ACCEPT" % (vmchain_out))
+ expected_rules.append("-A %s -p ARP -j DROP" % (vmchain_out))
+ if not verify_expected_rules_in_order(expected_rules, rules):
+ return False
+
+ # vmchain_out_dst
+ expected_rules = []
+ expected_rules.append("-A %s -p ARP --arp-op Reply --arp-mac-dst %s -j RETURN" % (vmchain_out_dst, new_mac))
+ expected_rules.append("-A %s -p ARP --arp-op Reply -j DROP" % (vmchain_out_dst))
+ if not verify_expected_rules_in_order(expected_rules, rules):
+ return False
+
+ # vmchain_out_ips
+ expected_rules = []
+ for vm_ip in vm_ips:
+ expected_rules.append("-A %s -p ARP --arp-ip-dst %s -j RETURN" % (vmchain_out_ips, vm_ip))
+ expected_rules.append("-A %s -j DROP" % (vmchain_out_ips))
+ if not verify_expected_rules_in_order(expected_rules, rules):
+ return False
+
+ return True
+
+def trim_mac_address(vm_mac):
+ new_mac = ""
+ for mac in vm_mac.split(":"):
+ if mac.startswith("0"):
+ new_mac += ":" + mac[1:]
+ else:
+ new_mac += ":" + mac
+ return new_mac[1:]
+
+def verify_expected_rules_exist(expected_rules, rules):
+ # Check if expected rules exist
+ for expected_rule in expected_rules:
+ found = False
+ for rule in rules:
+ if rule == expected_rule:
+ found = True
+ break
+ if not found:
+ print("Rule '%s' is not found" % expected_rule)
+ return False
+ return True
+
+def verify_expected_rules_in_order(expected_rules, rules):
+ # Check if expected rules exist in order (!!!)
+ i = 0
+ for rule in rules:
+ if i < len(expected_rules) and rule == expected_rules[i]:
+ i += 1
+ if i != len(expected_rules):
+ print("Cannot find rule '%s'" % expected_rules[i])
+ return False
+ return True
if __name__ == '__main__':
logging.basicConfig(filename="/var/log/cloudstack/agent/security_group.log", format="%(asctime)s - %(message)s", level=logging.DEBUG)
@@ -1252,6 +1610,8 @@
parser.add_argument("--nicsecips", dest="nicSecIps")
parser.add_argument("--action", dest="action")
parser.add_argument("--privnic", dest="privnic")
+ parser.add_argument("--isFirstNic", action="store_true", dest="isFirstNic")
+ parser.add_argument("--check", action="store_true", dest="check")
args = parser.parse_args()
cmd = args.command
logging.debug("Executing command: %s", cmd)
@@ -1265,10 +1625,15 @@
if cmd == "can_bridge_firewall":
can_bridge_firewall(args.privnic)
- elif cmd == "default_network_rules":
- default_network_rules(args.vmName, args.vmID, args.vmIP, args.vmIP6, args.vmMAC, args.vif, args.brname, args.nicSecIps)
+ elif cmd == "default_network_rules" and args.check:
+ check_default_network_rules(args.vmName, args.vmID, args.vmIP, args.vmIP6, args.vmMAC, args.vif, args.brname, args.nicSecIps, args.isFirstNic)
+ elif cmd == "default_network_rules" and not args.check:
+ default_network_rules(args.vmName, args.vmID, args.vmIP, args.vmIP6, args.vmMAC, args.vif, args.brname, args.nicSecIps, args.isFirstNic)
elif cmd == "destroy_network_rules_for_vm":
- destroy_network_rules_for_vm(args.vmName, args.vif)
+ if args.vmIP is None:
+ destroy_network_rules_for_vm(args.vmName, args.vif)
+ else:
+ destroy_network_rules_for_nic(args.vmName, args.vmIP, args.vmMAC, args.vif, args.nicSecIps)
elif cmd == "default_network_rules_systemvm":
default_network_rules_systemvm(args.vmName, args.localbrname)
elif cmd == "get_rule_logs_for_vms":
@@ -1276,11 +1641,13 @@
elif cmd == "add_network_rules":
add_network_rules(args.vmName, args.vmID, args.vmIP, args.vmIP6, args.sig, args.seq, args.vmMAC, args.rules, args.vif, args.brname, args.nicSecIps)
elif cmd == "network_rules_vmSecondaryIp":
- network_rules_vmSecondaryIp(args.vmName, args.nicSecIps, args.action)
+ network_rules_vmSecondaryIp(args.vmName, args.vmMAC, args.nicSecIps, args.action)
elif cmd == "cleanup_rules":
cleanup_rules()
elif cmd == "post_default_network_rules":
post_default_network_rules(args.vmName, args.vmID, args.vmIP, args.vmMAC, args.vif, args.brname, args.dhcpSvr, args.hostIp, args.hostMacAddr)
+ elif cmd == "verify_network_rules":
+ verify_network_rules(args.vmName, args.vmID, args.vmIP, args.vmIP6, args.vmMAC, args.vif, args.brname, args.nicSecIps)
else:
logging.debug("Unknown command: " + cmd)
sys.exit(1)
diff --git a/scripts/vm/network/vnet/modifyvlan.sh b/scripts/vm/network/vnet/modifyvlan.sh
index affa778..8ee2e39 100755
--- a/scripts/vm/network/vnet/modifyvlan.sh
+++ b/scripts/vm/network/vnet/modifyvlan.sh
@@ -52,7 +52,8 @@
if [ ! -d /sys/class/net/$vlanBr ]
then
- brctl addbr $vlanBr > /dev/null
+ ip link add name $vlanBr type bridge
+ ip link set $vlanBr up
if [ $? -gt 0 ]
then
@@ -62,15 +63,13 @@
return 2
fi
fi
-
- brctl setfd $vlanBr 0
fi
#pif is eslaved into vlanBr?
ls /sys/class/net/$vlanBr/brif/ |grep -w "$vlanDev" > /dev/null
if [ $? -gt 0 ]
then
- brctl addif $vlanBr $vlanDev > /dev/null
+ ip link set $vlanDev master $vlanBr
if [ $? -gt 0 ]
then
ls /sys/class/net/$vlanBr/brif/ |grep -w "$vlanDev" > /dev/null
@@ -108,7 +107,7 @@
return 1
fi
- brctl delbr $vlanBr
+ ip link delete $vlanBr type bridge
if [ $? -gt 0 ]
then
diff --git a/scripts/vm/systemvm/injectkeys.sh b/scripts/vm/systemvm/injectkeys.sh
index 9df1718..6f006ea 100755
--- a/scripts/vm/systemvm/injectkeys.sh
+++ b/scripts/vm/systemvm/injectkeys.sh
@@ -42,7 +42,7 @@
[ ! -f $isofile ] && echo "$(basename $0): Could not find systemvm iso patch file $isofile" && return 1
$SUDO mount -o loop $isofile $MOUNTPATH
[ $? -ne 0 ] && echo "$(basename $0): Failed to mount original iso $isofile" && clean_up && return 1
- diff -q $MOUNTPATH/authorized_keys $newpubkey &> /dev/null && clean_up && return 0
+ diff -q $MOUNTPATH/authorized_keys $newpubkey &> /dev/null && echo "New public key is the same as the one in the systemvm.iso, not injecting it, not modifying systemvm.iso" && clean_up && return 0
$SUDO cp -b $isofile $backup
[ $? -ne 0 ] && echo "$(basename $0): Failed to backup original iso $isofile" && clean_up && return 1
rm -rf $TMPDIR
diff --git a/server/pom.xml b/server/pom.xml
index 827715f..dc5a98a 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -24,10 +24,14 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
diff --git a/server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java b/server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
index b6ee305..698d6d7 100644
--- a/server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
+++ b/server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
@@ -29,8 +29,6 @@
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
-import com.google.common.base.Strings;
-
import com.cloud.agent.manager.allocator.HostAllocator;
import com.cloud.capacity.CapacityManager;
import com.cloud.capacity.CapacityVO;
@@ -63,6 +61,9 @@
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.dao.VMInstanceDao;
+import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.dao.UserVmDetailsDao;
+
/**
* An allocator that tries to find a fit on a computing host. This allocator does not care whether or not the host supports routing.
@@ -94,6 +95,8 @@
CapacityManager _capacityMgr;
@Inject
CapacityDao _capacityDao;
+ @Inject
+ UserVmDetailsDao _userVmDetailsDao;
boolean _checkHvm = true;
protected String _allocationAlgorithm = "random";
@@ -114,6 +117,16 @@
VMTemplateVO template = (VMTemplateVO)vmProfile.getTemplate();
Account account = vmProfile.getOwner();
+ boolean isVMDeployedWithUefi = false;
+ UserVmDetailVO userVmDetailVO = _userVmDetailsDao.findDetail(vmProfile.getId(), "UEFI");
+ if(userVmDetailVO != null){
+ if ("secure".equalsIgnoreCase(userVmDetailVO.getValue()) || "legacy".equalsIgnoreCase(userVmDetailVO.getValue())) {
+ isVMDeployedWithUefi = true;
+ }
+ }
+ s_logger.info(" Guest VM is requested with Cusotm[UEFI] Boot Type "+ isVMDeployedWithUefi);
+
+
if (type == Host.Type.Storage) {
// FirstFitAllocator should be used for user VMs only since it won't care whether the host is capable of routing or not
return new ArrayList<Host>();
@@ -125,11 +138,20 @@
String hostTagOnOffering = offering.getHostTag();
String hostTagOnTemplate = template.getTemplateTag();
+ String hostTagUefi = "UEFI";
boolean hasSvcOfferingTag = hostTagOnOffering != null ? true : false;
boolean hasTemplateTag = hostTagOnTemplate != null ? true : false;
List<HostVO> clusterHosts = new ArrayList<HostVO>();
+ List<HostVO> hostsMatchingUefiTag = new ArrayList<HostVO>();
+ if(isVMDeployedWithUefi){
+ hostsMatchingUefiTag = _hostDao.listByHostCapability(type, clusterId, podId, dcId, Host.HOST_UEFI_ENABLE);
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Hosts with tag '" + hostTagUefi + "' are:" + hostsMatchingUefiTag);
+ }
+ }
+
String haVmTag = (String)vmProfile.getParameter(VirtualMachineProfile.Param.HaTag);
if (haVmTag != null) {
@@ -177,6 +199,10 @@
}
}
+ if (isVMDeployedWithUefi) {
+ clusterHosts.retainAll(hostsMatchingUefiTag);
+ }
+
// add all hosts that we are not considering to the avoid list
List<HostVO> allhostsInCluster = _hostDao.listAllUpAndEnabledNonHAHosts(type, clusterId, podId, dcId, null);
allhostsInCluster.removeAll(clusterHosts);
@@ -420,10 +446,6 @@
// Determine the guest OS category of the template
String templateGuestOSCategory = getTemplateGuestOSCategory(template);
- if (Strings.isNullOrEmpty(templateGuestOSCategory)) {
- return hosts;
- }
-
List<Host> prioritizedHosts = new ArrayList<Host>();
List<Host> noHvmHosts = new ArrayList<Host>();
@@ -454,7 +476,7 @@
String hostGuestOSCategory = getHostGuestOSCategory(host);
if (hostGuestOSCategory == null) {
continue;
- } else if (templateGuestOSCategory.equals(hostGuestOSCategory)) {
+ } else if (templateGuestOSCategory != null && templateGuestOSCategory.equals(hostGuestOSCategory)) {
highPriorityHosts.add(host);
} else {
lowPriorityHosts.add(host);
diff --git a/server/src/main/java/com/cloud/api/ApiDBUtils.java b/server/src/main/java/com/cloud/api/ApiDBUtils.java
index 7457981..8d476ba 100644
--- a/server/src/main/java/com/cloud/api/ApiDBUtils.java
+++ b/server/src/main/java/com/cloud/api/ApiDBUtils.java
@@ -39,6 +39,9 @@
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.response.AccountResponse;
import org.apache.cloudstack.api.response.AsyncJobResponse;
+import org.apache.cloudstack.api.response.BackupOfferingResponse;
+import org.apache.cloudstack.api.response.BackupResponse;
+import org.apache.cloudstack.api.response.BackupScheduleResponse;
import org.apache.cloudstack.api.response.DiskOfferingResponse;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.DomainRouterResponse;
@@ -63,6 +66,12 @@
import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.api.response.VpcOfferingResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
+import org.apache.cloudstack.backup.Backup;
+import org.apache.cloudstack.backup.BackupOffering;
+import org.apache.cloudstack.backup.BackupSchedule;
+import org.apache.cloudstack.backup.dao.BackupDao;
+import org.apache.cloudstack.backup.dao.BackupOfferingDao;
+import org.apache.cloudstack.backup.dao.BackupScheduleDao;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService;
@@ -446,6 +455,9 @@
static ResourceMetaDataService s_resourceDetailsService;
static HostGpuGroupsDao s_hostGpuGroupsDao;
static VGPUTypesDao s_vgpuTypesDao;
+ static BackupDao s_backupDao;
+ static BackupScheduleDao s_backupScheduleDao;
+ static BackupOfferingDao s_backupOfferingDao;
@Inject
private ManagementServer ms;
@@ -684,6 +696,12 @@
private HostGpuGroupsDao hostGpuGroupsDao;
@Inject
private VGPUTypesDao vgpuTypesDao;
+ @Inject
+ private BackupDao backupDao;
+ @Inject
+ private BackupOfferingDao backupOfferingDao;
+ @Inject
+ private BackupScheduleDao backupScheduleDao;
@PostConstruct
void init() {
@@ -806,6 +824,9 @@
s_resourceDetailsService = resourceDetailsService;
s_hostGpuGroupsDao = hostGpuGroupsDao;
s_vgpuTypesDao = vgpuTypesDao;
+ s_backupDao = backupDao;
+ s_backupScheduleDao = backupScheduleDao;
+ s_backupOfferingDao = backupOfferingDao;
}
// ///////////////////////////////////////////////////////////
@@ -2037,4 +2058,16 @@
public static List<ResourceTagJoinVO> listResourceTagViewByResourceUUID(String resourceUUID, ResourceObjectType resourceType) {
return s_tagJoinDao.listBy(resourceUUID, resourceType);
}
+
+ public static BackupResponse newBackupResponse(Backup backup) {
+ return s_backupDao.newBackupResponse(backup);
+ }
+
+ public static BackupScheduleResponse newBackupScheduleResponse(BackupSchedule schedule) {
+ return s_backupScheduleDao.newBackupScheduleResponse(schedule);
+ }
+
+ public static BackupOfferingResponse newBackupOfferingResponse(BackupOffering policy) {
+ return s_backupOfferingDao.newBackupOfferingResponse(policy);
+ }
}
diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
index 05c1ab0..9bec408 100644
--- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
@@ -31,6 +31,7 @@
import javax.inject.Inject;
+import com.cloud.resource.RollingMaintenanceManager;
import org.apache.cloudstack.acl.ControlledEntity;
import org.apache.cloudstack.acl.ControlledEntity.ACLType;
import org.apache.cloudstack.affinity.AffinityGroup;
@@ -44,11 +45,17 @@
import org.apache.cloudstack.api.response.AccountResponse;
import org.apache.cloudstack.api.response.ApplicationLoadBalancerInstanceResponse;
import org.apache.cloudstack.api.response.ApplicationLoadBalancerResponse;
+import org.apache.cloudstack.api.response.RollingMaintenanceHostSkippedResponse;
+import org.apache.cloudstack.api.response.RollingMaintenanceHostUpdatedResponse;
+import org.apache.cloudstack.api.response.RollingMaintenanceResponse;
import org.apache.cloudstack.api.response.ApplicationLoadBalancerRuleResponse;
import org.apache.cloudstack.api.response.AsyncJobResponse;
import org.apache.cloudstack.api.response.AutoScalePolicyResponse;
import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse;
import org.apache.cloudstack.api.response.AutoScaleVmProfileResponse;
+import org.apache.cloudstack.api.response.BackupOfferingResponse;
+import org.apache.cloudstack.api.response.BackupResponse;
+import org.apache.cloudstack.api.response.BackupScheduleResponse;
import org.apache.cloudstack.api.response.CapabilityResponse;
import org.apache.cloudstack.api.response.CapacityResponse;
import org.apache.cloudstack.api.response.ClusterResponse;
@@ -61,6 +68,7 @@
import org.apache.cloudstack.api.response.CreateSSHKeyPairResponse;
import org.apache.cloudstack.api.response.DiskOfferingResponse;
import org.apache.cloudstack.api.response.DomainResponse;
+import org.apache.cloudstack.api.response.RouterHealthCheckResultResponse;
import org.apache.cloudstack.api.response.DomainRouterResponse;
import org.apache.cloudstack.api.response.EventResponse;
import org.apache.cloudstack.api.response.ExtractResponse;
@@ -140,6 +148,10 @@
import org.apache.cloudstack.api.response.VpcResponse;
import org.apache.cloudstack.api.response.VpnUsersResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
+import org.apache.cloudstack.backup.Backup;
+import org.apache.cloudstack.backup.BackupOffering;
+import org.apache.cloudstack.backup.BackupSchedule;
+import org.apache.cloudstack.backup.dao.BackupOfferingDao;
import org.apache.cloudstack.config.Configuration;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
@@ -233,6 +245,7 @@
import com.cloud.network.PhysicalNetworkServiceProvider;
import com.cloud.network.PhysicalNetworkTrafficType;
import com.cloud.network.RemoteAccessVpn;
+import com.cloud.network.RouterHealthCheckResult;
import com.cloud.network.Site2SiteCustomerGateway;
import com.cloud.network.Site2SiteVpnConnection;
import com.cloud.network.Site2SiteVpnGateway;
@@ -376,6 +389,8 @@
NetworkDetailsDao networkDetailsDao;
@Inject
private VMSnapshotDao vmSnapshotDao;
+ @Inject
+ private BackupOfferingDao backupOfferingDao;
@Override
public UserResponse createUserResponse(User user) {
@@ -1349,6 +1364,7 @@
return listVrs.get(0);
}
+
@Override
public SystemVmResponse createSystemVmResponse(VirtualMachine vm) {
SystemVmResponse vmResponse = new SystemVmResponse();
@@ -3657,6 +3673,25 @@
}
usageRecResponse.setDescription(builder.toString());
}
+ } else if (usageRecord.getUsageType() == UsageTypes.BACKUP) {
+ resourceType = ResourceObjectType.Backup;
+ final StringBuilder builder = new StringBuilder();
+ builder.append("Backup usage of size ").append(usageRecord.getUsageDisplay());
+ if (vmInstance != null) {
+ resourceId = vmInstance.getId();
+ usageRecResponse.setResourceName(vmInstance.getInstanceName());
+ usageRecResponse.setUsageId(vmInstance.getUuid());
+ builder.append(" for VM ").append(vmInstance.getHostName())
+ .append(" (").append(vmInstance.getUuid()).append(")");
+ final BackupOffering backupOffering = backupOfferingDao.findByIdIncludingRemoved(usageRecord.getOfferingId());
+ if (backupOffering != null) {
+ builder.append(" and backup offering ").append(backupOffering.getName())
+ .append(" (").append(backupOffering.getUuid()).append(", user ad-hoc/scheduled backup allowed: ")
+ .append(backupOffering.isUserDrivenBackupAllowed()).append(")");
+ }
+
+ }
+ usageRecResponse.setDescription(builder.toString());
} else if (usageRecord.getUsageType() == UsageTypes.VM_SNAPSHOT) {
resourceType = ResourceObjectType.VMSnapshot;
VMSnapshotVO vmSnapshotVO = null;
@@ -3669,6 +3704,9 @@
}
}
usageRecResponse.setSize(usageRecord.getSize());
+ if (usageRecord.getVirtualSize() != null) {
+ usageRecResponse.setVirtualSize(usageRecord.getVirtualSize());
+ }
if (usageRecord.getOfferingId() != null) {
usageRecResponse.setOfferingId(usageRecord.getOfferingId().toString());
}
@@ -4207,6 +4245,22 @@
response.setDomainName(domain.getName());
return response;
}
+
+ @Override
+ public BackupResponse createBackupResponse(Backup backup) {
+ return ApiDBUtils.newBackupResponse(backup);
+ }
+
+ @Override
+ public BackupScheduleResponse createBackupScheduleResponse(BackupSchedule schedule) {
+ return ApiDBUtils.newBackupScheduleResponse(schedule);
+ }
+
+ @Override
+ public BackupOfferingResponse createBackupOfferingResponse(BackupOffering policy) {
+ return ApiDBUtils.newBackupOfferingResponse(policy);
+ }
+
public ManagementServerResponse createManagementResponse(ManagementServerHost mgmt) {
ManagementServerResponse response = new ManagementServerResponse();
response.setId(mgmt.getUuid());
@@ -4215,4 +4269,47 @@
response.setState(mgmt.getState());
return response;
}
+
+ @Override
+ public List<RouterHealthCheckResultResponse> createHealthCheckResponse(VirtualMachine router, List<RouterHealthCheckResult> healthCheckResults) {
+ List<RouterHealthCheckResultResponse> responses = new ArrayList<>(healthCheckResults.size());
+ for (RouterHealthCheckResult hcResult : healthCheckResults) {
+ RouterHealthCheckResultResponse healthCheckResponse = new RouterHealthCheckResultResponse();
+ healthCheckResponse.setObjectName("routerhealthchecks");
+ healthCheckResponse.setCheckName(hcResult.getCheckName());
+ healthCheckResponse.setCheckType(hcResult.getCheckType());
+ healthCheckResponse.setResult(hcResult.getCheckResult());
+ healthCheckResponse.setLastUpdated(hcResult.getLastUpdateTime());
+ healthCheckResponse.setDetails(hcResult.getParsedCheckDetails());
+ responses.add(healthCheckResponse);
+ }
+ return responses;
+ }
+
+ @Override
+ public RollingMaintenanceResponse createRollingMaintenanceResponse(Boolean success, String details, List<RollingMaintenanceManager.HostUpdated> hostsUpdated, List<RollingMaintenanceManager.HostSkipped> hostsSkipped) {
+ RollingMaintenanceResponse response = new RollingMaintenanceResponse(success, details);
+ List<RollingMaintenanceHostUpdatedResponse> updated = new ArrayList<>();
+ for (RollingMaintenanceManager.HostUpdated h : hostsUpdated) {
+ RollingMaintenanceHostUpdatedResponse r = new RollingMaintenanceHostUpdatedResponse();
+ r.setHostId(h.getHost().getUuid());
+ r.setHostName(h.getHost().getName());
+ r.setStartDate(getDateStringInternal(h.getStart()));
+ r.setEndDate(getDateStringInternal(h.getEnd()));
+ r.setOutput(h.getOutputMsg());
+ updated.add(r);
+ }
+ List<RollingMaintenanceHostSkippedResponse> skipped = new ArrayList<>();
+ for (RollingMaintenanceManager.HostSkipped h : hostsSkipped) {
+ RollingMaintenanceHostSkippedResponse r = new RollingMaintenanceHostSkippedResponse();
+ r.setHostId(h.getHost().getUuid());
+ r.setHostName(h.getHost().getName());
+ r.setReason(h.getReason());
+ skipped.add(r);
+ }
+ response.setUpdatedHosts(updated);
+ response.setSkippedHosts(skipped);
+ response.setObjectName("rollingmaintenance");
+ return response;
+ }
}
diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
index c41cd0e..8cac107 100644
--- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
@@ -39,6 +39,7 @@
import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao;
import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd;
import org.apache.cloudstack.api.ResourceDetail;
+import org.apache.cloudstack.api.ResponseGenerator;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.command.admin.account.ListAccountsCmdByAdmin;
import org.apache.cloudstack.api.command.admin.domain.ListDomainsCmd;
@@ -48,6 +49,7 @@
import org.apache.cloudstack.api.command.admin.internallb.ListInternalLBVMsCmd;
import org.apache.cloudstack.api.command.admin.iso.ListIsosCmdByAdmin;
import org.apache.cloudstack.api.command.admin.management.ListMgmtsCmd;
+import org.apache.cloudstack.api.command.admin.router.GetRouterHealthCheckResultsCmd;
import org.apache.cloudstack.api.command.admin.router.ListRoutersCmd;
import org.apache.cloudstack.api.command.admin.storage.ListImageStoresCmd;
import org.apache.cloudstack.api.command.admin.storage.ListSecondaryStagingStoresCmd;
@@ -95,6 +97,7 @@
import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.ResourceDetailResponse;
import org.apache.cloudstack.api.response.ResourceTagResponse;
+import org.apache.cloudstack.api.response.RouterHealthCheckResultResponse;
import org.apache.cloudstack.api.response.SecurityGroupResponse;
import org.apache.cloudstack.api.response.ServiceOfferingResponse;
import org.apache.cloudstack.api.response.StoragePoolResponse;
@@ -180,6 +183,10 @@
import com.cloud.ha.HighAvailabilityManager;
import com.cloud.hypervisor.Hypervisor;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.network.RouterHealthCheckResult;
+import com.cloud.network.VpcVirtualNetworkApplianceService;
+import com.cloud.network.dao.RouterHealthCheckResultDao;
+import com.cloud.network.router.VirtualNetworkApplianceManager;
import com.cloud.network.security.SecurityGroupVMMapVO;
import com.cloud.network.security.dao.SecurityGroupVMMapDao;
import com.cloud.org.Grouping;
@@ -395,6 +402,15 @@
@Inject
TemplateOVFPropertiesDao templateOVFPropertiesDao;
+ @Inject
+ public VpcVirtualNetworkApplianceService routerService;
+
+ @Inject
+ private ResponseGenerator responseGenerator;
+
+ @Inject
+ private RouterHealthCheckResultDao routerHealthCheckResultDao;
+
/*
* (non-Javadoc)
*
@@ -413,6 +429,36 @@
return response;
}
+ public ListResponse<UserResponse> searchForUsers(Long domainId, boolean recursive) throws PermissionDeniedException {
+ Account caller = CallContext.current().getCallingAccount();
+
+ List<Long> permittedAccounts = new ArrayList<Long>();
+
+ boolean listAll = true;
+ Long id = null;
+
+ if (caller.getType() == Account.ACCOUNT_TYPE_NORMAL) {
+ long currentId = CallContext.current().getCallingUser().getId();
+ if (id != null && currentId != id.longValue()) {
+ throw new PermissionDeniedException("Calling user is not authorized to see the user requested by id");
+ }
+ id = currentId;
+ }
+ Object username = null;
+ Object type = null;
+ String accountName = null;
+ Object state = null;
+ Object keyword = null;
+
+ Pair<List<UserAccountJoinVO>, Integer> result = getUserListInternal(caller, permittedAccounts, listAll, id, username, type, accountName, state, keyword, domainId, recursive,
+ null);
+ ListResponse<UserResponse> response = new ListResponse<UserResponse>();
+ List<UserResponse> userResponses = ViewResponseHelper.createUserResponse(CallContext.current().getCallingAccount().getDomainId(),
+ result.first().toArray(new UserAccountJoinVO[result.first().size()]));
+ response.setResponses(userResponses, result.second());
+ return response;
+ }
+
private Pair<List<UserAccountJoinVO>, Integer> searchForUsersInternal(ListUsersCmd cmd) throws PermissionDeniedException {
Account caller = CallContext.current().getCallingAccount();
@@ -427,42 +473,52 @@
}
id = currentId;
}
- Ternary<Long, Boolean, ListProjectResourcesCriteria> domainIdRecursiveListProject = new Ternary<Long, Boolean, ListProjectResourcesCriteria>(cmd.getDomainId(), cmd.isRecursive(), null);
- _accountMgr.buildACLSearchParameters(caller, id, cmd.getAccountName(), null, permittedAccounts, domainIdRecursiveListProject, listAll, false);
- Long domainId = domainIdRecursiveListProject.first();
- Boolean isRecursive = domainIdRecursiveListProject.second();
- ListProjectResourcesCriteria listProjectResourcesCriteria = domainIdRecursiveListProject.third();
-
- Filter searchFilter = new Filter(UserAccountJoinVO.class, "id", true, cmd.getStartIndex(), cmd.getPageSizeVal());
-
Object username = cmd.getUsername();
Object type = cmd.getAccountType();
- Object accountName = cmd.getAccountName();
+ String accountName = cmd.getAccountName();
Object state = cmd.getState();
Object keyword = cmd.getKeyword();
+ Long domainId = cmd.getDomainId();
+ boolean recursive = cmd.isRecursive();
+ Long pageSizeVal = cmd.getPageSizeVal();
+ Long startIndex = cmd.getStartIndex();
+
+ Filter searchFilter = new Filter(UserAccountJoinVO.class, "id", true, startIndex, pageSizeVal);
+
+ return getUserListInternal(caller, permittedAccounts, listAll, id, username, type, accountName, state, keyword, domainId, recursive, searchFilter);
+ }
+
+ private Pair<List<UserAccountJoinVO>, Integer> getUserListInternal(Account caller, List<Long> permittedAccounts, boolean listAll, Long id, Object username, Object type,
+ String accountName, Object state, Object keyword, Long domainId, boolean recursive, Filter searchFilter) {
+ Ternary<Long, Boolean, ListProjectResourcesCriteria> domainIdRecursiveListProject = new Ternary<Long, Boolean, ListProjectResourcesCriteria>(domainId, recursive, null);
+ _accountMgr.buildACLSearchParameters(caller, id, accountName, null, permittedAccounts, domainIdRecursiveListProject, listAll, false);
+ domainId = domainIdRecursiveListProject.first();
+ Boolean isRecursive = domainIdRecursiveListProject.second();
+ ListProjectResourcesCriteria listProjectResourcesCriteria = domainIdRecursiveListProject.third();
+
SearchBuilder<UserAccountJoinVO> sb = _userAccountJoinDao.createSearchBuilder();
_accountMgr.buildACLViewSearchBuilder(sb, domainId, isRecursive, permittedAccounts, listProjectResourcesCriteria);
- sb.and("username", sb.entity().getUsername(), SearchCriteria.Op.LIKE);
+ sb.and("username", sb.entity().getUsername(), Op.LIKE);
if (id != null && id == 1) {
// system user should NOT be searchable
List<UserAccountJoinVO> emptyList = new ArrayList<UserAccountJoinVO>();
return new Pair<List<UserAccountJoinVO>, Integer>(emptyList, 0);
} else if (id != null) {
- sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
+ sb.and("id", sb.entity().getId(), Op.EQ);
} else {
// this condition is used to exclude system user from the search
// results
- sb.and("id", sb.entity().getId(), SearchCriteria.Op.NEQ);
+ sb.and("id", sb.entity().getId(), Op.NEQ);
}
- sb.and("type", sb.entity().getAccountType(), SearchCriteria.Op.EQ);
- sb.and("domainId", sb.entity().getDomainId(), SearchCriteria.Op.EQ);
- sb.and("accountName", sb.entity().getAccountName(), SearchCriteria.Op.EQ);
- sb.and("state", sb.entity().getState(), SearchCriteria.Op.EQ);
+ sb.and("type", sb.entity().getAccountType(), Op.EQ);
+ sb.and("domainId", sb.entity().getDomainId(), Op.EQ);
+ sb.and("accountName", sb.entity().getAccountName(), Op.EQ);
+ sb.and("state", sb.entity().getState(), Op.EQ);
if ((accountName == null) && (domainId != null)) {
- sb.and("domainPath", sb.entity().getDomainPath(), SearchCriteria.Op.LIKE);
+ sb.and("domainPath", sb.entity().getDomainPath(), Op.LIKE);
}
SearchCriteria<UserAccountJoinVO> sc = sb.create();
@@ -472,15 +528,15 @@
if (keyword != null) {
SearchCriteria<UserAccountJoinVO> ssc = _userAccountJoinDao.createSearchCriteria();
- ssc.addOr("username", SearchCriteria.Op.LIKE, "%" + keyword + "%");
- ssc.addOr("firstname", SearchCriteria.Op.LIKE, "%" + keyword + "%");
- ssc.addOr("lastname", SearchCriteria.Op.LIKE, "%" + keyword + "%");
- ssc.addOr("email", SearchCriteria.Op.LIKE, "%" + keyword + "%");
- ssc.addOr("state", SearchCriteria.Op.LIKE, "%" + keyword + "%");
- ssc.addOr("accountName", SearchCriteria.Op.LIKE, "%" + keyword + "%");
- ssc.addOr("accountType", SearchCriteria.Op.LIKE, "%" + keyword + "%");
+ ssc.addOr("username", Op.LIKE, "%" + keyword + "%");
+ ssc.addOr("firstname", Op.LIKE, "%" + keyword + "%");
+ ssc.addOr("lastname", Op.LIKE, "%" + keyword + "%");
+ ssc.addOr("email", Op.LIKE, "%" + keyword + "%");
+ ssc.addOr("state", Op.LIKE, "%" + keyword + "%");
+ ssc.addOr("accountName", Op.LIKE, "%" + keyword + "%");
+ ssc.addOr("accountType", Op.LIKE, "%" + keyword + "%");
- sc.addAnd("username", SearchCriteria.Op.SC, ssc);
+ sc.addAnd("username", Op.SC, ssc);
}
if (username != null) {
@@ -1159,8 +1215,17 @@
Pair<List<DomainRouterJoinVO>, Integer> result = searchForRoutersInternal(cmd, cmd.getId(), cmd.getRouterName(), cmd.getState(), cmd.getZoneId(), cmd.getPodId(), cmd.getClusterId(),
cmd.getHostId(), cmd.getKeyword(), cmd.getNetworkId(), cmd.getVpcId(), cmd.getForVpc(), cmd.getRole(), cmd.getVersion());
ListResponse<DomainRouterResponse> response = new ListResponse<DomainRouterResponse>();
-
List<DomainRouterResponse> routerResponses = ViewResponseHelper.createDomainRouterResponse(result.first().toArray(new DomainRouterJoinVO[result.first().size()]));
+ if (VirtualNetworkApplianceManager.RouterHealthChecksEnabled.value()) {
+ for (DomainRouterResponse res : routerResponses) {
+ DomainRouterVO resRouter = _routerDao.findByUuid(res.getId());
+ res.setHealthChecksFailed(routerHealthCheckResultDao.hasFailingChecks(resRouter.getId()));
+ if (cmd.shouldFetchHealthCheckResults()) {
+ res.setHealthCheckResults(responseGenerator.createHealthCheckResponse(resRouter,
+ new ArrayList<>(routerHealthCheckResultDao.getHealthCheckResults(resRouter.getId()))));
+ }
+ }
+ }
response.setResponses(routerResponses, result.second());
return response;
}
@@ -1170,8 +1235,18 @@
Pair<List<DomainRouterJoinVO>, Integer> result = searchForRoutersInternal(cmd, cmd.getId(), cmd.getRouterName(), cmd.getState(), cmd.getZoneId(), cmd.getPodId(), null, cmd.getHostId(),
cmd.getKeyword(), cmd.getNetworkId(), cmd.getVpcId(), cmd.getForVpc(), cmd.getRole(), null);
ListResponse<DomainRouterResponse> response = new ListResponse<DomainRouterResponse>();
-
List<DomainRouterResponse> routerResponses = ViewResponseHelper.createDomainRouterResponse(result.first().toArray(new DomainRouterJoinVO[result.first().size()]));
+ if (VirtualNetworkApplianceManager.RouterHealthChecksEnabled.value()) {
+ for (DomainRouterResponse res : routerResponses) {
+ DomainRouterVO resRouter = _routerDao.findByUuid(res.getId());
+ res.setHealthChecksFailed(routerHealthCheckResultDao.hasFailingChecks(resRouter.getId()));
+ if (cmd.shouldFetchHealthCheckResults()) {
+ res.setHealthCheckResults(responseGenerator.createHealthCheckResponse(resRouter,
+ new ArrayList<>(routerHealthCheckResultDao.getHealthCheckResults(resRouter.getId()))));
+ }
+ }
+ }
+
response.setResponses(routerResponses, result.second());
return response;
}
@@ -1690,7 +1765,7 @@
Pair<List<VolumeJoinVO>, Integer> result = searchForVolumesInternal(cmd);
ListResponse<VolumeResponse> response = new ListResponse<VolumeResponse>();
- ResponseView respView = ResponseView.Restricted;
+ ResponseView respView = cmd.getResponseView();
Account account = CallContext.current().getCallingAccount();
if (_accountMgr.isRootAdmin(account.getAccountId())) {
respView = ResponseView.Full;
@@ -1739,6 +1814,7 @@
Long clusterId = cmd.getClusterId();
Long diskOffId = cmd.getDiskOfferingId();
Boolean display = cmd.getDisplay();
+ String state = cmd.getState();
Long zoneId = cmd.getZoneId();
Long podId = cmd.getPodId();
@@ -1774,8 +1850,8 @@
sb.and("storageId", sb.entity().getPoolUuid(), SearchCriteria.Op.EQ);
sb.and("diskOfferingId", sb.entity().getDiskOfferingId(), SearchCriteria.Op.EQ);
sb.and("display", sb.entity().isDisplayVolume(), SearchCriteria.Op.EQ);
- // Only return volumes that are not destroyed
- sb.and("state", sb.entity().getState(), SearchCriteria.Op.NEQ);
+ sb.and("state", sb.entity().getState(), SearchCriteria.Op.EQ);
+ sb.and("stateNEQ", sb.entity().getState(), SearchCriteria.Op.NEQ);
sb.and("systemUse", sb.entity().isSystemUse(), SearchCriteria.Op.NEQ);
// display UserVM volumes only
sb.and().op("type", sb.entity().getVmType(), SearchCriteria.Op.NIN);
@@ -1790,6 +1866,7 @@
SearchCriteria<VolumeJoinVO> ssc = _volumeJoinDao.createSearchCriteria();
ssc.addOr("name", SearchCriteria.Op.LIKE, "%" + keyword + "%");
ssc.addOr("volumeType", SearchCriteria.Op.LIKE, "%" + keyword + "%");
+ ssc.addOr("state", SearchCriteria.Op.LIKE, "%" + keyword + "%");
sc.addAnd("name", SearchCriteria.Op.SC, ssc);
}
@@ -1848,8 +1925,11 @@
// Don't return DomR and ConsoleProxy volumes
sc.setParameters("type", VirtualMachine.Type.ConsoleProxy, VirtualMachine.Type.SecondaryStorageVm, VirtualMachine.Type.DomainRouter);
- // Only return volumes that are not destroyed
- sc.setParameters("state", Volume.State.Destroy);
+ if (state != null) {
+ sc.setParameters("state", state);
+ } else if (!_accountMgr.isAdmin(caller.getId())) {
+ sc.setParameters("stateNEQ", Volume.State.Expunged);
+ }
// search Volume details by ids
Pair<List<VolumeJoinVO>, Integer> uniqueVolPair = _volumeJoinDao.searchAndCount(sc, searchFilter);
@@ -3910,6 +3990,27 @@
}
@Override
+ public List<RouterHealthCheckResultResponse> listRouterHealthChecks(GetRouterHealthCheckResultsCmd cmd) {
+ s_logger.info("Executing health check command " + cmd);
+ long routerId = cmd.getRouterId();
+ if (!VirtualNetworkApplianceManager.RouterHealthChecksEnabled.value()) {
+ throw new CloudRuntimeException("Router health checks are not enabled for router " + routerId);
+ }
+
+ if (cmd.shouldPerformFreshChecks() && !routerService.performRouterHealthChecks(routerId)) {
+ throw new CloudRuntimeException("Unable to perform fresh checks on router.");
+ }
+
+ List<RouterHealthCheckResult> result = new ArrayList<>(routerHealthCheckResultDao.getHealthCheckResults(routerId));
+ if (result == null || result.size() == 0) {
+ throw new CloudRuntimeException("Database had no entries for health checks for router. This could happen for " +
+ "a newly created router. Please wait for periodic results to populate or manually call for checks to execute.");
+ }
+
+ return responseGenerator.createHealthCheckResponse(_routerDao.findById(routerId), result);
+ }
+
+ @Override
public String getConfigComponentName() {
return QueryService.class.getSimpleName();
}
diff --git a/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java
index f028a6c..ff5d254 100644
--- a/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java
+++ b/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java
@@ -194,6 +194,7 @@
float cpuUtil = (float)hostStats.getCpuUtilization();
cpuUsed = decimalFormat.format(cpuUtil) + "%";
hostResponse.setCpuUsed(cpuUsed);
+ hostResponse.setCpuAverageLoad(hostStats.getLoadAverage());
hostResponse.setMemoryUsed((new Double(hostStats.getUsedMemory())).longValue());
hostResponse.setNetworkKbsRead((new Double(hostStats.getNetworkReadKBs())).longValue());
hostResponse.setNetworkKbsWrite((new Double(hostStats.getNetworkWriteKBs())).longValue());
diff --git a/server/src/main/java/com/cloud/api/query/dao/NetworkOfferingJoinDao.java b/server/src/main/java/com/cloud/api/query/dao/NetworkOfferingJoinDao.java
index 362cabb..767b9ac 100644
--- a/server/src/main/java/com/cloud/api/query/dao/NetworkOfferingJoinDao.java
+++ b/server/src/main/java/com/cloud/api/query/dao/NetworkOfferingJoinDao.java
@@ -27,9 +27,27 @@
public interface NetworkOfferingJoinDao extends GenericDao<NetworkOfferingJoinVO, Long> {
- List<NetworkOfferingJoinVO> findByDomainId(long domainId);
+ /**
+ * Returns list of network offerings for a given domain
+ * NetworkOfferingJoinVO can have multiple domains set. Method will search for
+ * given domainId in list of domains for the offering.
+ * @param long domainId
+ * @param Boolean includeAllDomainOffering (if set to true offerings for which domain
+ * is not set will also be returned)
+ * @return List<NetworkOfferingJoinVO> List of network offerings
+ */
+ List<NetworkOfferingJoinVO> findByDomainId(long domainId, Boolean includeAllDomainOffering);
- List<NetworkOfferingJoinVO> findByZoneId(long zoneId);
+ /**
+ * Returns list of network offerings for a given zone
+ * NetworkOfferingJoinVO can have multiple zones set. Method will search for
+ * given zoneId in list of zones for the offering.
+ * @param long zoneId
+ * @param Boolean includeAllZoneOffering (if set to true offerings for which zone
+ * is not set will also be returned)
+ * @return List<NetworkOfferingJoinVO> List of network offerings
+ */
+ List<NetworkOfferingJoinVO> findByZoneId(long zoneId, Boolean includeAllZoneOffering);
NetworkOfferingResponse newNetworkOfferingResponse(NetworkOffering nof);
diff --git a/server/src/main/java/com/cloud/api/query/dao/NetworkOfferingJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/NetworkOfferingJoinDaoImpl.java
index b53aef8..0c258d1 100644
--- a/server/src/main/java/com/cloud/api/query/dao/NetworkOfferingJoinDaoImpl.java
+++ b/server/src/main/java/com/cloud/api/query/dao/NetworkOfferingJoinDaoImpl.java
@@ -43,9 +43,12 @@
}
@Override
- public List<NetworkOfferingJoinVO> findByDomainId(long domainId) {
+ public List<NetworkOfferingJoinVO> findByDomainId(long domainId, Boolean includeAllDomainOffering) {
SearchBuilder<NetworkOfferingJoinVO> sb = createSearchBuilder();
sb.and("domainId", sb.entity().getDomainId(), SearchCriteria.Op.FIND_IN_SET);
+ if (includeAllDomainOffering) {
+ sb.or("dId", sb.entity().getDomainId(), SearchCriteria.Op.NULL);
+ }
sb.done();
SearchCriteria<NetworkOfferingJoinVO> sc = sb.create();
@@ -54,9 +57,12 @@
}
@Override
- public List<NetworkOfferingJoinVO> findByZoneId(long zoneId) {
+ public List<NetworkOfferingJoinVO> findByZoneId(long zoneId, Boolean includeAllZoneOffering) {
SearchBuilder<NetworkOfferingJoinVO> sb = createSearchBuilder();
sb.and("zoneId", sb.entity().getZoneId(), SearchCriteria.Op.FIND_IN_SET);
+ if (includeAllZoneOffering) {
+ sb.or("zId", sb.entity().getZoneId(), SearchCriteria.Op.NULL);
+ }
sb.done();
SearchCriteria<NetworkOfferingJoinVO> sc = sb.create();
diff --git a/server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java
index 1398044..add6415 100644
--- a/server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java
+++ b/server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java
@@ -102,6 +102,7 @@
offeringResponse.setDetails(ApiDBUtils.getResourceDetails(offering.getId(), ResourceObjectType.ServiceOffering));
offeringResponse.setObjectName("serviceoffering");
offeringResponse.setIscutomized(offering.isDynamic());
+ offeringResponse.setCacheMode(offering.getCacheMode());
return offeringResponse;
}
diff --git a/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
index 4ccfce9..21c6786 100644
--- a/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
+++ b/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
@@ -28,7 +28,6 @@
import javax.inject.Inject;
-import com.cloud.vm.UserVmManager;
import org.apache.cloudstack.affinity.AffinityGroupResponse;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiConstants.VMDetails;
@@ -57,6 +56,7 @@
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.net.Dhcp;
import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.UserVmManager;
import com.cloud.vm.VirtualMachine.State;
import com.cloud.vm.VmStats;
import com.cloud.vm.dao.NicExtraDhcpOptionDao;
@@ -174,6 +174,10 @@
userVmResponse.setDiskOfferingId(userVm.getDiskOfferingUuid());
userVmResponse.setDiskOfferingName(userVm.getDiskOfferingName());
}
+ if (details.contains(VMDetails.all) || details.contains(VMDetails.backoff)) {
+ userVmResponse.setBackupOfferingId(userVm.getBackupOfferingUuid());
+ userVmResponse.setBackupOfferingName(userVm.getBackupOfferingName());
+ }
if (details.contains(VMDetails.all) || details.contains(VMDetails.servoff) || details.contains(VMDetails.stats)) {
userVmResponse.setCpuNumber(userVm.getCpu());
userVmResponse.setCpuSpeed(userVm.getSpeed());
@@ -317,6 +321,15 @@
(UserVmManager.DisplayVMOVFProperties.value() && userVmDetailVO.getName().startsWith(ApiConstants.OVF_PROPERTIES))) {
resourceDetails.put(userVmDetailVO.getName(), userVmDetailVO.getValue());
}
+ if ((ApiConstants.BootType.UEFI.toString()).equalsIgnoreCase(userVmDetailVO.getName())) {
+ userVmResponse.setBootType("Uefi");
+ userVmResponse.setBootMode(userVmDetailVO.getValue().toLowerCase());
+
+ }
+ }
+ if (vmDetails.size() == 0) {
+ userVmResponse.setBootType("Bios");
+ userVmResponse.setBootMode("legacy");
}
// Remove blacklisted settings if user is not admin
if (caller.getType() != Account.ACCOUNT_TYPE_ADMIN) {
diff --git a/server/src/main/java/com/cloud/api/query/vo/ServiceOfferingJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/ServiceOfferingJoinVO.java
index fa16308..4f8932a 100644
--- a/server/src/main/java/com/cloud/api/query/vo/ServiceOfferingJoinVO.java
+++ b/server/src/main/java/com/cloud/api/query/vo/ServiceOfferingJoinVO.java
@@ -172,6 +172,9 @@
@Column(name = "deployment_planner")
private String deploymentPlanner;
+ @Column(name = "cache_mode")
+ String cacheMode;
+
public ServiceOfferingJoinVO() {
}
@@ -349,4 +352,8 @@
public boolean isDynamic() {
return cpu == null || speed == null || ramSize == null;
}
+
+ public String getCacheMode() {
+ return cacheMode;
+ }
}
diff --git a/server/src/main/java/com/cloud/api/query/vo/UserVmJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/UserVmJoinVO.java
index 7ff557c..6d48bec 100644
--- a/server/src/main/java/com/cloud/api/query/vo/UserVmJoinVO.java
+++ b/server/src/main/java/com/cloud/api/query/vo/UserVmJoinVO.java
@@ -211,6 +211,15 @@
@Column(name = "service_offering_name")
private String serviceOfferingName;
+ @Column(name = "backup_offering_id")
+ private Long backupOfferingId;
+
+ @Column(name = "backup_offering_uuid")
+ private String backupOfferingUuid;
+
+ @Column(name = "backup_offering_name")
+ private String backupOfferingName;
+
@Column(name = "cpu")
private int cpu;
@@ -599,6 +608,14 @@
return serviceOfferingName;
}
+ public String getBackupOfferingUuid() {
+ return backupOfferingUuid;
+ }
+
+ public String getBackupOfferingName() {
+ return backupOfferingName;
+ }
+
public int getCpu() {
return cpu;
}
diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
index 6738af7..7e9c9d3 100755
--- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -16,6 +16,96 @@
// under the License.
package com.cloud.configuration;
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URLDecoder;
+import java.sql.Date;
+import java.sql.PreparedStatement;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.UUID;
+
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+
+import org.apache.cloudstack.acl.SecurityChecker;
+import org.apache.cloudstack.affinity.AffinityGroup;
+import org.apache.cloudstack.affinity.AffinityGroupService;
+import org.apache.cloudstack.affinity.dao.AffinityGroupDao;
+import org.apache.cloudstack.agent.lb.IndirectAgentLB;
+import org.apache.cloudstack.agent.lb.IndirectAgentLBServiceImpl;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd;
+import org.apache.cloudstack.api.command.admin.network.CreateManagementNetworkIpRangeCmd;
+import org.apache.cloudstack.api.command.admin.network.CreateNetworkOfferingCmd;
+import org.apache.cloudstack.api.command.admin.network.DeleteManagementNetworkIpRangeCmd;
+import org.apache.cloudstack.api.command.admin.network.DeleteNetworkOfferingCmd;
+import org.apache.cloudstack.api.command.admin.network.UpdateNetworkOfferingCmd;
+import org.apache.cloudstack.api.command.admin.offering.CreateDiskOfferingCmd;
+import org.apache.cloudstack.api.command.admin.offering.CreateServiceOfferingCmd;
+import org.apache.cloudstack.api.command.admin.offering.DeleteDiskOfferingCmd;
+import org.apache.cloudstack.api.command.admin.offering.DeleteServiceOfferingCmd;
+import org.apache.cloudstack.api.command.admin.offering.UpdateDiskOfferingCmd;
+import org.apache.cloudstack.api.command.admin.offering.UpdateServiceOfferingCmd;
+import org.apache.cloudstack.api.command.admin.pod.DeletePodCmd;
+import org.apache.cloudstack.api.command.admin.pod.UpdatePodCmd;
+import org.apache.cloudstack.api.command.admin.region.CreatePortableIpRangeCmd;
+import org.apache.cloudstack.api.command.admin.region.DeletePortableIpRangeCmd;
+import org.apache.cloudstack.api.command.admin.region.ListPortableIpRangesCmd;
+import org.apache.cloudstack.api.command.admin.vlan.CreateVlanIpRangeCmd;
+import org.apache.cloudstack.api.command.admin.vlan.DedicatePublicIpRangeCmd;
+import org.apache.cloudstack.api.command.admin.vlan.DeleteVlanIpRangeCmd;
+import org.apache.cloudstack.api.command.admin.vlan.ReleasePublicIpRangeCmd;
+import org.apache.cloudstack.api.command.admin.zone.CreateZoneCmd;
+import org.apache.cloudstack.api.command.admin.zone.DeleteZoneCmd;
+import org.apache.cloudstack.api.command.admin.zone.UpdateZoneCmd;
+import org.apache.cloudstack.api.command.user.network.ListNetworkOfferingsCmd;
+import org.apache.cloudstack.config.ApiServiceConfiguration;
+import org.apache.cloudstack.config.Configuration;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
+import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope;
+import org.apache.cloudstack.framework.config.ConfigDepot;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.Configurable;
+import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.framework.config.impl.ConfigurationVO;
+import org.apache.cloudstack.framework.messagebus.MessageBus;
+import org.apache.cloudstack.framework.messagebus.MessageSubscriber;
+import org.apache.cloudstack.framework.messagebus.PublishScope;
+import org.apache.cloudstack.region.PortableIp;
+import org.apache.cloudstack.region.PortableIpDao;
+import org.apache.cloudstack.region.PortableIpRange;
+import org.apache.cloudstack.region.PortableIpRangeDao;
+import org.apache.cloudstack.region.PortableIpRangeVO;
+import org.apache.cloudstack.region.PortableIpVO;
+import org.apache.cloudstack.region.Region;
+import org.apache.cloudstack.region.RegionVO;
+import org.apache.cloudstack.region.dao.RegionDao;
+import org.apache.cloudstack.resourcedetail.DiskOfferingDetailVO;
+import org.apache.cloudstack.resourcedetail.dao.DiskOfferingDetailsDao;
+import org.apache.cloudstack.storage.datastore.db.ImageStoreDao;
+import org.apache.cloudstack.storage.datastore.db.ImageStoreDetailsDao;
+import org.apache.cloudstack.storage.datastore.db.ImageStoreVO;
+import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
+import org.apache.log4j.Logger;
+
import com.cloud.agent.AgentManager;
import com.cloud.alert.AlertManager;
import com.cloud.api.ApiDBUtils;
@@ -118,6 +208,7 @@
import com.cloud.storage.Storage.ProvisioningType;
import com.cloud.storage.StorageManager;
import com.cloud.storage.dao.DiskOfferingDao;
+import com.cloud.storage.dao.VMTemplateZoneDao;
import com.cloud.storage.dao.VolumeDao;
import com.cloud.test.IPRangeConfig;
import com.cloud.user.Account;
@@ -154,99 +245,11 @@
import com.cloud.vm.dao.NicIpAliasVO;
import com.cloud.vm.dao.NicSecondaryIpDao;
import com.cloud.vm.dao.VMInstanceDao;
+import com.google.common.base.Enums;
import com.google.common.base.MoreObjects;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.collect.Sets;
-import org.apache.cloudstack.acl.SecurityChecker;
-import org.apache.cloudstack.affinity.AffinityGroup;
-import org.apache.cloudstack.affinity.AffinityGroupService;
-import org.apache.cloudstack.affinity.dao.AffinityGroupDao;
-import org.apache.cloudstack.agent.lb.IndirectAgentLB;
-import org.apache.cloudstack.agent.lb.IndirectAgentLBServiceImpl;
-import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd;
-import org.apache.cloudstack.api.command.admin.network.CreateManagementNetworkIpRangeCmd;
-import org.apache.cloudstack.api.command.admin.network.CreateNetworkOfferingCmd;
-import org.apache.cloudstack.api.command.admin.network.DeleteManagementNetworkIpRangeCmd;
-import org.apache.cloudstack.api.command.admin.network.DeleteNetworkOfferingCmd;
-import org.apache.cloudstack.api.command.admin.network.UpdateNetworkOfferingCmd;
-import org.apache.cloudstack.api.command.admin.offering.CreateDiskOfferingCmd;
-import org.apache.cloudstack.api.command.admin.offering.CreateServiceOfferingCmd;
-import org.apache.cloudstack.api.command.admin.offering.DeleteDiskOfferingCmd;
-import org.apache.cloudstack.api.command.admin.offering.DeleteServiceOfferingCmd;
-import org.apache.cloudstack.api.command.admin.offering.UpdateDiskOfferingCmd;
-import org.apache.cloudstack.api.command.admin.offering.UpdateServiceOfferingCmd;
-import org.apache.cloudstack.api.command.admin.pod.DeletePodCmd;
-import org.apache.cloudstack.api.command.admin.pod.UpdatePodCmd;
-import org.apache.cloudstack.api.command.admin.region.CreatePortableIpRangeCmd;
-import org.apache.cloudstack.api.command.admin.region.DeletePortableIpRangeCmd;
-import org.apache.cloudstack.api.command.admin.region.ListPortableIpRangesCmd;
-import org.apache.cloudstack.api.command.admin.vlan.CreateVlanIpRangeCmd;
-import org.apache.cloudstack.api.command.admin.vlan.DedicatePublicIpRangeCmd;
-import org.apache.cloudstack.api.command.admin.vlan.DeleteVlanIpRangeCmd;
-import org.apache.cloudstack.api.command.admin.vlan.ReleasePublicIpRangeCmd;
-import org.apache.cloudstack.api.command.admin.zone.CreateZoneCmd;
-import org.apache.cloudstack.api.command.admin.zone.DeleteZoneCmd;
-import org.apache.cloudstack.api.command.admin.zone.UpdateZoneCmd;
-import org.apache.cloudstack.api.command.user.network.ListNetworkOfferingsCmd;
-import org.apache.cloudstack.config.ApiServiceConfiguration;
-import org.apache.cloudstack.config.Configuration;
-import org.apache.cloudstack.context.CallContext;
-import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
-import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
-import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope;
-import org.apache.cloudstack.framework.config.ConfigDepot;
-import org.apache.cloudstack.framework.config.ConfigKey;
-import org.apache.cloudstack.framework.config.Configurable;
-import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
-import org.apache.cloudstack.framework.config.impl.ConfigurationVO;
-import org.apache.cloudstack.framework.messagebus.MessageBus;
-import org.apache.cloudstack.framework.messagebus.MessageSubscriber;
-import org.apache.cloudstack.framework.messagebus.PublishScope;
-import org.apache.cloudstack.region.PortableIp;
-import org.apache.cloudstack.region.PortableIpDao;
-import org.apache.cloudstack.region.PortableIpRange;
-import org.apache.cloudstack.region.PortableIpRangeDao;
-import org.apache.cloudstack.region.PortableIpRangeVO;
-import org.apache.cloudstack.region.PortableIpVO;
-import org.apache.cloudstack.region.Region;
-import org.apache.cloudstack.region.RegionVO;
-import org.apache.cloudstack.region.dao.RegionDao;
-import org.apache.cloudstack.resourcedetail.DiskOfferingDetailVO;
-import org.apache.cloudstack.resourcedetail.dao.DiskOfferingDetailsDao;
-import org.apache.cloudstack.storage.datastore.db.ImageStoreDao;
-import org.apache.cloudstack.storage.datastore.db.ImageStoreDetailsDao;
-import org.apache.cloudstack.storage.datastore.db.ImageStoreVO;
-import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
-import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
-import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
-import org.apache.log4j.Logger;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URLDecoder;
-import java.sql.Date;
-import java.sql.PreparedStatement;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.inject.Inject;
-import javax.naming.ConfigurationException;
public class ConfigurationManagerImpl extends ManagerBase implements ConfigurationManager, ConfigurationService, Configurable {
public static final Logger s_logger = Logger.getLogger(ConfigurationManagerImpl.class);
@@ -381,7 +384,8 @@
AgentManager _agentManager;
@Inject
IndirectAgentLB _indirectAgentLB;
-
+ @Inject
+ private VMTemplateZoneDao templateZoneDao;
// FIXME - why don't we have interface for DataCenterLinkLocalIpAddressDao?
@Inject
@@ -397,6 +401,20 @@
public static final ConfigKey<Boolean> SystemVMUseLocalStorage = new ConfigKey<Boolean>(Boolean.class, "system.vm.use.local.storage", "Advanced", "false",
"Indicates whether to use local storage pools or shared storage pools for system VMs.", false, ConfigKey.Scope.Zone, null);
+ public final static ConfigKey<Long> BYTES_MAX_READ_LENGTH= new ConfigKey<Long>(Long.class, "vm.disk.bytes.maximum.read.length", "Advanced", "0",
+ "Maximum Bytes read burst duration (seconds). If '0' (zero) then does not check for maximum burst length.", true, ConfigKey.Scope.Global, null);
+ public final static ConfigKey<Long> BYTES_MAX_WRITE_LENGTH = new ConfigKey<Long>(Long.class, "vm.disk.bytes.maximum.write.length", "Advanced", "0",
+ "Maximum Bytes write burst duration (seconds). If '0' (zero) then does not check for maximum burst length.", true, ConfigKey.Scope.Global, null);
+ public final static ConfigKey<Long> IOPS_MAX_READ_LENGTH = new ConfigKey<Long>(Long.class, "vm.disk.iops.maximum.read.length", "Advanced", "0",
+ "Maximum IOPS read burst duration (seconds). If '0' (zero) then does not check for maximum burst length.", true, ConfigKey.Scope.Global, null);
+ public final static ConfigKey<Long> IOPS_MAX_WRITE_LENGTH = new ConfigKey<Long>(Long.class, "vm.disk.iops.maximum.write.length", "Advanced", "0",
+ "Maximum IOPS write burst duration (seconds). If '0' (zero) then does not check for maximum burst length.", true, ConfigKey.Scope.Global, null);
+
+ private static final String IOPS_READ_RATE = "IOPS Read";
+ private static final String IOPS_WRITE_RATE = "IOPS Write";
+ private static final String BYTES_READ_RATE = "Bytes Read";
+ private static final String BYTES_WRITE_RATE = "Bytes Write";
+
private static final String DefaultForSystemVmsForPodIpRange = "0";
private static final String DefaultVlanForPodIpRange = Vlan.UNTAGGED.toString();
@@ -1840,6 +1858,8 @@
final boolean success = _zoneDao.remove(zoneId);
if (success) {
+ // delete template refs for this zone
+ templateZoneDao.deleteByZoneId(zoneId);
// delete all capacity records for the zone
_capacityDao.removeBy(null, zoneId, null, null, null);
// remove from dedicated resources
@@ -2348,6 +2368,9 @@
}
}
+ // check if cache_mode parameter is valid
+ validateCacheMode(cmd.getCacheMode());
+
final Boolean offerHA = cmd.isOfferHa();
boolean localStorageRequired = false;
@@ -2428,7 +2451,7 @@
cmd.getBytesWriteRate(), cmd.getBytesWriteRateMax(), cmd.getBytesWriteRateMaxLength(),
cmd.getIopsReadRate(), cmd.getIopsReadRateMax(), cmd.getIopsReadRateMaxLength(),
cmd.getIopsWriteRate(), cmd.getIopsWriteRateMax(), cmd.getIopsWriteRateMaxLength(),
- cmd.getHypervisorSnapshotReserve());
+ cmd.getHypervisorSnapshotReserve(), cmd.getCacheMode());
}
protected ServiceOfferingVO createServiceOffering(final long userId, final boolean isSystem, final VirtualMachine.Type vmType,
@@ -2439,7 +2462,7 @@
Long bytesWriteRate, Long bytesWriteRateMax, Long bytesWriteRateMaxLength,
Long iopsReadRate, Long iopsReadRateMax, Long iopsReadRateMaxLength,
Long iopsWriteRate, Long iopsWriteRateMax, Long iopsWriteRateMaxLength,
- final Integer hypervisorSnapshotReserve) {
+ final Integer hypervisorSnapshotReserve, String cacheMode) {
// Filter child domains when both parent and child domains are present
List<Long> filteredDomainIds = filterChildSubDomains(domainIds);
@@ -2536,6 +2559,9 @@
if (iopsWriteRateMaxLength != null && iopsWriteRateMaxLength > 0) {
offering.setIopsWriteRateMaxLength(iopsWriteRateMaxLength);
}
+ if(cacheMode != null) {
+ offering.setCacheMode(DiskOffering.DiskCacheMode.valueOf(cacheMode.toUpperCase()));
+ }
if (hypervisorSnapshotReserve != null && hypervisorSnapshotReserve < 0) {
throw new InvalidParameterValueException("If provided, Hypervisor Snapshot Reserve must be greater than or equal to 0.");
@@ -2794,7 +2820,7 @@
Long bytesWriteRate, Long bytesWriteRateMax, Long bytesWriteRateMaxLength,
Long iopsReadRate, Long iopsReadRateMax, Long iopsReadRateMaxLength,
Long iopsWriteRate, Long iopsWriteRateMax, Long iopsWriteRateMaxLength,
- final Integer hypervisorSnapshotReserve) {
+ final Integer hypervisorSnapshotReserve, String cacheMode) {
long diskSize = 0;// special case for custom disk offerings
if (numGibibytes != null && numGibibytes <= 0) {
throw new InvalidParameterValueException("Please specify a disk size of at least 1 Gb.");
@@ -2900,6 +2926,9 @@
if (iopsWriteRateMaxLength != null && iopsWriteRateMaxLength > 0) {
newDiskOffering.setIopsWriteRateMaxLength(iopsWriteRateMaxLength);
}
+ if (cacheMode != null) {
+ newDiskOffering.setCacheMode(DiskOffering.DiskCacheMode.valueOf(cacheMode.toUpperCase()));
+ }
if (hypervisorSnapshotReserve != null && hypervisorSnapshotReserve < 0) {
throw new InvalidParameterValueException("If provided, Hypervisor Snapshot Reserve must be greater than or equal to 0.");
@@ -2966,6 +2995,9 @@
throw new InvalidParameterValueException("Disksize is not allowed for a customized disk offering");
}
+ // check if cache_mode parameter is valid
+ validateCacheMode(cmd.getCacheMode());
+
boolean localStorageRequired = false;
final String storageType = cmd.getStorageType();
if (storageType != null) {
@@ -2992,13 +3024,72 @@
final Long iopsWriteRateMax = cmd.getIopsWriteRateMax();
final Long iopsWriteRateMaxLength = cmd.getIopsWriteRateMaxLength();
final Integer hypervisorSnapshotReserve = cmd.getHypervisorSnapshotReserve();
+ final String cacheMode = cmd.getCacheMode();
+
+ validateMaxRateEqualsOrGreater(iopsReadRate, iopsReadRateMax, IOPS_READ_RATE);
+ validateMaxRateEqualsOrGreater(iopsWriteRate, iopsWriteRateMax, IOPS_WRITE_RATE);
+ validateMaxRateEqualsOrGreater(bytesReadRate, bytesReadRateMax, BYTES_READ_RATE);
+ validateMaxRateEqualsOrGreater(bytesWriteRate, bytesWriteRateMax, BYTES_WRITE_RATE);
+
+ validateMaximumIopsAndBytesLength(iopsReadRateMaxLength, iopsWriteRateMaxLength, bytesReadRateMaxLength, bytesWriteRateMaxLength);
final Long userId = CallContext.current().getCallingUserId();
return createDiskOffering(userId, domainIds, zoneIds, name, description, provisioningType, numGibibytes, tags, isCustomized,
localStorageRequired, isDisplayOfferingEnabled, isCustomizedIops, minIops,
maxIops, bytesReadRate, bytesReadRateMax, bytesReadRateMaxLength, bytesWriteRate, bytesWriteRateMax, bytesWriteRateMaxLength,
iopsReadRate, iopsReadRateMax, iopsReadRateMaxLength, iopsWriteRate, iopsWriteRateMax, iopsWriteRateMaxLength,
- hypervisorSnapshotReserve);
+ hypervisorSnapshotReserve, cacheMode);
+ }
+
+ /**
+ * Validates rate offerings, being flexible about which rate is being validated (e.g. read/write Bytes, read/write IOPS).</br>
+ * It throws InvalidParameterValueException if normal rate is greater than maximum rate
+ */
+ protected void validateMaxRateEqualsOrGreater(Long normalRate, Long maxRate, String rateType) {
+ if (normalRate != null && maxRate != null && maxRate < normalRate) {
+ throw new InvalidParameterValueException(
+ String.format("%s rate (%d) cannot be greater than %s maximum rate (%d)", rateType, normalRate, rateType, maxRate));
+ }
+ }
+
+ /**
+ * Throws InvalidParameterValueException if At least one of the VM disk Bytes/IOPS Read/Write length are smaller than the respective disk offering max length.</br>
+ * It will ignore verification in case of default values (zero):
+ * <ul>
+ * <li>vm.disk.bytes.maximum.read.length = 0</li>
+ * <li>vm.disk.bytes.maximum.write.length = 0</li>
+ * <li>vm.disk.iops.maximum.read.length = 0</li>
+ * <li>vm.disk.iops.maximum.write.length = 0</li>
+ * </ul>
+ */
+ protected void validateMaximumIopsAndBytesLength(final Long iopsReadRateMaxLength, final Long iopsWriteRateMaxLength, Long bytesReadRateMaxLength, Long bytesWriteRateMaxLength) {
+ if (IOPS_MAX_READ_LENGTH.value() != null && IOPS_MAX_READ_LENGTH.value() != 0l) {
+ if (iopsReadRateMaxLength != null && iopsReadRateMaxLength > IOPS_MAX_READ_LENGTH.value()) {
+ throw new InvalidParameterValueException(String.format("IOPS read max length (%d seconds) cannot be greater than vm.disk.iops.maximum.read.length (%d seconds)",
+ iopsReadRateMaxLength, IOPS_MAX_READ_LENGTH.value()));
+ }
+ }
+
+ if (IOPS_MAX_WRITE_LENGTH.value() != null && IOPS_MAX_WRITE_LENGTH.value() != 0l) {
+ if (iopsWriteRateMaxLength != null && iopsWriteRateMaxLength > IOPS_MAX_WRITE_LENGTH.value()) {
+ throw new InvalidParameterValueException(String.format("IOPS write max length (%d seconds) cannot be greater than vm.disk.iops.maximum.write.length (%d seconds)",
+ iopsWriteRateMaxLength, IOPS_MAX_WRITE_LENGTH.value()));
+ }
+ }
+
+ if (BYTES_MAX_READ_LENGTH.value() != null && BYTES_MAX_READ_LENGTH.value() != 0l) {
+ if (bytesReadRateMaxLength != null && bytesReadRateMaxLength > BYTES_MAX_READ_LENGTH.value()) {
+ throw new InvalidParameterValueException(String.format("Bytes read max length (%d seconds) cannot be greater than vm.disk.bytes.maximum.read.length (%d seconds)",
+ bytesReadRateMaxLength, BYTES_MAX_READ_LENGTH.value()));
+ }
+ }
+
+ if (BYTES_MAX_WRITE_LENGTH.value() != null && BYTES_MAX_WRITE_LENGTH.value() != 0l) {
+ if (bytesWriteRateMaxLength != null && bytesWriteRateMaxLength > BYTES_MAX_WRITE_LENGTH.value()) {
+ throw new InvalidParameterValueException(String.format("Bytes write max length (%d seconds) cannot be greater than vm.disk.bytes.maximum.write.length (%d seconds)",
+ bytesWriteRateMaxLength, BYTES_MAX_WRITE_LENGTH.value()));
+ }
+ }
}
@Override
@@ -6262,6 +6353,15 @@
return filteredDomainIds;
}
+ protected void validateCacheMode(String cacheMode){
+ if(cacheMode != null &&
+ !Enums.getIfPresent(DiskOffering.DiskCacheMode.class,
+ cacheMode.toUpperCase()).isPresent()) {
+ throw new InvalidParameterValueException(String.format("Invalid cache mode (%s). Please specify one of the following " +
+ "valid cache mode parameters: none, writeback or writethrough", cacheMode));
+ }
+ }
+
public List<SecurityChecker> getSecChecker() {
return _secChecker;
}
@@ -6278,6 +6378,6 @@
@Override
public ConfigKey<?>[] getConfigKeys() {
- return new ConfigKey<?>[] {SystemVMUseLocalStorage};
+ return new ConfigKey<?>[] {SystemVMUseLocalStorage, IOPS_MAX_READ_LENGTH, IOPS_MAX_WRITE_LENGTH, BYTES_MAX_READ_LENGTH, BYTES_MAX_WRITE_LENGTH};
}
}
diff --git a/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index 83a53aa..368fc33 100644
--- a/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -100,6 +100,7 @@
import com.cloud.resource.UnableDeleteHostException;
import com.cloud.service.ServiceOfferingVO;
import com.cloud.service.dao.ServiceOfferingDao;
+import com.cloud.storage.DataStoreRole;
import com.cloud.storage.Storage;
import com.cloud.storage.StoragePoolStatus;
import com.cloud.storage.VMTemplateStorageResourceAssoc.Status;
@@ -918,7 +919,7 @@
}
List<ConsoleProxyVO> l =
_consoleProxyDao.getProxyListInStates(dcId, VirtualMachine.State.Starting, VirtualMachine.State.Running, VirtualMachine.State.Stopping,
- VirtualMachine.State.Stopped, VirtualMachine.State.Migrating, VirtualMachine.State.Shutdowned, VirtualMachine.State.Unknown);
+ VirtualMachine.State.Stopped, VirtualMachine.State.Migrating, VirtualMachine.State.Shutdown, VirtualMachine.State.Unknown);
String value = _configDao.getValue(Config.ConsoleProxyLaunchMax.key());
int launchLimit = NumbersUtil.parseInt(value, 10);
@@ -1011,7 +1012,12 @@
}
return false;
}
- TemplateDataStoreVO templateHostRef = _vmTemplateStoreDao.findByTemplateZoneDownloadStatus(template.getId(), dataCenterId, Status.DOWNLOADED);
+ TemplateDataStoreVO templateHostRef = null;
+ if (template.isDirectDownload()) {
+ templateHostRef = _vmTemplateStoreDao.findByTemplate(template.getId(), DataStoreRole.Image);
+ } else {
+ templateHostRef = _vmTemplateStoreDao.findByTemplateZoneDownloadStatus(template.getId(), dataCenterId, Status.DOWNLOADED);
+ }
if (templateHostRef != null) {
boolean useLocalStorage = false;
diff --git a/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java
index a95f4ef..0c1aab3 100644
--- a/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -30,10 +30,12 @@
import javax.inject.Inject;
import javax.naming.ConfigurationException;
+import com.cloud.utils.StringUtils;
import com.cloud.utils.db.Filter;
import com.cloud.utils.fsm.StateMachine2;
import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
import org.apache.log4j.Logger;
import org.apache.cloudstack.affinity.AffinityGroupProcessor;
import org.apache.cloudstack.affinity.AffinityGroupService;
@@ -271,6 +273,7 @@
}
String haVmTag = (String)vmProfile.getParameter(VirtualMachineProfile.Param.HaTag);
+ String uefiFlag = (String)vmProfile.getParameter(VirtualMachineProfile.Param.UefiFlag);
if (plan.getHostId() != null && haVmTag == null) {
Long hostIdSpecified = plan.getHostId();
@@ -278,6 +281,14 @@
s_logger.debug("DeploymentPlan has host_id specified, choosing this host and making no checks on this host: " + hostIdSpecified);
}
HostVO host = _hostDao.findById(hostIdSpecified);
+ if (host != null && StringUtils.isNotBlank(uefiFlag) && "yes".equalsIgnoreCase(uefiFlag)) {
+ _hostDao.loadDetails(host);
+ if (MapUtils.isNotEmpty(host.getDetails()) && host.getDetails().containsKey(Host.HOST_UEFI_ENABLE) && "false".equalsIgnoreCase(host.getDetails().get(Host.HOST_UEFI_ENABLE))) {
+ s_logger.debug("Cannot deploy to specified host as host does n't support uefi vm deployment, returning.");
+ return null;
+
+ }
+ }
if (host == null) {
s_logger.debug("The specified host cannot be found");
} else if (avoids.shouldAvoid(host)) {
@@ -1041,7 +1052,7 @@
for (Long clusterId : clusterList) {
ClusterVO clusterVO = _clusterDao.findById(clusterId);
- if (clusterVO.getAllocationState() == Grouping.AllocationState.Disabled) {
+ if (clusterVO.getAllocationState() == Grouping.AllocationState.Disabled && !plan.isMigrationPlan()) {
s_logger.debug("Cannot deploy in disabled cluster " + clusterId + ", skipping this cluster");
avoid.addCluster(clusterVO.getId());
}
diff --git a/server/src/main/java/com/cloud/deploy/FirstFitPlanner.java b/server/src/main/java/com/cloud/deploy/FirstFitPlanner.java
index 5760e24..88f6b95 100644
--- a/server/src/main/java/com/cloud/deploy/FirstFitPlanner.java
+++ b/server/src/main/java/com/cloud/deploy/FirstFitPlanner.java
@@ -68,12 +68,15 @@
import com.cloud.vm.dao.UserVmDao;
import com.cloud.vm.dao.UserVmDetailsDao;
import com.cloud.vm.dao.VMInstanceDao;
+import com.cloud.host.dao.HostDetailsDao;
public class FirstFitPlanner extends AdapterBase implements DeploymentClusterPlanner, Configurable, DeploymentPlanner {
private static final Logger s_logger = Logger.getLogger(FirstFitPlanner.class);
@Inject
protected HostDao hostDao;
@Inject
+ protected HostDetailsDao hostDetailsDao;
+ @Inject
protected DataCenterDao dcDao;
@Inject
protected HostPodDao podDao;
@@ -187,8 +190,16 @@
if (clusterList != null && !clusterList.isEmpty()) {
ServiceOffering offering = vmProfile.getServiceOffering();
+ boolean nonUefiVMDeploy =false;
+ if (vmProfile.getParameters().containsKey(VirtualMachineProfile.Param.BootType)) {
+ if (vmProfile.getParameters().get(VirtualMachineProfile.Param.BootType).toString().equalsIgnoreCase("BIOS")) {
+ nonUefiVMDeploy = true;
+
+ }
+
+ }
// In case of non-GPU VMs, protect GPU enabled Hosts and prefer VM deployment on non-GPU Hosts.
- if ((serviceOfferingDetailsDao.findDetail(offering.getId(), GPU.Keys.vgpuType.toString()) == null) && !(hostGpuGroupsDao.listHostIds().isEmpty())) {
+ if (((serviceOfferingDetailsDao.findDetail(offering.getId(), GPU.Keys.vgpuType.toString()) == null) && !(hostGpuGroupsDao.listHostIds().isEmpty())) || nonUefiVMDeploy) {
int requiredCpu = offering.getCpu() * offering.getSpeed();
long requiredRam = offering.getRamSize() * 1024L * 1024L;
reorderClustersBasedOnImplicitTags(clusterList, requiredCpu, requiredRam);
@@ -205,7 +216,8 @@
List<Long> hostList = capacityDao.listHostsWithEnoughCapacity(requiredCpu, requiredRam, clusterId, Host.Type.Routing.toString());
if (!hostList.isEmpty() && implicitHostTags.length > 0) {
uniqueTags = new Long(hostTagsDao.getDistinctImplicitHostTags(hostList, implicitHostTags).size());
- }
+ uniqueTags = uniqueTags + getHostsByCapability(hostList, Host.HOST_UEFI_ENABLE);
+ }
UniqueTagsInClusterMap.put(clusterId, uniqueTags);
}
Collections.sort(clusterList, new Comparator<Long>() {
@@ -218,6 +230,19 @@
});
}
+ private Long getHostsByCapability(List<Long> hostList, String hostCapability) {
+ for (Long host : hostList) { //TODO: Fix this in single query instead of polling request for each Host
+ Map<String, String> details = hostDetailsDao.findDetails(host);
+ if (details.containsKey(Host.HOST_UEFI_ENABLE)) {
+ if (details.get(Host.HOST_UEFI_ENABLE).equalsIgnoreCase("Yes")) {
+ return new Long(1);
+ }
+
+ }
+ }
+ return new Long(0);
+ }
+
private List<Long> scanPodsForDestination(VirtualMachineProfile vmProfile, DeploymentPlan plan, ExcludeList avoid) {
ServiceOffering offering = vmProfile.getServiceOffering();
diff --git a/server/src/main/java/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/main/java/com/cloud/ha/HighAvailabilityManagerImpl.java
index 076f500..b05e008 100644
--- a/server/src/main/java/com/cloud/ha/HighAvailabilityManagerImpl.java
+++ b/server/src/main/java/com/cloud/ha/HighAvailabilityManagerImpl.java
@@ -105,6 +105,11 @@
private static final int SECONDS_TO_MILLISECONDS_FACTOR = 1000;
protected static final Logger s_logger = Logger.getLogger(HighAvailabilityManagerImpl.class);
+ private ConfigKey<Integer> MigrationMaxRetries = new ConfigKey<>("Advanced", Integer.class,
+ "vm.ha.migration.max.retries","5",
+ "Total number of attempts for trying migration of a VM.",
+ true, ConfigKey.Scope.Global);
+
WorkerThread[] _workers;
boolean _stopped;
long _timeToSleep;
@@ -315,6 +320,7 @@
if (vm.getHostId() != null) {
final HaWorkVO work = new HaWorkVO(vm.getId(), vm.getType(), WorkType.Migration, Step.Scheduled, vm.getHostId(), vm.getState(), 0, vm.getUpdated());
_haDao.persist(work);
+ s_logger.info("Scheduled migration work of VM " + vm.getUuid() + " from host " + _hostDao.findById(vm.getHostId()) + " with HAWork " + work);
wakeupWorkers();
}
return true;
@@ -630,23 +636,32 @@
public Long migrate(final HaWorkVO work) {
long vmId = work.getInstanceId();
-
long srcHostId = work.getHostId();
+
+ VMInstanceVO vm = _instanceDao.findById(vmId);
+ if (vm == null) {
+ s_logger.info("Unable to find vm: " + vmId + ", skipping migrate.");
+ return null;
+ }
+ s_logger.info("Migration attempt: for VM " + vm.getUuid() + "from host id " + srcHostId +
+ ". Starting attempt: " + (1 + work.getTimesTried()) + "/" + _maxRetries + " times.");
try {
work.setStep(Step.Migrating);
_haDao.update(work.getId(), work);
- VMInstanceVO vm = _instanceDao.findById(vmId);
- if (vm == null) {
- return null;
- }
// First try starting the vm with its original planner, if it doesn't succeed send HAPlanner as its an emergency.
_itMgr.migrateAway(vm.getUuid(), srcHostId);
return null;
} catch (InsufficientServerCapacityException e) {
- s_logger.warn("Insufficient capacity for migrating a VM.");
- _resourceMgr.maintenanceFailed(srcHostId);
+ s_logger.warn("Migration attempt: Insufficient capacity for migrating a VM " +
+ vm.getUuid() + " from source host id " + srcHostId +
+ ". Exception: " + e.getMessage());
+ _resourceMgr.migrateAwayFailed(srcHostId, vmId);
return (System.currentTimeMillis() >> 10) + _migrateRetryInterval;
+ } catch (Exception e) {
+ s_logger.warn("Migration attempt: Unexpected exception occurred when attempting migration of " +
+ vm.getUuid() + e.getMessage());
+ throw e;
}
}
@@ -745,7 +760,7 @@
@Override
public void cancelScheduledMigrations(final HostVO host) {
WorkType type = host.getType() == HostVO.Type.Storage ? WorkType.Stop : WorkType.Migration;
-
+ s_logger.info("Canceling all scheduled migrations from host " + host.getUuid());
_haDao.deleteMigrationWorkItems(host.getId(), type, _serverId);
}
@@ -763,7 +778,6 @@
}
private void rescheduleWork(final HaWorkVO work, final long nextTime) {
- s_logger.info("Rescheduling work " + work + " to try again at " + new Date(nextTime << 10));
work.setTimeToTry(nextTime);
work.setTimesTried(work.getTimesTried() + 1);
work.setServerId(null);
@@ -804,7 +818,7 @@
}
if (nextTime == null) {
- s_logger.info("Completed work " + work);
+ s_logger.info("Completed work " + work + ". Took " + (work.getTimesTried() + 1) + "/" + _maxRetries + " attempts.");
work.setStep(Step.Done);
} else {
rescheduleWork(work, nextTime.longValue());
@@ -820,12 +834,18 @@
VMInstanceVO vm = _instanceDao.findById(work.getInstanceId());
work.setUpdateTime(vm.getUpdated());
work.setPreviousState(vm.getState());
+ } finally {
+ if (!Step.Done.equals(work.getStep())) {
+ if (work.getTimesTried() >= _maxRetries) {
+ s_logger.warn("Giving up, retried max " + work.getTimesTried() + "/" + _maxRetries + " times for work: " + work);
+ work.setStep(Step.Done);
+ } else {
+ s_logger.warn("Rescheduling work " + work + " to try again at " + new Date(work.getTimeToTry() << 10) +
+ ". Finished attempt " + work.getTimesTried() + "/" + _maxRetries + " times.");
+ }
+ }
+ _haDao.update(work.getId(), work);
}
- if (!Step.Done.equals(work.getStep()) && work.getTimesTried() >= _maxRetries) {
- s_logger.warn("Giving up, retried max. times for work: " + work);
- work.setStep(Step.Done);
- }
- _haDao.update(work.getId(), work);
}
@Override
@@ -843,7 +863,7 @@
_forceHA = ForceHA.value();
_timeToSleep = TimeToSleep.value() * SECONDS_TO_MILLISECONDS_FACTOR;
- _maxRetries = MaxRetries.value();
+ _maxRetries = MigrationMaxRetries.value();
_timeBetweenFailures = TimeBetweenFailures.value() * SECONDS_TO_MILLISECONDS_FACTOR;
_timeBetweenCleanups = TimeBetweenCleanup.value();
_stopRetryInterval = StopRetryInterval.value();
@@ -988,6 +1008,20 @@
return haWorks.size() > 0;
}
+ @Override
+ public boolean hasPendingMigrationsWork(long vmId) {
+ List<HaWorkVO> haWorks = _haDao.listPendingMigrationsForVm(vmId);
+ for (HaWorkVO work : haWorks) {
+ if (work.getTimesTried() <= _maxRetries) {
+ return true;
+ } else {
+ s_logger.warn("HAWork Job of migration type " + work + " found in database which has max " +
+ "retries more than " + _maxRetries + " but still not in Done, Cancelled, or Error State");
+ }
+ }
+ return false;
+ }
+
/**
* @return The name of the component that provided this configuration
* variable. This value is saved in the database so someone can easily
@@ -1003,7 +1037,7 @@
*/
@Override
public ConfigKey<?>[] getConfigKeys() {
- return new ConfigKey[] {TimeBetweenCleanup, MaxRetries, TimeToSleep, TimeBetweenFailures,
+ return new ConfigKey[] {TimeBetweenCleanup, MigrationMaxRetries, TimeToSleep, TimeBetweenFailures,
StopRetryInterval, RestartRetryInterval, MigrateRetryInterval, InvestigateRetryInterval,
HAWorkers, ForceHA};
}
diff --git a/server/src/main/java/com/cloud/ha/dao/HighAvailabilityDao.java b/server/src/main/java/com/cloud/ha/dao/HighAvailabilityDao.java
index 85135bb..e8a3e17 100644
--- a/server/src/main/java/com/cloud/ha/dao/HighAvailabilityDao.java
+++ b/server/src/main/java/com/cloud/ha/dao/HighAvailabilityDao.java
@@ -83,4 +83,6 @@
List<HaWorkVO> listRunningHaWorkForVm(long vmId);
List<HaWorkVO> listPendingHaWorkForVm(long vmId);
+
+ List<HaWorkVO> listPendingMigrationsForVm(long vmId);
}
diff --git a/server/src/main/java/com/cloud/ha/dao/HighAvailabilityDaoImpl.java b/server/src/main/java/com/cloud/ha/dao/HighAvailabilityDaoImpl.java
index 3d11eb0..56e24c3 100644
--- a/server/src/main/java/com/cloud/ha/dao/HighAvailabilityDaoImpl.java
+++ b/server/src/main/java/com/cloud/ha/dao/HighAvailabilityDaoImpl.java
@@ -48,6 +48,7 @@
private final SearchBuilder<HaWorkVO> FutureHaWorkSearch;
private final SearchBuilder<HaWorkVO> RunningHaWorkSearch;
private final SearchBuilder<HaWorkVO> PendingHaWorkSearch;
+ private final SearchBuilder<HaWorkVO> MigratingWorkSearch;
protected HighAvailabilityDaoImpl() {
super();
@@ -112,6 +113,12 @@
PendingHaWorkSearch.and("type", PendingHaWorkSearch.entity().getType(), Op.EQ);
PendingHaWorkSearch.and("step", PendingHaWorkSearch.entity().getStep(), Op.NIN);
PendingHaWorkSearch.done();
+
+ MigratingWorkSearch = createSearchBuilder();
+ MigratingWorkSearch.and("instance", MigratingWorkSearch.entity().getInstanceId(), Op.EQ);
+ MigratingWorkSearch.and("workType", MigratingWorkSearch.entity().getWorkType(), Op.EQ);
+ MigratingWorkSearch.and("step", MigratingWorkSearch.entity().getStep(), Op.NIN);
+ MigratingWorkSearch.done();
}
@Override
@@ -125,6 +132,16 @@
}
@Override
+ public List<HaWorkVO> listPendingMigrationsForVm(long vmId) {
+ SearchCriteria<HaWorkVO> sc = MigratingWorkSearch.create();
+ sc.setParameters("instance", vmId);
+ sc.setParameters("workType", WorkType.Migration);
+ sc.setParameters("step", Step.Done, Step.Error, Step.Cancelled);
+
+ return search(sc, null);
+ }
+
+ @Override
public List<HaWorkVO> listRunningHaWorkForVm(long vmId) {
SearchCriteria<HaWorkVO> sc = RunningHaWorkSearch.create();
sc.setParameters("instance", vmId);
diff --git a/server/src/main/java/com/cloud/hypervisor/HypervisorGuruBase.java b/server/src/main/java/com/cloud/hypervisor/HypervisorGuruBase.java
index b790978..2ae35fc 100644
--- a/server/src/main/java/com/cloud/hypervisor/HypervisorGuruBase.java
+++ b/server/src/main/java/com/cloud/hypervisor/HypervisorGuruBase.java
@@ -23,8 +23,10 @@
import javax.inject.Inject;
import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.backup.Backup;
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
import org.apache.log4j.Logger;
import com.cloud.agent.api.Command;
@@ -34,6 +36,8 @@
import com.cloud.gpu.GPU;
import com.cloud.network.Networks.BroadcastDomainType;
import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkDetailVO;
+import com.cloud.network.dao.NetworkDetailsDao;
import com.cloud.network.dao.NetworkVO;
import com.cloud.offering.NetworkOffering;
import com.cloud.offering.ServiceOffering;
@@ -44,6 +48,7 @@
import com.cloud.service.dao.ServiceOfferingDetailsDao;
import com.cloud.storage.StoragePool;
import com.cloud.utils.Pair;
+import com.cloud.utils.StringUtils;
import com.cloud.utils.component.AdapterBase;
import com.cloud.vm.NicProfile;
import com.cloud.vm.NicVO;
@@ -77,6 +82,8 @@
protected ServiceOfferingDetailsDao _serviceOfferingDetailsDao;
@Inject
private ServiceOfferingDao _serviceOfferingDao;
+ @Inject
+ private NetworkDetailsDao networkDetailsDao;
@Override
public NicTO toNicTO(NicProfile profile) {
@@ -166,6 +173,21 @@
offering.getRamSize() * 1024l * 1024l, null, null, vm.isHaEnabled(), vm.limitCpuUse(), vm.getVncPassword());
to.setBootArgs(vmProfile.getBootArgs());
+ Map<VirtualMachineProfile.Param, Object> map = vmProfile.getParameters();
+ if (MapUtils.isNotEmpty(map)) {
+ if (map.containsKey(VirtualMachineProfile.Param.BootMode)) {
+ if (StringUtils.isNotBlank((String) map.get(VirtualMachineProfile.Param.BootMode))) {
+ to.setBootMode((String) map.get(VirtualMachineProfile.Param.BootMode));
+ }
+ }
+
+ if (map.containsKey(VirtualMachineProfile.Param.BootType)) {
+ if (StringUtils.isNotBlank((String) map.get(VirtualMachineProfile.Param.BootType))) {
+ to.setBootType((String) map.get(VirtualMachineProfile.Param.BootType));
+ }
+ }
+ }
+
List<NicProfile> nicProfiles = vmProfile.getNics();
NicTO[] nics = new NicTO[nicProfiles.size()];
int i = 0;
@@ -182,6 +204,10 @@
details.putIfAbsent(NetworkOffering.Detail.MacAddressChanges, NetworkOrchestrationService.MacAddressChanges.value().toString());
details.putIfAbsent(NetworkOffering.Detail.ForgedTransmits, NetworkOrchestrationService.ForgedTransmits.value().toString());
}
+ NetworkDetailVO pvlantypeDetail = networkDetailsDao.findDetail(network.getId(), ApiConstants.ISOLATED_PVLAN_TYPE);
+ if (pvlantypeDetail != null) {
+ details.putIfAbsent(NetworkOffering.Detail.pvlanType, pvlantypeDetail.getValue());
+ }
nicTo.setDetails(details);
}
nics[i++] = nicTo;
@@ -260,6 +286,17 @@
}
@Override
+ public VirtualMachine importVirtualMachineFromBackup(long zoneId, long domainId, long accountId, long userId,
+ String vmInternalName, Backup backup) throws Exception {
+ return null;
+ }
+
+ @Override
+ public boolean attachRestoredVolumeToVirtualMachine(long zoneId, String location, Backup.VolumeInfo volumeInfo,
+ VirtualMachine vm, long poolId, Backup backup) throws Exception {
+ return false;
+ }
+
public List<Command> finalizeMigrate(VirtualMachine vm, StoragePool destination) {
return null;
}
diff --git a/server/src/main/java/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java b/server/src/main/java/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
index 6c9bcac..904a488 100644
--- a/server/src/main/java/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
+++ b/server/src/main/java/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
@@ -202,6 +202,7 @@
@Override
public Map<? extends ServerResource, Map<String, String>>
find(long dcId, Long podId, Long clusterId, URI uri, String username, String password, List<String> hostTags) throws DiscoveryException {
+ boolean isUefiSupported = false;
ClusterVO cluster = _clusterDao.findById(clusterId);
if (cluster == null || cluster.getHypervisorType() != getHypervisorType()) {
@@ -251,11 +252,16 @@
throw new DiscoveredWithErrorException("Authentication error");
}
- if (!SSHCmdHelper.sshExecuteCmd(sshConnection, "lsmod|grep kvm")) {
+ if (!SSHCmdHelper.sshExecuteCmd(sshConnection, "ls /dev/kvm")) {
s_logger.debug("It's not a KVM enabled machine");
return null;
}
+ if (SSHCmdHelper.sshExecuteCmd(sshConnection, "rpm -qa | grep -i ovmf", 3)) {
+ s_logger.debug("It's UEFI enabled KVM machine");
+ isUefiSupported = true;
+ }
+
List<PhysicalNetworkSetupInfo> netInfos = _networkMgr.getPhysicalNetworkInfo(dcId, getHypervisorType());
String kvmPrivateNic = null;
String kvmPublicNic = null;
@@ -338,6 +344,7 @@
Map<String, String> hostDetails = connectedHost.getDetails();
hostDetails.put("password", password);
hostDetails.put("username", username);
+ hostDetails.put(Host.HOST_UEFI_ENABLE, isUefiSupported == true ? Boolean.toString(true) : Boolean.toString(false));
_hostDao.saveDetails(connectedHost);
return resources;
} catch (DiscoveredWithErrorException e) {
diff --git a/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java b/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java
index 817efcc..9ad56fc 100644
--- a/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java
@@ -26,6 +26,7 @@
import java.util.Random;
import java.util.Set;
import java.util.UUID;
+import java.util.Collections;
import javax.inject.Inject;
@@ -300,6 +301,72 @@
private Random rand = new Random(System.currentTimeMillis());
+ @DB
+ private IPAddressVO assignAndAllocateIpAddressEntry(final Account owner, final VlanType vlanUse, final Long guestNetworkId,
+ final boolean sourceNat, final boolean allocate, final boolean isSystem,
+ final Long vpcId, final Boolean displayIp, final boolean fetchFromDedicatedRange,
+ final List<IPAddressVO> addressVOS) throws CloudRuntimeException {
+ return Transaction.execute((TransactionCallbackWithException<IPAddressVO, CloudRuntimeException>) status -> {
+ IPAddressVO finalAddress = null;
+ if (!fetchFromDedicatedRange && VlanType.VirtualNetwork.equals(vlanUse)) {
+ // Check that the maximum number of public IPs for the given accountId will not be exceeded
+ try {
+ _resourceLimitMgr.checkResourceLimit(owner, ResourceType.public_ip);
+ } catch (ResourceAllocationException ex) {
+ s_logger.warn("Failed to allocate resource of type " + ex.getResourceType() + " for account " + owner);
+ throw new AccountLimitException("Maximum number of public IP addresses for account: " + owner.getAccountName() + " has been exceeded.");
+ }
+ }
+
+ for (final IPAddressVO possibleAddr : addressVOS) {
+ if (possibleAddr.getState() != State.Free) {
+ continue;
+ }
+ final IPAddressVO addressVO = possibleAddr;
+ addressVO.setSourceNat(sourceNat);
+ addressVO.setAllocatedTime(new Date());
+ addressVO.setAllocatedInDomainId(owner.getDomainId());
+ addressVO.setAllocatedToAccountId(owner.getId());
+ addressVO.setSystem(isSystem);
+
+ if (displayIp != null) {
+ addressVO.setDisplay(displayIp);
+ }
+
+ if (vlanUse != VlanType.DirectAttached) {
+ addressVO.setAssociatedWithNetworkId(guestNetworkId);
+ addressVO.setVpcId(vpcId);
+ }
+ if (_ipAddressDao.lockRow(possibleAddr.getId(), true) != null) {
+ final IPAddressVO userIp = _ipAddressDao.findById(addressVO.getId());
+ if (userIp.getState() == State.Free) {
+ addressVO.setState(State.Allocating);
+ if (_ipAddressDao.update(addressVO.getId(), addressVO)) {
+ finalAddress = addressVO;
+ break;
+ }
+ }
+ }
+ }
+
+ if (finalAddress == null) {
+ s_logger.error("Failed to fetch any free public IP address");
+ throw new CloudRuntimeException("Failed to fetch any free public IP address");
+ }
+
+ if (allocate) {
+ markPublicIpAsAllocated(finalAddress);
+ }
+
+ final State expectedAddressState = allocate ? State.Allocated : State.Allocating;
+ if (finalAddress.getState() != expectedAddressState) {
+ s_logger.error("Failed to fetch new public IP and get in expected state=" + expectedAddressState);
+ throw new CloudRuntimeException("Failed to fetch new public IP with expected state " + expectedAddressState);
+ }
+ return finalAddress;
+ });
+ }
+
@Override
public boolean configure(String name, Map<String, Object> params) {
// populate providers
@@ -444,7 +511,7 @@
DataCenter zone = _entityMgr.findById(DataCenter.class, zoneId);
- return allocateIp(ipOwner, isSystem, caller, callerUserId, zone, null);
+ return allocateIp(ipOwner, isSystem, caller, callerUserId, zone, null, null);
}
// An IP association is required in below cases
@@ -694,9 +761,23 @@
return fetchNewPublicIp(dcId, podId, vlanDbIds, owner, type, networkId, false, true, requestedIp, isSystem, null, null, false);
}
+ @Override
+ public PublicIp getAvailablePublicIpAddressFromVlans(long dcId, Long podId, Account owner, VlanType type, List<Long> vlanDbIds, Long networkId, String requestedIp, boolean isSystem)
+ throws InsufficientAddressCapacityException {
+ return fetchNewPublicIp(dcId, podId, vlanDbIds, owner, type, networkId, false, false, false, requestedIp, isSystem, null, null, false);
+ }
+
@DB
public PublicIp fetchNewPublicIp(final long dcId, final Long podId, final List<Long> vlanDbIds, final Account owner, final VlanType vlanUse, final Long guestNetworkId,
- final boolean sourceNat, final boolean assign, final String requestedIp, final boolean isSystem, final Long vpcId, final Boolean displayIp, final boolean forSystemVms)
+ final boolean sourceNat, final boolean allocate, final String requestedIp, final boolean isSystem, final Long vpcId, final Boolean displayIp, final boolean forSystemVms)
+ throws InsufficientAddressCapacityException {
+ return fetchNewPublicIp(dcId, podId, vlanDbIds, owner, vlanUse, guestNetworkId,
+ sourceNat, true, allocate, requestedIp, isSystem, vpcId, displayIp, forSystemVms);
+ }
+
+ @DB
+ public PublicIp fetchNewPublicIp(final long dcId, final Long podId, final List<Long> vlanDbIds, final Account owner, final VlanType vlanUse, final Long guestNetworkId,
+ final boolean sourceNat, final boolean assign, final boolean allocate, final String requestedIp, final boolean isSystem, final Long vpcId, final Boolean displayIp, final boolean forSystemVms)
throws InsufficientAddressCapacityException {
IPAddressVO addr = Transaction.execute(new TransactionCallbackWithException<IPAddressVO, InsufficientAddressCapacityException>() {
@Override
@@ -807,64 +888,13 @@
}
assert(addrs.size() == 1) : "Return size is incorrect: " + addrs.size();
-
- if (!fetchFromDedicatedRange && VlanType.VirtualNetwork.equals(vlanUse)) {
- // Check that the maximum number of public IPs for the given accountId will not be exceeded
- try {
- _resourceLimitMgr.checkResourceLimit(owner, ResourceType.public_ip);
- } catch (ResourceAllocationException ex) {
- s_logger.warn("Failed to allocate resource of type " + ex.getResourceType() + " for account " + owner);
- throw new AccountLimitException("Maximum number of public IP addresses for account: " + owner.getAccountName() + " has been exceeded.");
- }
- }
-
IPAddressVO finalAddr = null;
- for (final IPAddressVO possibleAddr: addrs) {
- if (possibleAddr.getState() != IpAddress.State.Free) {
- continue;
- }
- final IPAddressVO addr = possibleAddr;
- addr.setSourceNat(sourceNat);
- addr.setAllocatedTime(new Date());
- addr.setAllocatedInDomainId(owner.getDomainId());
- addr.setAllocatedToAccountId(owner.getId());
- addr.setSystem(isSystem);
-
- if (displayIp != null) {
- addr.setDisplay(displayIp);
- }
-
- if (vlanUse != VlanType.DirectAttached) {
- addr.setAssociatedWithNetworkId(guestNetworkId);
- addr.setVpcId(vpcId);
- }
- if (_ipAddressDao.lockRow(possibleAddr.getId(), true) != null) {
- final IPAddressVO userIp = _ipAddressDao.findById(addr.getId());
- if (userIp.getState() == IpAddress.State.Free) {
- addr.setState(IpAddress.State.Allocating);
- if (_ipAddressDao.update(addr.getId(), addr)) {
- finalAddr = addr;
- break;
- }
- }
- }
- }
-
- if (finalAddr == null) {
- s_logger.error("Failed to fetch any free public IP address");
- throw new CloudRuntimeException("Failed to fetch any free public IP address");
- }
-
if (assign) {
- markPublicIpAsAllocated(finalAddr);
+ finalAddr = assignAndAllocateIpAddressEntry(owner, vlanUse, guestNetworkId, sourceNat, allocate,
+ isSystem,vpcId, displayIp, fetchFromDedicatedRange, addrs);
+ } else {
+ finalAddr = addrs.get(0);
}
-
- final State expectedAddressState = assign ? State.Allocated : State.Allocating;
- if (finalAddr.getState() != expectedAddressState) {
- s_logger.error("Failed to fetch new public IP and get in expected state=" + expectedAddressState);
- throw new CloudRuntimeException("Failed to fetch new public IP with expected state " + expectedAddressState);
- }
-
return finalAddr;
}
});
@@ -1132,7 +1162,7 @@
@DB
@Override
- public IpAddress allocateIp(final Account ipOwner, final boolean isSystem, Account caller, long callerUserId, final DataCenter zone, final Boolean displayIp)
+ public IpAddress allocateIp(final Account ipOwner, final boolean isSystem, Account caller, long callerUserId, final DataCenter zone, final Boolean displayIp, final String ipaddress)
throws ConcurrentOperationException,
ResourceAllocationException, InsufficientAddressCapacityException {
@@ -1166,7 +1196,7 @@
ip = Transaction.execute(new TransactionCallbackWithException<PublicIp, InsufficientAddressCapacityException>() {
@Override
public PublicIp doInTransaction(TransactionStatus status) throws InsufficientAddressCapacityException {
- PublicIp ip = fetchNewPublicIp(zone.getId(), null, null, ipOwner, vlanType, null, false, assign, null, isSystem, null, displayIp, false);
+ PublicIp ip = fetchNewPublicIp(zone.getId(), null, null, ipOwner, vlanType, null, false, assign, ipaddress, isSystem, null, displayIp, false);
if (ip == null) {
InsufficientAddressCapacityException ex = new InsufficientAddressCapacityException("Unable to find available public IP addresses", DataCenter.class, zone
@@ -1693,7 +1723,7 @@
s_logger.debug("Creating network for account " + owner + " from the network offering id=" + requiredOfferings.get(0).getId()
+ " as a part of createVlanIpRange process");
guestNetwork = _networkMgr.createGuestNetwork(requiredOfferings.get(0).getId(), owner.getAccountName() + "-network", owner.getAccountName()
- + "-network", null, null, null, false, null, owner, null, physicalNetwork, zoneId, ACLType.Account, null, null, null, null, true, null, null);
+ + "-network", null, null, null, false, null, owner, null, physicalNetwork, zoneId, ACLType.Account, null, null, null, null, true, null, null, null);
if (guestNetwork == null) {
s_logger.warn("Failed to create default Virtual network for the account " + accountId + "in zone " + zoneId);
throw new CloudRuntimeException("Failed to create a Guest Isolated Networks with SourceNAT "
@@ -1855,6 +1885,52 @@
return NetUtils.long2Ip(array[rand.nextInt(array.length)]);
}
+ @Override
+ public String acquireFirstGuestIpAddress(Network network) {
+ if (_networkModel.listNetworkOfferingServices(network.getNetworkOfferingId()).isEmpty() && network.getCidr() == null) {
+ return null;
+ }
+ Set<Long> availableIps = _networkModel.getAvailableIps(network, null);
+ if (availableIps == null || availableIps.isEmpty()) {
+ s_logger.debug("There are no free ips in the network " + network);
+ return null;
+ }
+ return NetUtils.long2Ip(availableIps.iterator().next());
+ }
+
+ @Override
+ public String acquireLastGuestIpAddress(Network network) {
+ if (_networkModel.listNetworkOfferingServices(network.getNetworkOfferingId()).isEmpty() && network.getCidr() == null) {
+ return null;
+ }
+ Set<Long> availableIps = _networkModel.getAvailableIps(network, null);
+ if (availableIps == null || availableIps.isEmpty()) {
+ s_logger.debug("There are no free ips in the network " + network);
+ return null;
+ }
+
+ List<Long> availableIpsReverse = new ArrayList(availableIps);
+ Collections.sort(availableIpsReverse, Collections.reverseOrder());
+
+ return NetUtils.long2Ip(availableIpsReverse.iterator().next());
+ }
+
+ @Override
+ public String acquireGuestIpAddressByPlacement(Network network, String requestedIp) {
+ if (requestedIp != null) {
+ return this.acquireGuestIpAddress(network, requestedIp);
+ }
+ String placementConfig = VrouterRedundantTiersPlacement.valueIn(network.getAccountId());
+ IpPlacement ipPlacement = IpPlacement.fromString(placementConfig);
+ switch (ipPlacement) {
+ case Last:
+ return this.acquireLastGuestIpAddress(network);
+ case First:
+ return this.acquireFirstGuestIpAddress(network);
+ }
+ return this.acquireGuestIpAddress(network, null);
+ }
+
/**
* Get the list of public IPs that need to be applied for a static NAT enable/disable operation.
* Manipulating only these ips prevents concurrency issues when disabling static nat at the same time.
@@ -2146,7 +2222,7 @@
@Override
public ConfigKey<?>[] getConfigKeys() {
- return new ConfigKey<?>[] {UseSystemPublicIps, RulesContinueOnError, SystemVmPublicIpReservationModeStrictness};
+ return new ConfigKey<?>[] {UseSystemPublicIps, RulesContinueOnError, SystemVmPublicIpReservationModeStrictness, VrouterRedundantTiersPlacement};
}
/**
diff --git a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
index f440ced..ad13887 100644
--- a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
@@ -38,6 +38,7 @@
import javax.inject.Inject;
import javax.naming.ConfigurationException;
+import com.cloud.network.Network.PVlanType;
import org.apache.cloudstack.acl.ControlledEntity.ACLType;
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.api.ApiConstants;
@@ -55,6 +56,8 @@
import org.apache.cloudstack.api.response.AcquirePodIpCmdResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.Configurable;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.framework.messagebus.MessageBus;
import org.apache.cloudstack.framework.messagebus.PublishScope;
@@ -107,6 +110,7 @@
import com.cloud.network.dao.IPAddressDao;
import com.cloud.network.dao.IPAddressVO;
import com.cloud.network.dao.LoadBalancerDao;
+import com.cloud.network.dao.NetworkAccountDao;
import com.cloud.network.dao.NetworkDao;
import com.cloud.network.dao.NetworkDetailVO;
import com.cloud.network.dao.NetworkDetailsDao;
@@ -197,12 +201,20 @@
import com.cloud.vm.dao.UserVmDao;
import com.cloud.vm.dao.VMInstanceDao;
+import static org.apache.commons.lang.StringUtils.isBlank;
+import static org.apache.commons.lang.StringUtils.isNotBlank;
+
/**
* NetworkServiceImpl implements NetworkService.
*/
-public class NetworkServiceImpl extends ManagerBase implements NetworkService {
+public class NetworkServiceImpl extends ManagerBase implements NetworkService, Configurable {
private static final Logger s_logger = Logger.getLogger(NetworkServiceImpl.class);
+ private static final ConfigKey<Boolean> AllowDuplicateNetworkName = new ConfigKey<Boolean>("Advanced", Boolean.class,
+ "allow.duplicate.networkname", "true", "Allow creating networks with same name in account", true, ConfigKey.Scope.Account);
+ private static final ConfigKey<Boolean> AllowEmptyStartEndIpAddress = new ConfigKey<Boolean>("Advanced", Boolean.class,
+ "allow.empty.start.end.ipaddress", "true", "Allow creating network without mentioning start and end IP address",
+ true, ConfigKey.Scope.Account);
private static final long MIN_VLAN_ID = 0L;
private static final long MAX_VLAN_ID = 4095L; // 2^12 - 1
private static final long MIN_GRE_KEY = 0L;
@@ -313,6 +325,8 @@
VpcOfferingDao _vpcOfferingDao;
@Inject
AccountService _accountService;
+ @Inject
+ NetworkAccountDao _networkAccountDao;
int _cidrLimit;
boolean _allowSubdomainNetworkAccess;
@@ -520,7 +534,7 @@
@Override
@ActionEvent(eventType = EventTypes.EVENT_NET_IP_ASSIGN, eventDescription = "allocating Ip", create = true)
- public IpAddress allocateIP(Account ipOwner, long zoneId, Long networkId, Boolean displayIp)
+ public IpAddress allocateIP(Account ipOwner, long zoneId, Long networkId, Boolean displayIp, String ipaddress)
throws ResourceAllocationException, InsufficientAddressCapacityException, ConcurrentOperationException {
Account caller = CallContext.current().getCallingAccount();
@@ -544,7 +558,7 @@
if (s_logger.isDebugEnabled()) {
s_logger.debug("Associate IP address called by the user " + callerUserId + " account " + ipOwner.getId());
}
- return _ipAddrMgr.allocateIp(ipOwner, false, caller, callerUserId, zone, displayIp);
+ return _ipAddrMgr.allocateIp(ipOwner, false, caller, callerUserId, zone, displayIp, ipaddress);
} else {
throw new InvalidParameterValueException("Associate IP address can only be called on the shared networks in the advanced zone"
+ " with Firewall/Source Nat/Static Nat/Port Forwarding/Load balancing services enabled");
@@ -555,7 +569,7 @@
_accountMgr.checkAccess(caller, null, false, ipOwner);
}
- return _ipAddrMgr.allocateIp(ipOwner, false, caller, callerUserId, zone, displayIp);
+ return _ipAddrMgr.allocateIp(ipOwner, false, caller, callerUserId, zone, displayIp, ipaddress);
}
@Override
@@ -1052,6 +1066,7 @@
Long aclId = cmd.getAclId();
String isolatedPvlan = cmd.getIsolatedPvlan();
String externalId = cmd.getExternalId();
+ String isolatedPvlanType = cmd.getIsolatedPvlanType();
// Validate network offering
NetworkOfferingVO ntwkOff = _networkOfferingDao.findById(networkOfferingId);
@@ -1164,6 +1179,18 @@
throw new InvalidParameterValueException("Parameter subDomainAccess can be specified only with aclType=Domain");
}
+ if (aclType == ACLType.Domain) {
+ owner = _accountDao.findById(Account.ACCOUNT_ID_SYSTEM);
+ }
+
+ // The network name is unique under the account
+ if (!AllowDuplicateNetworkName.valueIn(owner.getAccountId())) {
+ List<NetworkVO> existingNetwork = _networksDao.listByAccountIdNetworkName(owner.getId(), name);
+ if (!existingNetwork.isEmpty()) {
+ throw new InvalidParameterValueException("Another network with same name already exists within account: " + owner.getAccountName());
+ }
+ }
+
boolean ipv4 = true, ipv6 = false;
if (startIP != null) {
ipv4 = true;
@@ -1188,6 +1215,15 @@
}
}
+ // Start and end IP address are mandatory for shared networks.
+ if (ntwkOff.getGuestType() == GuestType.Shared && vpcId == null) {
+ if (!AllowEmptyStartEndIpAddress.valueIn(owner.getAccountId()) &&
+ (startIP == null && endIP == null) &&
+ (startIPv6 == null && endIPv6 == null)) {
+ throw new InvalidParameterValueException("Either IPv4 or IPv6 start and end address are mandatory");
+ }
+ }
+
String cidr = null;
if (ipv4) {
// if end ip is not specified, default it to startIp
@@ -1239,14 +1275,24 @@
}
}
- if (isolatedPvlan != null && (zone.getNetworkType() != NetworkType.Advanced || ntwkOff.getGuestType() != Network.GuestType.Shared)) {
- throw new InvalidParameterValueException("Can only support create Private VLAN network with advance shared network!");
+ if (isNotBlank(isolatedPvlan) && (zone.getNetworkType() != NetworkType.Advanced || ntwkOff.getGuestType() == GuestType.Isolated)) {
+ throw new InvalidParameterValueException("Can only support create Private VLAN network with advanced shared or L2 network!");
}
- if (isolatedPvlan != null && ipv6) {
+ if (isNotBlank(isolatedPvlan) && ipv6) {
throw new InvalidParameterValueException("Can only support create Private VLAN network with IPv4!");
}
+ Pair<String, PVlanType> pvlanPair = getPrivateVlanPair(isolatedPvlan, isolatedPvlanType, vlanId);
+ String secondaryVlanId = pvlanPair.first();
+ PVlanType privateVlanType = pvlanPair.second();
+
+ if ((isNotBlank(secondaryVlanId) || privateVlanType != null) && isBlank(vlanId)) {
+ throw new InvalidParameterValueException("VLAN ID has to be set in order to configure a Private VLAN");
+ }
+
+ performBasicPrivateVlanChecks(vlanId, secondaryVlanId, privateVlanType);
+
// Regular user can create Guest Isolated Source Nat enabled network only
if (_accountMgr.isNormalUser(caller.getId()) && (ntwkOff.getTrafficType() != TrafficType.Guest
|| ntwkOff.getGuestType() != Network.GuestType.Isolated && areServicesSupportedByNetworkOffering(ntwkOff.getId(), Service.SourceNat))) {
@@ -1278,7 +1324,7 @@
throw new InvalidParameterValueException("Cannot support IPv6 on network offering with external devices!");
}
- if (isolatedPvlan != null && providersConfiguredForExternalNetworking(ntwkProviders)) {
+ if (isNotBlank(secondaryVlanId) && providersConfiguredForExternalNetworking(ntwkProviders)) {
throw new InvalidParameterValueException("Cannot support private vlan on network offering with external devices!");
}
@@ -1314,7 +1360,7 @@
}
Network network = commitNetwork(networkOfferingId, gateway, startIP, endIP, netmask, networkDomain, vlanId, bypassVlanOverlapCheck, name, displayText, caller, physicalNetworkId, zoneId,
- domainId, isDomainSpecific, subdomainAccess, vpcId, startIPv6, endIPv6, ip6Gateway, ip6Cidr, displayNetwork, aclId, isolatedPvlan, ntwkOff, pNtwk, aclType, owner, cidr, createVlan,
+ domainId, isDomainSpecific, subdomainAccess, vpcId, startIPv6, endIPv6, ip6Gateway, ip6Cidr, displayNetwork, aclId, secondaryVlanId, privateVlanType, ntwkOff, pNtwk, aclType, owner, cidr, createVlan,
externalId);
if (hideIpAddressUsage) {
@@ -1348,11 +1394,54 @@
return network;
}
+ /**
+ * Retrieve information (if set) for private VLAN when creating the network
+ */
+ protected Pair<String, PVlanType> getPrivateVlanPair(String pvlanId, String pvlanTypeStr, String vlanId) {
+ String secondaryVlanId = pvlanId;
+ PVlanType type = null;
+
+ if (isNotBlank(pvlanTypeStr)) {
+ PVlanType providedType = PVlanType.fromValue(pvlanTypeStr);
+ type = providedType;
+ } else if (isNotBlank(vlanId) && isNotBlank(secondaryVlanId)) {
+ // Preserve the existing functionality
+ type = vlanId.equals(secondaryVlanId) ? PVlanType.Promiscuous : PVlanType.Isolated;
+ }
+
+ if (isBlank(secondaryVlanId) && type == PVlanType.Promiscuous) {
+ secondaryVlanId = vlanId;
+ }
+
+ if (isNotBlank(secondaryVlanId)) {
+ try {
+ Integer.parseInt(secondaryVlanId);
+ } catch (NumberFormatException e) {
+ throw new CloudRuntimeException("The secondary VLAN ID: " + secondaryVlanId + " is not in numeric format", e);
+ }
+ }
+
+ return new Pair<>(secondaryVlanId, type);
+ }
+
+ /**
+ * Basic checks for setting up private VLANs, considering the VLAN ID, secondary VLAN ID and private VLAN type
+ */
+ protected void performBasicPrivateVlanChecks(String vlanId, String secondaryVlanId, PVlanType privateVlanType) {
+ if (isNotBlank(vlanId) && isBlank(secondaryVlanId) && privateVlanType != null && privateVlanType != PVlanType.Promiscuous) {
+ throw new InvalidParameterValueException("Private VLAN ID has not been set, therefore Promiscuous type is expected");
+ } else if (isNotBlank(vlanId) && isNotBlank(secondaryVlanId) && !vlanId.equalsIgnoreCase(secondaryVlanId) && privateVlanType == PVlanType.Promiscuous) {
+ throw new InvalidParameterValueException("Private VLAN type is set to Promiscuous, but VLAN ID and Secondary VLAN ID differ");
+ } else if (isNotBlank(vlanId) && isNotBlank(secondaryVlanId) && privateVlanType != null && privateVlanType != PVlanType.Promiscuous && vlanId.equalsIgnoreCase(secondaryVlanId)) {
+ throw new InvalidParameterValueException("Private VLAN type is set to " + privateVlanType + ", but VLAN ID and Secondary VLAN ID are equal");
+ }
+ }
+
private Network commitNetwork(final Long networkOfferingId, final String gateway, final String startIP, final String endIP, final String netmask, final String networkDomain, final String vlanId,
- final Boolean bypassVlanOverlapCheck, final String name, final String displayText, final Account caller, final Long physicalNetworkId, final Long zoneId, final Long domainId,
- final boolean isDomainSpecific, final Boolean subdomainAccessFinal, final Long vpcId, final String startIPv6, final String endIPv6, final String ip6Gateway, final String ip6Cidr,
- final Boolean displayNetwork, final Long aclId, final String isolatedPvlan, final NetworkOfferingVO ntwkOff, final PhysicalNetwork pNtwk, final ACLType aclType, final Account ownerFinal,
- final String cidr, final boolean createVlan, final String externalId) throws InsufficientCapacityException, ResourceAllocationException {
+ final Boolean bypassVlanOverlapCheck, final String name, final String displayText, final Account caller, final Long physicalNetworkId, final Long zoneId, final Long domainId,
+ final boolean isDomainSpecific, final Boolean subdomainAccessFinal, final Long vpcId, final String startIPv6, final String endIPv6, final String ip6Gateway, final String ip6Cidr,
+ final Boolean displayNetwork, final Long aclId, final String isolatedPvlan, final PVlanType isolatedPvlanType, final NetworkOfferingVO ntwkOff, final PhysicalNetwork pNtwk, final ACLType aclType, final Account ownerFinal,
+ final String cidr, final boolean createVlan, final String externalId) throws InsufficientCapacityException, ResourceAllocationException {
try {
Network network = Transaction.execute(new TransactionCallbackWithException<Network, Exception>() {
@Override
@@ -1407,7 +1496,7 @@
}
network = _networkMgr.createGuestNetwork(networkOfferingId, name, displayText, gateway, cidr, vlanId, bypassVlanOverlapCheck, networkDomain, owner, sharedDomainId, pNtwk,
- zoneId, aclType, subdomainAccess, vpcId, ip6Gateway, ip6Cidr, displayNetwork, isolatedPvlan, externalId);
+ zoneId, aclType, subdomainAccess, vpcId, ip6Gateway, ip6Cidr, displayNetwork, isolatedPvlan, isolatedPvlanType, externalId);
}
if (_accountMgr.isRootAdmin(caller.getId()) && createVlan && network != null) {
@@ -1861,14 +1950,7 @@
@Override
@ActionEvent(eventType = EventTypes.EVENT_NETWORK_RESTART, eventDescription = "restarting network", async = true)
- public boolean restartNetwork(RestartNetworkCmd cmd, boolean cleanup, boolean makeRedundant) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException {
- // This method restarts all network elements belonging to the network and re-applies all the rules
- Long networkId = cmd.getNetworkId();
-
- User callerUser = _accountMgr.getActiveUser(CallContext.current().getCallingUserId());
- Account callerAccount = _accountMgr.getActiveAccountById(callerUser.getAccountId());
-
- // Check if network exists
+ public boolean restartNetwork(Long networkId, boolean cleanup, boolean makeRedundant, User user) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException {
NetworkVO network = _networksDao.findById(networkId);
if (network == null) {
throwInvalidIdException("Network with specified id doesn't exist", networkId.toString(), "networkId");
@@ -1888,8 +1970,8 @@
throw new InvalidParameterException("Unable to restart a running SDN network.");
}
+ Account callerAccount = _accountMgr.getActiveAccountById(user.getAccountId());
_accountMgr.checkAccess(callerAccount, null, true, network);
-
if (!network.isRedundant() && makeRedundant) {
network.setRedundant(true);
if (!_networksDao.update(network.getId(), network)) {
@@ -1898,8 +1980,7 @@
cleanup = true;
}
- boolean success = _networkMgr.restartNetwork(networkId, callerAccount, callerUser, cleanup);
-
+ boolean success = _networkMgr.restartNetwork(networkId, callerAccount, user, cleanup);
if (success) {
s_logger.debug("Network id=" + networkId + " is restarted successfully.");
} else {
@@ -1910,6 +1991,17 @@
}
@Override
+ @ActionEvent(eventType = EventTypes.EVENT_NETWORK_RESTART, eventDescription = "restarting network", async = true)
+ public boolean restartNetwork(RestartNetworkCmd cmd) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException {
+ // This method restarts all network elements belonging to the network and re-applies all the rules
+ Long networkId = cmd.getNetworkId();
+ boolean cleanup = cmd.getCleanup();
+ boolean makeRedundant = cmd.getMakeRedundant();
+ User callerUser = _accountMgr.getActiveUser(CallContext.current().getCallingUserId());
+ return restartNetwork(networkId, cleanup, makeRedundant, callerUser);
+ }
+
+ @Override
public int getActiveNicsInNetwork(long networkId) {
return _networksDao.getActiveNicsIn(networkId);
}
@@ -4319,7 +4411,7 @@
@Override
@DB
public Network createPrivateNetwork(final String networkName, final String displayText, long physicalNetworkId, String broadcastUriString, final String startIp, String endIp, final String gateway,
- String netmask, final long networkOwnerId, final Long vpcId, final Boolean sourceNat, final Long networkOfferingId)
+ String netmask, final long networkOwnerId, final Long vpcId, final Boolean sourceNat, final Long networkOfferingId, final Boolean bypassVlanOverlapCheck)
throws ResourceAllocationException, ConcurrentOperationException, InsufficientCapacityException {
final Account owner = _accountMgr.getAccount(networkOwnerId);
@@ -4377,11 +4469,10 @@
DataCenterVO dc = _dcDao.lockRow(pNtwk.getDataCenterId(), true);
//check if we need to create guest network
- Network privateNetwork = _networksDao.getPrivateNetwork(uriString, cidr, networkOwnerId, pNtwk.getDataCenterId(), networkOfferingId);
+ Network privateNetwork = _networksDao.getPrivateNetwork(uriString, cidr, networkOwnerId, pNtwk.getDataCenterId(), networkOfferingId, vpcId);
if (privateNetwork == null) {
//create Guest network
- privateNetwork = _networkMgr.createGuestNetwork(ntwkOffFinal.getId(), networkName, displayText, gateway, cidr, uriString, false, null, owner, null, pNtwk,
- pNtwk.getDataCenterId(), ACLType.Account, null, vpcId, null, null, true, null, null);
+ privateNetwork = _networkMgr.createPrivateNetwork(ntwkOffFinal.getId(), networkName, displayText, gateway, cidr, uriString, bypassVlanOverlapCheck, owner, pNtwk, vpcId);
if (privateNetwork != null) {
s_logger.debug("Successfully created guest network " + privateNetwork);
} else {
@@ -4390,10 +4481,8 @@
} else {
s_logger.debug("Private network already exists: " + privateNetwork);
//Do not allow multiple private gateways with same Vlan within a VPC
- if (vpcId != null && vpcId.equals(privateNetwork.getVpcId())) {
- throw new InvalidParameterValueException("Private network for the vlan: " + uriString + " and cidr " + cidr + " already exists " + "for Vpc " + vpcId + " in zone "
+ throw new InvalidParameterValueException("Private network for the vlan: " + uriString + " and cidr " + cidr + " already exists " + "for Vpc " + vpcId + " in zone "
+ _entityMgr.findById(DataCenter.class, pNtwk.getDataCenterId()).getName());
- }
}
if (vpcId != null) {
//add entry to private_ip_address table
@@ -4534,4 +4623,14 @@
return true;
}
+ @Override
+ public String getConfigComponentName() {
+ return NetworkService.class.getSimpleName();
+ }
+
+ @Override
+ public ConfigKey<?>[] getConfigKeys() {
+ return new ConfigKey<?>[] {AllowDuplicateNetworkName, AllowEmptyStartEndIpAddress};
+ }
+
}
diff --git a/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java b/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java
index 1b936e1..c710549 100644
--- a/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java
@@ -1376,6 +1376,9 @@
} catch (final ResourceUnavailableException ex) {
s_logger.warn("Exception: ", ex);
throw new ServerApiException(ApiErrorCode.RESOURCE_UNAVAILABLE_ERROR, ex.getMessage());
+ } catch (ResourceAllocationException ex) {
+ s_logger.warn("Exception: ", ex);
+ throw new ServerApiException(ApiErrorCode.RESOURCE_ALLOCATION_ERROR, ex.getMessage());
} catch (ConcurrentOperationException ex) {
s_logger.warn("Exception: ", ex);
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, ex.getMessage());
diff --git a/server/src/main/java/com/cloud/network/firewall/FirewallManagerImpl.java b/server/src/main/java/com/cloud/network/firewall/FirewallManagerImpl.java
index efab0e2..56814da 100644
--- a/server/src/main/java/com/cloud/network/firewall/FirewallManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/firewall/FirewallManagerImpl.java
@@ -18,23 +18,21 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.Collections;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
-import com.cloud.network.dao.FirewallRulesDcidrsDao;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
-
import org.apache.cloudstack.api.command.user.firewall.IListFirewallRulesCmd;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.configuration.Config;
import com.cloud.domain.dao.DomainDao;
@@ -55,6 +53,7 @@
import com.cloud.network.NetworkRuleApplier;
import com.cloud.network.dao.FirewallRulesCidrsDao;
import com.cloud.network.dao.FirewallRulesDao;
+import com.cloud.network.dao.FirewallRulesDcidrsDao;
import com.cloud.network.dao.IPAddressDao;
import com.cloud.network.dao.IPAddressVO;
import com.cloud.network.dao.NetworkDao;
diff --git a/server/src/main/java/com/cloud/network/guru/DirectNetworkGuru.java b/server/src/main/java/com/cloud/network/guru/DirectNetworkGuru.java
index 21538a8..22811da 100644
--- a/server/src/main/java/com/cloud/network/guru/DirectNetworkGuru.java
+++ b/server/src/main/java/com/cloud/network/guru/DirectNetworkGuru.java
@@ -201,6 +201,10 @@
if (userSpecified.getBroadcastDomainType() != null) {
config.setBroadcastDomainType(userSpecified.getBroadcastDomainType());
}
+
+ if (userSpecified.getPvlanType() != null) {
+ config.setPvlanType(userSpecified.getPvlanType());
+ }
}
boolean isSecurityGroupEnabled = _networkModel.areServicesSupportedByNetworkOffering(offering.getId(), Service.SecurityGroup);
diff --git a/server/src/main/java/com/cloud/network/guru/GuestNetworkGuru.java b/server/src/main/java/com/cloud/network/guru/GuestNetworkGuru.java
index 9cd3374..7fb482f 100644
--- a/server/src/main/java/com/cloud/network/guru/GuestNetworkGuru.java
+++ b/server/src/main/java/com/cloud/network/guru/GuestNetworkGuru.java
@@ -214,6 +214,10 @@
if (offering.isSpecifyVlan()) {
network.setBroadcastUri(userSpecified.getBroadcastUri());
network.setState(State.Setup);
+ if (userSpecified.getPvlanType() != null) {
+ network.setBroadcastDomainType(BroadcastDomainType.Pvlan);
+ network.setPvlanType(userSpecified.getPvlanType());
+ }
}
} else {
final String guestNetworkCidr = dc.getGuestNetworkCidr();
@@ -368,12 +372,15 @@
if (isGateway) {
guestIp = network.getGateway();
+ } else if (vm.getVirtualMachine().getType() == VirtualMachine.Type.DomainRouter) {
+ guestIp = _ipAddrMgr.acquireGuestIpAddressByPlacement(network, nic.getRequestedIPv4());
} else {
guestIp = _ipAddrMgr.acquireGuestIpAddress(network, nic.getRequestedIPv4());
- if (guestIp == null && network.getGuestType() != GuestType.L2 && !_networkModel.listNetworkOfferingServices(network.getNetworkOfferingId()).isEmpty()) {
- throw new InsufficientVirtualNetworkCapacityException("Unable to acquire Guest IP" + " address for network " + network, DataCenter.class,
- dc.getId());
- }
+ }
+
+ if (!isGateway && guestIp == null && network.getGuestType() != GuestType.L2 && !_networkModel.listNetworkOfferingServices(network.getNetworkOfferingId()).isEmpty()) {
+ throw new InsufficientVirtualNetworkCapacityException("Unable to acquire Guest IP" + " address for network " + network, DataCenter.class,
+ dc.getId());
}
nic.setIPv4Address(guestIp);
@@ -460,6 +467,6 @@
@Override
public ConfigKey<?>[] getConfigKeys() {
- return new ConfigKey<?>[] {UseSystemGuestVlans};
+ return new ConfigKey<?>[]{UseSystemGuestVlans};
}
}
diff --git a/server/src/main/java/com/cloud/network/router/CommandSetupHelper.java b/server/src/main/java/com/cloud/network/router/CommandSetupHelper.java
index 87a1662..63e9d80 100644
--- a/server/src/main/java/com/cloud/network/router/CommandSetupHelper.java
+++ b/server/src/main/java/com/cloud/network/router/CommandSetupHelper.java
@@ -188,9 +188,11 @@
public void createVmDataCommand(final VirtualRouter router, final UserVm vm, final NicVO nic, final String publicKey, final Commands cmds) {
final String serviceOffering = _serviceOfferingDao.findByIdIncludingRemoved(vm.getId(), vm.getServiceOfferingId()).getDisplayText();
final String zoneName = _dcDao.findById(router.getDataCenterId()).getName();
+ final IPAddressVO staticNatIp = _ipAddressDao.findByVmIdAndNetworkId(nic.getNetworkId(), vm.getId());
cmds.addCommand(
"vmdata",
- generateVmDataCommand(router, nic.getIPv4Address(), vm.getUserData(), serviceOffering, zoneName, nic.getIPv4Address(), vm.getHostName(), vm.getInstanceName(),
+ generateVmDataCommand(router, nic.getIPv4Address(), vm.getUserData(), serviceOffering, zoneName,
+ staticNatIp == null || staticNatIp.getState() != IpAddress.State.Allocated ? null : staticNatIp.getAddress().addr(), vm.getHostName(), vm.getInstanceName(),
vm.getId(), vm.getUuid(), publicKey, nic.getNetworkId()));
}
@@ -1035,7 +1037,7 @@
}
private VmDataCommand generateVmDataCommand(final VirtualRouter router, final String vmPrivateIpAddress, final String userData, final String serviceOffering,
- final String zoneName, final String guestIpAddress, final String vmName, final String vmInstanceName, final long vmId, final String vmUuid, final String publicKey,
+ final String zoneName, final String publicIpAddress, final String vmName, final String vmInstanceName, final long vmId, final String vmUuid, final String publicKey,
final long guestNetworkId) {
final VmDataCommand cmd = new VmDataCommand(vmPrivateIpAddress, vmName, _networkModel.getExecuteInSeqNtwkElmtCmd());
@@ -1049,18 +1051,21 @@
cmd.addVmData("userdata", "user-data", userData);
cmd.addVmData("metadata", "service-offering", StringUtils.unicodeEscape(serviceOffering));
cmd.addVmData("metadata", "availability-zone", StringUtils.unicodeEscape(zoneName));
- cmd.addVmData("metadata", "local-ipv4", guestIpAddress);
+ cmd.addVmData("metadata", "local-ipv4", vmPrivateIpAddress);
cmd.addVmData("metadata", "local-hostname", StringUtils.unicodeEscape(vmName));
- if (dcVo.getNetworkType() == NetworkType.Basic) {
- cmd.addVmData("metadata", "public-ipv4", guestIpAddress);
+
+ Network network = _networkDao.findById(guestNetworkId);
+ if (dcVo.getNetworkType() == NetworkType.Basic || network.getGuestType() == Network.GuestType.Shared) {
+ cmd.addVmData("metadata", "public-ipv4", vmPrivateIpAddress);
cmd.addVmData("metadata", "public-hostname", StringUtils.unicodeEscape(vmName));
} else {
- if (router.getPublicIpAddress() == null) {
- cmd.addVmData("metadata", "public-ipv4", guestIpAddress);
- } else {
+ if (publicIpAddress != null) {
+ cmd.addVmData("metadata", "public-ipv4", publicIpAddress);
+ cmd.addVmData("metadata", "public-hostname", publicIpAddress);
+ } else if (router.getPublicIpAddress() != null) {
cmd.addVmData("metadata", "public-ipv4", router.getPublicIpAddress());
+ cmd.addVmData("metadata", "public-hostname", router.getPublicIpAddress());
}
- cmd.addVmData("metadata", "public-hostname", router.getPublicIpAddress());
}
if (vmUuid == null) {
cmd.addVmData("metadata", "instance-id", vmInstanceName);
diff --git a/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java b/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java
index da07bb5..39d902f 100644
--- a/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java
+++ b/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java
@@ -154,6 +154,8 @@
protected IpAddressManager _ipAddrMgr;
@Inject
ConfigurationDao _configDao;
+ @Inject
+ VpcVirtualNetworkApplianceManager _vpcRouterMgr;
protected final Map<HypervisorType, ConfigKey<String>> hypervisorsMap = new HashMap<>();
@@ -258,7 +260,7 @@
@Override
public boolean checkRouterVersion(final VirtualRouter router) {
- if (!VirtualNetworkApplianceManagerImpl.routerVersionCheckEnabled.value()) {
+ if (!VirtualNetworkApplianceManager.RouterVersionCheckEnabled.value()) {
// Router version check is disabled.
return true;
}
@@ -288,7 +290,7 @@
// only after router start successfully
final Long vpcId = router.getVpcId();
if (vpcId != null) {
- _s2sVpnMgr.reconnectDisconnectedVpnByVpc(vpcId);
+ _vpcRouterMgr.startSite2SiteVpn(_routerDao.findById(router.getId()));
}
return _routerDao.findById(router.getId());
}
@@ -747,7 +749,7 @@
final NicProfile gatewayNic = new NicProfile(defaultNetworkStartIp, defaultNetworkStartIpv6);
if (routerDeploymentDefinition.isPublicNetwork()) {
if (routerDeploymentDefinition.isRedundant()) {
- gatewayNic.setIPv4Address(_ipAddrMgr.acquireGuestIpAddress(guestNetwork, null));
+ gatewayNic.setIPv4Address(this.acquireGuestIpAddressForVrouterRedundant(guestNetwork));
} else {
gatewayNic.setIPv4Address(guestNetwork.getGateway());
}
@@ -883,4 +885,8 @@
}
return true;
}
+
+ public String acquireGuestIpAddressForVrouterRedundant(Network network) {
+ return _ipAddrMgr.acquireGuestIpAddressByPlacement(network, null);
+ }
}
diff --git a/server/src/main/java/com/cloud/network/router/NicProfileHelperImpl.java b/server/src/main/java/com/cloud/network/router/NicProfileHelperImpl.java
index 18ab4a9..588e832 100644
--- a/server/src/main/java/com/cloud/network/router/NicProfileHelperImpl.java
+++ b/server/src/main/java/com/cloud/network/router/NicProfileHelperImpl.java
@@ -118,7 +118,7 @@
final NicProfile guestNic = new NicProfile();
if (vpcRouterDeploymentDefinition.isRedundant()) {
- guestNic.setIPv4Address(_ipAddrMgr.acquireGuestIpAddress(guestNetwork, null));
+ guestNic.setIPv4Address(this.acquireGuestIpAddressForVrouterRedundant(guestNetwork));
} else {
guestNic.setIPv4Address(guestNetwork.getGateway());
}
@@ -133,4 +133,8 @@
return guestNic;
}
+ public String acquireGuestIpAddressForVrouterRedundant(Network network) {
+ return _ipAddrMgr.acquireGuestIpAddressByPlacement(network, null);
+ }
+
}
\ No newline at end of file
diff --git a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManager.java b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManager.java
index c767e56..6edbb44 100644
--- a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManager.java
+++ b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManager.java
@@ -45,6 +45,10 @@
static final String SetServiceMonitorCK = "network.router.EnableServiceMonitoring";
static final String RouterAlertsCheckIntervalCK = "router.alerts.check.interval";
+ static final String RouterHealthChecksConfigRefreshIntervalCK = "router.health.checks.config.refresh.interval";
+ static final String RouterHealthChecksResultFetchIntervalCK = "router.health.checks.results.fetch.interval";
+ static final String RouterHealthChecksFailuresToRecreateVrCK = "router.health.checks.failures.to.recreate.vr";
+
static final ConfigKey<String> RouterTemplateXen = new ConfigKey<String>(String.class, RouterTemplateXenCK, "Advanced", "SystemVM Template (XenServer)",
"Name of the default router template on Xenserver.", true, ConfigKey.Scope.Zone, null);
static final ConfigKey<String> RouterTemplateKvm = new ConfigKey<String>(String.class, RouterTemplateKvmCK, "Advanced", "SystemVM Template (KVM)",
@@ -63,13 +67,50 @@
static final ConfigKey<Integer> RouterAlertsCheckInterval = new ConfigKey<Integer>(Integer.class, RouterAlertsCheckIntervalCK, "Advanced", "1800",
"Interval (in seconds) to check for alerts in Virtual Router.", false, ConfigKey.Scope.Global, null);
- static final ConfigKey<Boolean> routerVersionCheckEnabled = new ConfigKey<Boolean>("Advanced", Boolean.class, "router.version.check", "true",
+ static final ConfigKey<Boolean> RouterVersionCheckEnabled = new ConfigKey<Boolean>("Advanced", Boolean.class, "router.version.check", "true",
"If true, router minimum required version is checked before sending command", false);
static final ConfigKey<Boolean> UseExternalDnsServers = new ConfigKey<Boolean>(Boolean.class, "use.external.dns", "Advanced", "false",
"Bypass internal dns, use external dns1 and dns2", true, ConfigKey.Scope.Zone, null);
static final ConfigKey<Boolean> ExposeDnsAndBootpServer = new ConfigKey<Boolean>(Boolean.class, "expose.dns.externally", "Advanced", "true",
"open dns, dhcp and bootp on the public interface", true, ConfigKey.Scope.Zone, null);
+ // Health checks
+ static final ConfigKey<Boolean> RouterHealthChecksEnabled = new ConfigKey<Boolean>(Boolean.class, "router.health.checks.enabled", "Advanced", "true",
+ "If true, router health checks are allowed to be executed and read. If false, all scheduled checks and API calls for on demand checks are disabled.",
+ true, ConfigKey.Scope.Global, null);
+ static final ConfigKey<Integer> RouterHealthChecksBasicInterval = new ConfigKey<Integer>(Integer.class, "router.health.checks.basic.interval", "Advanced", "3",
+ "Interval in minutes at which basic router health checks are performed. If set to 0, no tests are scheduled.",
+ true, ConfigKey.Scope.Global, null);
+ static final ConfigKey<Integer> RouterHealthChecksAdvancedInterval = new ConfigKey<Integer>(Integer.class, "router.health.checks.advanced.interval", "Advanced", "10",
+ "Interval in minutes at which advanced router health checks are performed. If set to 0, no tests are scheduled.",
+ true, ConfigKey.Scope.Global, null);
+ static final ConfigKey<Integer> RouterHealthChecksConfigRefreshInterval = new ConfigKey<Integer>(Integer.class, RouterHealthChecksConfigRefreshIntervalCK, "Advanced", "10",
+ "Interval in minutes at which router health checks config - such as scheduling intervals, excluded checks, etc is updated on virtual routers by the management server. This value should" +
+ " be sufficiently high (like 2x) from the router.health.checks.basic.interval and router.health.checks.advanced.interval so that there is time between new results generation and results generation for passed data.",
+ false, ConfigKey.Scope.Global, null);
+ static final ConfigKey<Integer> RouterHealthChecksResultFetchInterval = new ConfigKey<Integer>(Integer.class, RouterHealthChecksResultFetchIntervalCK, "Advanced", "10",
+ "Interval in minutes at which router health checks results are fetched by management server. On each result fetch, management server evaluates need to recreate VR as per configuration of " + RouterHealthChecksFailuresToRecreateVrCK +
+ "This value should be sufficiently high (like 2x) from the router.health.checks.basic.interval and router.health.checks.advanced.interval so that there is time between new results generation and fetch.",
+ false, ConfigKey.Scope.Global, null);
+ static final ConfigKey<String> RouterHealthChecksFailuresToRecreateVr = new ConfigKey<String>(String.class, RouterHealthChecksFailuresToRecreateVrCK, "Advanced", "",
+ "Health checks failures defined by this config are the checks that should cause router recreation. If empty the recreate is not attempted for any health check failure. Possible values are comma separated script names " +
+ "from systemvm’s /root/health_scripts/ (namely - cpu_usage_check.py, dhcp_check.py, disk_space_check.py, dns_check.py, gateways_check.py, haproxy_check.py, iptables_check.py, memory_usage_check.py, router_version_check.py), connectivity.test " +
+ " or services (namely - loadbalancing.service, webserver.service, dhcp.service) ",
+ true, ConfigKey.Scope.Zone, null);
+ static final ConfigKey<String> RouterHealthChecksToExclude = new ConfigKey<String>(String.class, "router.health.checks.to.exclude", "Advanced", "",
+ "Health checks that should be excluded when executing scheduled checks on the router. This can be a comma separated list of script names placed in the '/root/health_checks/' folder. Currently the following scripts are " +
+ "placed in default systemvm template - cpu_usage_check.py, disk_space_check.py, gateways_check.py, iptables_check.py, router_version_check.py, dhcp_check.py, dns_check.py, haproxy_check.py, memory_usage_check.py.",
+ true, ConfigKey.Scope.Zone, null);
+ static final ConfigKey<Double> RouterHealthChecksFreeDiskSpaceThreshold = new ConfigKey<Double>(Double.class, "router.health.checks.free.disk.space.threshold",
+ "Advanced", "100", "Free disk space threshold (in MB) on VR below which the check is considered a failure.",
+ true, ConfigKey.Scope.Zone, null);
+ static final ConfigKey<Double> RouterHealthChecksMaxCpuUsageThreshold = new ConfigKey<Double>(Double.class, "router.health.checks.max.cpu.usage.threshold",
+ "Advanced", "100", " Max CPU Usage threshold as % above which check is considered a failure.",
+ true, ConfigKey.Scope.Zone, null);
+ static final ConfigKey<Double> RouterHealthChecksMaxMemoryUsageThreshold = new ConfigKey<Double>(Double.class, "router.health.checks.max.memory.usage.threshold",
+ "Advanced", "100", "Max Memory Usage threshold as % above which check is considered a failure.",
+ true, ConfigKey.Scope.Zone, null);
+
public static final int DEFAULT_ROUTER_VM_RAMSIZE = 256; // 256M
public static final int DEFAULT_ROUTER_CPU_MHZ = 500; // 500 MHz
public static final boolean USE_POD_VLAN = false;
diff --git a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 22a208e..c895307 100644
--- a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -17,6 +17,7 @@
package com.cloud.network.router;
+import java.lang.reflect.Type;
import java.math.BigInteger;
import java.nio.charset.Charset;
import java.security.MessageDigest;
@@ -24,7 +25,9 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Calendar;
+import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@@ -42,11 +45,6 @@
import javax.inject.Inject;
import javax.naming.ConfigurationException;
-import org.apache.log4j.Logger;
-import org.cloud.network.router.deployment.RouterDeploymentDefinitionBuilder;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-
import org.apache.cloudstack.alert.AlertService;
import org.apache.cloudstack.alert.AlertService.AlertType;
import org.apache.cloudstack.api.command.admin.router.RebootRouterCmd;
@@ -61,11 +59,18 @@
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.framework.jobs.AsyncJobManager;
import org.apache.cloudstack.framework.jobs.impl.AsyncJobVO;
+import org.apache.cloudstack.lb.ApplicationLoadBalancerRuleVO;
+import org.apache.cloudstack.lb.dao.ApplicationLoadBalancerRuleDao;
import org.apache.cloudstack.managed.context.ManagedContextRunnable;
import org.apache.cloudstack.network.topology.NetworkTopology;
import org.apache.cloudstack.network.topology.NetworkTopologyContext;
import org.apache.cloudstack.utils.identity.ManagementServerNode;
import org.apache.cloudstack.utils.usage.UsageUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.cloud.network.router.deployment.RouterDeploymentDefinitionBuilder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
import com.cloud.agent.AgentManager;
import com.cloud.agent.Listener;
@@ -87,6 +92,9 @@
import com.cloud.agent.api.routing.AggregationControlCommand;
import com.cloud.agent.api.routing.AggregationControlCommand.Action;
import com.cloud.agent.api.routing.GetRouterAlertsCommand;
+import com.cloud.agent.api.routing.GetRouterMonitorResultsAnswer;
+import com.cloud.agent.api.routing.GetRouterMonitorResultsCommand;
+import com.cloud.agent.api.routing.GroupAnswer;
import com.cloud.agent.api.routing.IpAliasTO;
import com.cloud.agent.api.routing.NetworkElementCommand;
import com.cloud.agent.api.routing.SetMonitorServiceCommand;
@@ -95,6 +103,10 @@
import com.cloud.alert.AlertManager;
import com.cloud.api.ApiAsyncJobDispatcher;
import com.cloud.api.ApiGsonHelper;
+import com.cloud.api.query.dao.DomainRouterJoinDao;
+import com.cloud.api.query.dao.UserVmJoinDao;
+import com.cloud.api.query.vo.DomainRouterJoinVO;
+import com.cloud.api.query.vo.UserVmJoinVO;
import com.cloud.cluster.ManagementServerHostVO;
import com.cloud.cluster.dao.ManagementServerHostDao;
import com.cloud.configuration.Config;
@@ -109,7 +121,9 @@
import com.cloud.dc.dao.HostPodDao;
import com.cloud.dc.dao.VlanDao;
import com.cloud.deploy.DeployDestination;
+import com.cloud.domain.Domain;
import com.cloud.event.ActionEvent;
+import com.cloud.event.ActionEventUtils;
import com.cloud.event.EventTypes;
import com.cloud.exception.AgentUnavailableException;
import com.cloud.exception.ConcurrentOperationException;
@@ -135,6 +149,7 @@
import com.cloud.network.Networks.TrafficType;
import com.cloud.network.PublicIpAddress;
import com.cloud.network.RemoteAccessVpn;
+import com.cloud.network.RouterHealthCheckResult;
import com.cloud.network.Site2SiteCustomerGateway;
import com.cloud.network.Site2SiteVpnConnection;
import com.cloud.network.SshKeysDistriMonitor;
@@ -144,8 +159,11 @@
import com.cloud.network.dao.FirewallRulesDao;
import com.cloud.network.dao.IPAddressDao;
import com.cloud.network.dao.IPAddressVO;
+import com.cloud.network.dao.LBStickinessPolicyDao;
+import com.cloud.network.dao.LBStickinessPolicyVO;
import com.cloud.network.dao.LoadBalancerDao;
import com.cloud.network.dao.LoadBalancerVMMapDao;
+import com.cloud.network.dao.LoadBalancerVMMapVO;
import com.cloud.network.dao.LoadBalancerVO;
import com.cloud.network.dao.MonitoringServiceDao;
import com.cloud.network.dao.MonitoringServiceVO;
@@ -155,6 +173,8 @@
import com.cloud.network.dao.OpRouterMonitorServiceVO;
import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
import com.cloud.network.dao.RemoteAccessVpnDao;
+import com.cloud.network.dao.RouterHealthCheckResultDao;
+import com.cloud.network.dao.RouterHealthCheckResultVO;
import com.cloud.network.dao.Site2SiteCustomerGatewayDao;
import com.cloud.network.dao.Site2SiteVpnConnectionDao;
import com.cloud.network.dao.Site2SiteVpnConnectionVO;
@@ -175,12 +195,14 @@
import com.cloud.network.rules.FirewallRuleVO;
import com.cloud.network.rules.LoadBalancerContainer.Scheme;
import com.cloud.network.rules.PortForwardingRule;
+import com.cloud.network.rules.PortForwardingRuleVO;
import com.cloud.network.rules.RulesManager;
import com.cloud.network.rules.StaticNat;
import com.cloud.network.rules.StaticNatImpl;
import com.cloud.network.rules.StaticNatRule;
import com.cloud.network.rules.dao.PortForwardingRulesDao;
import com.cloud.network.vpc.Vpc;
+import com.cloud.network.vpc.VpcService;
import com.cloud.network.vpc.dao.VpcDao;
import com.cloud.network.vpn.Site2SiteVpnManager;
import com.cloud.offering.NetworkOffering;
@@ -188,6 +210,7 @@
import com.cloud.offerings.NetworkOfferingVO;
import com.cloud.offerings.dao.NetworkOfferingDao;
import com.cloud.resource.ResourceManager;
+import com.cloud.serializer.GsonHelper;
import com.cloud.server.ConfigurationServer;
import com.cloud.service.ServiceOfferingVO;
import com.cloud.service.dao.ServiceOfferingDao;
@@ -214,6 +237,7 @@
import com.cloud.utils.db.Filter;
import com.cloud.utils.db.GlobalLock;
import com.cloud.utils.db.QueryBuilder;
+import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionCallbackNoReturn;
@@ -243,6 +267,8 @@
import com.cloud.vm.dao.UserVmDao;
import com.cloud.vm.dao.UserVmDetailsDao;
import com.cloud.vm.dao.VMInstanceDao;
+import com.google.gson.JsonSyntaxException;
+import com.google.gson.reflect.TypeToken;
/**
* VirtualNetworkApplianceManagerImpl manages the different types of virtual
@@ -251,6 +277,7 @@
public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements VirtualNetworkApplianceManager, VirtualNetworkApplianceService, VirtualMachineGuru, Listener,
Configurable, StateListener<VirtualMachine.State, VirtualMachine.Event, VirtualMachine> {
private static final Logger s_logger = Logger.getLogger(VirtualNetworkApplianceManagerImpl.class);
+ private static final String CONNECTIVITY_TEST = "connectivity.test";
@Inject private EntityManager _entityMgr;
@Inject private DataCenterDao _dcDao;
@@ -272,12 +299,12 @@
@Inject private AccountManager _accountMgr;
@Inject private ConfigurationManager _configMgr;
@Inject private ConfigurationServer _configServer;
- @Inject private ServiceOfferingDao _serviceOfferingDao;
+ @Inject protected ServiceOfferingDao _serviceOfferingDao;
@Inject private UserVmDao _userVmDao;
@Inject private VMInstanceDao _vmDao;
@Inject private NetworkOfferingDao _networkOfferingDao;
@Inject private GuestOSDao _guestOSDao;
- @Inject private NetworkOrchestrationService _networkMgr;
+ @Inject protected NetworkOrchestrationService _networkMgr;
@Inject protected NetworkModel _networkModel;
@Inject protected VirtualMachineManager _itMgr;
@Inject private VpnUserDao _vpnUsersDao;
@@ -303,7 +330,7 @@
@Inject private NetworkService _networkSvc;
@Inject private IpAddressManager _ipAddrMgr;
@Inject private ConfigDepot _configDepot;
- @Inject private MonitoringServiceDao _monitorServiceDao;
+ @Inject protected MonitoringServiceDao _monitorServiceDao;
@Inject private AsyncJobManager _asyncMgr;
@Inject protected VpcDao _vpcDao;
@Inject protected ApiAsyncJobDispatcher _asyncDispatcher;
@@ -311,6 +338,16 @@
@Inject protected NetworkTopologyContext _networkTopologyContext;
+ @Inject private UserVmJoinDao userVmJoinDao;
+ @Inject private DomainRouterJoinDao domainRouterJoinDao;
+ @Inject private PortForwardingRulesDao portForwardingDao;
+ @Inject private ApplicationLoadBalancerRuleDao applicationLoadBalancerRuleDao;
+ @Inject private RouterHealthCheckResultDao routerHealthCheckResultDao;
+ @Inject private LBStickinessPolicyDao lbStickinessPolicyDao;
+
+ @Inject private NetworkService networkService;
+ @Inject private VpcService vpcService;
+
@Autowired
@Qualifier("networkHelper")
protected NetworkHelper _nwHelper;
@@ -496,12 +533,6 @@
}
}
- static final ConfigKey<Boolean> UseExternalDnsServers = new ConfigKey<Boolean>(Boolean.class, "use.external.dns", "Advanced", "false",
- "Bypass internal dns, use external dns1 and dns2", true, ConfigKey.Scope.Zone, null);
-
- static final ConfigKey<Boolean> routerVersionCheckEnabled = new ConfigKey<Boolean>("Advanced", Boolean.class, "router.version.check", "true",
- "If true, router minimum required version is checked before sending command", false);
-
@Override
public boolean configure(final String name, final Map<String, Object> params) throws ConfigurationException {
@@ -658,7 +689,21 @@
if (routerAlertsCheckInterval > 0) {
_checkExecutor.scheduleAtFixedRate(new CheckRouterAlertsTask(), routerAlertsCheckInterval, routerAlertsCheckInterval, TimeUnit.SECONDS);
} else {
- s_logger.debug("router.alerts.check.interval - " + routerAlertsCheckInterval + " so not scheduling the router alerts checking thread");
+ s_logger.debug(RouterAlertsCheckIntervalCK + "=" + routerAlertsCheckInterval + " so not scheduling the router alerts checking thread");
+ }
+
+ final int routerHealthCheckConfigRefreshInterval = RouterHealthChecksConfigRefreshInterval.value();
+ if (routerHealthCheckConfigRefreshInterval > 0) {
+ _checkExecutor.scheduleAtFixedRate(new UpdateRouterHealthChecksConfigTask(), routerHealthCheckConfigRefreshInterval, routerHealthCheckConfigRefreshInterval, TimeUnit.MINUTES);
+ } else {
+ s_logger.debug(RouterHealthChecksConfigRefreshIntervalCK + "=" + routerHealthCheckConfigRefreshInterval + " so not scheduling the router health check data thread");
+ }
+
+ final int routerHealthChecksFetchInterval = RouterHealthChecksResultFetchInterval.value();
+ if (routerHealthChecksFetchInterval > 0) {
+ _checkExecutor.scheduleAtFixedRate(new FetchRouterHealthChecksResultTask(), routerHealthChecksFetchInterval, routerHealthChecksFetchInterval, TimeUnit.MINUTES);
+ } else {
+ s_logger.debug(RouterHealthChecksResultFetchIntervalCK + "=" + routerHealthChecksFetchInterval + " so not scheduling the router checks fetching thread");
}
return true;
@@ -1197,6 +1242,598 @@
}
}
+ protected class FetchRouterHealthChecksResultTask extends ManagedContextRunnable {
+ public FetchRouterHealthChecksResultTask() {
+ }
+
+ @Override
+ protected void runInContext() {
+ try {
+ final List<DomainRouterVO> routers = _routerDao.listByStateAndManagementServer(VirtualMachine.State.Running, mgmtSrvrId);
+ s_logger.info("Found " + routers.size() + " running routers. Fetching, analysing and updating DB for the health checks.");
+ if (!RouterHealthChecksEnabled.value()) {
+ s_logger.debug("Skipping fetching of router health check results as router.health.checks.enabled is disabled");
+ return;
+ }
+
+ for (final DomainRouterVO router : routers) {
+ GetRouterMonitorResultsAnswer answer = fetchAndUpdateRouterHealthChecks(router, false);
+ List<String> failingChecks = getFailingChecks(router, answer);
+ handleFailingChecks(router, failingChecks);
+ }
+ } catch (final Exception ex) {
+ s_logger.error("Fail to complete the FetchRouterHealthChecksResultTask! ", ex);
+ ex.printStackTrace();
+ }
+ }
+
+ private List<String> getFailingChecks(DomainRouterVO router, GetRouterMonitorResultsAnswer answer) {
+
+ if (answer == null) {
+ s_logger.warn("Unable to fetch monitor results for router " + router);
+ resetRouterHealthChecksAndConnectivity(router.getId(), false, "Communication failed");
+ return Arrays.asList(CONNECTIVITY_TEST);
+ } else if (!answer.getResult()) {
+ s_logger.warn("Failed to fetch monitor results from router " + router + " with details: " + answer.getDetails());
+ resetRouterHealthChecksAndConnectivity(router.getId(), false, "Failed to fetch results with details: " + answer.getDetails());
+ return Arrays.asList(CONNECTIVITY_TEST);
+ } else {
+ resetRouterHealthChecksAndConnectivity(router.getId(), true, "Successfully fetched data");
+ updateDbHealthChecksFromRouterResponse(router.getId(), answer.getMonitoringResults());
+ return answer.getFailingChecks();
+ }
+ }
+
+ private void handleFailingChecks(DomainRouterVO router, List<String> failingChecks) {
+ if (failingChecks == null || failingChecks.size() == 0) {
+ return;
+ }
+
+ String alertMessage = "Health checks failed: " + failingChecks.size() + " failing checks on router " + router.getUuid();
+ _alertMgr.sendAlert(AlertType.ALERT_TYPE_DOMAIN_ROUTER, router.getDataCenterId(), router.getPodIdToDeployIn(),
+ alertMessage, alertMessage);
+ s_logger.warn(alertMessage + ". Checking failed health checks to see if router needs recreate");
+
+ String checkFailsToRecreateVr = RouterHealthChecksFailuresToRecreateVr.valueIn(router.getDataCenterId());
+ StringBuilder failingChecksEvent = new StringBuilder();
+ boolean recreateRouter = false;
+ for (int i = 0; i < failingChecks.size(); i++) {
+ String failedCheck = failingChecks.get(i);
+ if (i == 0) {
+ failingChecksEvent.append("Router ")
+ .append(router.getUuid())
+ .append(" has failing checks: ");
+ }
+
+ failingChecksEvent.append(failedCheck);
+ if (i < failingChecks.size() - 1) {
+ failingChecksEvent.append(", ");
+ }
+
+ if (StringUtils.isNotBlank(checkFailsToRecreateVr) && checkFailsToRecreateVr.contains(failedCheck)) {
+ recreateRouter = true;
+ }
+ }
+
+ ActionEventUtils.onActionEvent(User.UID_SYSTEM, Account.ACCOUNT_ID_SYSTEM,
+ Domain.ROOT_DOMAIN, EventTypes.EVENT_ROUTER_HEALTH_CHECKS, failingChecksEvent.toString());
+
+ if (recreateRouter) {
+ s_logger.warn("Health Check Alert: Found failing checks in " +
+ RouterHealthChecksFailuresToRecreateVrCK + ", attempting recreating router.");
+ recreateRouter(router.getId());
+ }
+ }
+ }
+
+ private DomainRouterJoinVO getAnyRouterJoinWithVpc(long routerId) {
+ List<DomainRouterJoinVO> routerJoinVOs = domainRouterJoinDao.searchByIds(routerId);
+ for (DomainRouterJoinVO router : routerJoinVOs) {
+ if (router.getRemoved() == null && router.getVpcId() != 0) {
+ return router;
+ }
+ }
+ return null;
+ }
+
+ private boolean restartVpcInDomainRouter(DomainRouterJoinVO router, User user) {
+ try {
+ s_logger.debug("Attempting restart VPC " + router.getVpcName() + " for router recreation " + router.getUuid());
+ ActionEventUtils.onActionEvent(User.UID_SYSTEM, Account.ACCOUNT_ID_SYSTEM,
+ Domain.ROOT_DOMAIN, EventTypes.EVENT_ROUTER_HEALTH_CHECKS,
+ "Recreating router " + router.getUuid() + " by restarting VPC " + router.getVpcUuid());
+ return vpcService.restartVpc(router.getVpcId(), true, false, user);
+ } catch (Exception e) {
+ s_logger.error("Failed to restart VPC for router recreation " +
+ router.getVpcName() + " ,router " + router.getUuid(), e);
+ return false;
+ }
+ }
+
+ private DomainRouterJoinVO getAnyRouterJoinWithGuestTraffic(long routerId) {
+ List<DomainRouterJoinVO> routerJoinVOs = domainRouterJoinDao.searchByIds(routerId);
+ for (DomainRouterJoinVO router : routerJoinVOs) {
+ if (router.getRemoved() == null && router.getTrafficType() == TrafficType.Guest) {
+ return router;
+ }
+ }
+ return null;
+ }
+
+ private boolean restartGuestNetworkInDomainRouter(DomainRouterJoinVO router, User user) {
+ try {
+ s_logger.info("Attempting restart network " + router.getNetworkName() + " for router recreation " + router.getUuid());
+ ActionEventUtils.onActionEvent(User.UID_SYSTEM, Account.ACCOUNT_ID_SYSTEM,
+ Domain.ROOT_DOMAIN, EventTypes.EVENT_ROUTER_HEALTH_CHECKS,
+ "Recreating router " + router.getUuid() + " by restarting network " + router.getNetworkUuid());
+ return networkService.restartNetwork(router.getNetworkId(), true, false, user);
+ } catch (Exception e) {
+ s_logger.error("Failed to restart network " + router.getNetworkName() +
+ " for router recreation " + router.getNetworkName(), e);
+ return false;
+ }
+ }
+
+ /**
+ * Attempts recreation of router by restarting with cleanup a VPC if any or a guest network associated in case no VPC.
+ * @param routerId - the id of the router to be recreated.
+ * @return true if successfully restart is attempted else false.
+ */
+ private boolean recreateRouter(long routerId) {
+ User systemUser = _userDao.getUser(User.UID_SYSTEM);
+
+ // Find any VPC containing router join VO, restart it and return
+ DomainRouterJoinVO routerJoinToRestart = getAnyRouterJoinWithVpc(routerId);
+ if (routerJoinToRestart != null) {
+ return restartVpcInDomainRouter(routerJoinToRestart, systemUser);
+ }
+
+ // If no VPC containing router join VO was found we look for a guest network traffic containing join VO and restart that.
+ routerJoinToRestart = getAnyRouterJoinWithGuestTraffic(routerId);
+ if (routerJoinToRestart != null) {
+ return restartGuestNetworkInDomainRouter(routerJoinToRestart, systemUser);
+ }
+
+ s_logger.warn("Unable to find a valid guest network or VPC to restart for recreating router id " + routerId);
+ return false;
+ }
+
+ private Map<String, Map<String, RouterHealthCheckResultVO>> getHealthChecksFromDb(long routerId) {
+ List<RouterHealthCheckResultVO> healthChecksList = routerHealthCheckResultDao.getHealthCheckResults(routerId);
+ Map<String, Map<String, RouterHealthCheckResultVO>> healthCheckResults = new HashMap<>();
+ if (healthChecksList.isEmpty()) {
+ return healthCheckResults;
+ }
+
+ for (RouterHealthCheckResultVO healthCheck : healthChecksList) {
+ if (!healthCheckResults.containsKey(healthCheck.getCheckType())) {
+ healthCheckResults.put(healthCheck.getCheckType(), new HashMap<>());
+ }
+ healthCheckResults.get(healthCheck.getCheckType()).put(healthCheck.getCheckName(), healthCheck);
+ }
+
+ return healthCheckResults;
+ }
+
+ private RouterHealthCheckResultVO resetRouterHealthChecksAndConnectivity(final long routerId, boolean connected, String message) {
+ routerHealthCheckResultDao.expungeHealthChecks(routerId);
+ boolean newEntry = false;
+ RouterHealthCheckResultVO connectivityVO = routerHealthCheckResultDao.getRouterHealthCheckResult(routerId, CONNECTIVITY_TEST, "basic");
+ if (connectivityVO == null) {
+ connectivityVO = new RouterHealthCheckResultVO(routerId, CONNECTIVITY_TEST, "basic");
+ newEntry = true;
+ }
+
+ connectivityVO.setCheckResult(connected);
+ connectivityVO.setLastUpdateTime(new Date());
+ if (StringUtils.isNotEmpty(message)) {
+ connectivityVO.setCheckDetails(message.getBytes(com.cloud.utils.StringUtils.getPreferredCharset()));
+ }
+
+ if (newEntry) {
+ routerHealthCheckResultDao.persist(connectivityVO);
+ } else {
+ routerHealthCheckResultDao.update(connectivityVO.getId(), connectivityVO);
+ }
+
+ return routerHealthCheckResultDao.getRouterHealthCheckResult(routerId, CONNECTIVITY_TEST, "basic");
+ }
+
+ private RouterHealthCheckResultVO parseHealthCheckVOFromJson(final long routerId,
+ final String checkName, final String checkType, final Map<String, String> checkData,
+ final Map<String, Map<String, RouterHealthCheckResultVO>> checksInDb) {
+ boolean success = Boolean.parseBoolean(checkData.get("success"));
+ Date lastUpdate = new Date(Long.parseLong(checkData.get("lastUpdate")));
+ double lastRunDuration = Double.parseDouble(checkData.get("lastRunDuration"));
+ String message = checkData.get("message");
+ final RouterHealthCheckResultVO hcVo;
+ boolean newEntry = false;
+ if (checksInDb.containsKey(checkType) && checksInDb.get(checkType).containsKey(checkName)) {
+ hcVo = checksInDb.get(checkType).get(checkName);
+ } else {
+ hcVo = new RouterHealthCheckResultVO(routerId, checkName, checkType);
+ newEntry = true;
+ }
+
+ hcVo.setCheckResult(success);
+ hcVo.setLastUpdateTime(lastUpdate);
+ if (StringUtils.isNotEmpty(message)) {
+ hcVo.setCheckDetails(message.getBytes(com.cloud.utils.StringUtils.getPreferredCharset()));
+ }
+
+ if (newEntry) {
+ routerHealthCheckResultDao.persist(hcVo);
+ } else {
+ routerHealthCheckResultDao.update(hcVo.getId(), hcVo);
+ }
+ s_logger.info("Found health check " + hcVo + " which took running duration (ms) " + lastRunDuration);
+ return hcVo;
+ }
+
+ /**
+ *
+ * @param checksJson JSON expected is
+ * {
+ * checkType1: {
+ * checkName1: {
+ * success: true/false,
+ * lastUpdate: date string,
+ * lastRunDuration: ms spent on test,
+ * message: detailed message from check execution
+ * },
+ * checkType2: .....
+ * },
+ * checkType2: ......
+ * }
+ * @return converts the above JSON into list of RouterHealthCheckResult.
+ */
+ private List<RouterHealthCheckResult> parseHealthCheckResults(
+ final Map<String, Map<String, Map<String, String>>> checksJson, final long routerId) {
+ final Map<String, Map<String, RouterHealthCheckResultVO>> checksInDb = getHealthChecksFromDb(routerId);
+ List<RouterHealthCheckResult> healthChecks = new ArrayList<>();
+ final String lastRunKey = "lastRun";
+ for (String checkType : checksJson.keySet()) {
+ if (checksJson.get(checkType).containsKey(lastRunKey)) { // Log last run of this check type run info
+ Map<String, String> lastRun = checksJson.get(checkType).get(lastRunKey);
+ s_logger.info("Found check types executed on VR " + checkType + ", start: " + lastRun.get("start") +
+ ", end: " + lastRun.get("end") + ", duration: " + lastRun.get("duration"));
+ }
+
+ for (String checkName : checksJson.get(checkType).keySet()) {
+ if (lastRunKey.equals(checkName)) {
+ continue;
+ }
+
+ try {
+ final RouterHealthCheckResultVO hcVo = parseHealthCheckVOFromJson(
+ routerId, checkName, checkType, checksJson.get(checkType).get(checkName), checksInDb);
+ healthChecks.add(hcVo);
+ } catch (Exception ex) {
+ s_logger.error("Skipping health check: Exception while parsing check result data for router id " + routerId +
+ ", check type: " + checkType + ", check name: " + checkName + ":" + ex.getLocalizedMessage(), ex);
+ }
+ }
+ }
+ return healthChecks;
+ }
+
+ private List<RouterHealthCheckResult> updateDbHealthChecksFromRouterResponse(final long routerId, final String monitoringResult) {
+ if (StringUtils.isBlank(monitoringResult)) {
+ s_logger.warn("Attempted parsing empty monitoring results string for router " + routerId);
+ return Collections.emptyList();
+ }
+
+ try {
+ s_logger.debug("Parsing and updating DB health check data for router: " + routerId + " with data: " + monitoringResult) ;
+ final Type t = new TypeToken<Map<String, Map<String, Map<String, String>>>>() {}.getType();
+ final Map<String, Map<String, Map<String, String>>> checks = GsonHelper.getGson().fromJson(monitoringResult, t);
+ return parseHealthCheckResults(checks, routerId);
+ } catch (JsonSyntaxException ex) {
+ s_logger.error("Unable to parse the result of health checks due to " + ex.getLocalizedMessage(), ex);
+ }
+ return Collections.emptyList();
+ }
+
+ private GetRouterMonitorResultsAnswer fetchAndUpdateRouterHealthChecks(DomainRouterVO router, boolean performFreshChecks) {
+ if (!RouterHealthChecksEnabled.value()) {
+ return null;
+ }
+
+ String controlIP = getRouterControlIP(router);
+ if (StringUtils.isNotBlank(controlIP) && !controlIP.equals("0.0.0.0")) {
+ final GetRouterMonitorResultsCommand command = new GetRouterMonitorResultsCommand(performFreshChecks);
+ command.setAccessDetail(NetworkElementCommand.ROUTER_IP, controlIP);
+ command.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName());
+ try {
+ final Answer answer = _agentMgr.easySend(router.getHostId(), command);
+
+ if (answer == null) {
+ s_logger.warn("Unable to fetch monitoring results data from router " + router.getHostName());
+ return null;
+ }
+ if (answer instanceof GetRouterMonitorResultsAnswer) {
+ return (GetRouterMonitorResultsAnswer) answer;
+ } else {
+ s_logger.warn("Unable to fetch health checks results to router " + router.getHostName() + " Received answer " + answer.getDetails());
+ return new GetRouterMonitorResultsAnswer(command, false, null, answer.getDetails());
+ }
+ } catch (final Exception e) {
+ s_logger.warn("Error while collecting alerts from router: " + router.getInstanceName(), e);
+ return null;
+ }
+ }
+
+ return null;
+ }
+
+ @Override
+ public boolean performRouterHealthChecks(long routerId) {
+ DomainRouterVO router = _routerDao.findById(routerId);
+
+ if (router == null) {
+ throw new CloudRuntimeException("Unable to find router with id " + routerId);
+ }
+
+ if (!RouterHealthChecksEnabled.value()) {
+ throw new CloudRuntimeException("Router health checks are not enabled for router: " + router);
+ }
+
+ s_logger.info("Running health check results for router " + router.getUuid());
+
+ final GetRouterMonitorResultsAnswer answer;
+ boolean success = true;
+ // Step 1: Update health check data on router and perform and retrieve health checks on router
+ if (!updateRouterHealthChecksConfig(router)) {
+ s_logger.warn("Unable to update health check config for fresh run successfully for router: " + router + ", so trying to fetch last result.");
+ success = false;
+ answer = fetchAndUpdateRouterHealthChecks(router, false);
+ } else {
+ s_logger.info("Successfully updated health check config for fresh run successfully for router: " + router);
+ answer = fetchAndUpdateRouterHealthChecks(router, true);
+ }
+
+ // Step 2: Update health checks values in database. We do this irrespective of new health check config.
+ if (answer == null || !answer.getResult()) {
+ success = false;
+ resetRouterHealthChecksAndConnectivity(routerId, false,
+ answer == null ? "Communication failed " : "Failed to fetch results with details: " + answer.getDetails());
+ } else {
+ resetRouterHealthChecksAndConnectivity(routerId, true, "Successfully fetched data");
+ updateDbHealthChecksFromRouterResponse(routerId, answer.getMonitoringResults());
+ }
+
+ return success;
+ }
+
+ protected class UpdateRouterHealthChecksConfigTask extends ManagedContextRunnable {
+ public UpdateRouterHealthChecksConfigTask() {
+ }
+
+ @Override
+ protected void runInContext() {
+ try {
+ final List<DomainRouterVO> routers = _routerDao.listByStateAndManagementServer(VirtualMachine.State.Running, mgmtSrvrId);
+ s_logger.debug("Found " + routers.size() + " running routers. ");
+
+ for (final DomainRouterVO router : routers) {
+ updateRouterHealthChecksConfig(router);
+ }
+ } catch (final Exception ex) {
+ s_logger.error("Fail to complete the UpdateRouterHealthChecksConfigTask! ", ex);
+ }
+ }
+ }
+
+ private SetMonitorServiceCommand createMonitorServiceCommand(DomainRouterVO router, List<MonitorServiceTO> services,
+ boolean reconfigure, boolean deleteFromProcessedCache) {
+ final SetMonitorServiceCommand command = new SetMonitorServiceCommand(services);
+ command.setAccessDetail(NetworkElementCommand.ROUTER_IP, getRouterControlIP(router));
+ command.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName());
+ command.setAccessDetail(SetMonitorServiceCommand.ROUTER_HEALTH_CHECKS_ENABLED, RouterHealthChecksEnabled.value().toString());
+ command.setAccessDetail(SetMonitorServiceCommand.ROUTER_HEALTH_CHECKS_BASIC_INTERVAL, RouterHealthChecksBasicInterval.value().toString());
+ command.setAccessDetail(SetMonitorServiceCommand.ROUTER_HEALTH_CHECKS_ADVANCED_INTERVAL, RouterHealthChecksAdvancedInterval.value().toString());
+ command.setAccessDetail(SetMonitorServiceCommand.ROUTER_HEALTH_CHECKS_EXCLUDED, RouterHealthChecksToExclude.valueIn(router.getDataCenterId()));
+ command.setHealthChecksConfig(getRouterHealthChecksConfig(router));
+ command.setReconfigureAfterUpdate(reconfigure);
+ command.setDeleteFromProcessedCache(deleteFromProcessedCache); // As part of updating
+ return command;
+ }
+
+ /**
+ * Updates router health check config to the virtual router that it uses for health checks.
+ * @param router - the router ID that data needs to be sent to.
+ * @return success of whether data was sent or not
+ */
+ private boolean updateRouterHealthChecksConfig(DomainRouterVO router) {
+ if (!RouterHealthChecksEnabled.value()) {
+ return false;
+ }
+
+ SetMonitorServiceCommand command = createMonitorServiceCommand(router, null,true, true);
+ String controlIP = getRouterControlIP(router);
+ if (StringUtils.isBlank(controlIP) || controlIP.equals("0.0.0.0")) {
+ s_logger.debug("Skipping update data on router " + router.getUuid() + " because controlIp is not correct.");
+ return false;
+ }
+
+ s_logger.info("Updating data for router health checks for router " + router.getUuid());
+ Answer origAnswer = null;
+ try {
+ origAnswer = _agentMgr.easySend(router.getHostId(), command);
+ } catch (final Exception e) {
+ s_logger.error("Error while sending update data for health check to router: " + router.getInstanceName(), e);
+ return false;
+ }
+
+ if (origAnswer == null) {
+ s_logger.error("Unable to update health checks data to router " + router.getHostName());
+ return false;
+ }
+
+ GroupAnswer answer = null;
+ if (origAnswer instanceof GroupAnswer) {
+ answer = (GroupAnswer) origAnswer;
+ } else {
+ s_logger.error("Unable to update health checks data to router " + router.getHostName() + " Received answer " + origAnswer.getDetails());
+ return false;
+ }
+
+ if (!answer.getResult()) {
+ s_logger.error("Unable to update health checks data to router " + router.getHostName() + ", details : " + answer.getDetails());
+ }
+
+ return answer.getResult();
+ }
+
+ private String getSystemThresholdsHealthChecksData(final DomainRouterVO router) {
+ return new StringBuilder()
+ .append("minDiskNeeded=" + RouterHealthChecksFreeDiskSpaceThreshold.valueIn(router.getDataCenterId()))
+ .append(",maxCpuUsage=" + RouterHealthChecksMaxCpuUsageThreshold.valueIn(router.getDataCenterId()))
+ .append(",maxMemoryUsage=" + RouterHealthChecksMaxMemoryUsageThreshold.valueIn(router.getDataCenterId()) + ";")
+ .toString();
+ }
+
+ private String getRouterVersionHealthChecksData(final DomainRouterVO router) {
+ if (router.getTemplateVersion() != null && router.getScriptsVersion() != null) {
+ StringBuilder routerVersion = new StringBuilder()
+ .append("templateVersion=" + router.getTemplateVersion())
+ .append(",scriptsVersion=" + router.getScriptsVersion());
+ return routerVersion.toString();
+ }
+ return null;
+ }
+
+ private void updateWithPortForwardingRules(final DomainRouterJoinVO routerJoinVO, final UserVmJoinVO vm, final StringBuilder portData) {
+ SearchBuilder<PortForwardingRuleVO> sbpf = portForwardingDao.createSearchBuilder();
+ sbpf.and("networkId", sbpf.entity().getNetworkId(), SearchCriteria.Op.EQ);
+ sbpf.and("instanceId", sbpf.entity().getVirtualMachineId(), SearchCriteria.Op.EQ);
+ SearchCriteria<PortForwardingRuleVO> scpf = sbpf.create();
+ scpf.setParameters("networkId", routerJoinVO.getNetworkId());
+ scpf.setParameters("instanceId", vm.getId());
+ List<PortForwardingRuleVO> portForwardingRules = portForwardingDao.search(scpf, null);
+ for (PortForwardingRuleVO portForwardingRule : portForwardingRules) {
+ portData.append("sourceIp=").append(_ipAddressDao.findById(portForwardingRule.getSourceIpAddressId()).getAddress().toString())
+ .append(",sourcePortStart=").append(portForwardingRule.getSourcePortStart())
+ .append(",sourcePortEnd=").append(portForwardingRule.getSourcePortEnd())
+ .append(",destIp=").append(portForwardingRule.getDestinationIpAddress())
+ .append(",destPortStart=").append(portForwardingRule.getDestinationPortStart())
+ .append(",destPortEnd=").append(portForwardingRule.getDestinationPortEnd()).append(";");
+ }
+ }
+
+ private String getStickinessPolicies(long loadBalancingRuleId) {
+ List<LBStickinessPolicyVO> stickinessPolicyVOs = lbStickinessPolicyDao.listByLoadBalancerId(loadBalancingRuleId, false);
+ if (stickinessPolicyVOs != null && stickinessPolicyVOs.size() > 0) {
+ StringBuilder stickiness = new StringBuilder();
+ for (LBStickinessPolicyVO stickinessVO : stickinessPolicyVOs) {
+ stickiness.append(stickinessVO.getMethodName()).append(" ");
+ }
+ return stickiness.toString().trim();
+ }
+ return "None";
+ }
+
+ private void updateWithLbRules(final DomainRouterJoinVO routerJoinVO, final StringBuilder loadBalancingData) {
+ List<? extends FirewallRuleVO> loadBalancerVOs = this.getLBRules(routerJoinVO);
+ for (FirewallRuleVO firewallRuleVO : loadBalancerVOs) {
+ List<LoadBalancerVMMapVO> vmMapVOs = _loadBalancerVMMapDao.listByLoadBalancerId(firewallRuleVO.getId(), false);
+ if (vmMapVOs.size() > 0) {
+
+ final NetworkOffering offering = _networkOfferingDao.findById(_networkDao.findById(routerJoinVO.getNetworkId()).getNetworkOfferingId());
+ if (offering.getConcurrentConnections() == null) {
+ loadBalancingData.append("maxconn=").append(_configDao.getValue(Config.NetworkLBHaproxyMaxConn.key()));
+ } else {
+ loadBalancingData.append("maxconn=").append(offering.getConcurrentConnections().toString());
+ }
+
+ loadBalancingData.append(",sourcePortStart=").append(firewallRuleVO.getSourcePortStart())
+ .append(",sourcePortEnd=").append(firewallRuleVO.getSourcePortEnd());
+ if (firewallRuleVO instanceof LoadBalancerVO) {
+ LoadBalancerVO loadBalancerVO = (LoadBalancerVO) firewallRuleVO;
+ loadBalancingData.append(",sourceIp=").append(_ipAddressDao.findById(loadBalancerVO.getSourceIpAddressId()).getAddress().toString())
+ .append(",destPortStart=").append(loadBalancerVO.getDefaultPortStart())
+ .append(",destPortEnd=").append(loadBalancerVO.getDefaultPortEnd())
+ .append(",algorithm=").append(loadBalancerVO.getAlgorithm())
+ .append(",protocol=").append(loadBalancerVO.getLbProtocol());
+ } else if (firewallRuleVO instanceof ApplicationLoadBalancerRuleVO) {
+ ApplicationLoadBalancerRuleVO appLoadBalancerVO = (ApplicationLoadBalancerRuleVO) firewallRuleVO;
+ loadBalancingData.append(",sourceIp=").append(appLoadBalancerVO.getSourceIp())
+ .append(",destPortStart=").append(appLoadBalancerVO.getDefaultPortStart())
+ .append(",destPortEnd=").append(appLoadBalancerVO.getDefaultPortEnd())
+ .append(",algorithm=").append(appLoadBalancerVO.getAlgorithm())
+ .append(",protocol=").append(appLoadBalancerVO.getLbProtocol());
+ }
+ loadBalancingData.append(",stickiness=").append(getStickinessPolicies(firewallRuleVO.getId()));
+ loadBalancingData.append(",keepAliveEnabled=").append(offering.isKeepAliveEnabled()).append(",vmIps=");
+ for (LoadBalancerVMMapVO vmMapVO : vmMapVOs) {
+ loadBalancingData.append(vmMapVO.getInstanceIp()).append(" ");
+ }
+ loadBalancingData.setCharAt(loadBalancingData.length() - 1, ';');
+ }
+ }
+ }
+
+ private Map<String, String> getRouterHealthChecksConfig(final DomainRouterVO router) {
+ Map<String, String> data = new HashMap<>();
+ List<DomainRouterJoinVO> routerJoinVOs = domainRouterJoinDao.searchByIds(router.getId());
+ StringBuilder vmsData = new StringBuilder();
+ StringBuilder portData = new StringBuilder();
+ StringBuilder loadBalancingData = new StringBuilder();
+ StringBuilder gateways = new StringBuilder();
+ gateways.append("gatewaysIps=");
+ for (DomainRouterJoinVO routerJoinVO : routerJoinVOs) {
+ if (StringUtils.isNotBlank(routerJoinVO.getGateway())) {
+ gateways.append(routerJoinVO.getGateway() + " ");
+ }
+ SearchBuilder<UserVmJoinVO> sbvm = userVmJoinDao.createSearchBuilder();
+ sbvm.and("networkId", sbvm.entity().getNetworkId(), SearchCriteria.Op.EQ);
+ SearchCriteria<UserVmJoinVO> scvm = sbvm.create();
+ scvm.setParameters("networkId", routerJoinVO.getNetworkId());
+ List<UserVmJoinVO> vms = userVmJoinDao.search(scvm, null);
+ for (UserVmJoinVO vm : vms) {
+ if (vm.getState() != VirtualMachine.State.Running) {
+ continue;
+ }
+
+ vmsData.append("vmName=").append(vm.getName())
+ .append(",macAddress=").append(vm.getMacAddress())
+ .append(",ip=").append(vm.getIpAddress()).append(";");
+ updateWithPortForwardingRules(routerJoinVO, vm, portData);
+ }
+ updateWithLbRules(routerJoinVO, loadBalancingData);
+ }
+
+ String routerVersion = getRouterVersionHealthChecksData(router);
+ data.put("virtualMachines", vmsData.toString());
+ data.put("gateways", gateways.toString());
+ data.put("portForwarding", portData.toString());
+ data.put("haproxyData", loadBalancingData.toString());
+ data.put("systemThresholds", getSystemThresholdsHealthChecksData(router));
+ if (routerVersion != null) {
+ data.put("routerVersion", routerVersion);
+ }
+ return data;
+ }
+
+ private List<? extends FirewallRuleVO> getLBRules(final DomainRouterJoinVO router) {
+ if (router.getRole() == Role.VIRTUAL_ROUTER) {
+ SearchBuilder<LoadBalancerVO> sblb = _loadBalancerDao.createSearchBuilder();
+ sblb.and("networkId", sblb.entity().getNetworkId(), SearchCriteria.Op.EQ);
+ sblb.and("sourceIpAddressId", sblb.entity().getSourceIpAddressId(), SearchCriteria.Op.NNULL);
+ SearchCriteria<LoadBalancerVO> sclb = sblb.create();
+ sclb.setParameters("networkId", router.getNetworkId());
+ return _loadBalancerDao.search(sclb, null);
+ } else if (router.getRole() == Role.INTERNAL_LB_VM) {
+ SearchBuilder<ApplicationLoadBalancerRuleVO> sbalb = applicationLoadBalancerRuleDao.createSearchBuilder();
+ sbalb.and("networkId", sbalb.entity().getNetworkId(), SearchCriteria.Op.EQ);
+ sbalb.and("sourceIpAddress", sbalb.entity().getSourceIp(), SearchCriteria.Op.NNULL);
+ SearchCriteria<ApplicationLoadBalancerRuleVO> sclb = sbalb.create();
+ sclb.setParameters("networkId", router.getNetworkId());
+ return applicationLoadBalancerRuleDao.search(sclb, null);
+ }
+ return Collections.emptyList();
+ }
+
protected class CheckRouterAlertsTask extends ManagedContextRunnable {
public CheckRouterAlertsTask() {
}
@@ -1216,12 +1853,11 @@
final List<DomainRouterVO> routers = _routerDao.listByStateAndManagementServer(VirtualMachine.State.Running, mgmtSrvrId);
s_logger.debug("Found " + routers.size() + " running routers. ");
-
for (final DomainRouterVO router : routers) {
final String serviceMonitoringFlag = SetServiceMonitor.valueIn(router.getDataCenterId());
// Skip the routers in VPC network or skip the routers where
// Monitor service is not enabled in the corresponding Zone
- if (!Boolean.parseBoolean(serviceMonitoringFlag) || router.getVpcId() != null) {
+ if (!Boolean.parseBoolean(serviceMonitoringFlag)) {
continue;
}
String controlIP = getRouterControlIP(router);
@@ -1264,7 +1900,7 @@
final String alerts[] = answer.getAlerts();
if (alerts != null) {
final String lastAlertTimeStamp = answer.getTimeStamp();
- final SimpleDateFormat sdfrmt = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+ final SimpleDateFormat sdfrmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
sdfrmt.setLenient(false);
try {
sdfrmt.parse(lastAlertTimeStamp);
@@ -1686,19 +2322,7 @@
if (reprogramGuestNtwks) {
finalizeIpAssocForNetwork(cmds, router, provider, guestNetworkId, null);
finalizeNetworkRulesForNetwork(cmds, router, provider, guestNetworkId);
-
- final NetworkOffering offering = _networkOfferingDao.findById(_networkDao.findById(guestNetworkId).getNetworkOfferingId());
- // service monitoring is currently not added in RVR
- if (!offering.isRedundantRouter()) {
- final String serviceMonitringSet = _configDao.getValue(Config.EnableServiceMonitoring.key());
-
- if (serviceMonitringSet != null && serviceMonitringSet.equalsIgnoreCase("true")) {
- finalizeMonitorServiceOnStrat(cmds, profile, router, provider, guestNetworkId, true);
- } else {
- finalizeMonitorServiceOnStrat(cmds, profile, router, provider, guestNetworkId, false);
- }
- }
-
+ finalizeMonitorService(cmds, profile, router, provider, guestNetworkId, true);
}
finalizeUserDataAndDhcpOnStart(cmds, router, provider, guestNetworkId);
@@ -1711,31 +2335,38 @@
return true;
}
- private void finalizeMonitorServiceOnStrat(final Commands cmds, final VirtualMachineProfile profile, final DomainRouterVO router, final Provider provider,
- final long networkId, final Boolean add) {
+ protected void finalizeMonitorService(final Commands cmds, final VirtualMachineProfile profile, final DomainRouterVO router, final Provider provider,
+ final long networkId, boolean onStart) {
+ final NetworkOffering offering = _networkOfferingDao.findById(_networkDao.findById(networkId).getNetworkOfferingId());
+ if (offering.isRedundantRouter()) {
+ // service monitoring is currently not added in RVR
+ return;
+ }
+ final String serviceMonitoringSet = _configDao.getValue(Config.EnableServiceMonitoring.key());
+ final Boolean isMonitoringServicesEnabled = serviceMonitoringSet != null && serviceMonitoringSet.equalsIgnoreCase("true");
final NetworkVO network = _networkDao.findById(networkId);
s_logger.debug("Creating monitoring services on " + router + " start...");
// get the list of sevices for this network to monitor
final List<MonitoringServiceVO> services = new ArrayList<MonitoringServiceVO>();
- if (_networkModel.isProviderSupportServiceInNetwork(network.getId(), Service.Dhcp, Provider.VirtualRouter)
- || _networkModel.isProviderSupportServiceInNetwork(network.getId(), Service.Dns, Provider.VirtualRouter)) {
+ if (_networkModel.isProviderSupportServiceInNetwork(network.getId(), Service.Dhcp, provider)
+ || _networkModel.isProviderSupportServiceInNetwork(network.getId(), Service.Dns, provider)) {
final MonitoringServiceVO dhcpService = _monitorServiceDao.getServiceByName(MonitoringService.Service.Dhcp.toString());
if (dhcpService != null) {
services.add(dhcpService);
}
}
- if (_networkModel.isProviderSupportServiceInNetwork(network.getId(), Service.Lb, Provider.VirtualRouter)) {
+ if (_networkModel.isProviderSupportServiceInNetwork(network.getId(), Service.Lb, provider)) {
final MonitoringServiceVO lbService = _monitorServiceDao.getServiceByName(MonitoringService.Service.LoadBalancing.toString());
if (lbService != null) {
services.add(lbService);
}
}
- final List<MonitoringServiceVO> defaultServices = _monitorServiceDao.listDefaultServices(true);
- services.addAll(defaultServices);
+
+ services.addAll(getDefaultServicesToMonitor(network));
final List<MonitorServiceTO> servicesTO = new ArrayList<MonitorServiceTO>();
for (final MonitoringServiceVO service : services) {
@@ -1753,17 +2384,21 @@
if (controlNic == null) {
throw new CloudRuntimeException("VirtualMachine " + profile.getInstanceName() + " doesn't have a control interface");
}
- final SetMonitorServiceCommand command = new SetMonitorServiceCommand(servicesTO);
- command.setAccessDetail(NetworkElementCommand.ROUTER_IP, controlNic.getIPv4Address());
- command.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, _routerControlHelper.getRouterIpInNetwork(networkId, router.getId()));
- command.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName());
- if (!add) {
- command.setAccessDetail(NetworkElementCommand.ROUTER_MONITORING_ENABLE, add.toString());
+ // As part of aggregate command we don't need to reconfigure if onStart and persist in processed cache. Subsequent updates are not needed.
+ SetMonitorServiceCommand command = createMonitorServiceCommand(router, servicesTO, !onStart, false);
+ command.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, _routerControlHelper.getRouterIpInNetwork(networkId, router.getId()));
+ if (!isMonitoringServicesEnabled) {
+ command.setAccessDetail(SetMonitorServiceCommand.ROUTER_MONITORING_ENABLED, isMonitoringServicesEnabled.toString());
}
+
cmds.addCommand("monitor", command);
}
+ protected List<MonitoringServiceVO> getDefaultServicesToMonitor(final NetworkVO network) {
+ return _monitorServiceDao.listDefaultServices(true);
+ }
+
protected NicProfile getControlNic(final VirtualMachineProfile profile) {
final DomainRouterVO router = _routerDao.findById(profile.getId());
final DataCenterVO dcVo = _dcDao.findById(router.getDataCenterId());
@@ -2064,6 +2699,11 @@
// Get guest networks info
final List<Network> guestNetworks = new ArrayList<Network>();
+ final GetDomRVersionAnswer versionAnswer = (GetDomRVersionAnswer) cmds.getAnswer("getDomRVersion");
+ router.setTemplateVersion(versionAnswer.getTemplateVersion());
+ router.setScriptsVersion(versionAnswer.getScriptsVersion());
+ _routerDao.persist(router, guestNetworks);
+
final List<? extends Nic> routerNics = _nicDao.listByVmId(profile.getId());
for (final Nic nic : routerNics) {
final Network network = _networkModel.getNetwork(nic.getNetworkId());
@@ -2084,11 +2724,11 @@
}
}
}
+
if (result) {
- final GetDomRVersionAnswer versionAnswer = (GetDomRVersionAnswer) cmds.getAnswer("getDomRVersion");
- router.setTemplateVersion(versionAnswer.getTemplateVersion());
- router.setScriptsVersion(versionAnswer.getScriptsVersion());
- _routerDao.persist(router, guestNetworks);
+ for (Network guestNetwork : guestNetworks) {
+ _routerDao.addRouterToGuestNetwork(router, guestNetwork);
+ }
}
return result;
@@ -2601,7 +3241,23 @@
@Override
public ConfigKey<?>[] getConfigKeys() {
- return new ConfigKey<?>[] { UseExternalDnsServers, routerVersionCheckEnabled, SetServiceMonitor, RouterAlertsCheckInterval, ExposeDnsAndBootpServer };
+ return new ConfigKey<?>[] {
+ UseExternalDnsServers,
+ RouterVersionCheckEnabled,
+ SetServiceMonitor,
+ RouterAlertsCheckInterval,
+ RouterHealthChecksEnabled,
+ RouterHealthChecksBasicInterval,
+ RouterHealthChecksAdvancedInterval,
+ RouterHealthChecksConfigRefreshInterval,
+ RouterHealthChecksResultFetchInterval,
+ RouterHealthChecksFailuresToRecreateVr,
+ RouterHealthChecksToExclude,
+ RouterHealthChecksFreeDiskSpaceThreshold,
+ RouterHealthChecksMaxCpuUsageThreshold,
+ RouterHealthChecksMaxMemoryUsageThreshold,
+ ExposeDnsAndBootpServer
+ };
}
@Override
diff --git a/server/src/main/java/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java b/server/src/main/java/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java
index c6181e9..8c661c7 100644
--- a/server/src/main/java/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java
+++ b/server/src/main/java/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java
@@ -74,4 +74,11 @@
* @throws ResourceUnavailableException
*/
boolean stopRemoteAccessVpn(RemoteAccessVpn vpn, VirtualRouter router) throws ResourceUnavailableException;
-}
\ No newline at end of file
+
+ /**
+ * @param router
+ * @return
+ * @throws ResourceUnavailableException
+ */
+ boolean startSite2SiteVpn(DomainRouterVO router) throws ResourceUnavailableException;
+}
diff --git a/server/src/main/java/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/main/java/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
index 80b1797..e9d32a2 100644
--- a/server/src/main/java/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
@@ -18,6 +18,7 @@
import java.net.URI;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -26,6 +27,9 @@
import javax.inject.Inject;
import javax.naming.ConfigurationException;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.Command;
import com.cloud.agent.api.Command.OnError;
@@ -34,6 +38,7 @@
import com.cloud.agent.api.SetupGuestNetworkCommand;
import com.cloud.agent.api.routing.AggregationControlCommand;
import com.cloud.agent.api.routing.AggregationControlCommand.Action;
+import com.cloud.agent.api.to.VirtualMachineTO;
import com.cloud.agent.manager.Commands;
import com.cloud.dc.DataCenter;
import com.cloud.deploy.DeployDestination;
@@ -42,7 +47,11 @@
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.OperationTimedoutException;
import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.hypervisor.HypervisorGuru;
+import com.cloud.hypervisor.HypervisorGuruManager;
import com.cloud.network.IpAddress;
+import com.cloud.network.MonitoringService;
import com.cloud.network.Network;
import com.cloud.network.Network.Provider;
import com.cloud.network.Network.Service;
@@ -54,7 +63,10 @@
import com.cloud.network.VirtualRouterProvider;
import com.cloud.network.addr.PublicIp;
import com.cloud.network.dao.IPAddressVO;
+import com.cloud.network.dao.MonitoringServiceVO;
+import com.cloud.network.dao.NetworkVO;
import com.cloud.network.dao.RemoteAccessVpnVO;
+import com.cloud.network.dao.Site2SiteVpnConnectionVO;
import com.cloud.network.vpc.NetworkACLItemDao;
import com.cloud.network.vpc.NetworkACLItemVO;
import com.cloud.network.vpc.NetworkACLManager;
@@ -72,6 +84,9 @@
import com.cloud.network.vpc.dao.StaticRouteDao;
import com.cloud.network.vpc.dao.VpcGatewayDao;
import com.cloud.network.vpn.Site2SiteVpnManager;
+import com.cloud.service.ServiceOfferingVO;
+import com.cloud.template.VirtualMachineTemplate;
+import com.cloud.user.Account;
import com.cloud.user.UserStatisticsVO;
import com.cloud.utils.Pair;
import com.cloud.utils.db.EntityManager;
@@ -87,14 +102,8 @@
import com.cloud.vm.VirtualMachine.State;
import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.VirtualMachineProfile.Param;
+import com.cloud.vm.VirtualMachineProfileImpl;
import com.cloud.vm.dao.VMInstanceDao;
-import com.cloud.agent.api.to.VirtualMachineTO;
-import com.cloud.hypervisor.Hypervisor;
-import com.cloud.hypervisor.HypervisorGuru;
-import com.cloud.hypervisor.HypervisorGuruManager;
-
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
@Component
public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplianceManagerImpl implements VpcVirtualNetworkApplianceManager {
@@ -151,8 +160,9 @@
result = false;
}
// 3) apply networking rules
- if (result && params.get(Param.ReProgramGuestNetworks) != null && (Boolean) params.get(Param.ReProgramGuestNetworks) == true) {
- sendNetworkRulesToRouter(router.getId(), network.getId());
+ if (result) {
+ boolean reprogramNetwork = params != null && params.get(Param.ReProgramGuestNetworks) != null && (Boolean) params.get(Param.ReProgramGuestNetworks) == true;
+ sendNetworkRulesToRouter(router.getId(), network.getId(), reprogramNetwork);
}
} catch (final Exception ex) {
s_logger.warn("Failed to add router " + router + " to network " + network + " due to ", ex);
@@ -454,19 +464,25 @@
throw new CloudRuntimeException("Cannot find related provider of virtual router provider: " + vrProvider.getType().toString());
}
+ if (reprogramGuestNtwks && publicNics.size() > 0) {
+ finalizeMonitorService(cmds, profile, domainRouterVO, provider, publicNics.get(0).second().getId(), true);
+ }
+
for (final Pair<Nic, Network> nicNtwk : guestNics) {
final Nic guestNic = nicNtwk.first();
+ final long guestNetworkId = guestNic.getNetworkId();
final AggregationControlCommand startCmd = new AggregationControlCommand(Action.Start, domainRouterVO.getInstanceName(), controlNic.getIPv4Address(), _routerControlHelper.getRouterIpInNetwork(
- guestNic.getNetworkId(), domainRouterVO.getId()));
+ guestNetworkId, domainRouterVO.getId()));
cmds.addCommand(startCmd);
if (reprogramGuestNtwks) {
- finalizeIpAssocForNetwork(cmds, domainRouterVO, provider, guestNic.getNetworkId(), vlanMacAddress);
- finalizeNetworkRulesForNetwork(cmds, domainRouterVO, provider, guestNic.getNetworkId());
+ finalizeIpAssocForNetwork(cmds, domainRouterVO, provider, guestNetworkId, vlanMacAddress);
+ finalizeNetworkRulesForNetwork(cmds, domainRouterVO, provider, guestNetworkId);
+ finalizeMonitorService(cmds, profile, domainRouterVO, provider, guestNetworkId, true);
}
- finalizeUserDataAndDhcpOnStart(cmds, domainRouterVO, provider, guestNic.getNetworkId());
+ finalizeUserDataAndDhcpOnStart(cmds, domainRouterVO, provider, guestNetworkId);
final AggregationControlCommand finishCmd = new AggregationControlCommand(Action.Finish, domainRouterVO.getInstanceName(), controlNic.getIPv4Address(), _routerControlHelper.getRouterIpInNetwork(
- guestNic.getNetworkId(), domainRouterVO.getId()));
+ guestNetworkId, domainRouterVO.getId()));
cmds.addCommand(finishCmd);
}
@@ -477,6 +493,14 @@
}
@Override
+ protected List<MonitoringServiceVO> getDefaultServicesToMonitor(NetworkVO network) {
+ if (network.getTrafficType() == TrafficType.Public) {
+ return Arrays.asList(_monitorServiceDao.getServiceByName(MonitoringService.Service.Ssh.toString()));
+ }
+ return super.getDefaultServicesToMonitor(network);
+ }
+
+ @Override
protected void finalizeNetworkRulesForNetwork(final Commands cmds, final DomainRouterVO domainRouterVO, final Provider provider, final Long guestNetworkId) {
super.finalizeNetworkRulesForNetwork(cmds, domainRouterVO, provider, guestNetworkId);
@@ -495,7 +519,7 @@
}
}
- protected boolean sendNetworkRulesToRouter(final long routerId, final long networkId) throws ResourceUnavailableException {
+ protected boolean sendNetworkRulesToRouter(final long routerId, final long networkId, final boolean reprogramNetwork) throws ResourceUnavailableException {
final DomainRouterVO router = _routerDao.findById(routerId);
final Commands cmds = new Commands(OnError.Continue);
@@ -508,10 +532,26 @@
throw new CloudRuntimeException("Cannot find related provider of virtual router provider: " + vrProvider.getType().toString());
}
- finalizeNetworkRulesForNetwork(cmds, router, provider, networkId);
+ if (reprogramNetwork) {
+ finalizeNetworkRulesForNetwork(cmds, router, provider, networkId);
+ }
+
+ finalizeMonitorService(cmds, getVirtualMachineProfile(router), router, provider, networkId, false);
+
return _nwHelper.sendCommandsToRouter(router, cmds);
}
+ private VirtualMachineProfile getVirtualMachineProfile(DomainRouterVO router) {
+ final ServiceOfferingVO offering = _serviceOfferingDao.findById(router.getId(), router.getServiceOfferingId());
+ final VirtualMachineTemplate template = _entityMgr.findByIdIncludingRemoved(VirtualMachineTemplate.class, router.getTemplateId());
+ final Account owner = _entityMgr.findById(Account.class, router.getAccountId());
+ final VirtualMachineProfileImpl profile = new VirtualMachineProfileImpl(router, template, offering, owner, null);
+ for (final NicProfile nic : _networkMgr.getNicProfiles(router)) {
+ profile.addNic(nic);
+ }
+ return profile;
+ }
+
/**
* @param router
* @param add
@@ -618,6 +658,17 @@
}
@Override
+ public boolean startSite2SiteVpn(DomainRouterVO router) throws ResourceUnavailableException {
+ boolean result = true;
+ List<Site2SiteVpnConnectionVO> conns = _s2sVpnMgr.getConnectionsForRouter(router);
+ for (Site2SiteVpnConnectionVO conn : conns) {
+ result = result && startSite2SiteVpn(conn, router);
+ }
+
+ return result;
+ }
+
+ @Override
public boolean stopSite2SiteVpn(final Site2SiteVpnConnection conn, final VirtualRouter router) throws ResourceUnavailableException {
if (router.getState() != State.Running) {
s_logger.warn("Unable to apply site-to-site VPN configuration, virtual router is not in the right state " + router.getState());
diff --git a/server/src/main/java/com/cloud/network/rules/RulesManagerImpl.java b/server/src/main/java/com/cloud/network/rules/RulesManagerImpl.java
index 9dc7a3d..de56774 100644
--- a/server/src/main/java/com/cloud/network/rules/RulesManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/rules/RulesManagerImpl.java
@@ -24,6 +24,12 @@
import javax.inject.Inject;
+import com.cloud.network.element.UserDataServiceProvider;
+import com.cloud.storage.VMTemplateVO;
+import com.cloud.storage.dao.VMTemplateDao;
+import com.cloud.vm.NicProfile;
+import com.cloud.vm.VirtualMachineProfile;
+import com.cloud.vm.VirtualMachineProfileImpl;
import org.apache.cloudstack.api.command.user.firewall.ListPortForwardingRulesCmd;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
@@ -145,6 +151,8 @@
LoadBalancerVMMapDao _loadBalancerVMMapDao;
@Inject
VpcService _vpcSvc;
+ @Inject
+ VMTemplateDao _templateDao;
protected void checkIpAndUserVm(IpAddress ipAddress, UserVm userVm, Account caller, Boolean ignoreVmState) {
if (ipAddress == null || ipAddress.getAllocatedTime() == null || ipAddress.getAllocatedToAccountId() == null) {
@@ -500,6 +508,7 @@
s_logger.debug("The ip is not associated with the VPC network id=" + networkId + ", so assigning");
try {
ipAddress = _ipAddrMgr.associateIPToGuestNetwork(ipId, networkId, false);
+ performedIpAssoc = true;
} catch (Exception ex) {
s_logger.warn("Failed to associate ip id=" + ipId + " to VPC network id=" + networkId + " as " + "a part of enable static nat");
return false;
@@ -596,6 +605,7 @@
// enable static nat on the backend
s_logger.trace("Enabling static nat for ip address " + ipAddress + " and vm id=" + vmId + " on the backend");
if (applyStaticNatForIp(ipId, false, caller, false)) {
+ applyUserData(vmId, network, guestNic);
performedIpAssoc = false; // ignor unassignIPFromVpcNetwork in finally block
return true;
} else {
@@ -619,6 +629,24 @@
return false;
}
+ protected void applyUserData(long vmId, Network network, Nic guestNic) throws ResourceUnavailableException {
+ UserVmVO vm = _vmDao.findById(vmId);
+ VMTemplateVO template = _templateDao.findByIdIncludingRemoved(vm.getTemplateId());
+ NicProfile nicProfile = new NicProfile(guestNic, network, null, null, null,
+ _networkModel.isSecurityGroupSupportedInNetwork(network),
+ _networkModel.getNetworkTag(template.getHypervisorType(), network));
+ VirtualMachineProfile vmProfile = new VirtualMachineProfileImpl(vm);
+ UserDataServiceProvider element = _networkModel.getUserDataUpdateProvider(network);
+ if (element == null) {
+ s_logger.error("Can't find network element for " + Service.UserData.getName() + " provider needed for UserData update");
+ } else {
+ boolean result = element.saveUserData(network, nicProfile, vmProfile);
+ if (!result) {
+ s_logger.error("Failed to update userdata for vm " + vm + " and nic " + guestNic);
+ }
+ }
+ }
+
protected void isIpReadyForStaticNat(long vmId, IPAddressVO ipAddress, String vmIp, Account caller, long callerUserId) throws NetworkRuleConflictException,
ResourceUnavailableException {
if (ipAddress.isSourceNat()) {
@@ -1095,6 +1123,10 @@
revokeStaticNatRuleInternal(rule.getId(), caller, userId, false);
}
+ IPAddressVO ipAddress = _ipAddressDao.findById(ipId);
+ Long vmId = ipAddress.getAssociatedWithVmId();
+ Long networkId = ipAddress.getAssociatedWithNetworkId();
+
boolean success = true;
// revoke all port forwarding rules
@@ -1104,7 +1136,17 @@
success = success && applyStaticNatRulesForIp(ipId, _ipAddrMgr.RulesContinueOnError.value(), caller, true);
// revoke static nat for the ip address
- success = success && applyStaticNatForIp(ipId, false, caller, true);
+ if (vmId != null && networkId != null) {
+ Network guestNetwork = _networkModel.getNetwork(networkId);
+ Nic guestNic = _networkModel.getNicInNetwork(vmId, guestNetwork.getId());
+ if (applyStaticNatForIp(ipId, false, caller, true)) {
+ if (ipAddress.getState() == IpAddress.State.Releasing) {
+ applyUserData(vmId, guestNetwork, guestNic);
+ }
+ } else {
+ success = false;
+ }
+ }
// Now we check again in case more rules have been inserted.
rules.addAll(_portForwardingDao.listByIpAndNotRevoked(ipId));
@@ -1242,7 +1284,12 @@
}
}
- return disableStaticNat(ipId, caller, ctx.getCallingUserId(), false);
+ if (disableStaticNat(ipId, caller, ctx.getCallingUserId(), false)) {
+ Nic guestNic = _networkModel.getNicInNetworkIncludingRemoved(vmId, guestNetwork.getId());
+ applyUserData(vmId, guestNetwork, guestNic);
+ return true;
+ }
+ return false;
}
@Override
diff --git a/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl.java
index 07d7e4d..5bb7767 100644
--- a/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl.java
@@ -44,12 +44,14 @@
import org.apache.cloudstack.api.command.user.securitygroup.DeleteSecurityGroupCmd;
import org.apache.cloudstack.api.command.user.securitygroup.RevokeSecurityGroupEgressCmd;
import org.apache.cloudstack.api.command.user.securitygroup.RevokeSecurityGroupIngressCmd;
+import org.apache.cloudstack.api.command.user.securitygroup.UpdateSecurityGroupCmd;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.managed.context.ManagedContextRunnable;
import org.apache.cloudstack.utils.identity.ManagementServerNode;
import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import com.cloud.agent.AgentManager;
@@ -57,6 +59,7 @@
import com.cloud.agent.api.NetworkRulesVmSecondaryIpCommand;
import com.cloud.agent.api.SecurityGroupRulesCmd;
import com.cloud.agent.api.SecurityGroupRulesCmd.IpPortAndProto;
+import com.cloud.agent.api.to.VirtualMachineTO;
import com.cloud.agent.manager.Commands;
import com.cloud.api.query.dao.SecurityGroupJoinDao;
import com.cloud.configuration.Config;
@@ -112,6 +115,8 @@
import com.cloud.vm.VirtualMachine.Event;
import com.cloud.vm.VirtualMachine.State;
import com.cloud.vm.VirtualMachineManager;
+import com.cloud.vm.VirtualMachineProfile;
+import com.cloud.vm.VirtualMachineProfileImpl;
import com.cloud.vm.dao.NicDao;
import com.cloud.vm.dao.NicSecondaryIpDao;
import com.cloud.vm.dao.UserVmDao;
@@ -376,6 +381,7 @@
}
@DB
+ @Override
public void scheduleRulesetUpdateToHosts(final List<Long> affectedVms, final boolean updateSeqno, Long delayMs) {
if (affectedVms.size() == 0) {
return;
@@ -512,8 +518,35 @@
egressResult.add(ipPortAndProto);
}
}
- return new SecurityGroupRulesCmd(guestIp, guestIp6, guestMac, vmName, vmId, signature, seqnum, ingressResult.toArray(new IpPortAndProto[ingressResult.size()]),
+ SecurityGroupRulesCmd cmd = new SecurityGroupRulesCmd(guestIp, guestIp6, guestMac, vmName, vmId, signature, seqnum, ingressResult.toArray(new IpPortAndProto[ingressResult.size()]),
egressResult.toArray(new IpPortAndProto[egressResult.size()]), secIps);
+
+ final VirtualMachineTO to = getVmTO(vmId);
+ cmd.setVmTO(to);
+ return cmd;
+ }
+
+ protected VirtualMachineTO getVmTO(Long vmId) {
+ final VMInstanceVO vm = _vmDao.findById(vmId);
+ final VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);
+ final List<NicVO> nics = _nicDao.listByVmId(profile.getId());
+ Collections.sort(nics, new Comparator<NicVO>() {
+ @Override
+ public int compare(NicVO nic1, NicVO nic2) {
+ Long nicId1 = Long.valueOf(nic1.getDeviceId());
+ Long nicId2 = Long.valueOf(nic2.getDeviceId());
+ return nicId1.compareTo(nicId2);
+ }
+ });
+ for (final NicVO nic : nics) {
+ final Network network = _networkModel.getNetwork(nic.getNetworkId());
+ final NicProfile nicProfile =
+ new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), null, _networkModel.isSecurityGroupSupportedInNetwork(network),
+ _networkModel.getNetworkTag(profile.getHypervisorType(), network));
+ profile.addNic(nicProfile);
+ }
+ final VirtualMachineTO to = _itMgr.toVmTO(profile);
+ return to;
}
protected void handleVmStopped(VMInstanceVO vm) {
@@ -617,10 +650,27 @@
}
}
- if (!NetUtils.isValidSecurityGroupProto(protocol)) {
- throw new InvalidParameterValueException("Invalid protocol " + protocol);
+ //Validate Protocol
+ protocol = protocol.trim().toLowerCase();
+ //Check if protocol is a number
+ if(StringUtils.isNumeric(protocol)){
+ int protoNumber = Integer.parseInt(protocol);
+ // Deal with ICMP(protocol number 1) specially because it need to be paired with icmp type and code
+ if (protoNumber == 1) {
+ protocol = "icmp";
+ icmpCode = -1;
+ icmpType = -1;
+ } else if(protoNumber < 0 || protoNumber > 255){
+ throw new InvalidParameterValueException("Invalid protocol number: " + protoNumber);
+ }
+ } else {
+ //Protocol is not number
+ //Check for valid protocol strings
+ if (!NetUtils.isValidSecurityGroupProto(protocol)) {
+ throw new InvalidParameterValueException("Invalid protocol " + protocol);
+ }
}
- if ("icmp".equalsIgnoreCase(protocol)) {
+ if (protocol.equals(NetUtils.ICMP_PROTO)) {
if ((icmpType == null) || (icmpCode == null)) {
throw new InvalidParameterValueException("Invalid ICMP type/code specified, icmpType = " + icmpType + ", icmpCode = " + icmpCode);
}
@@ -641,7 +691,7 @@
}
startPortOrType = 0;
endPortOrCode = 0;
- } else {
+ } else if (protocol.equals(NetUtils.TCP_PROTO) || protocol.equals(NetUtils.UDP_PROTO)) {
if ((startPort == null) || (endPort == null)) {
throw new InvalidParameterValueException("Invalid port range specified, startPort = " + startPort + ", endPort = " + endPort);
}
@@ -660,10 +710,13 @@
}
startPortOrType = startPort;
endPortOrCode = endPort;
+ } else {
+ // in 4.6, the start port and end port are ignored in definition of ProtocolAclRule
+ // see core/src/com/cloud/agent/resource/virtualnetwork/facade/SetNetworkAclConfigItem.java
+ startPortOrType = 0;
+ endPortOrCode = 0;
}
- protocol = protocol.toLowerCase();
-
List<SecurityGroupVO> authorizedGroups = new ArrayList<SecurityGroupVO>();
if (groupList != null) {
Collection userGroupCollection = groupList.values();
@@ -858,6 +911,10 @@
Account caller = CallContext.current().getCallingAccount();
Account owner = _accountMgr.finalizeOwner(caller, cmd.getAccountName(), cmd.getDomainId(), cmd.getProjectId());
+ if (StringUtils.isBlank(name)) {
+ throw new InvalidParameterValueException("Security group name cannot be empty");
+ }
+
if (_securityGroupDao.isNameInUse(owner.getId(), owner.getDomainId(), cmd.getSecurityGroupName())) {
throw new InvalidParameterValueException("Unable to create security group, a group with name " + name + " already exists.");
}
@@ -993,16 +1050,17 @@
agentId = vm.getHostId();
if (agentId != null) {
// get nic secondary ip address
- String privateIp = vm.getPrivateIpAddress();
- NicVO nic = _nicDao.findByIp4AddressAndVmId(privateIp, vm.getId());
+ NicVO nic = _nicDao.findFirstNicForVM(vm.getId());
List<String> nicSecIps = null;
if (nic != null) {
if (nic.getSecondaryIp()) {
//get secondary ips of the vm
nicSecIps = _nicSecIpDao.getSecondaryIpAddressesForNic(nic.getId());
}
+ } else {
+ return;
}
- SecurityGroupRulesCmd cmd = generateRulesetCmd(vm.getInstanceName(), nic.getIPv6Address(), vm.getPrivateIpAddress(), vm.getPrivateMacAddress(), vm.getId(),
+ SecurityGroupRulesCmd cmd = generateRulesetCmd(vm.getInstanceName(), nic.getIPv4Address(), nic.getIPv6Address(), vm.getPrivateMacAddress(), vm.getId(),
generateRulesetSignature(ingressRules, egressRules), seqnum, ingressRules, egressRules, nicSecIps);
Commands cmds = new Commands(cmd);
try {
@@ -1098,6 +1156,60 @@
@DB
@Override
+ @ActionEvent(eventType = EventTypes.EVENT_SECURITY_GROUP_UPDATE, eventDescription = "updating security group")
+ public SecurityGroup updateSecurityGroup(UpdateSecurityGroupCmd cmd) {
+ final Long groupId = cmd.getId();
+ final String newName = cmd.getName();
+ Account caller = CallContext.current().getCallingAccount();
+
+ SecurityGroupVO group = _securityGroupDao.findById(groupId);
+ if (group == null) {
+ throw new InvalidParameterValueException("Unable to find security group: " + groupId + "; failed to update security group.");
+ }
+
+ if (newName == null) {
+ s_logger.debug("security group name is not changed. id=" + groupId);
+ return group;
+ }
+
+ if (StringUtils.isBlank(newName)) {
+ throw new InvalidParameterValueException("Security group name cannot be empty");
+ }
+
+ // check permissions
+ _accountMgr.checkAccess(caller, null, true, group);
+
+ return Transaction.execute(new TransactionCallback<SecurityGroupVO>() {
+ @Override
+ public SecurityGroupVO doInTransaction(TransactionStatus status) {
+ SecurityGroupVO group = _securityGroupDao.lockRow(groupId, true);
+ if (group == null) {
+ throw new InvalidParameterValueException("Unable to find security group by id " + groupId);
+ }
+
+ if (newName.equals(group.getName())) {
+ s_logger.debug("security group name is not changed. id=" + groupId);
+ return group;
+ } else if (newName.equalsIgnoreCase(SecurityGroupManager.DEFAULT_GROUP_NAME)) {
+ throw new InvalidParameterValueException("The security group name " + SecurityGroupManager.DEFAULT_GROUP_NAME + " is reserved");
+ }
+
+ if (group.getName().equalsIgnoreCase(SecurityGroupManager.DEFAULT_GROUP_NAME)) {
+ throw new InvalidParameterValueException("The default security group cannot be renamed");
+ }
+
+ group.setName(newName);
+ _securityGroupDao.update(groupId, group);
+
+ s_logger.debug("Updated security group id=" + groupId);
+
+ return group;
+ }
+ });
+ }
+
+ @DB
+ @Override
@ActionEvent(eventType = EventTypes.EVENT_SECURITY_GROUP_DELETE, eventDescription = "deleting security group")
public boolean deleteSecurityGroup(DeleteSecurityGroupCmd cmd) throws ResourceInUseException {
final Long groupId = cmd.getId();
@@ -1336,7 +1448,7 @@
return true;
}
- String vmMac = vm.getPrivateMacAddress();
+ String vmMac = nic.getMacAddress();
String vmName = vm.getInstanceName();
if (vmMac == null || vmName == null) {
throw new InvalidParameterValueException("vm name or vm mac can't be null");
diff --git a/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl2.java b/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl2.java
index 2d0ec61..5b4b85f 100644
--- a/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl2.java
+++ b/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl2.java
@@ -177,16 +177,17 @@
Map<PortAndProto, Set<String>> egressRules = generateRulesForVM(userVmId, SecurityRuleType.EgressRule);
Long agentId = vm.getHostId();
if (agentId != null) {
- String privateIp = vm.getPrivateIpAddress();
- NicVO nic = _nicDao.findByIp4AddressAndVmId(privateIp, vm.getId());
+ NicVO nic = _nicDao.findFirstNicForVM(vm.getId());
List<String> nicSecIps = null;
if (nic != null) {
if (nic.getSecondaryIp()) {
nicSecIps = _nicSecIpDao.getSecondaryIpAddressesForNic(nic.getId());
}
+ } else {
+ return;
}
SecurityGroupRulesCmd cmd =
- generateRulesetCmd(vm.getInstanceName(), vm.getPrivateIpAddress(), nic.getIPv6Address(), vm.getPrivateMacAddress(), vm.getId(), null, work.getLogsequenceNumber(),
+ generateRulesetCmd(vm.getInstanceName(), nic.getIPv4Address(), nic.getIPv6Address(), vm.getPrivateMacAddress(), vm.getId(), null, work.getLogsequenceNumber(),
ingressRules, egressRules, nicSecIps);
cmd.setMsId(_serverId);
if (s_logger.isDebugEnabled()) {
diff --git a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
index 620e551..881c37d 100644
--- a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
@@ -46,6 +46,7 @@
import org.apache.cloudstack.api.command.user.vpc.ListPrivateGatewaysCmd;
import org.apache.cloudstack.api.command.user.vpc.ListStaticRoutesCmd;
import org.apache.cloudstack.api.command.user.vpc.ListVPCOfferingsCmd;
+import org.apache.cloudstack.api.command.user.vpc.RestartVPCCmd;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
@@ -1697,16 +1698,21 @@
return success;
}
+
@Override
@ActionEvent(eventType = EventTypes.EVENT_VPC_RESTART, eventDescription = "restarting vpc")
- public boolean restartVpc(final long vpcId, final boolean cleanUp, final boolean makeRedundant) throws ConcurrentOperationException, ResourceUnavailableException,
+ public boolean restartVpc(final RestartVPCCmd cmd) throws ConcurrentOperationException, ResourceUnavailableException,
InsufficientCapacityException {
-
- final Account callerAccount = CallContext.current().getCallingAccount();
+ final long vpcId = cmd.getId();
+ final boolean cleanUp = cmd.getCleanup();
+ final boolean makeRedundant = cmd.getMakeredundant();
final User callerUser = _accountMgr.getActiveUser(CallContext.current().getCallingUserId());
- final ReservationContext context = new ReservationContextImpl(null, null, callerUser, callerAccount);
+ return restartVpc(vpcId, cleanUp, makeRedundant, callerUser);
+ }
- // Verify input parameters
+ @Override
+ @ActionEvent(eventType = EventTypes.EVENT_VPC_RESTART, eventDescription = "restarting vpc")
+ public boolean restartVpc(Long vpcId, boolean cleanUp, boolean makeRedundant, User user) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException {
Vpc vpc = getActiveVpc(vpcId);
if (vpc == null) {
final InvalidParameterValueException ex = new InvalidParameterValueException("Unable to find Enabled VPC by id specified");
@@ -1714,6 +1720,8 @@
throw ex;
}
+ Account callerAccount = _accountMgr.getActiveAccountById(user.getAccountId());
+ final ReservationContext context = new ReservationContextImpl(null, null, user, callerAccount);
_accountMgr.checkAccess(callerAccount, null, false, vpc);
s_logger.debug("Restarting VPC " + vpc);
@@ -1747,7 +1755,7 @@
return true;
}
- restartVPCNetworks(vpcId, callerAccount, callerUser, cleanUp);
+ restartVPCNetworks(vpcId, callerAccount, user, cleanUp);
s_logger.debug("Starting VPC " + vpc + " as a part of VPC restart process without cleanup");
if (!startVpc(vpcId, false)) {
@@ -1808,7 +1816,7 @@
@DB
@ActionEvent(eventType = EventTypes.EVENT_PRIVATE_GATEWAY_CREATE, eventDescription = "creating VPC private gateway", create = true)
public PrivateGateway createVpcPrivateGateway(final long vpcId, Long physicalNetworkId, final String broadcastUri, final String ipAddress, final String gateway,
- final String netmask, final long gatewayOwnerId, final Long networkOfferingId, final Boolean isSourceNat, final Long aclId) throws ResourceAllocationException,
+ final String netmask, final long gatewayOwnerId, final Long networkOfferingId, final Boolean isSourceNat, final Long aclId, final Boolean bypassVlanOverlapCheck) throws ResourceAllocationException,
ConcurrentOperationException, InsufficientCapacityException {
// Validate parameters
@@ -1849,7 +1857,7 @@
Network privateNtwk = null;
if (BroadcastDomainType.getSchemeValue(BroadcastDomainType.fromString(broadcastUri)) == BroadcastDomainType.Lswitch) {
final String cidr = NetUtils.ipAndNetMaskToCidr(gateway, netmask);
- privateNtwk = _ntwkDao.getPrivateNetwork(broadcastUri, cidr, gatewayOwnerId, dcId, networkOfferingId);
+ privateNtwk = _ntwkDao.getPrivateNetwork(broadcastUri, cidr, gatewayOwnerId, dcId, networkOfferingId, vpcId);
// if the dcid is different we get no network so next we
// try to create it
}
@@ -1857,7 +1865,7 @@
s_logger.info("creating new network for vpc " + vpc + " using broadcast uri: " + broadcastUri);
final String networkName = "vpc-" + vpc.getName() + "-privateNetwork";
privateNtwk = _ntwkSvc.createPrivateNetwork(networkName, networkName, physicalNetworkIdFinal, broadcastUri, ipAddress, null, gateway, netmask,
- gatewayOwnerId, vpcId, isSourceNat, networkOfferingId);
+ gatewayOwnerId, vpcId, isSourceNat, networkOfferingId, bypassVlanOverlapCheck);
} else { // create the nic/ip as createPrivateNetwork
// doesn''t do that work for us now
s_logger.info("found and using existing network for vpc " + vpc + ": " + broadcastUri);
@@ -2572,7 +2580,7 @@
// 2) Create network
final Network guestNetwork = _ntwkMgr.createGuestNetwork(ntwkOffId, name, displayText, gateway, cidr, vlanId, false, networkDomain, owner, domainId, pNtwk, zoneId, aclType,
- subdomainAccess, vpcId, null, null, isDisplayNetworkEnabled, null, externalId);
+ subdomainAccess, vpcId, null, null, isDisplayNetworkEnabled, null, null, externalId);
if (guestNetwork != null) {
guestNetwork.setNetworkACLId(aclId);
diff --git a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
index d07a438..c1c221b 100755
--- a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
@@ -26,7 +26,6 @@
import java.util.List;
import java.util.Map;
import java.util.Random;
-import java.util.concurrent.ConcurrentHashMap;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
@@ -274,8 +273,6 @@
private SearchBuilder<HostGpuGroupsVO> _gpuAvailability;
- private Map<Long,Integer> retryHostMaintenance = new ConcurrentHashMap<>();
-
private void insertListener(final Integer event, final ResourceListener listener) {
List<ResourceListener> lst = _lifeCycleListeners.get(event);
if (lst == null) {
@@ -1165,6 +1162,10 @@
throw new InvalidParameterValueException("Host with id " + hostId.toString() + " doesn't exist");
}
+ if (!ResourceState.isMaintenanceState(host.getResourceState())) {
+ throw new CloudRuntimeException("Cannot perform cancelMaintenance when resource state is " + host.getResourceState() + ", hostId = " + hostId);
+ }
+
processResourceEvent(ResourceListener.EVENT_CANCEL_MAINTENANCE_BEFORE, hostId);
final boolean success = cancelMaintenance(hostId);
processResourceEvent(ResourceListener.EVENT_CANCEL_MAINTENANCE_AFTER, hostId);
@@ -1212,6 +1213,12 @@
private boolean doMaintain(final long hostId) {
final HostVO host = _hostDao.findById(hostId);
+ s_logger.info("Maintenance: attempting maintenance of host " + host.getUuid());
+ ResourceState hostState = host.getResourceState();
+ if (!ResourceState.canAttemptMaintenance(hostState)) {
+ throw new CloudRuntimeException("Cannot perform maintain when resource state is " + hostState + ", hostId = " + hostId);
+ }
+
final MaintainAnswer answer = (MaintainAnswer)_agentMgr.easySend(hostId, new MaintainCommand());
if (answer == null || !answer.getResult()) {
s_logger.warn("Unable to send MaintainCommand to host: " + hostId);
@@ -1219,7 +1226,7 @@
}
try {
- resourceStateTransitTo(host, ResourceState.Event.AdminAskMaintenace, _nodeId);
+ resourceStateTransitTo(host, ResourceState.Event.AdminAskMaintenance, _nodeId);
} catch (final NoTransitionException e) {
final String err = "Cannot transmit resource state of host " + host.getId() + " to " + ResourceState.Maintenance;
s_logger.debug(err, e);
@@ -1228,7 +1235,6 @@
ActionEventUtils.onStartedActionEvent(CallContext.current().getCallingUserId(), CallContext.current().getCallingAccountId(), EventTypes.EVENT_MAINTENANCE_PREPARE, "starting maintenance for host " + hostId, true, 0);
_agentMgr.pullAgentToMaintenance(hostId);
- setHostMaintenanceRetries(host);
/* TODO: move below to listener */
if (host.getType() == Host.Type.Routing) {
@@ -1244,11 +1250,13 @@
|| _serviceOfferingDetailsDao.findDetail(vm.getServiceOfferingId(), GPU.Keys.vgpuType.toString()) != null) {
// Migration is not supported for VGPU Vms so stop them.
// for the last host in this cluster, stop all the VMs
+ s_logger.error("Maintenance: No hosts available for migrations. Scheduling shutdown instead of migrations.");
_haMgr.scheduleStop(vm, hostId, WorkType.ForceStop);
} else if (HypervisorType.LXC.equals(host.getHypervisorType()) && VirtualMachine.Type.User.equals(vm.getType())){
//Migration is not supported for LXC Vms. Schedule restart instead.
_haMgr.scheduleRestart(vm, false);
} else {
+ s_logger.info("Maintenance: scheduling migration of VM " + vm.getUuid() + " from host " + host.getUuid());
_haMgr.scheduleMigration(vm);
}
}
@@ -1256,19 +1264,9 @@
return true;
}
- /**
- * Set retries for transiting the host into Maintenance
- */
- protected void setHostMaintenanceRetries(HostVO host) {
- Integer retries = HostMaintenanceRetries.valueIn(host.getClusterId());
- retryHostMaintenance.put(host.getId(), retries);
- s_logger.debug(String.format("Setting the host %s (%s) retries for Maintenance mode: %s",
- host.getId(), host.getName(), retries));
- }
-
@Override
public boolean maintain(final long hostId) throws AgentUnavailableException {
- final Boolean result = propagateResourceEvent(hostId, ResourceState.Event.AdminAskMaintenace);
+ final Boolean result = propagateResourceEvent(hostId, ResourceState.Event.AdminAskMaintenance);
if (result != null) {
return result;
}
@@ -1285,13 +1283,29 @@
s_logger.debug("Unable to find host " + hostId);
throw new InvalidParameterValueException("Unable to find host with ID: " + hostId + ". Please specify a valid host ID.");
}
+ if (!ResourceState.canAttemptMaintenance(host.getResourceState())) {
+ throw new CloudRuntimeException("Host is already in state " + host.getResourceState() + ". Cannot recall for maintenance until resolved.");
+ }
- if (_hostDao.countBy(host.getClusterId(), ResourceState.PrepareForMaintenance, ResourceState.ErrorInMaintenance) > 0) {
- throw new InvalidParameterValueException("There are other servers in PrepareForMaintenance OR ErrorInMaintenance STATUS in cluster " + host.getClusterId());
+ if (_hostDao.countBy(host.getClusterId(), ResourceState.PrepareForMaintenance, ResourceState.ErrorInPrepareForMaintenance) > 0) {
+ throw new CloudRuntimeException("There are other servers attempting migrations for maintenance. " +
+ "Found hosts in PrepareForMaintenance OR ErrorInPrepareForMaintenance STATUS in cluster " + host.getClusterId());
}
if (_storageMgr.isLocalStorageActiveOnHost(host.getId())) {
- throw new InvalidParameterValueException("There are active VMs using the host's local storage pool. Please stop all VMs on this host that use local storage.");
+ throw new CloudRuntimeException("There are active VMs using the host's local storage pool. Please stop all VMs on this host that use local storage.");
+ }
+ List<VMInstanceVO> migratingInVMs = _vmDao.findByHostInStates(hostId, State.Migrating);
+ if (migratingInVMs.size() > 0) {
+ throw new CloudRuntimeException("Host contains incoming VMs migrating. Please wait for them to complete before putting to maintenance.");
+ }
+
+ if (_vmDao.findByHostInStates(hostId, State.Starting, State.Stopping).size() > 0) {
+ throw new CloudRuntimeException("Host contains VMs in starting/stopping state. Please wait for them to complete before putting to maintenance.");
+ }
+
+ if (_vmDao.findByHostInStates(hostId, State.Error, State.Unknown).size() > 0) {
+ throw new CloudRuntimeException("Host contains VMs in error/unknown/shutdown state. Please fix errors to proceed.");
}
try {
@@ -1332,19 +1346,6 @@
}
/**
- * Set host into ErrorInMaintenance state, as errors occurred during VM migrations. Do the following:
- * - Cancel scheduled migrations for those which have already failed
- * - Configure VNC access for VMs (KVM hosts only)
- */
- protected boolean setHostIntoErrorInMaintenance(HostVO host, List<VMInstanceVO> failedMigrations) throws NoTransitionException {
- s_logger.debug("Unable to migrate " + failedMigrations.size() + " VM(s) from host " + host.getUuid());
- _haMgr.cancelScheduledMigrations(host);
- configureVncAccessForKVMHostFailedMigrations(host, failedMigrations);
- resourceStateTransitTo(host, ResourceState.Event.UnableToMigrate, _nodeId);
- return false;
- }
-
- /**
* Safely transit host into Maintenance mode
*/
protected boolean setHostIntoMaintenance(HostVO host) throws NoTransitionException {
@@ -1357,31 +1358,104 @@
}
/**
- * Return true if host goes into Maintenance mode, only when:
- * - No Running, Migrating or Failed migrations (host_id = last_host_id) for the host
+ * Set host into ErrorInMaintenance state, as errors occurred during VM migrations. Do the following:
+ * - Cancel scheduled migrations for those which have already failed
+ * - Configure VNC access for VMs (KVM hosts only)
*/
- protected boolean isHostInMaintenance(HostVO host, List<VMInstanceVO> runningVms, List<VMInstanceVO> migratingVms, List<VMInstanceVO> failedMigrations) throws NoTransitionException {
- if (CollectionUtils.isEmpty(runningVms) && CollectionUtils.isEmpty(migratingVms)) {
- return CollectionUtils.isEmpty(failedMigrations) ?
- setHostIntoMaintenance(host) :
- setHostIntoErrorInMaintenance(host, failedMigrations);
- } else if (retryHostMaintenance.containsKey(host.getId())) {
- Integer retriesLeft = retryHostMaintenance.get(host.getId());
- if (retriesLeft != null) {
- if (retriesLeft <= 0) {
- retryHostMaintenance.remove(host.getId());
- s_logger.debug(String.format("No retries left while preparing KVM host %s (%s) for Maintenance, " +
- "please investigate this connection.",
- host.getId(), host.getName()));
- return setHostIntoErrorInMaintenance(host, failedMigrations);
- }
- retriesLeft--;
- retryHostMaintenance.put(host.getId(), retriesLeft);
- s_logger.debug(String.format("Retries left preparing KVM host %s (%s) for Maintenance: %s",
- host.getId(), host.getName(), retriesLeft));
+ protected boolean setHostIntoErrorInMaintenance(HostVO host, List<VMInstanceVO> errorVms) throws NoTransitionException {
+ s_logger.debug("Unable to migrate / fix errors for " + errorVms.size() + " VM(s) from host " + host.getUuid());
+ _haMgr.cancelScheduledMigrations(host);
+ configureVncAccessForKVMHostFailedMigrations(host, errorVms);
+ resourceStateTransitTo(host, ResourceState.Event.UnableToMaintain, _nodeId);
+ return false;
+ }
+
+ protected boolean setHostIntoErrorInPrepareForMaintenance(HostVO host, List<VMInstanceVO> errorVms) throws NoTransitionException {
+ s_logger.debug("Host " + host.getUuid() + " entering in PrepareForMaintenanceWithErrors state");
+ configureVncAccessForKVMHostFailedMigrations(host, errorVms);
+ resourceStateTransitTo(host, ResourceState.Event.UnableToMigrate, _nodeId);
+ return false;
+ }
+
+ protected boolean setHostIntoPrepareForMaintenanceAfterErrorsFixed(HostVO host) throws NoTransitionException {
+ s_logger.debug("Host " + host.getUuid() + " entering in PrepareForMaintenance state as any previous corrections have been fixed");
+ resourceStateTransitTo(host, ResourceState.Event.ErrorsCorrected, _nodeId);
+ return false;
+ }
+
+ /**
+ * Return true if host goes into Maintenance mode. There are various possibilities for VMs' states
+ * on a host. We need to track the various VM states on each run and accordingly transit to the
+ * appropriate state.
+ *
+ * We change states as follws -
+ * 1. If there are no VMs in running, migrating, starting, stopping, error, unknown states we can move
+ * to maintenance state. Note that there cannot be incoming migrations as the API Call prepare for
+ * maintenance checks incoming migrations before starting.
+ * 2. If there errors (like migrating VMs, error VMs, etc) we mark as ErrorInPrepareForMaintenance but
+ * don't stop remaining migrations/ongoing legitimate operations.
+ * 3. If all migration retries, legitimate operations have finished we check for VMs on the host and if
+ * there are still VMs in error state or in running state or failed migrations we mark the VM as
+ * ErrorInMaintenance state.
+ * 4. Lastly if there are no errors or failed migrations or running VMs but there are still pending
+ * legitimate operations and the host was in ErrorInPrepareForMaintenance, we push the host back
+ * to PrepareForMaintenance state.
+ */
+ protected boolean attemptMaintain(HostVO host) throws NoTransitionException {
+ final long hostId = host.getId();
+
+ s_logger.info("Attempting maintenance for host " + host.getName());
+
+ // Step 0: First gather if VMs have pending HAWork for migration with retries left.
+ final List<VMInstanceVO> allVmsOnHost = _vmDao.listByHostId(hostId);
+ final boolean hasMigratingAwayVms = CollectionUtils.isNotEmpty(_vmDao.listVmsMigratingFromHost(hostId));
+ boolean hasPendingMigrationRetries = false;
+ for (VMInstanceVO vmInstanceVO : allVmsOnHost) {
+ if (_haMgr.hasPendingMigrationsWork(vmInstanceVO.getId())) {
+ s_logger.info("Attempting maintenance for " + host + " found pending migration for VM " + vmInstanceVO);
+ hasPendingMigrationRetries = true;
+ break;
}
}
+ // Step 1: If there are no VMs in migrating, running, starting, stopping, error or unknown state we can safely move the host to maintenance.
+ if (!hasMigratingAwayVms && CollectionUtils.isEmpty(_vmDao.findByHostInStates(host.getId(),
+ State.Migrating, State.Running, State.Starting, State.Stopping, State.Error, State.Unknown))) {
+ if (hasPendingMigrationRetries) {
+ s_logger.error("There should not be pending retries VMs for this host as there are no running, migrating," +
+ "starting, stopping, error or unknown states on host " + host);
+ }
+ return setHostIntoMaintenance(host);
+ }
+
+ // Step 2: Gather relevant VMs' states on the host and then based on them we can determine if
+ final List<VMInstanceVO> failedMigrations = new ArrayList<>(_vmDao.listNonMigratingVmsByHostEqualsLastHost(hostId));
+ final List<VMInstanceVO> errorVms = new ArrayList<>(_vmDao.findByHostInStates(hostId, State.Unknown, State.Error));
+ final boolean hasRunningVms = CollectionUtils.isNotEmpty(_vmDao.findByHostInStates(hostId, State.Running));
+ final boolean hasFailedMigrations = CollectionUtils.isNotEmpty(failedMigrations);
+ final boolean hasVmsInFailureStates = CollectionUtils.isNotEmpty(errorVms);
+ final boolean hasStoppingVms = CollectionUtils.isNotEmpty(_vmDao.findByHostInStates(hostId, State.Stopping));
+ errorVms.addAll(failedMigrations);
+
+ // Step 3: If there are no pending migration retries but host still has running VMs or,
+ // host has VMs in failure state / failed migrations we move the host to ErrorInMaintenance state.
+ if ((!hasPendingMigrationRetries && !hasMigratingAwayVms && hasRunningVms) ||
+ (!hasRunningVms && !hasMigratingAwayVms && hasVmsInFailureStates)) {
+ return setHostIntoErrorInMaintenance(host, errorVms);
+ }
+
+ // Step 4: IF there are pending migrations or ongoing retries left or stopping VMs and there were errors or failed
+ // migrations we put the host into ErrorInPrepareForMaintenance
+ if ((hasPendingMigrationRetries || hasMigratingAwayVms || hasStoppingVms) && (hasVmsInFailureStates || hasFailedMigrations)) {
+ return setHostIntoErrorInPrepareForMaintenance(host, errorVms);
+ }
+
+ // Step 5: If there were previously errors found, but not anymore it means the operator has fixed errors and we put
+ // the host into PrepareForMaintenance state.
+ if (host.getResourceState() == ResourceState.ErrorInPrepareForMaintenance) {
+ return setHostIntoPrepareForMaintenanceAfterErrorsFixed(host);
+ }
+
return false;
}
@@ -1392,14 +1466,10 @@
try {
if (host.getType() != Host.Type.Storage) {
- final List<VMInstanceVO> vos = _vmDao.listByHostId(hostId);
- final List<VMInstanceVO> vosMigrating = _vmDao.listVmsMigratingFromHost(hostId);
- final List<VMInstanceVO> failedVmMigrations = _vmDao.listNonMigratingVmsByHostEqualsLastHost(hostId);
-
- hostInMaintenance = isHostInMaintenance(host, vos, vosMigrating, failedVmMigrations);
+ hostInMaintenance = attemptMaintain(host);
}
} catch (final NoTransitionException e) {
- s_logger.debug("Cannot transmit host " + host.getId() + "to Maintenance state", e);
+ s_logger.debug("Cannot transmit host " + host.getId() + " to Maintenance state", e);
}
return hostInMaintenance;
}
@@ -2327,8 +2397,7 @@
* TODO: think twice about returning true or throwing out exception, I
* really prefer to exception that always exposes bugs
*/
- if (host.getResourceState() != ResourceState.PrepareForMaintenance && host.getResourceState() != ResourceState.Maintenance &&
- host.getResourceState() != ResourceState.ErrorInMaintenance) {
+ if (!ResourceState.isMaintenanceState(host.getResourceState())) {
throw new CloudRuntimeException("Cannot perform cancelMaintenance when resource state is " + host.getResourceState() + ", hostId = " + hostId);
}
@@ -2349,7 +2418,6 @@
try {
resourceStateTransitTo(host, ResourceState.Event.AdminCancelMaintenance, _nodeId);
_agentMgr.pullAgentOutMaintenance(hostId);
- retryHostMaintenance.remove(hostId);
} catch (final NoTransitionException e) {
s_logger.debug("Cannot transmit host " + host.getId() + "to Enabled state", e);
return false;
@@ -2417,7 +2485,7 @@
}
}
- private boolean cancelMaintenance(final long hostId) {
+ public boolean cancelMaintenance(final long hostId) {
try {
final Boolean result = propagateResourceEvent(hostId, ResourceState.Event.AdminCancelMaintenance);
@@ -2433,7 +2501,7 @@
@Override
public boolean executeUserRequest(final long hostId, final ResourceState.Event event) throws AgentUnavailableException {
- if (event == ResourceState.Event.AdminAskMaintenace) {
+ if (event == ResourceState.Event.AdminAskMaintenance) {
return doMaintain(hostId);
} else if (event == ResourceState.Event.AdminCancelMaintenance) {
return doCancelMaintenance(hostId);
@@ -2561,7 +2629,7 @@
return null;
}
- s_logger.debug("Propagating resource request event:" + event.toString() + " to agent:" + agentId);
+ s_logger.debug("Propagating resource request event:" + event.toString() + " to agent:" + agentId);
final Command[] cmds = new Command[1];
cmds[0] = new PropagateResourceEventCommand(agentId, event);
@@ -2580,7 +2648,7 @@
}
@Override
- public boolean maintenanceFailed(final long hostId) {
+ public boolean migrateAwayFailed(final long hostId, final long vmId) {
final HostVO host = _hostDao.findById(hostId);
if (host == null) {
if (s_logger.isDebugEnabled()) {
@@ -2589,6 +2657,8 @@
return false;
} else {
try {
+ s_logger.warn("Migration of VM " + _vmDao.findById(vmId) + " failed from host " + _hostDao.findById(hostId) +
+ ". Emitting event UnableToMigrate.");
return resourceStateTransitTo(host, ResourceState.Event.UnableToMigrate, _nodeId);
} catch (final NoTransitionException e) {
s_logger.debug("No next resource state for host " + host.getId() + " while current state is " + host.getResourceState() + " with event " +
@@ -2704,7 +2774,11 @@
sc.and(sc.entity().getDataCenterId(), Op.EQ, dcId);
}
sc.and(sc.entity().getType(), Op.EQ, type);
- sc.and(sc.entity().getResourceState(), Op.NIN, ResourceState.Maintenance, ResourceState.ErrorInMaintenance, ResourceState.PrepareForMaintenance,
+ sc.and(sc.entity().getResourceState(), Op.NIN,
+ ResourceState.Maintenance,
+ ResourceState.ErrorInMaintenance,
+ ResourceState.ErrorInPrepareForMaintenance,
+ ResourceState.PrepareForMaintenance,
ResourceState.Error);
return sc.list();
}
@@ -2981,6 +3055,6 @@
@Override
public ConfigKey<?>[] getConfigKeys() {
- return new ConfigKey<?>[] {HostMaintenanceRetries};
+ return new ConfigKey[0];
}
}
diff --git a/server/src/main/java/com/cloud/resource/RollingMaintenanceManagerImpl.java b/server/src/main/java/com/cloud/resource/RollingMaintenanceManagerImpl.java
new file mode 100644
index 0000000..62bb30e
--- /dev/null
+++ b/server/src/main/java/com/cloud/resource/RollingMaintenanceManagerImpl.java
@@ -0,0 +1,734 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.resource;
+
+import com.cloud.agent.AgentManager;
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.RollingMaintenanceAnswer;
+import com.cloud.agent.api.RollingMaintenanceCommand;
+import com.cloud.alert.AlertManager;
+import com.cloud.capacity.CapacityManager;
+import com.cloud.dc.ClusterDetailsDao;
+import com.cloud.dc.ClusterDetailsVO;
+import com.cloud.deploy.DeployDestination;
+import com.cloud.event.ActionEventUtils;
+import com.cloud.event.EventVO;
+import com.cloud.exception.AgentUnavailableException;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.OperationTimedoutException;
+import com.cloud.host.Host;
+import com.cloud.host.HostVO;
+import com.cloud.host.Status;
+import com.cloud.host.dao.HostDao;
+import com.cloud.host.dao.HostTagsDao;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.org.Cluster;
+import com.cloud.org.Grouping;
+import com.cloud.service.ServiceOfferingVO;
+import com.cloud.service.dao.ServiceOfferingDao;
+import com.cloud.utils.Pair;
+import com.cloud.utils.Ternary;
+import com.cloud.utils.component.ManagerBase;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.VirtualMachine.State;
+import com.cloud.vm.VirtualMachineProfileImpl;
+import com.cloud.vm.dao.VMInstanceDao;
+import org.apache.cloudstack.affinity.AffinityGroupProcessor;
+import org.apache.cloudstack.api.command.admin.host.PrepareForMaintenanceCmd;
+import org.apache.cloudstack.api.command.admin.resource.StartRollingMaintenanceCmd;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.log4j.Logger;
+
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class RollingMaintenanceManagerImpl extends ManagerBase implements RollingMaintenanceManager {
+
+ @Inject
+ private HostDao hostDao;
+ @Inject
+ private AgentManager agentManager;
+ @Inject
+ private ResourceManager resourceManager;
+ @Inject
+ private CapacityManager capacityManager;
+ @Inject
+ private VMInstanceDao vmInstanceDao;
+ @Inject
+ private ServiceOfferingDao serviceOfferingDao;
+ @Inject
+ private ClusterDetailsDao clusterDetailsDao;
+ @Inject
+ private HostTagsDao hostTagsDao;
+ @Inject
+ private AlertManager alertManager;
+
+ protected List<AffinityGroupProcessor> _affinityProcessors;
+
+ public void setAffinityGroupProcessors(List<AffinityGroupProcessor> affinityProcessors) {
+ _affinityProcessors = affinityProcessors;
+ }
+
+ public static final Logger s_logger = Logger.getLogger(RollingMaintenanceManagerImpl.class.getName());
+
+ private Pair<ResourceType, List<Long>> getResourceTypeAndIdPair(List<Long> podIds, List<Long> clusterIds, List<Long> zoneIds, List<Long> hostIds) {
+ Pair<ResourceType, List<Long>> pair = CollectionUtils.isNotEmpty(podIds) ? new Pair<>(ResourceType.Pod, podIds) :
+ CollectionUtils.isNotEmpty(clusterIds) ? new Pair<>(ResourceType.Cluster, clusterIds) :
+ CollectionUtils.isNotEmpty(zoneIds) ? new Pair<>(ResourceType.Zone, zoneIds) :
+ CollectionUtils.isNotEmpty(hostIds) ? new Pair<>(ResourceType.Host, hostIds) : null;
+ if (pair == null) {
+ throw new CloudRuntimeException("Parameters podId, clusterId, zoneId, hostId are mutually exclusive, " +
+ "please set only one of them");
+ }
+ return pair;
+ }
+
+ @Override
+ public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
+ return true;
+ }
+
+ private void updateCluster(long clusterId, String state) {
+ Cluster cluster = resourceManager.getCluster(clusterId);
+ if (cluster == null) {
+ throw new InvalidParameterValueException("Unable to find the cluster by id=" + clusterId);
+ }
+ resourceManager.updateCluster(cluster, "", "", state, "");
+ }
+
+ private void generateReportAndFinishingEvent(StartRollingMaintenanceCmd cmd, boolean success, String details,
+ List<HostUpdated> hostsUpdated, List<HostSkipped> hostsSkipped) {
+ Pair<ResourceType, List<Long>> pair = getResourceTypeIdPair(cmd);
+ ResourceType entity = pair.first();
+ List<Long> ids = pair.second();
+
+ String description = String.format("Success: %s, details: %s, hosts updated: %s, hosts skipped: %s", success, details,
+ generateReportHostsUpdated(hostsUpdated), generateReportHostsSkipped(hostsSkipped));
+ ActionEventUtils.onCompletedActionEvent(CallContext.current().getCallingUserId(), CallContext.current().getCallingAccountId(),
+ EventVO.LEVEL_INFO, cmd.getEventType(),
+ "Completed rolling maintenance for entity " + entity + " with IDs: " + ids + " - " + description, 0);
+ }
+
+ private String generateReportHostsUpdated(List<HostUpdated> hostsUpdated) {
+ StringBuilder stringBuilder = new StringBuilder();
+ stringBuilder.append(hostsUpdated.size());
+ return stringBuilder.toString();
+ }
+
+ private String generateReportHostsSkipped(List<HostSkipped> hostsSkipped) {
+ StringBuilder stringBuilder = new StringBuilder();
+ stringBuilder.append(hostsSkipped.size());
+ return stringBuilder.toString();
+ }
+
+ @Override
+ public Ternary<Boolean, String, Pair<List<HostUpdated>, List<HostSkipped>>> startRollingMaintenance(StartRollingMaintenanceCmd cmd) {
+ Pair<ResourceType, List<Long>> pair = getResourceTypeAndIdPair(cmd.getPodIds(), cmd.getClusterIds(), cmd.getZoneIds(), cmd.getHostIds());
+ ResourceType type = pair.first();
+ List<Long> ids = pair.second();
+ int timeout = cmd.getTimeout() == null ? KvmRollingMaintenanceStageTimeout.value() : cmd.getTimeout();
+ String payload = cmd.getPayload();
+ Boolean forced = cmd.getForced();
+
+ Set<Long> disabledClusters = new HashSet<>();
+ Map<Long, String> hostsToAvoidMaintenance = new HashMap<>();
+
+ boolean success = false;
+ String details = null;
+ List<HostUpdated> hostsUpdated = new ArrayList<>();
+ List<HostSkipped> hostsSkipped = new ArrayList<>();
+
+ if (timeout <= KvmRollingMaintenancePingInterval.value()) {
+ return new Ternary<>(success, "The timeout value provided must be greater or equal than the ping interval " +
+ "defined in '" + KvmRollingMaintenancePingInterval.key() + "'", new Pair<>(hostsUpdated, hostsSkipped));
+ }
+
+ try {
+ Map<Long, List<Host>> hostsByCluster = getHostsByClusterForRollingMaintenance(type, ids);
+
+ for (Long clusterId : hostsByCluster.keySet()) {
+ Cluster cluster = resourceManager.getCluster(clusterId);
+ List<Host> hosts = hostsByCluster.get(clusterId);
+
+ if (!isMaintenanceAllowedByVMStates(cluster, hosts, hostsSkipped)) {
+ if (forced) {
+ continue;
+ }
+ success = false;
+ details = "VMs in invalid states in cluster: " + cluster.getUuid();
+ return new Ternary<>(success, details, new Pair<>(hostsUpdated, hostsSkipped));
+ }
+ disableClusterIfEnabled(cluster, disabledClusters);
+
+ s_logger.debug("State checks on the hosts in the cluster");
+ performStateChecks(cluster, hosts, forced, hostsSkipped);
+ s_logger.debug("Checking hosts capacity before attempting rolling maintenance");
+ performCapacityChecks(cluster, hosts, forced);
+ s_logger.debug("Attempting pre-flight stages on each host before starting rolling maintenance");
+ performPreFlightChecks(hosts, timeout, payload, forced, hostsToAvoidMaintenance);
+
+ for (Host host: hosts) {
+ Ternary<Boolean, Boolean, String> hostResult = startRollingMaintenanceHostInCluster(cluster, host,
+ timeout, payload, forced, hostsToAvoidMaintenance, hostsUpdated, hostsSkipped);
+ if (hostResult.second()) {
+ continue;
+ }
+ if (hostResult.first()) {
+ success = false;
+ details = hostResult.third();
+ return new Ternary<>(success, details, new Pair<>(hostsUpdated, hostsSkipped));
+ }
+ }
+ enableClusterIfDisabled(cluster, disabledClusters);
+ }
+ } catch (AgentUnavailableException | InterruptedException | CloudRuntimeException e) {
+ String err = "Error starting rolling maintenance: " + e.getMessage();
+ s_logger.error(err, e);
+ success = false;
+ details = err;
+ return new Ternary<>(success, details, new Pair<>(hostsUpdated, hostsSkipped));
+ } finally {
+ // Enable back disabled clusters
+ for (Long clusterId : disabledClusters) {
+ Cluster cluster = resourceManager.getCluster(clusterId);
+ if (cluster.getAllocationState() == Grouping.AllocationState.Disabled) {
+ updateCluster(clusterId, "Enabled");
+ }
+ }
+ generateReportAndFinishingEvent(cmd, success, details, hostsUpdated, hostsSkipped);
+ }
+ success = true;
+ details = "OK";
+ return new Ternary<>(success, details, new Pair<>(hostsUpdated, hostsSkipped));
+ }
+
+ /**
+ * Perform state checks on the hosts in a cluster
+ */
+ protected void performStateChecks(Cluster cluster, List<Host> hosts, Boolean forced, List<HostSkipped> hostsSkipped) {
+ List<Host> hostsToDrop = new ArrayList<>();
+ for (Host host : hosts) {
+ if (host.getStatus() != Status.Up) {
+ String msg = "Host " + host.getUuid() + " is not connected, state = " + host.getStatus().toString();
+ if (forced) {
+ hostsSkipped.add(new HostSkipped(host, msg));
+ hostsToDrop.add(host);
+ continue;
+ }
+ throw new CloudRuntimeException(msg);
+ }
+ if (host.getResourceState() != ResourceState.Enabled) {
+ String msg = "Host " + host.getUuid() + " is not enabled, state = " + host.getResourceState().toString();
+ if (forced) {
+ hostsSkipped.add(new HostSkipped(host, msg));
+ hostsToDrop.add(host);
+ continue;
+ }
+ throw new CloudRuntimeException(msg);
+ }
+ }
+ if (CollectionUtils.isNotEmpty(hostsToDrop)) {
+ hosts.removeAll(hostsToDrop);
+ }
+ }
+
+ /**
+ * Do not allow rolling maintenance if there are VMs in Starting/Stopping/Migrating/Error/Unknown state
+ */
+ private boolean isMaintenanceAllowedByVMStates(Cluster cluster, List<Host> hosts, List<HostSkipped> hostsSkipped) {
+ for (Host host : hosts) {
+ List<VMInstanceVO> notAllowedStates = vmInstanceDao.findByHostInStates(host.getId(), State.Starting, State.Stopping,
+ State.Migrating, State.Error, State.Unknown);
+ if (notAllowedStates.size() > 0) {
+ String msg = "There are VMs in starting/stopping/migrating/error/unknown state, not allowing rolling maintenance in the cluster";
+ HostSkipped skipped = new HostSkipped(host, msg);
+ hostsSkipped.add(skipped);
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Start rolling maintenance for a single host
+ * @return tuple: (FAIL, SKIP, DETAILS), where:
+ * - FAIL: True if rolling maintenance must fail
+ * - SKIP: True if host must be skipped
+ * - DETAILS: Information retrieved by the host
+ */
+ private Ternary<Boolean, Boolean, String> startRollingMaintenanceHostInCluster(Cluster cluster, Host host, int timeout,
+ String payload, Boolean forced,
+ Map<Long, String> hostsToAvoidMaintenance,
+ List<HostUpdated> hostsUpdated,
+ List<HostSkipped> hostsSkipped) throws InterruptedException, AgentUnavailableException {
+ Ternary<Boolean, Boolean, String> result;
+ if (!isMaintenanceScriptDefinedOnHost(host, hostsSkipped)) {
+ String msg = "There is no maintenance script on the host";
+ hostsSkipped.add(new HostSkipped(host, msg));
+ return new Ternary<>(false, true, msg);
+ }
+
+ result = performPreMaintenanceStageOnHost(host, timeout, payload, forced, hostsToAvoidMaintenance, hostsSkipped);
+ if (result.first() || result.second()) {
+ return result;
+ }
+
+ if (isMaintenanceStageAvoided(host, hostsToAvoidMaintenance, hostsSkipped)) {
+ return new Ternary<>(false, true, "Maintenance stage must be avoided");
+ }
+
+ s_logger.debug("Updating capacity before re-checking capacity");
+ alertManager.recalculateCapacity();
+ result = reCheckCapacityBeforeMaintenanceOnHost(cluster, host, forced, hostsSkipped);
+ if (result.first() || result.second()) {
+ return result;
+ }
+
+ Date startTime = new Date();
+ putHostIntoMaintenance(host);
+ result = performMaintenanceStageOnHost(host, timeout, payload, forced, hostsToAvoidMaintenance, hostsSkipped);
+ if (result.first() || result.second()) {
+ cancelHostMaintenance(host);
+ return result;
+ }
+ cancelHostMaintenance(host);
+ Date endTime = new Date();
+
+ HostUpdated hostUpdated = new HostUpdated(host, startTime, endTime, result.third());
+ hostsUpdated.add(hostUpdated);
+
+ result = performPostMaintenanceStageOnHost(host, timeout, payload, forced, hostsToAvoidMaintenance, hostsSkipped);
+ if (result.first() || result.second()) {
+ return result;
+ }
+ return new Ternary<>(false, false, "Completed rolling maintenance on host " + host.getUuid());
+ }
+
+ /**
+ * Perform Post-Maintenance stage on host
+ * @return tuple: (FAIL, SKIP, DETAILS), where:
+ * - FAIL: True if rolling maintenance must fail
+ * - SKIP: True if host must be skipped
+ * - DETAILS: Information retrieved by the host after executing the stage
+ * @throws InterruptedException
+ */
+ private Ternary<Boolean, Boolean, String> performPostMaintenanceStageOnHost(Host host, int timeout, String payload, Boolean forced, Map<Long, String> hostsToAvoidMaintenance, List<HostSkipped> hostsSkipped) throws InterruptedException {
+ Ternary<Boolean, String, Boolean> result = performStageOnHost(host, Stage.PostMaintenance, timeout, payload, forced);
+ if (!result.first()) {
+ if (forced) {
+ String msg = "Post-maintenance script failed: " + result.second();
+ hostsSkipped.add(new HostSkipped(host, msg));
+ return new Ternary<>(true, true, msg);
+ }
+ return new Ternary<>(true, false, result.second());
+ }
+ return new Ternary<>(false, false, result.second());
+ }
+
+ /**
+ * Cancel maintenance mode on host
+ * @param host host
+ */
+ private void cancelHostMaintenance(Host host) {
+ if (!resourceManager.cancelMaintenance(host.getId())) {
+ String message = "Could not cancel maintenance on host " + host.getUuid();
+ s_logger.error(message);
+ throw new CloudRuntimeException(message);
+ }
+ }
+
+ /**
+ * Perform Maintenance stage on host
+ * @return tuple: (FAIL, SKIP, DETAILS), where:
+ * - FAIL: True if rolling maintenance must fail
+ * - SKIP: True if host must be skipped
+ * - DETAILS: Information retrieved by the host after executing the stage
+ * @throws InterruptedException
+ */
+ private Ternary<Boolean, Boolean, String> performMaintenanceStageOnHost(Host host, int timeout, String payload, Boolean forced, Map<Long, String> hostsToAvoidMaintenance, List<HostSkipped> hostsSkipped) throws InterruptedException {
+ Ternary<Boolean, String, Boolean> result = performStageOnHost(host, Stage.Maintenance, timeout, payload, forced);
+ if (!result.first()) {
+ if (forced) {
+ String msg = "Maintenance script failed: " + result.second();
+ hostsSkipped.add(new HostSkipped(host, msg));
+ return new Ternary<>(true, true, msg);
+ }
+ return new Ternary<>(true, false, result.second());
+ }
+ return new Ternary<>(false, false, result.second());
+ }
+
+ /**
+ * Puts host into maintenance and waits for its completion
+ * @param host host
+ * @throws InterruptedException
+ * @throws AgentUnavailableException
+ */
+ private void putHostIntoMaintenance(Host host) throws InterruptedException, AgentUnavailableException {
+ s_logger.debug("Trying to set the host " + host.getId() + " into maintenance");
+ PrepareForMaintenanceCmd cmd = new PrepareForMaintenanceCmd();
+ cmd.setId(host.getId());
+ resourceManager.maintain(cmd);
+ waitForHostInMaintenance(host.getId());
+ }
+
+ /**
+ * Enable back disabled cluster
+ * @param cluster cluster to enable if it has been disabled
+ * @param disabledClusters set of disabled clusters
+ */
+ private void enableClusterIfDisabled(Cluster cluster, Set<Long> disabledClusters) {
+ if (cluster.getAllocationState() == Grouping.AllocationState.Disabled && disabledClusters.contains(cluster.getId())) {
+ updateCluster(cluster.getId(), "Enabled");
+ }
+ }
+
+ /**
+ * Re-check capacity to ensure the host can transit into maintenance state
+ * @return tuple: (FAIL, SKIP, DETAILS), where:
+ * - FAIL: True if rolling maintenance must fail
+ * - SKIP: True if host must be skipped
+ * - DETAILS: Information retrieved after capacity checks
+ */
+ private Ternary<Boolean, Boolean, String> reCheckCapacityBeforeMaintenanceOnHost(Cluster cluster, Host host, Boolean forced, List<HostSkipped> hostsSkipped) {
+ Pair<Boolean, String> capacityCheckBeforeMaintenance = performCapacityChecksBeforeHostInMaintenance(host, cluster);
+ if (!capacityCheckBeforeMaintenance.first()) {
+ String errorMsg = "Capacity check failed for host " + host.getUuid() + ": " + capacityCheckBeforeMaintenance.second();
+ if (forced) {
+ s_logger.info("Skipping host " + host.getUuid() + " as: " + errorMsg);
+ hostsSkipped.add(new HostSkipped(host, errorMsg));
+ return new Ternary<>(true, true, capacityCheckBeforeMaintenance.second());
+ }
+ return new Ternary<>(true, false, capacityCheckBeforeMaintenance.second());
+ }
+ return new Ternary<>(false, false, capacityCheckBeforeMaintenance.second());
+ }
+
+ /**
+ * Indicates if the maintenance stage must be avoided
+ */
+ private boolean isMaintenanceStageAvoided(Host host, Map<Long, String> hostsToAvoidMaintenance, List<HostSkipped> hostsSkipped) {
+ if (hostsToAvoidMaintenance.containsKey(host.getId())) {
+ s_logger.debug("Host " + host.getId() + " is not being put into maintenance, skipping it");
+ HostSkipped hostSkipped = new HostSkipped(host, hostsToAvoidMaintenance.get(host.getId()));
+ hostsSkipped.add(hostSkipped);
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Perform Pre-Maintenance stage on host
+ * @return tuple: (FAIL, SKIP, DETAILS), where:
+ * - FAIL: True if rolling maintenance must fail
+ * - SKIP: True if host must be skipped
+ * - DETAILS: Information retrieved by the host after executing the stage
+ * @throws InterruptedException
+ */
+ private Ternary<Boolean, Boolean, String> performPreMaintenanceStageOnHost(Host host, int timeout, String payload, Boolean forced,
+ Map<Long, String> hostsToAvoidMaintenance,
+ List<HostSkipped> hostsSkipped) throws InterruptedException {
+ Ternary<Boolean, String, Boolean> result = performStageOnHost(host, Stage.PreMaintenance, timeout, payload, forced);
+ if (!result.first()) {
+ if (forced) {
+ String msg = "Pre-maintenance script failed: " + result.second();
+ hostsSkipped.add(new HostSkipped(host, msg));
+ return new Ternary<>(true, true, result.second());
+ }
+ return new Ternary<>(true, false, result.second());
+ }
+ if (result.third() && !hostsToAvoidMaintenance.containsKey(host.getId())) {
+ s_logger.debug("Host " + host.getId() + " added to the avoid maintenance set");
+ hostsToAvoidMaintenance.put(host.getId(), "Pre-maintenance stage set to avoid maintenance");
+ }
+ return new Ternary<>(false, false, result.second());
+ }
+
+ /**
+ * Disable cluster (if hasn't been disabled yet)
+ * @param cluster cluster to disable
+ * @param disabledClusters set of disabled cluster ids. cluster is added if it is disabled
+ */
+ private void disableClusterIfEnabled(Cluster cluster, Set<Long> disabledClusters) {
+ if (cluster.getAllocationState() == Grouping.AllocationState.Enabled && !disabledClusters.contains(cluster.getId())) {
+ updateCluster(cluster.getId(), "Disabled");
+ disabledClusters.add(cluster.getId());
+ }
+ }
+
+ private boolean isMaintenanceScriptDefinedOnHost(Host host, List<HostSkipped> hostsSkipped) {
+ try {
+ RollingMaintenanceAnswer answer = (RollingMaintenanceAnswer) agentManager.send(host.getId(), new RollingMaintenanceCommand(true));
+ return answer.isMaintenaceScriptDefined();
+ } catch (AgentUnavailableException | OperationTimedoutException e) {
+ String msg = "Could not check for maintenance script on host " + host.getId() + " due to: " + e.getMessage();
+ s_logger.error(msg, e);
+ return false;
+ }
+ }
+
+ /**
+ * Execute stage on host
+ * @return tuple: (SUCCESS, DETAILS, AVOID_MAINTENANCE) where:
+ * - SUCCESS: True if stage is successfull
+ * - DETAILS: Information retrieved by the host after executing the stage
+ * - AVOID_MAINTENANCE: True if maintenance stage must be avoided
+ */
+ private Ternary<Boolean, String, Boolean> performStageOnHost(Host host, Stage stage, int timeout,
+ String payload, Boolean forced) throws InterruptedException {
+ Ternary<Boolean, String, Boolean> result = sendRollingMaintenanceCommandToHost(host, stage, timeout, payload);
+ if (!result.first() && !forced) {
+ throw new CloudRuntimeException("Stage: " + stage.toString() + " failed on host " + host.getUuid() + ": " + result.second());
+ }
+ return result;
+ }
+
+ /**
+ * Send rolling maintenance command to a host to perform a certain stage specified in cmd
+ * @return tuple: (SUCCESS, DETAILS, AVOID_MAINTENANCE) where:
+ * - SUCCESS: True if stage is successfull
+ * - DETAILS: Information retrieved by the host after executing the stage
+ * - AVOID_MAINTENANCE: True if maintenance stage must be avoided
+ */
+ private Ternary<Boolean, String, Boolean> sendRollingMaintenanceCommandToHost(Host host, Stage stage,
+ int timeout, String payload) throws InterruptedException {
+ boolean completed = false;
+ Answer answer = null;
+ long timeSpent = 0L;
+ long pingInterval = KvmRollingMaintenancePingInterval.value() * 1000L;
+ boolean avoidMaintenance = false;
+
+ RollingMaintenanceCommand cmd = new RollingMaintenanceCommand(stage.toString());
+ cmd.setWait(timeout);
+ cmd.setPayload(payload);
+
+ while (!completed && timeSpent < timeout * 1000L) {
+ try {
+ answer = agentManager.send(host.getId(), cmd);
+ } catch (AgentUnavailableException | OperationTimedoutException e) {
+ // Agent may be restarted on the scripts - continue polling until it is up
+ String msg = "Cannot send command to host: " + host.getId() + ", waiting " + pingInterval + "ms - " + e.getMessage();
+ s_logger.warn(msg);
+ cmd.setStarted(true);
+ Thread.sleep(pingInterval);
+ timeSpent += pingInterval;
+ continue;
+ }
+ cmd.setStarted(true);
+
+ RollingMaintenanceAnswer rollingMaintenanceAnswer = (RollingMaintenanceAnswer) answer;
+ completed = rollingMaintenanceAnswer.isFinished();
+ if (!completed) {
+ Thread.sleep(pingInterval);
+ timeSpent += pingInterval;
+ } else {
+ avoidMaintenance = rollingMaintenanceAnswer.isAvoidMaintenance();
+ }
+ }
+ if (timeSpent >= timeout * 1000L) {
+ return new Ternary<>(false,
+ "Timeout exceeded for rolling maintenance on host " + host.getUuid() + " and stage " + stage.toString(),
+ avoidMaintenance);
+ }
+ return new Ternary<>(answer.getResult(), answer.getDetails(), avoidMaintenance);
+ }
+
+ /**
+ * Pre flight checks on hosts
+ */
+ private void performPreFlightChecks(List<Host> hosts, int timeout, String payload, Boolean forced,
+ Map<Long, String> hostsToAvoidMaintenance) throws InterruptedException {
+ for (Host host : hosts) {
+ Ternary<Boolean, String, Boolean> result = performStageOnHost(host, Stage.PreFlight, timeout, payload, forced);
+ if (result.third() && !hostsToAvoidMaintenance.containsKey(host.getId())) {
+ s_logger.debug("Host " + host.getId() + " added to the avoid maintenance set");
+ hostsToAvoidMaintenance.put(host.getId(), "Pre-flight stage set to avoid maintenance");
+ }
+ }
+ }
+
+ /**
+ * Capacity checks on hosts
+ */
+ private void performCapacityChecks(Cluster cluster, List<Host> hosts, Boolean forced) {
+ for (Host host : hosts) {
+ Pair<Boolean, String> result = performCapacityChecksBeforeHostInMaintenance(host, cluster);
+ if (!result.first() && !forced) {
+ throw new CloudRuntimeException("Capacity check failed for host " + host.getUuid() + ": " + result.second());
+ }
+ }
+ }
+
+ /**
+ * Check if there is enough capacity for host to enter maintenance
+ */
+ private Pair<Boolean, String> performCapacityChecksBeforeHostInMaintenance(Host host, Cluster cluster) {
+ List<HostVO> hosts = hostDao.findByClusterId(cluster.getId());
+ List<Host> hostsInCluster = hosts.stream()
+ .filter(x -> x.getId() != host.getId() &&
+ x.getClusterId().equals(cluster.getId()) &&
+ x.getResourceState() == ResourceState.Enabled &&
+ x.getStatus() == Status.Up)
+ .collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(hostsInCluster)) {
+ throw new CloudRuntimeException("No host available in cluster " + cluster.getUuid() + " (" + cluster.getName() + ") to support host " +
+ host.getUuid() + " (" + host.getName() + ") in maintenance");
+ }
+ List<VMInstanceVO> vmsRunning = vmInstanceDao.listByHostId(host.getId());
+ if (CollectionUtils.isEmpty(vmsRunning)) {
+ return new Pair<>(true, "OK");
+ }
+ List<String> hostTags = hostTagsDao.gethostTags(host.getId());
+
+ int sucessfullyCheckedVmMigrations = 0;
+ for (VMInstanceVO runningVM : vmsRunning) {
+ boolean canMigrateVm = false;
+ ServiceOfferingVO serviceOffering = serviceOfferingDao.findById(runningVM.getServiceOfferingId());
+ for (Host hostInCluster : hostsInCluster) {
+ if (!checkHostTags(hostTags, hostTagsDao.gethostTags(hostInCluster.getId()), serviceOffering.getHostTag())) {
+ s_logger.debug("Host tags mismatch between host " + host.getUuid() + " and host " + hostInCluster.getUuid() +
+ ". Skipping it from the capacity check");
+ continue;
+ }
+ DeployDestination deployDestination = new DeployDestination(null, null, null, host);
+ VirtualMachineProfileImpl vmProfile = new VirtualMachineProfileImpl(runningVM);
+ boolean affinityChecks = true;
+ for (AffinityGroupProcessor affinityProcessor : _affinityProcessors) {
+ affinityChecks = affinityChecks && affinityProcessor.check(vmProfile, deployDestination);
+ }
+ if (!affinityChecks) {
+ s_logger.debug("Affinity check failed between host " + host.getUuid() + " and host " + hostInCluster.getUuid() +
+ ". Skipping it from the capacity check");
+ continue;
+ }
+ boolean maxGuestLimit = capacityManager.checkIfHostReachMaxGuestLimit(host);
+ boolean hostHasCPUCapacity = capacityManager.checkIfHostHasCpuCapability(hostInCluster.getId(), serviceOffering.getCpu(), serviceOffering.getSpeed());
+ int cpuRequested = serviceOffering.getCpu() * serviceOffering.getSpeed();
+ long ramRequested = serviceOffering.getRamSize() * 1024L * 1024L;
+ ClusterDetailsVO clusterDetailsCpuOvercommit = clusterDetailsDao.findDetail(cluster.getId(), "cpuOvercommitRatio");
+ ClusterDetailsVO clusterDetailsRamOvercommmt = clusterDetailsDao.findDetail(cluster.getId(), "memoryOvercommitRatio");
+ Float cpuOvercommitRatio = Float.parseFloat(clusterDetailsCpuOvercommit.getValue());
+ Float memoryOvercommitRatio = Float.parseFloat(clusterDetailsRamOvercommmt.getValue());
+ boolean hostHasCapacity = capacityManager.checkIfHostHasCapacity(hostInCluster.getId(), cpuRequested, ramRequested, false,
+ cpuOvercommitRatio, memoryOvercommitRatio, false);
+ if (!maxGuestLimit && hostHasCPUCapacity && hostHasCapacity) {
+ canMigrateVm = true;
+ break;
+ }
+ }
+ if (!canMigrateVm) {
+ String msg = "VM " + runningVM.getUuid() + " cannot be migrated away from host " + host.getUuid() +
+ " to any other host in the cluster";
+ s_logger.error(msg);
+ return new Pair<>(false, msg);
+ }
+ sucessfullyCheckedVmMigrations++;
+ }
+ if (sucessfullyCheckedVmMigrations != vmsRunning.size()) {
+ return new Pair<>(false, "Host " + host.getId() + " cannot enter maintenance mode as capacity check failed for hosts in cluster " + cluster.getUuid());
+ }
+ return new Pair<>(true, "OK");
+ }
+
+ /**
+ * Check hosts tags
+ */
+ private boolean checkHostTags(List<String> hostTags, List<String> hostInClusterTags, String offeringTag) {
+ if (CollectionUtils.isEmpty(hostTags) && CollectionUtils.isEmpty(hostInClusterTags)) {
+ return true;
+ } else if ((CollectionUtils.isNotEmpty(hostTags) && CollectionUtils.isEmpty(hostInClusterTags)) ||
+ (CollectionUtils.isEmpty(hostTags) && CollectionUtils.isNotEmpty(hostInClusterTags))) {
+ return false;
+ } else {
+ return hostInClusterTags.contains(offeringTag);
+ }
+ }
+
+ /**
+ * Retrieve all the hosts in 'Up' state within the scope for starting rolling maintenance
+ */
+ protected Map<Long, List<Host>> getHostsByClusterForRollingMaintenance(ResourceType type, List<Long> ids) {
+ Set<Host> hosts = new HashSet<>();
+ List<HostVO> hostsInScope = null;
+ for (Long id : ids) {
+ if (type == ResourceType.Host) {
+ hostsInScope = Collections.singletonList(hostDao.findById(id));
+ } else if (type == ResourceType.Cluster) {
+ hostsInScope = hostDao.findByClusterId(id);
+ } else if (type == ResourceType.Pod) {
+ hostsInScope = hostDao.findByPodId(id);
+ } else if (type == ResourceType.Zone) {
+ hostsInScope = hostDao.findByDataCenterId(id);
+ }
+ List<HostVO> hostsUp = hostsInScope.stream()
+ .filter(x -> x.getHypervisorType() == Hypervisor.HypervisorType.KVM)
+ .collect(Collectors.toList());
+ hosts.addAll(hostsUp);
+ }
+ return hosts.stream().collect(Collectors.groupingBy(Host::getClusterId));
+ }
+
+ @Override
+ public Pair<ResourceType, List<Long>> getResourceTypeIdPair(StartRollingMaintenanceCmd cmd) {
+ return getResourceTypeAndIdPair(cmd.getPodIds(), cmd.getClusterIds(), cmd.getZoneIds(), cmd.getHostIds());
+ }
+
+ /*
+ Wait for to be in maintenance mode
+ */
+ private void waitForHostInMaintenance(long hostId) throws CloudRuntimeException, InterruptedException {
+ HostVO host = hostDao.findById(hostId);
+ long timeout = KvmRollingMaintenanceWaitForMaintenanceTimeout.value() * 1000L;
+ long timeSpent = 0;
+ long step = 30 * 1000L;
+ while (timeSpent < timeout && host.getResourceState() != ResourceState.Maintenance) {
+ Thread.sleep(step);
+ timeSpent += step;
+ host = hostDao.findById(hostId);
+ }
+
+ if (host.getResourceState() != ResourceState.Maintenance) {
+ String errorMsg = "Timeout: waited " + timeout + "ms for host " + host.getUuid() + "(" + host.getName() + ")" +
+ " to be in Maintenance state, but after timeout it is in " + host.getResourceState().toString() + " state";
+ s_logger.error(errorMsg);
+ throw new CloudRuntimeException(errorMsg);
+ }
+ s_logger.debug("Host " + host.getUuid() + "(" + host.getName() + ") is in maintenance");
+ }
+
+ @Override
+ public String getConfigComponentName() {
+ return RollingMaintenanceManagerImpl.class.getSimpleName();
+ }
+
+ @Override
+ public ConfigKey<?>[] getConfigKeys() {
+ return new ConfigKey<?>[] {KvmRollingMaintenanceStageTimeout, KvmRollingMaintenancePingInterval, KvmRollingMaintenanceWaitForMaintenanceTimeout};
+ }
+}
\ No newline at end of file
diff --git a/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java b/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
index 417ccfc..fbc8a99 100644
--- a/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
+++ b/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
@@ -44,6 +44,8 @@
import org.springframework.stereotype.Component;
import com.cloud.alert.AlertManager;
+import com.cloud.api.query.dao.UserVmJoinDao;
+import com.cloud.api.query.vo.UserVmJoinVO;
import com.cloud.configuration.Config;
import com.cloud.configuration.Resource;
import com.cloud.configuration.Resource.ResourceOwnerType;
@@ -100,6 +102,8 @@
import com.cloud.utils.db.TransactionCallbackWithExceptionNoReturn;
import com.cloud.utils.db.TransactionStatus;
import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.VirtualMachineManager;
+import com.cloud.vm.VirtualMachine.State;
import com.cloud.vm.dao.UserVmDao;
import com.cloud.vm.dao.VMInstanceDao;
@@ -151,6 +155,8 @@
private VlanDao _vlanDao;
@Inject
private SnapshotDataStoreDao _snapshotDataStoreDao;
+ @Inject
+ private UserVmJoinDao _userVmJoinDao;
protected GenericSearchBuilder<TemplateDataStoreVO, SumCount> templateSizeSearch;
protected GenericSearchBuilder<SnapshotDataStoreVO, SumCount> snapshotSizeSearch;
@@ -872,7 +878,7 @@
protected long recalculateAccountResourceCount(final long accountId, final ResourceType type) {
final Long newCount;
if (type == Resource.ResourceType.user_vm) {
- newCount = _userVmDao.countAllocatedVMsForAccount(accountId);
+ newCount = _userVmDao.countAllocatedVMsForAccount(accountId, VirtualMachineManager.ResoureCountRunningVMsonly.value());
} else if (type == Resource.ResourceType.volume) {
long virtualRouterCount = _vmDao.findIdsOfAllocatedVirtualRoutersForAccount(accountId).size();
newCount = _volumeDao.countAllocatedVolumesForAccount(accountId) - virtualRouterCount; // don't count the volumes of virtual router
@@ -929,11 +935,51 @@
}
public long countCpusForAccount(long accountId) {
- return _resourceCountDao.countCpuNumberAllocatedToAccount(accountId);
+ long cputotal = 0;
+ // user vms
+ SearchBuilder<UserVmJoinVO> userVmSearch = _userVmJoinDao.createSearchBuilder();
+ userVmSearch.and("accountId", userVmSearch.entity().getAccountId(), Op.EQ);
+ userVmSearch.and("state", userVmSearch.entity().getState(), SearchCriteria.Op.NIN);
+ userVmSearch.and("displayVm", userVmSearch.entity().isDisplayVm(), Op.EQ);
+ userVmSearch.groupBy(userVmSearch.entity().getId()); // select distinct
+ userVmSearch.done();
+
+ SearchCriteria<UserVmJoinVO> sc1 = userVmSearch.create();
+ sc1.setParameters("accountId", accountId);
+ if (VirtualMachineManager.ResoureCountRunningVMsonly.value())
+ sc1.setParameters("state", new Object[] {State.Destroyed, State.Error, State.Expunging, State.Stopped});
+ else
+ sc1.setParameters("state", new Object[] {State.Destroyed, State.Error, State.Expunging});
+ sc1.setParameters("displayVm", 1);
+ List<UserVmJoinVO> userVms = _userVmJoinDao.search(sc1,null);
+ for (UserVmJoinVO vm : userVms) {
+ cputotal += Long.valueOf(vm.getCpu());
+ }
+ return cputotal;
}
public long calculateMemoryForAccount(long accountId) {
- return _resourceCountDao.countMemoryAllocatedToAccount(accountId);
+ long ramtotal = 0;
+ // user vms
+ SearchBuilder<UserVmJoinVO> userVmSearch = _userVmJoinDao.createSearchBuilder();
+ userVmSearch.and("accountId", userVmSearch.entity().getAccountId(), Op.EQ);
+ userVmSearch.and("state", userVmSearch.entity().getState(), SearchCriteria.Op.NIN);
+ userVmSearch.and("displayVm", userVmSearch.entity().isDisplayVm(), Op.EQ);
+ userVmSearch.groupBy(userVmSearch.entity().getId()); // select distinct
+ userVmSearch.done();
+
+ SearchCriteria<UserVmJoinVO> sc1 = userVmSearch.create();
+ sc1.setParameters("accountId", accountId);
+ if (VirtualMachineManager.ResoureCountRunningVMsonly.value())
+ sc1.setParameters("state", new Object[] {State.Destroyed, State.Error, State.Expunging, State.Stopped});
+ else
+ sc1.setParameters("state", new Object[] {State.Destroyed, State.Error, State.Expunging});
+ sc1.setParameters("displayVm", 1);
+ List<UserVmJoinVO> userVms = _userVmJoinDao.search(sc1,null);
+ for (UserVmJoinVO vm : userVms) {
+ ramtotal += Long.valueOf(vm.getRamSize());
+ }
+ return ramtotal;
}
public long calculateSecondaryStorageForAccount(long accountId) {
diff --git a/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java b/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java
index 635b482..1d5b582 100644
--- a/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java
@@ -767,10 +767,10 @@
command.add(systemVmIsoPath);
final String result = command.execute();
- s_logger.info("Injected public and private keys into systemvm iso with result : " + result);
+ s_logger.info("The script injectkeys.sh was run with result : " + result);
if (result != null) {
- s_logger.warn("Failed to inject generated public key into systemvm iso " + result);
- throw new CloudRuntimeException("Failed to inject generated public key into systemvm iso " + result);
+ s_logger.warn("The script injectkeys.sh failed to run successfully : " + result);
+ throw new CloudRuntimeException("The script injectkeys.sh failed to run successfully : " + result);
}
}
diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
index fdd6354..c9ade17 100644
--- a/server/src/main/java/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
@@ -166,11 +166,13 @@
import org.apache.cloudstack.api.command.admin.resource.DeleteAlertsCmd;
import org.apache.cloudstack.api.command.admin.resource.ListAlertsCmd;
import org.apache.cloudstack.api.command.admin.resource.ListCapacityCmd;
+import org.apache.cloudstack.api.command.admin.resource.StartRollingMaintenanceCmd;
import org.apache.cloudstack.api.command.admin.resource.UploadCustomCertificateCmd;
import org.apache.cloudstack.api.command.admin.router.ConfigureOvsElementCmd;
import org.apache.cloudstack.api.command.admin.router.ConfigureVirtualRouterElementCmd;
import org.apache.cloudstack.api.command.admin.router.CreateVirtualRouterElementCmd;
import org.apache.cloudstack.api.command.admin.router.DestroyRouterCmd;
+import org.apache.cloudstack.api.command.admin.router.GetRouterHealthCheckResultsCmd;
import org.apache.cloudstack.api.command.admin.router.ListOvsElementsCmd;
import org.apache.cloudstack.api.command.admin.router.ListRoutersCmd;
import org.apache.cloudstack.api.command.admin.router.ListVirtualRouterElementsCmd;
@@ -264,9 +266,11 @@
import org.apache.cloudstack.api.command.admin.vmsnapshot.RevertToVMSnapshotCmdByAdmin;
import org.apache.cloudstack.api.command.admin.volume.AttachVolumeCmdByAdmin;
import org.apache.cloudstack.api.command.admin.volume.CreateVolumeCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.volume.DestroyVolumeCmdByAdmin;
import org.apache.cloudstack.api.command.admin.volume.DetachVolumeCmdByAdmin;
import org.apache.cloudstack.api.command.admin.volume.ListVolumesCmdByAdmin;
import org.apache.cloudstack.api.command.admin.volume.MigrateVolumeCmdByAdmin;
+import org.apache.cloudstack.api.command.admin.volume.RecoverVolumeCmdByAdmin;
import org.apache.cloudstack.api.command.admin.volume.ResizeVolumeCmdByAdmin;
import org.apache.cloudstack.api.command.admin.volume.UpdateVolumeCmdByAdmin;
import org.apache.cloudstack.api.command.admin.volume.UploadVolumeCmdByAdmin;
@@ -422,6 +426,7 @@
import org.apache.cloudstack.api.command.user.securitygroup.ListSecurityGroupsCmd;
import org.apache.cloudstack.api.command.user.securitygroup.RevokeSecurityGroupEgressCmd;
import org.apache.cloudstack.api.command.user.securitygroup.RevokeSecurityGroupIngressCmd;
+import org.apache.cloudstack.api.command.user.securitygroup.UpdateSecurityGroupCmd;
import org.apache.cloudstack.api.command.user.snapshot.ArchiveSnapshotCmd;
import org.apache.cloudstack.api.command.user.snapshot.CreateSnapshotCmd;
import org.apache.cloudstack.api.command.user.snapshot.CreateSnapshotFromVMSnapshotCmd;
@@ -482,12 +487,14 @@
import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd;
import org.apache.cloudstack.api.command.user.volume.CreateVolumeCmd;
import org.apache.cloudstack.api.command.user.volume.DeleteVolumeCmd;
+import org.apache.cloudstack.api.command.user.volume.DestroyVolumeCmd;
import org.apache.cloudstack.api.command.user.volume.DetachVolumeCmd;
import org.apache.cloudstack.api.command.user.volume.ExtractVolumeCmd;
import org.apache.cloudstack.api.command.user.volume.GetUploadParamsForVolumeCmd;
import org.apache.cloudstack.api.command.user.volume.ListResourceDetailsCmd;
import org.apache.cloudstack.api.command.user.volume.ListVolumesCmd;
import org.apache.cloudstack.api.command.user.volume.MigrateVolumeCmd;
+import org.apache.cloudstack.api.command.user.volume.RecoverVolumeCmd;
import org.apache.cloudstack.api.command.user.volume.RemoveResourceDetailCmd;
import org.apache.cloudstack.api.command.user.volume.ResizeVolumeCmd;
import org.apache.cloudstack.api.command.user.volume.UpdateVolumeCmd;
@@ -642,6 +649,7 @@
import com.cloud.storage.StorageManager;
import com.cloud.storage.StoragePool;
import com.cloud.storage.Volume;
+import com.cloud.storage.VolumeApiServiceImpl;
import com.cloud.storage.VolumeVO;
import com.cloud.storage.dao.DiskOfferingDao;
import com.cloud.storage.dao.GuestOSCategoryDao;
@@ -701,6 +709,8 @@
import com.cloud.vm.dao.SecondaryStorageVmDao;
import com.cloud.vm.dao.UserVmDao;
import com.cloud.vm.dao.VMInstanceDao;
+import com.cloud.vm.UserVmDetailVO;
+import com.cloud.vm.dao.UserVmDetailsDao;
public class ManagementServerImpl extends ManagerBase implements ManagementServer, Configurable {
public static final Logger s_logger = Logger.getLogger(ManagementServerImpl.class.getName());
@@ -720,6 +730,8 @@
@Inject
private ClusterDao _clusterDao;
@Inject
+ private UserVmDetailsDao _UserVmDetailsDao;
+ @Inject
private SecondaryStorageVmDao _secStorageVmDao;
@Inject
public EventDao _eventDao;
@@ -1183,6 +1195,16 @@
throw ex;
}
+ UserVmDetailVO userVmDetailVO = _UserVmDetailsDao.findDetail(vm.getId(), ApiConstants.BootType.UEFI.toString());
+ if (userVmDetailVO != null) {
+ s_logger.info(" Live Migration of UEFI enabled VM : " + vm.getInstanceName() + " is not supported");
+ if ("legacy".equalsIgnoreCase(userVmDetailVO.getValue()) || "secure".equalsIgnoreCase(userVmDetailVO.getValue())) {
+ // Return empty list.
+ return new Ternary<Pair<List<? extends Host>, Integer>, List<? extends Host>, Map<Host, Boolean>>(new Pair<List<? extends Host>,
+ Integer>(new ArrayList<HostVO>(), new Integer(0)), new ArrayList<Host>(), new HashMap<Host, Boolean>());
+ }
+ }
+
if (_serviceOfferingDetailsDao.findDetail(vm.getServiceOfferingId(), GPU.Keys.pciDevice.toString()) != null) {
s_logger.info(" Live Migration of GPU enabled VM : " + vm.getInstanceName() + " is not supported");
// Return empty list.
@@ -2889,6 +2911,7 @@
cmdList.add(ListSecurityGroupsCmd.class);
cmdList.add(RevokeSecurityGroupEgressCmd.class);
cmdList.add(RevokeSecurityGroupIngressCmd.class);
+ cmdList.add(UpdateSecurityGroupCmd.class);
cmdList.add(CreateSnapshotCmd.class);
cmdList.add(CreateSnapshotFromVMSnapshotCmd.class);
cmdList.add(DeleteSnapshotCmd.class);
@@ -2947,6 +2970,8 @@
cmdList.add(MigrateVolumeCmd.class);
cmdList.add(ResizeVolumeCmd.class);
cmdList.add(UploadVolumeCmd.class);
+ cmdList.add(DestroyVolumeCmd.class);
+ cmdList.add(RecoverVolumeCmd.class);
cmdList.add(CreateStaticRouteCmd.class);
cmdList.add(CreateVPCCmd.class);
cmdList.add(DeleteStaticRouteCmd.class);
@@ -3092,6 +3117,8 @@
cmdList.add(UpdateVolumeCmdByAdmin.class);
cmdList.add(UploadVolumeCmdByAdmin.class);
cmdList.add(ListVolumesCmdByAdmin.class);
+ cmdList.add(DestroyVolumeCmdByAdmin.class);
+ cmdList.add(RecoverVolumeCmdByAdmin.class);
cmdList.add(AssociateIPAddrCmdByAdmin.class);
cmdList.add(ListPublicIpAddressesCmdByAdmin.class);
cmdList.add(CreateNetworkCmdByAdmin.class);
@@ -3115,6 +3142,8 @@
cmdList.add(ListMgmtsCmd.class);
cmdList.add(GetUploadParamsForIsoCmd.class);
cmdList.add(ListTemplateOVFProperties.class);
+ cmdList.add(GetRouterHealthCheckResultsCmd.class);
+ cmdList.add(StartRollingMaintenanceCmd.class);
// Out-of-band management APIs for admins
cmdList.add(EnableOutOfBandManagementForHostCmd.class);
@@ -3499,9 +3528,13 @@
final boolean allowUserViewDestroyedVM = (QueryService.AllowUserViewDestroyedVM.valueIn(caller.getId()) | _accountService.isAdmin(caller.getId()));
final boolean allowUserExpungeRecoverVM = (UserVmManager.AllowUserExpungeRecoverVm.valueIn(caller.getId()) | _accountService.isAdmin(caller.getId()));
+ final boolean allowUserExpungeRecoverVolume = (VolumeApiServiceImpl.AllowUserExpungeRecoverVolume.valueIn(caller.getId()) | _accountService.isAdmin(caller.getId()));
final boolean allowUserViewAllDomainAccounts = (QueryService.AllowUserViewAllDomainAccounts.valueIn(caller.getDomainId()));
+ final boolean kubernetesServiceEnabled = Boolean.parseBoolean(_configDao.getValue("cloud.kubernetes.service.enabled"));
+ final boolean kubernetesClusterExperimentalFeaturesEnabled = Boolean.parseBoolean(_configDao.getValue("cloud.kubernetes.cluster.experimental.features.enabled"));
+
// check if region-wide secondary storage is used
boolean regionSecondaryEnabled = false;
final List<ImageStoreVO> imgStores = _imgStoreDao.findRegionImageStores();
@@ -3521,7 +3554,10 @@
capabilities.put("KVMSnapshotEnabled", KVMSnapshotEnabled);
capabilities.put("allowUserViewDestroyedVM", allowUserViewDestroyedVM);
capabilities.put("allowUserExpungeRecoverVM", allowUserExpungeRecoverVM);
+ capabilities.put("allowUserExpungeRecoverVolume", allowUserExpungeRecoverVolume);
capabilities.put("allowUserViewAllDomainAccounts", allowUserViewAllDomainAccounts);
+ capabilities.put("kubernetesServiceEnabled", kubernetesServiceEnabled);
+ capabilities.put("kubernetesClusterExperimentalFeaturesEnabled", kubernetesClusterExperimentalFeaturesEnabled);
if (apiLimitEnabled) {
capabilities.put("apiLimitInterval", apiLimitInterval);
capabilities.put("apiLimitMax", apiLimitMax);
@@ -3665,6 +3701,12 @@
final Long domainId = cmd.getDomainId();
final Long projectId = cmd.getProjectId();
+ final String name = cmd.getName();
+
+ if (StringUtils.isBlank(name)) {
+ throw new InvalidParameterValueException("Please specify a valid name for the key pair. The key name can't be empty");
+ }
+
final Account owner = _accountMgr.finalizeOwner(caller, accountName, domainId, projectId);
final SSHKeyPairVO s = _sshKeyPairDao.findByName(owner.getAccountId(), owner.getDomainId(), cmd.getName());
@@ -3673,8 +3715,6 @@
}
final SSHKeysHelper keys = new SSHKeysHelper(sshKeyLength.value());
-
- final String name = cmd.getName();
final String publicKey = keys.getPublicKey();
final String fingerprint = keys.getPublicKeyFingerPrint();
final String privateKey = keys.getPrivateKey();
@@ -4082,7 +4122,7 @@
if (newServiceOffering.isDynamic()) {
newServiceOffering.setDynamicFlag(true);
_userVmMgr.validateCustomParameters(newServiceOffering, customparameters);
- newServiceOffering = _offeringDao.getcomputeOffering(newServiceOffering, customparameters);
+ newServiceOffering = _offeringDao.getComputeOffering(newServiceOffering, customparameters);
}
_itMgr.checkIfCanUpgrade(systemVm, newServiceOffering);
diff --git a/server/src/main/java/com/cloud/server/StatsCollector.java b/server/src/main/java/com/cloud/server/StatsCollector.java
index 5683106..5709427 100644
--- a/server/src/main/java/com/cloud/server/StatsCollector.java
+++ b/server/src/main/java/com/cloud/server/StatsCollector.java
@@ -1374,6 +1374,20 @@
}
/**
+ * Calculates secondary storage disk capacity against a configurable threshold instead of the hardcoded default 95 % value
+ * @param imageStore secondary storage
+ * @param storeCapThreshold the threshold capacity for computing if secondary storage has enough space to accommodate the @this object
+ * @return
+ */
+ public boolean imageStoreHasEnoughCapacity(DataStore imageStore, Double storeCapThreshold) {
+ StorageStats imageStoreStats = _storageStats.get(imageStore.getId());
+ if (imageStoreStats != null && (imageStoreStats.getByteUsed() / (imageStoreStats.getCapacityBytes() * 1.0)) <= storeCapThreshold) {
+ return true;
+ }
+ return false;
+ }
+
+ /**
* Sends VMs metrics to the configured graphite host.
*/
protected void sendVmMetricsToGraphiteHost(Map<Object, Object> metrics, HostVO host) {
@@ -1549,7 +1563,11 @@
private SearchCriteria<HostVO> createSearchCriteriaForHostTypeRoutingStateUpAndNotInMaintenance() {
SearchCriteria<HostVO> sc = _hostDao.createSearchCriteria();
sc.addAnd("status", SearchCriteria.Op.EQ, Status.Up.toString());
- sc.addAnd("resourceState", SearchCriteria.Op.NIN, ResourceState.Maintenance, ResourceState.PrepareForMaintenance, ResourceState.ErrorInMaintenance);
+ sc.addAnd("resourceState", SearchCriteria.Op.NIN,
+ ResourceState.Maintenance,
+ ResourceState.PrepareForMaintenance,
+ ResourceState.ErrorInPrepareForMaintenance,
+ ResourceState.ErrorInMaintenance);
sc.addAnd("type", SearchCriteria.Op.EQ, Host.Type.Routing.toString());
return sc;
}
diff --git a/server/src/main/java/com/cloud/servlet/ConsoleProxyServlet.java b/server/src/main/java/com/cloud/servlet/ConsoleProxyServlet.java
index 5a6c84f..ae9b5c5 100644
--- a/server/src/main/java/com/cloud/servlet/ConsoleProxyServlet.java
+++ b/server/src/main/java/com/cloud/servlet/ConsoleProxyServlet.java
@@ -35,21 +35,16 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import com.cloud.resource.ResourceState;
+import org.apache.cloudstack.framework.security.keys.KeysManager;
import org.apache.commons.codec.binary.Base64;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
import org.springframework.web.context.support.SpringBeanAutowiringSupport;
-import com.cloud.vm.VmDetailConstants;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-import org.apache.cloudstack.framework.security.keys.KeysManager;
-
import com.cloud.exception.PermissionDeniedException;
import com.cloud.host.HostVO;
import com.cloud.hypervisor.Hypervisor;
+import com.cloud.resource.ResourceState;
import com.cloud.server.ManagementServer;
import com.cloud.storage.GuestOSVO;
import com.cloud.user.Account;
@@ -64,7 +59,10 @@
import com.cloud.vm.UserVmDetailVO;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineManager;
+import com.cloud.vm.VmDetailConstants;
import com.cloud.vm.dao.UserVmDetailsDao;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
/**
* Thumbnail access : /console?cmd=thumbnail&vm=xxx&w=xxx&h=xxx
@@ -420,14 +418,24 @@
StringBuffer sb = new StringBuffer(rootUrl);
String host = hostVo.getPrivateIpAddress();
- Pair<String, Integer> portInfo;
- if (hostVo.getResourceState().equals(ResourceState.ErrorInMaintenance)) {
+ Pair<String, Integer> portInfo = null;
+ if (hostVo.getHypervisorType() == Hypervisor.HypervisorType.KVM &&
+ (hostVo.getResourceState().equals(ResourceState.ErrorInMaintenance) ||
+ hostVo.getResourceState().equals(ResourceState.ErrorInPrepareForMaintenance))) {
UserVmDetailVO detailAddress = _userVmDetailsDao.findDetail(vm.getId(), VmDetailConstants.KVM_VNC_ADDRESS);
UserVmDetailVO detailPort = _userVmDetailsDao.findDetail(vm.getId(), VmDetailConstants.KVM_VNC_PORT);
- portInfo = new Pair<>(detailAddress.getValue(), Integer.valueOf(detailPort.getValue()));
- } else {
+ if (detailAddress != null && detailPort != null) {
+ portInfo = new Pair<>(detailAddress.getValue(), Integer.valueOf(detailPort.getValue()));
+ } else {
+ s_logger.warn("KVM Host in ErrorInMaintenance/ErrorInPrepareForMaintenance but " +
+ "no VNC Address/Port was available. Falling back to default one from MS.");
+ }
+ }
+
+ if (portInfo == null) {
portInfo = _ms.getVncPort(vm);
}
+
if (s_logger.isDebugEnabled())
s_logger.debug("Port info " + portInfo.first());
diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
index e602251..88af6e9 100644
--- a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
@@ -275,6 +275,9 @@
static final ConfigKey<Boolean> VolumeUrlCheck = new ConfigKey<Boolean>("Advanced", Boolean.class, "volume.url.check", "true",
"Check the url for a volume before downloading it from the management server. Set to false when you managment has no internet access.", true);
+ public static final ConfigKey<Boolean> AllowUserExpungeRecoverVolume = new ConfigKey<Boolean>("Advanced", Boolean.class, "allow.user.expunge.recover.volume", "true",
+ "Determines whether users can expunge or recover their volume", true, ConfigKey.Scope.Account);
+
private long _maxVolumeSizeInGb;
private final StateMachine2<Volume.State, Volume.Event, Volume> _volStateMachine;
@@ -1261,20 +1264,17 @@
* Otherwise, after the removal in the database, we will try to remove the volume from both primary and secondary storage.
*/
public boolean deleteVolume(long volumeId, Account caller) throws ConcurrentOperationException {
- VolumeVO volume = retrieveAndValidateVolume(volumeId, caller);
+ Volume volume = destroyVolume(volumeId, caller, true, true);
+ return (volume != null);
+ }
+
+ private boolean deleteVolumeFromStorage(VolumeVO volume, Account caller) throws ConcurrentOperationException {
try {
- destroyVolumeIfPossible(volume);
- // Mark volume as removed if volume has not been created on primary or secondary
- if (volume.getState() == Volume.State.Allocated) {
- _volsDao.remove(volumeId);
- stateTransitTo(volume, Volume.Event.DestroyRequested);
- return true;
- }
expungeVolumesInPrimaryStorageIfNeeded(volume);
expungeVolumesInSecondaryStorageIfNeeded(volume);
cleanVolumesCache(volume);
return true;
- } catch (InterruptedException | ExecutionException | NoTransitionException e) {
+ } catch (InterruptedException | ExecutionException e) {
s_logger.warn("Failed to expunge volume: " + volume.getUuid(), e);
return false;
}
@@ -1301,7 +1301,7 @@
if (!_snapshotMgr.canOperateOnVolume(volume)) {
throw new InvalidParameterValueException("There are snapshot operations in progress on the volume, unable to delete it");
}
- if (volume.getInstanceId() != null) {
+ if (volume.getInstanceId() != null && volume.getState() != Volume.State.Expunged) {
throw new InvalidParameterValueException("Please specify a volume that is not attached to any VM.");
}
if (volume.getState() == Volume.State.UploadOp) {
@@ -1334,12 +1334,8 @@
* The volume is destroyed via {@link VolumeService#destroyVolume(long)} method.
*/
protected void destroyVolumeIfPossible(VolumeVO volume) {
- if (volume.getState() != Volume.State.Destroy && volume.getState() != Volume.State.Expunging && volume.getState() != Volume.State.Expunged) {
+ if (volume.getState() != Volume.State.Destroy && volume.getState() != Volume.State.Expunging && volume.getState() != Volume.State.Expunged && volume.getState() != Volume.State.Allocated && volume.getState() != Volume.State.Uploaded) {
volService.destroyVolume(volume.getId());
-
- // Decrement the resource count for volumes and primary storage belonging user VM's only
- _resourceLimitMgr.decrementResourceCount(volume.getAccountId(), ResourceType.volume, volume.isDisplayVolume());
- _resourceLimitMgr.decrementResourceCount(volume.getAccountId(), ResourceType.primary_storage, volume.isDisplayVolume(), volume.getSize());
}
}
@@ -1390,6 +1386,89 @@
}
@Override
+ @ActionEvent(eventType = EventTypes.EVENT_VOLUME_DESTROY, eventDescription = "destroying a volume")
+ public Volume destroyVolume(long volumeId, Account caller, boolean expunge, boolean forceExpunge) {
+ VolumeVO volume = retrieveAndValidateVolume(volumeId, caller);
+
+ if (expunge) {
+ // When trying to expunge, permission is denied when the caller is not an admin and the AllowUserExpungeRecoverVolume is false for the caller.
+ final Long userId = caller.getAccountId();
+ if (!forceExpunge && !_accountMgr.isAdmin(userId) && !AllowUserExpungeRecoverVolume.valueIn(userId)) {
+ throw new PermissionDeniedException("Expunging a volume can only be done by an Admin. Or when the allow.user.expunge.recover.volume key is set.");
+ }
+ } else if (volume.getState() == Volume.State.Allocated || volume.getState() == Volume.State.Uploaded) {
+ throw new InvalidParameterValueException("The volume in Allocated/Uploaded state can only be expunged not destroyed/recovered");
+ }
+
+ destroyVolumeIfPossible(volume);
+
+ if (expunge) {
+ // Mark volume as removed if volume has not been created on primary or secondary
+ if (volume.getState() == Volume.State.Allocated) {
+ _volsDao.remove(volume.getId());
+ try {
+ stateTransitTo(volume, Volume.Event.DestroyRequested);
+ } catch (NoTransitionException e) {
+ s_logger.debug("Failed to destroy volume" + volume.getId(), e);
+ return null;
+ }
+ _resourceLimitMgr.decrementResourceCount(volume.getAccountId(), ResourceType.volume, volume.isDisplay());
+ _resourceLimitMgr.decrementResourceCount(volume.getAccountId(), ResourceType.primary_storage, volume.isDisplay(), new Long(volume.getSize()));
+ return volume;
+ }
+ if (!deleteVolumeFromStorage(volume, caller)) {
+ s_logger.warn("Failed to expunge volume: " + volumeId);
+ return null;
+ }
+ }
+
+ return volume;
+ }
+
+ @Override
+ @ActionEvent(eventType = EventTypes.EVENT_VOLUME_RECOVER, eventDescription = "recovering a volume in Destroy state")
+ public Volume recoverVolume(long volumeId) {
+ Account caller = CallContext.current().getCallingAccount();
+ final Long userId = caller.getAccountId();
+
+ // Verify input parameters
+ final VolumeVO volume = _volsDao.findById(volumeId);
+
+ if (volume == null) {
+ throw new InvalidParameterValueException("Unable to find a volume with id " + volume);
+ }
+
+ // When trying to expunge, permission is denied when the caller is not an admin and the AllowUserExpungeRecoverVolume is false for the caller.
+ if (!_accountMgr.isAdmin(userId) && !AllowUserExpungeRecoverVolume.valueIn(userId)) {
+ throw new PermissionDeniedException("Recovering a volume can only be done by an Admin. Or when the allow.user.expunge.recover.volume key is set.");
+ }
+
+ _accountMgr.checkAccess(caller, null, true, volume);
+
+ if (volume.getState() != Volume.State.Destroy) {
+ throw new InvalidParameterValueException("Please specify a volume in Destroy state.");
+ }
+
+ try {
+ _resourceLimitMgr.checkResourceLimit(_accountMgr.getAccount(volume.getAccountId()), ResourceType.primary_storage, volume.isDisplayVolume(), volume.getSize());
+ } catch (ResourceAllocationException e) {
+ s_logger.error("primary storage resource limit check failed", e);
+ throw new InvalidParameterValueException(e.getMessage());
+ }
+
+ try {
+ stateTransitTo(volume, Volume.Event.RecoverRequested);
+ } catch (NoTransitionException e) {
+ s_logger.debug("Failed to recover volume" + volume.getId(), e);
+ throw new CloudRuntimeException("Failed to recover volume" + volume.getId(), e);
+ }
+ _resourceLimitMgr.incrementResourceCount(volume.getAccountId(), ResourceType.volume, volume.isDisplay());
+ _resourceLimitMgr.incrementResourceCount(volume.getAccountId(), ResourceType.primary_storage, volume.isDisplay(), new Long(volume.getSize()));
+
+ return volume;
+ }
+
+ @Override
@ActionEvent(eventType = EventTypes.EVENT_VOLUME_ATTACH, eventDescription = "attaching volume", async = true)
public Volume attachVolumeToVM(AttachVolumeCmd command) {
return attachVolumeToVM(command.getVirtualMachineId(), command.getId(), command.getDeviceId());
@@ -1558,6 +1637,11 @@
throw new InvalidParameterValueException("Unable to attach volume, please specify a VM that does not have VM snapshots");
}
+ // if target VM has backups
+ if (vm.getBackupOfferingId() != null || vm.getBackupVolumeList().size() > 0) {
+ throw new InvalidParameterValueException("Unable to attach volume, please specify a VM that does not have any backups");
+ }
+
// permission check
_accountMgr.checkAccess(caller, null, true, volumeToAttach, vm);
@@ -1798,6 +1882,10 @@
throw new InvalidParameterValueException("Unable to detach volume, please specify a VM that does not have VM snapshots");
}
+ if (vm.getBackupOfferingId() != null || vm.getBackupVolumeList().size() > 0) {
+ throw new InvalidParameterValueException("Unable to detach volume, cannot detach volume from a VM that has backups. First remove the VM from the backup offering.");
+ }
+
AsyncJobExecutionContext asyncExecutionContext = AsyncJobExecutionContext.getCurrentExecutionContext();
if (asyncExecutionContext != null) {
AsyncJob job = asyncExecutionContext.getJob();
@@ -3409,6 +3497,6 @@
@Override
public ConfigKey<?>[] getConfigKeys() {
- return new ConfigKey<?>[] {ConcurrentMigrationsThresholdPerDatastore};
+ return new ConfigKey<?>[] {ConcurrentMigrationsThresholdPerDatastore, AllowUserExpungeRecoverVolume};
}
}
diff --git a/server/src/main/java/com/cloud/storage/snapshot/SnapshotManager.java b/server/src/main/java/com/cloud/storage/snapshot/SnapshotManager.java
index 407ffa3..c900b2d 100644
--- a/server/src/main/java/com/cloud/storage/snapshot/SnapshotManager.java
+++ b/server/src/main/java/com/cloud/storage/snapshot/SnapshotManager.java
@@ -57,7 +57,7 @@
"Time in seconds between retries in backing up snapshot to secondary", false, ConfigKey.Scope.Global, null);
public static final ConfigKey<Boolean> BackupSnapshotAfterTakingSnapshot = new ConfigKey<Boolean>(Boolean.class, "snapshot.backup.to.secondary", "Snapshots", "true",
- "Indicates whether to always backup primary storage snapshot to secondary storage", false, ConfigKey.Scope.Global, null);
+ "Indicates whether to always backup primary storage snapshot to secondary storage. Keeping snapshots only on Primary storage is applicable for KVM + Ceph only.", false, ConfigKey.Scope.Global, null);
void deletePoliciesForVolume(Long volumeId);
diff --git a/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
index 8e1d685..2392dfa 100755
--- a/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
+++ b/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
@@ -290,7 +290,7 @@
// in order to revert the volume
if (instanceId != null) {
UserVmVO vm = _vmDao.findById(instanceId);
- if (vm.getState() != State.Stopped && vm.getState() != State.Shutdowned) {
+ if (vm.getState() != State.Stopped && vm.getState() != State.Shutdown) {
throw new InvalidParameterValueException("The VM the specified disk is attached to is not in the shutdown state.");
}
// If target VM has associated VM snapshots then don't allow to revert from snapshot
diff --git a/server/src/main/java/com/cloud/usage/UsageServiceImpl.java b/server/src/main/java/com/cloud/usage/UsageServiceImpl.java
index 531b291..4f09d13 100644
--- a/server/src/main/java/com/cloud/usage/UsageServiceImpl.java
+++ b/server/src/main/java/com/cloud/usage/UsageServiceImpl.java
@@ -16,6 +16,28 @@
// under the License.
package com.cloud.usage;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.TimeZone;
+
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+
+import org.apache.cloudstack.api.command.admin.usage.GenerateUsageRecordsCmd;
+import org.apache.cloudstack.api.command.admin.usage.ListUsageRecordsCmd;
+import org.apache.cloudstack.api.command.admin.usage.RemoveRawUsageRecordsCmd;
+import org.apache.cloudstack.api.response.UsageTypeResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.usage.Usage;
+import org.apache.cloudstack.usage.UsageService;
+import org.apache.cloudstack.usage.UsageTypes;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
import com.cloud.configuration.Config;
import com.cloud.domain.DomainVO;
import com.cloud.domain.dao.DomainDao;
@@ -55,26 +77,6 @@
import com.cloud.utils.db.TransactionLegacy;
import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.dao.VMInstanceDao;
-import org.apache.cloudstack.api.command.admin.usage.GenerateUsageRecordsCmd;
-import org.apache.cloudstack.api.command.admin.usage.ListUsageRecordsCmd;
-import org.apache.cloudstack.api.command.admin.usage.RemoveRawUsageRecordsCmd;
-import org.apache.cloudstack.api.response.UsageTypeResponse;
-import org.apache.cloudstack.context.CallContext;
-import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
-import org.apache.cloudstack.usage.Usage;
-import org.apache.cloudstack.usage.UsageService;
-import org.apache.cloudstack.usage.UsageTypes;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
-
-import javax.inject.Inject;
-import javax.naming.ConfigurationException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.TimeZone;
@Component
public class UsageServiceImpl extends ManagerBase implements UsageService, Manager {
@@ -267,6 +269,7 @@
case UsageTypes.RUNNING_VM:
case UsageTypes.ALLOCATED_VM:
case UsageTypes.VM_SNAPSHOT:
+ case UsageTypes.BACKUP:
VMInstanceVO vm = _vmDao.findByUuidIncludingRemoved(usageId);
if (vm != null) {
usageDbId = vm.getId();
diff --git a/server/src/main/java/com/cloud/user/AccountManagerImpl.java b/server/src/main/java/com/cloud/user/AccountManagerImpl.java
index 77f21f0..98b4aa8 100644
--- a/server/src/main/java/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/main/java/com/cloud/user/AccountManagerImpl.java
@@ -132,7 +132,6 @@
import com.cloud.server.auth.UserAuthenticator;
import com.cloud.server.auth.UserAuthenticator.ActionOnFailedAuthentication;
import com.cloud.storage.VMTemplateVO;
-import com.cloud.storage.Volume;
import com.cloud.storage.VolumeApiService;
import com.cloud.storage.VolumeVO;
import com.cloud.storage.dao.VMTemplateDao;
@@ -782,13 +781,11 @@
// Mark the account's volumes as destroyed
List<VolumeVO> volumes = _volumeDao.findDetachedByAccount(accountId);
for (VolumeVO volume : volumes) {
- if (!volume.getState().equals(Volume.State.Destroy)) {
- try {
- volumeService.deleteVolume(volume.getId(), caller);
- } catch (Exception ex) {
- s_logger.warn("Failed to cleanup volumes as a part of account id=" + accountId + " cleanup due to Exception: ", ex);
- accountCleanupNeeded = true;
- }
+ try {
+ volumeService.deleteVolume(volume.getId(), caller);
+ } catch (Exception ex) {
+ s_logger.warn("Failed to cleanup volumes as a part of account id=" + accountId + " cleanup due to Exception: ", ex);
+ accountCleanupNeeded = true;
}
}
@@ -2328,9 +2325,9 @@
// Block when is not in the list of allowed IPs
if (!NetUtils.isIpInCidrList(loginIpAddress, accessAllowedCidrs.split(","))) {
- s_logger.warn("Request by account '" + account.toString() + "' was denied since " + loginIpAddress.toString().replaceAll("/", "") + " does not match " + accessAllowedCidrs);
+ s_logger.warn("Request by account '" + account.toString() + "' was denied since " + loginIpAddress.toString().replace("/", "") + " does not match " + accessAllowedCidrs);
throw new CloudAuthenticationException("Failed to authenticate user '" + username + "' in domain '" + domain.getPath() + "' from ip "
- + loginIpAddress.toString().replaceAll("/", "") + "; please provide valid credentials");
+ + loginIpAddress.toString().replace("/", "") + "; please provide valid credentials");
}
}
@@ -2914,4 +2911,4 @@
public ConfigKey<?>[] getConfigKeys() {
return new ConfigKey<?>[] {UseSecretKeyInResponse};
}
-}
\ No newline at end of file
+}
diff --git a/server/src/main/java/com/cloud/vm/UserVmManager.java b/server/src/main/java/com/cloud/vm/UserVmManager.java
index 1fe3f4d..6edf7e6 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManager.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManager.java
@@ -30,6 +30,7 @@
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.ManagementServerException;
+import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.exception.VirtualMachineMigrationException;
import com.cloud.service.ServiceOfferingVO;
@@ -98,10 +99,10 @@
boolean expunge(UserVmVO vm, long callerUserId, Account caller);
Pair<UserVmVO, Map<VirtualMachineProfile.Param, Object>> startVirtualMachine(long vmId, Long hostId, Map<VirtualMachineProfile.Param, Object> additionalParams, String deploymentPlannerToUse)
- throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException;
+ throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException, ResourceAllocationException;
Pair<UserVmVO, Map<VirtualMachineProfile.Param, Object>> startVirtualMachine(long vmId, Long podId, Long clusterId, Long hostId, Map<VirtualMachineProfile.Param, Object> additionalParams, String deploymentPlannerToUse)
- throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException;
+ throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException, ResourceAllocationException;
boolean upgradeVirtualMachine(Long id, Long serviceOfferingId, Map<String, String> customParameters) throws ResourceUnavailableException,
ConcurrentOperationException, ManagementServerException,
diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index 558b980..05befc4 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -16,6 +16,8 @@
// under the License.
package com.cloud.vm;
+import java.io.IOException;
+import java.io.StringReader;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.ArrayList;
@@ -34,13 +36,17 @@
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
-import com.cloud.storage.ScopeType;
import org.apache.cloudstack.acl.ControlledEntity.ACLType;
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.affinity.AffinityGroupService;
@@ -99,6 +105,11 @@
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
import com.cloud.agent.AgentManager;
import com.cloud.agent.api.Answer;
@@ -234,6 +245,7 @@
import com.cloud.storage.DiskOfferingVO;
import com.cloud.storage.GuestOSCategoryVO;
import com.cloud.storage.GuestOSVO;
+import com.cloud.storage.ScopeType;
import com.cloud.storage.Snapshot;
import com.cloud.storage.SnapshotVO;
import com.cloud.storage.Storage;
@@ -265,7 +277,6 @@
import com.cloud.user.Account;
import com.cloud.user.AccountManager;
import com.cloud.user.AccountService;
-import com.cloud.user.AccountVO;
import com.cloud.user.ResourceLimitService;
import com.cloud.user.SSHKeyPair;
import com.cloud.user.SSHKeyPairVO;
@@ -530,8 +541,18 @@
private static final ConfigKey<Boolean> AllowDeployVmIfGivenHostFails = new ConfigKey<Boolean>("Advanced", Boolean.class, "allow.deploy.vm.if.deploy.on.given.host.fails", "false",
"allow vm to deploy on different host if vm fails to deploy on the given host ", true);
- private static final ConfigKey<Boolean> EnableAdditionalVmConfig = new ConfigKey<>("Advanced", Boolean.class, "enable.additional.vm.configuration",
- "false", "allow additional arbitrary configuration to vm", true, ConfigKey.Scope.Account);
+ private static final ConfigKey<Boolean> EnableAdditionalVmConfig = new ConfigKey<>("Advanced", Boolean.class,
+ "enable.additional.vm.configuration", "false", "allow additional arbitrary configuration to vm", true, ConfigKey.Scope.Account);
+
+ private static final ConfigKey<String> KvmAdditionalConfigAllowList = new ConfigKey<>("Advanced", String.class,
+ "allow.additional.vm.configuration.list.kvm", "", "Comma separated list of allowed additional configuration options.", true);
+
+ private static final ConfigKey<String> XenServerAdditionalConfigAllowList = new ConfigKey<>("Advanced", String.class,
+ "allow.additional.vm.configuration.list.xenserver", "", "Comma separated list of allowed additional configuration options", true);
+
+ private static final ConfigKey<String> VmwareAdditionalConfigAllowList = new ConfigKey<>("Advanced", String.class,
+ "allow.additional.vm.configuration.list.vmware", "", "Comma separated list of allowed additional configuration options.", true);
+
private static final ConfigKey<Boolean> VmDestroyForcestop = new ConfigKey<Boolean>("Advanced", Boolean.class, "vm.destroy.forcestop", "false",
"On destroy, force-stop takes this value ", true);
@@ -551,16 +572,20 @@
_resourceLimitMgr.checkResourceLimit(owner, ResourceType.memory, displayVm, memory);
}
- private void resourceCountIncrement(long accountId, Boolean displayVm, Long cpu, Long memory) {
- _resourceLimitMgr.incrementResourceCount(accountId, ResourceType.user_vm, displayVm);
- _resourceLimitMgr.incrementResourceCount(accountId, ResourceType.cpu, displayVm, cpu);
- _resourceLimitMgr.incrementResourceCount(accountId, ResourceType.memory, displayVm, memory);
+ protected void resourceCountIncrement(long accountId, Boolean displayVm, Long cpu, Long memory) {
+ if (! VirtualMachineManager.ResoureCountRunningVMsonly.value()) {
+ _resourceLimitMgr.incrementResourceCount(accountId, ResourceType.user_vm, displayVm);
+ _resourceLimitMgr.incrementResourceCount(accountId, ResourceType.cpu, displayVm, cpu);
+ _resourceLimitMgr.incrementResourceCount(accountId, ResourceType.memory, displayVm, memory);
+ }
}
- private void resourceCountDecrement(long accountId, Boolean displayVm, Long cpu, Long memory) {
- _resourceLimitMgr.decrementResourceCount(accountId, ResourceType.user_vm, displayVm);
- _resourceLimitMgr.decrementResourceCount(accountId, ResourceType.cpu, displayVm, cpu);
- _resourceLimitMgr.decrementResourceCount(accountId, ResourceType.memory, displayVm, memory);
+ protected void resourceCountDecrement(long accountId, Boolean displayVm, Long cpu, Long memory) {
+ if (! VirtualMachineManager.ResoureCountRunningVMsonly.value()) {
+ _resourceLimitMgr.decrementResourceCount(accountId, ResourceType.user_vm, displayVm);
+ _resourceLimitMgr.decrementResourceCount(accountId, ResourceType.cpu, displayVm, cpu);
+ _resourceLimitMgr.decrementResourceCount(accountId, ResourceType.memory, displayVm, memory);
+ }
}
public class VmAndCountDetails {
@@ -865,9 +890,8 @@
userVm.setPassword(password);
//update the encrypted password in vm_details table too
encryptAndStorePassword(userVm, password);
- } else {
- _vmDao.saveDetails(userVm);
}
+ _vmDao.saveDetails(userVm);
if (vmInstance.getState() == State.Stopped) {
s_logger.debug("Vm " + vmInstance + " is stopped, not rebooting it as a part of SSH Key reset");
@@ -987,7 +1011,7 @@
if (newServiceOffering.isDynamic()) {
newServiceOffering.setDynamicFlag(true);
validateCustomParameters(newServiceOffering, cmd.getDetails());
- newServiceOffering = _offeringDao.getcomputeOffering(newServiceOffering, customParameters);
+ newServiceOffering = _offeringDao.getComputeOffering(newServiceOffering, customParameters);
}
ServiceOfferingVO currentServiceOffering = _offeringDao.findByIdIncludingRemoved(vmInstance.getId(), vmInstance.getServiceOfferingId());
@@ -997,11 +1021,13 @@
int currentMemory = currentServiceOffering.getRamSize();
Account owner = _accountMgr.getActiveAccountById(vmInstance.getAccountId());
- if (newCpu > currentCpu) {
- _resourceLimitMgr.checkResourceLimit(owner, ResourceType.cpu, newCpu - currentCpu);
- }
- if (newMemory > currentMemory) {
- _resourceLimitMgr.checkResourceLimit(owner, ResourceType.memory, newMemory - currentMemory);
+ if (! VirtualMachineManager.ResoureCountRunningVMsonly.value()) {
+ if (newCpu > currentCpu) {
+ _resourceLimitMgr.checkResourceLimit(owner, ResourceType.cpu, newCpu - currentCpu);
+ }
+ if (newMemory > currentMemory) {
+ _resourceLimitMgr.checkResourceLimit(owner, ResourceType.memory, newMemory - currentMemory);
+ }
}
// Check that the specified service offering ID is valid
@@ -1010,15 +1036,17 @@
_itMgr.upgradeVmDb(vmId, newServiceOffering, currentServiceOffering);
// Increment or decrement CPU and Memory count accordingly.
- if (newCpu > currentCpu) {
- _resourceLimitMgr.incrementResourceCount(owner.getAccountId(), ResourceType.cpu, new Long(newCpu - currentCpu));
- } else if (currentCpu > newCpu) {
- _resourceLimitMgr.decrementResourceCount(owner.getAccountId(), ResourceType.cpu, new Long(currentCpu - newCpu));
- }
- if (newMemory > currentMemory) {
- _resourceLimitMgr.incrementResourceCount(owner.getAccountId(), ResourceType.memory, new Long(newMemory - currentMemory));
- } else if (currentMemory > newMemory) {
- _resourceLimitMgr.decrementResourceCount(owner.getAccountId(), ResourceType.memory, new Long(currentMemory - newMemory));
+ if (! VirtualMachineManager.ResoureCountRunningVMsonly.value()) {
+ if (newCpu > currentCpu) {
+ _resourceLimitMgr.incrementResourceCount(owner.getAccountId(), ResourceType.cpu, new Long(newCpu - currentCpu));
+ } else if (currentCpu > newCpu) {
+ _resourceLimitMgr.decrementResourceCount(owner.getAccountId(), ResourceType.cpu, new Long(currentCpu - newCpu));
+ }
+ if (newMemory > currentMemory) {
+ _resourceLimitMgr.incrementResourceCount(owner.getAccountId(), ResourceType.memory, new Long(newMemory - currentMemory));
+ } else if (currentMemory > newMemory) {
+ _resourceLimitMgr.decrementResourceCount(owner.getAccountId(), ResourceType.memory, new Long(currentMemory - newMemory));
+ }
}
// Generate usage event for VM upgrade
@@ -1087,7 +1115,7 @@
if (newServiceOffering.isDynamic()) {
newServiceOffering.setDynamicFlag(true);
validateCustomParameters(newServiceOffering, customParameters);
- newServiceOffering = _offeringDao.getcomputeOffering(newServiceOffering, customParameters);
+ newServiceOffering = _offeringDao.getComputeOffering(newServiceOffering, customParameters);
}
ServiceOfferingVO currentServiceOffering = _offeringDao.findByIdIncludingRemoved(vmInstance.getId(), vmInstance.getServiceOfferingId());
@@ -1097,11 +1125,13 @@
int currentMemory = currentServiceOffering.getRamSize();
Account owner = _accountMgr.getActiveAccountById(vmInstance.getAccountId());
- if (newCpu > currentCpu) {
- _resourceLimitMgr.checkResourceLimit(owner, ResourceType.cpu, newCpu - currentCpu);
- }
- if (newMemory > currentMemory) {
- _resourceLimitMgr.checkResourceLimit(owner, ResourceType.memory, newMemory - currentMemory);
+ if (! VirtualMachineManager.ResoureCountRunningVMsonly.value()) {
+ if (newCpu > currentCpu) {
+ _resourceLimitMgr.checkResourceLimit(owner, ResourceType.cpu, newCpu - currentCpu);
+ }
+ if (newMemory > currentMemory) {
+ _resourceLimitMgr.checkResourceLimit(owner, ResourceType.memory, newMemory - currentMemory);
+ }
}
// Check that the specified service offering ID is valid
@@ -1128,15 +1158,17 @@
_itMgr.upgradeVmDb(vmId, newServiceOffering, currentServiceOffering);
// Increment or decrement CPU and Memory count accordingly.
- if (newCpu > currentCpu) {
- _resourceLimitMgr.incrementResourceCount(owner.getAccountId(), ResourceType.cpu, new Long(newCpu - currentCpu));
- } else if (currentCpu > newCpu) {
- _resourceLimitMgr.decrementResourceCount(owner.getAccountId(), ResourceType.cpu, new Long(currentCpu - newCpu));
- }
- if (newMemory > currentMemory) {
- _resourceLimitMgr.incrementResourceCount(owner.getAccountId(), ResourceType.memory, new Long(newMemory - currentMemory));
- } else if (currentMemory > newMemory) {
- _resourceLimitMgr.decrementResourceCount(owner.getAccountId(), ResourceType.memory, new Long(currentMemory - newMemory));
+ if (! VirtualMachineManager.ResoureCountRunningVMsonly.value()) {
+ if (newCpu > currentCpu) {
+ _resourceLimitMgr.incrementResourceCount(owner.getAccountId(), ResourceType.cpu, new Long(newCpu - currentCpu));
+ } else if (currentCpu > newCpu) {
+ _resourceLimitMgr.decrementResourceCount(owner.getAccountId(), ResourceType.cpu, new Long(currentCpu - newCpu));
+ }
+ if (newMemory > currentMemory) {
+ _resourceLimitMgr.incrementResourceCount(owner.getAccountId(), ResourceType.memory, new Long(newMemory - currentMemory));
+ } else if (currentMemory > newMemory) {
+ _resourceLimitMgr.decrementResourceCount(owner.getAccountId(), ResourceType.memory, new Long(currentMemory - newMemory));
+ }
}
return _vmDao.findById(vmInstance.getId());
@@ -1722,7 +1754,7 @@
if (newServiceOffering.isDynamic()) {
newServiceOffering.setDynamicFlag(true);
validateCustomParameters(newServiceOffering, customParameters);
- newServiceOffering = _offeringDao.getcomputeOffering(newServiceOffering, customParameters);
+ newServiceOffering = _offeringDao.getComputeOffering(newServiceOffering, customParameters);
}
// Check that the specified service offering ID is valid
@@ -1977,7 +2009,9 @@
// First check that the maximum number of UserVMs, CPU and Memory limit for the given
// accountId will not be exceeded
- resourceLimitCheck(account, vm.isDisplayVm(), new Long(serviceOffering.getCpu()), new Long(serviceOffering.getRamSize()));
+ if (! VirtualMachineManager.ResoureCountRunningVMsonly.value()) {
+ resourceLimitCheck(account, vm.isDisplayVm(), new Long(serviceOffering.getCpu()), new Long(serviceOffering.getRamSize()));
+ }
_haMgr.cancelDestroy(vm, vm.getHostId());
@@ -2140,11 +2174,6 @@
List<VolumeVO> rootVol = _volsDao.findByInstanceAndType(vm.getId(), Volume.Type.ROOT);
// expunge the vm
_itMgr.advanceExpunge(vm.getUuid());
- // Update Resource count
- if (vm.getAccountId() != Account.ACCOUNT_ID_SYSTEM && !rootVol.isEmpty()) {
- _resourceLimitMgr.decrementResourceCount(vm.getAccountId(), ResourceType.volume);
- _resourceLimitMgr.decrementResourceCount(vm.getAccountId(), ResourceType.primary_storage, new Long(rootVol.get(0).getSize()));
- }
// Only if vm is not expunged already, cleanup it's resources
if (vm.getRemoved() == null) {
@@ -2421,6 +2450,10 @@
}
} else {
if (MapUtils.isNotEmpty(details)) {
+ if (details.containsKey("extraconfig")) {
+ throw new InvalidParameterValueException("'extraconfig' should not be included in details as key");
+ }
+
if (caller != null && caller.getType() != Account.ACCOUNT_TYPE_ADMIN) {
// Ensure blacklisted detail is not passed by non-root-admin user
for (final String detailName : details.keySet()) {
@@ -2447,9 +2480,13 @@
vmInstance.setDetails(details);
_vmDao.saveDetails(vmInstance);
}
- if (StringUtils.isNotBlank(extraConfig) && EnableAdditionalVmConfig.valueIn(accountId)) {
- AccountVO account = _accountDao.findById(accountId);
- addExtraConfig(vmInstance, account, extraConfig);
+ if (StringUtils.isNotBlank(extraConfig)) {
+ if (EnableAdditionalVmConfig.valueIn(accountId)) {
+ s_logger.info("Adding extra configuration to user vm: " + vmInstance.getUuid());
+ addExtraConfig(vmInstance, extraConfig);
+ } else {
+ throw new InvalidParameterValueException("attempted setting extraconfig but enable.additional.vm.configuration is disabled");
+ }
}
}
return updateVirtualMachine(id, displayName, group, ha, isDisplayVm, osTypeId, userData, isDynamicallyScalable,
@@ -2461,9 +2498,11 @@
// Resource limit changes
ServiceOffering offering = _serviceOfferingDao.findByIdIncludingRemoved(vmInstance.getId(), vmInstance.getServiceOfferingId());
- _resourceLimitMgr.changeResourceCount(vmInstance.getAccountId(), ResourceType.user_vm, isDisplayVm);
- _resourceLimitMgr.changeResourceCount(vmInstance.getAccountId(), ResourceType.cpu, isDisplayVm, new Long(offering.getCpu()));
- _resourceLimitMgr.changeResourceCount(vmInstance.getAccountId(), ResourceType.memory, isDisplayVm, new Long(offering.getRamSize()));
+ if (isDisplayVm) {
+ resourceCountIncrement(vmInstance.getAccountId(), true, new Long(offering.getCpu()), new Long(offering.getRamSize()));
+ } else {
+ resourceCountDecrement(vmInstance.getAccountId(), true, new Long(offering.getCpu()), new Long(offering.getRamSize()));
+ }
// Usage
saveUsageEvent(vmInstance);
@@ -2735,7 +2774,7 @@
@Override
@ActionEvent(eventType = EventTypes.EVENT_VM_START, eventDescription = "starting Vm", async = true)
- public UserVm startVirtualMachine(StartVMCmd cmd) throws ExecutionException, ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException {
+ public UserVm startVirtualMachine(StartVMCmd cmd) throws ExecutionException, ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException, ResourceAllocationException {
return startVirtualMachine(cmd.getId(), cmd.getPodId(), cmd.getClusterId(), cmd.getHostId(), null, cmd.getDeploymentPlanner()).first();
}
@@ -3126,21 +3165,23 @@
throw new InvalidParameterValueException("Security group feature is not supported for vmWare hypervisor");
}
// Only one network can be specified, and it should be security group enabled
- if (networkIdList.size() > 1) {
+ if (networkIdList.size() > 1 && template.getHypervisorType() != HypervisorType.KVM && hypervisor != HypervisorType.KVM) {
throw new InvalidParameterValueException("Only support one network per VM if security group enabled");
}
- NetworkVO network = _networkDao.findById(networkIdList.get(0));
+ for (Long networkId : networkIdList) {
+ NetworkVO network = _networkDao.findById(networkId);
- if (network == null) {
- throw new InvalidParameterValueException("Unable to find network by id " + networkIdList.get(0).longValue());
+ if (network == null) {
+ throw new InvalidParameterValueException("Unable to find network by id " + networkId);
+ }
+
+ if (!_networkModel.isSecurityGroupSupportedInNetwork(network)) {
+ throw new InvalidParameterValueException("Network is not security group enabled: " + network.getId());
+ }
+
+ networkList.add(network);
}
-
- if (!_networkModel.isSecurityGroupSupportedInNetwork(network)) {
- throw new InvalidParameterValueException("Network is not security group enabled: " + network.getId());
- }
-
- networkList.add(network);
isSecurityGroupEnabledNetworkUsed = true;
} else {
@@ -3154,10 +3195,6 @@
boolean isSecurityGroupEnabled = _networkModel.isSecurityGroupSupportedInNetwork(network);
if (isSecurityGroupEnabled) {
- if (networkIdList.size() > 1) {
- throw new InvalidParameterValueException("Can't create a vm with multiple networks one of" + " which is Security Group enabled");
- }
-
isSecurityGroupEnabledNetworkUsed = true;
}
@@ -3255,7 +3292,7 @@
}
s_logger.debug("Creating network for account " + owner + " from the network offering id=" + requiredOfferings.get(0).getId() + " as a part of deployVM process");
Network newNetwork = _networkMgr.createGuestNetwork(requiredOfferings.get(0).getId(), owner.getAccountName() + "-network", owner.getAccountName() + "-network",
- null, null, null, false, null, owner, null, physicalNetwork, zone.getId(), ACLType.Account, null, null, null, null, true, null,
+ null, null, null, false, null, owner, null, physicalNetwork, zone.getId(), ACLType.Account, null, null, null, null, true, null, null,
null);
if (newNetwork != null) {
defaultNetwork = _networkDao.findById(newNetwork.getId());
@@ -3394,7 +3431,7 @@
if (offering.isDynamic()) {
offering.setDynamicFlag(true);
validateCustomParameters(offering, customParameters);
- offering = _offeringDao.getcomputeOffering(offering, customParameters);
+ offering = _offeringDao.getComputeOffering(offering, customParameters);
}
// check if account/domain is with in resource limits to create a new vm
boolean isIso = Storage.ImageFormat.ISO == template.getFormat();
@@ -3434,7 +3471,9 @@
}
size += _diskOfferingDao.findById(diskOfferingId).getDiskSize();
}
- resourceLimitCheck(owner, isDisplayVm, new Long(offering.getCpu()), new Long(offering.getRamSize()));
+ if (! VirtualMachineManager.ResoureCountRunningVMsonly.value()) {
+ resourceLimitCheck(owner, isDisplayVm, new Long(offering.getCpu()), new Long(offering.getRamSize()));
+ }
_resourceLimitMgr.checkResourceLimit(owner, ResourceType.volume, (isIso || diskOfferingId == null ? 1 : 2));
_resourceLimitMgr.checkResourceLimit(owner, ResourceType.primary_storage, size);
@@ -3763,12 +3802,12 @@
return _instance + "-" + uuidName;
}
- private UserVmVO commitUserVm(final DataCenter zone, final VirtualMachineTemplate template, final String hostName, final String displayName, final Account owner,
- final Long diskOfferingId, final Long diskSize, final String userData, final Account caller, final Boolean isDisplayVm, final String keyboard,
- final long accountId, final long userId, final ServiceOfferingVO offering, final boolean isIso, final String sshPublicKey, final LinkedHashMap<String, NicProfile> networkNicMap,
- final long id, final String instanceName, final String uuidName, final HypervisorType hypervisorType, final Map<String, String> customParameters, final Map<String,
- Map<Integer, String>> extraDhcpOptionMap, final Map<Long, DiskOffering> dataDiskTemplateToDiskOfferingMap,
- Map<String, String> userVmOVFPropertiesMap) throws InsufficientCapacityException {
+ private UserVmVO commitUserVm(final boolean isImport, final DataCenter zone, final Host host, final Host lastHost, final VirtualMachineTemplate template, final String hostName, final String displayName, final Account owner,
+ final Long diskOfferingId, final Long diskSize, final String userData, final Account caller, final Boolean isDisplayVm, final String keyboard,
+ final long accountId, final long userId, final ServiceOffering offering, final boolean isIso, final String sshPublicKey, final LinkedHashMap<String, NicProfile> networkNicMap,
+ final long id, final String instanceName, final String uuidName, final HypervisorType hypervisorType, final Map<String, String> customParameters,
+ final Map<String, Map<Integer, String>> extraDhcpOptionMap, final Map<Long, DiskOffering> dataDiskTemplateToDiskOfferingMap,
+ final Map<String, String> userVmOVFPropertiesMap, final VirtualMachine.PowerState powerState) throws InsufficientCapacityException {
return Transaction.execute(new TransactionCallbackWithException<UserVmVO, InsufficientCapacityException>() {
@Override
public UserVmVO doInTransaction(TransactionStatus status) throws InsufficientCapacityException {
@@ -3790,7 +3829,7 @@
vm.setDetail(VmDetailConstants.KEYBOARD, keyboard);
}
- if (isIso) {
+ if (!isImport && isIso) {
vm.setIsoId(template.getId());
}
Long rootDiskSize = null;
@@ -3842,9 +3881,21 @@
}
}
+ if (isImport) {
+ vm.setDataCenterId(zone.getId());
+ vm.setHostId(host.getId());
+ if (lastHost != null) {
+ vm.setLastHostId(lastHost.getId());
+ }
+ vm.setPowerState(powerState);
+ if (powerState == VirtualMachine.PowerState.PowerOn) {
+ vm.setState(State.Running);
+ }
+ }
+
_vmDao.persist(vm);
for (String key : customParameters.keySet()) {
- if( key.equalsIgnoreCase(VmDetailConstants.CPU_NUMBER) ||
+ if (key.equalsIgnoreCase(VmDetailConstants.CPU_NUMBER) ||
key.equalsIgnoreCase(VmDetailConstants.CPU_SPEED) ||
key.equalsIgnoreCase(VmDetailConstants.MEMORY)) {
// handle double byte strings.
@@ -3852,6 +3903,11 @@
} else {
vm.setDetail(key, customParameters.get(key));
}
+
+ if (key.equalsIgnoreCase(ApiConstants.BootType.UEFI.toString())) {
+ vm.setDetail(key, customParameters.get(key));
+ continue;
+ }
}
vm.setDetail(VmDetailConstants.DEPLOY_VM, "true");
@@ -3878,45 +3934,62 @@
}
_vmDao.saveDetails(vm);
+ if (!isImport) {
+ s_logger.debug("Allocating in the DB for vm");
+ DataCenterDeployment plan = new DataCenterDeployment(zone.getId());
- s_logger.debug("Allocating in the DB for vm");
- DataCenterDeployment plan = new DataCenterDeployment(zone.getId());
+ List<String> computeTags = new ArrayList<String>();
+ computeTags.add(offering.getHostTag());
- List<String> computeTags = new ArrayList<String>();
- computeTags.add(offering.getHostTag());
+ List<String> rootDiskTags = new ArrayList<String>();
+ rootDiskTags.add(offering.getTags());
- List<String> rootDiskTags = new ArrayList<String>();
- rootDiskTags.add(offering.getTags());
+ if (isIso) {
+ _orchSrvc.createVirtualMachineFromScratch(vm.getUuid(), Long.toString(owner.getAccountId()), vm.getIsoId().toString(), hostName, displayName,
+ hypervisorType.name(), guestOSCategory.getName(), offering.getCpu(), offering.getSpeed(), offering.getRamSize(), diskSize, computeTags, rootDiskTags,
+ networkNicMap, plan, extraDhcpOptionMap);
+ } else {
+ _orchSrvc.createVirtualMachine(vm.getUuid(), Long.toString(owner.getAccountId()), Long.toString(template.getId()), hostName, displayName, hypervisorType.name(),
+ offering.getCpu(), offering.getSpeed(), offering.getRamSize(), diskSize, computeTags, rootDiskTags, networkNicMap, plan, rootDiskSize, extraDhcpOptionMap, dataDiskTemplateToDiskOfferingMap);
+ }
- if (isIso) {
- _orchSrvc.createVirtualMachineFromScratch(vm.getUuid(), Long.toString(owner.getAccountId()), vm.getIsoId().toString(), hostName, displayName,
- hypervisorType.name(), guestOSCategory.getName(), offering.getCpu(), offering.getSpeed(), offering.getRamSize(), diskSize, computeTags, rootDiskTags,
- networkNicMap, plan, extraDhcpOptionMap);
- } else {
- _orchSrvc.createVirtualMachine(vm.getUuid(), Long.toString(owner.getAccountId()), Long.toString(template.getId()), hostName, displayName, hypervisorType.name(),
- offering.getCpu(), offering.getSpeed(), offering.getRamSize(), diskSize, computeTags, rootDiskTags, networkNicMap, plan, rootDiskSize, extraDhcpOptionMap, dataDiskTemplateToDiskOfferingMap);
- }
-
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("Successfully allocated DB entry for " + vm);
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Successfully allocated DB entry for " + vm);
+ }
}
CallContext.current().setEventDetails("Vm Id: " + vm.getUuid());
- if (!offering.isDynamic()) {
- UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_CREATE, accountId, zone.getId(), vm.getId(), vm.getHostName(), offering.getId(), template.getId(),
- hypervisorType.toString(), VirtualMachine.class.getName(), vm.getUuid(), vm.isDisplayVm());
- } else {
- UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_CREATE, accountId, zone.getId(), vm.getId(), vm.getHostName(), offering.getId(), template.getId(),
- hypervisorType.toString(), VirtualMachine.class.getName(), vm.getUuid(), customParameters, vm.isDisplayVm());
- }
+ if (!isImport) {
+ if (!offering.isDynamic()) {
+ UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_CREATE, accountId, zone.getId(), vm.getId(), vm.getHostName(), offering.getId(), template.getId(),
+ hypervisorType.toString(), VirtualMachine.class.getName(), vm.getUuid(), vm.isDisplayVm());
+ } else {
+ UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_CREATE, accountId, zone.getId(), vm.getId(), vm.getHostName(), offering.getId(), template.getId(),
+ hypervisorType.toString(), VirtualMachine.class.getName(), vm.getUuid(), customParameters, vm.isDisplayVm());
+ }
- //Update Resource Count for the given account
- resourceCountIncrement(accountId, isDisplayVm, new Long(offering.getCpu()), new Long(offering.getRamSize()));
+ //Update Resource Count for the given account
+ resourceCountIncrement(accountId, isDisplayVm, new Long(offering.getCpu()), new Long(offering.getRamSize()));
+ }
return vm;
}
});
}
+ private UserVmVO commitUserVm(final DataCenter zone, final VirtualMachineTemplate template, final String hostName, final String displayName, final Account owner,
+ final Long diskOfferingId, final Long diskSize, final String userData, final Account caller, final Boolean isDisplayVm, final String keyboard,
+ final long accountId, final long userId, final ServiceOfferingVO offering, final boolean isIso, final String sshPublicKey, final LinkedHashMap<String, NicProfile> networkNicMap,
+ final long id, final String instanceName, final String uuidName, final HypervisorType hypervisorType, final Map<String, String> customParameters, final Map<String,
+ Map<Integer, String>> extraDhcpOptionMap, final Map<Long, DiskOffering> dataDiskTemplateToDiskOfferingMap,
+ Map<String, String> userVmOVFPropertiesMap) throws InsufficientCapacityException {
+ return commitUserVm(false, zone, null, null, template, hostName, displayName, owner,
+ diskOfferingId, diskSize, userData, caller, isDisplayVm, keyboard,
+ accountId, userId, offering, isIso, sshPublicKey, networkNicMap,
+ id, instanceName, uuidName, hypervisorType, customParameters,
+ extraDhcpOptionMap, dataDiskTemplateToDiskOfferingMap,
+ userVmOVFPropertiesMap, null);
+ }
+
public void validateRootDiskResize(final HypervisorType hypervisorType, Long rootDiskSize, VMTemplateVO templateVO, UserVmVO vm, final Map<String, String> customParameters) throws InvalidParameterValueException
{
// rootdisksize must be larger than template.
@@ -4149,23 +4222,31 @@
@Override
@ActionEvent(eventType = EventTypes.EVENT_VM_CREATE, eventDescription = "starting Vm", async = true)
- public UserVm startVirtualMachine(DeployVMCmd cmd) throws ResourceUnavailableException, InsufficientCapacityException, ConcurrentOperationException {
+ public UserVm startVirtualMachine(DeployVMCmd cmd) throws ResourceUnavailableException, InsufficientCapacityException, ConcurrentOperationException, ResourceAllocationException {
long vmId = cmd.getEntityId();
Long podId = null;
Long clusterId = null;
Long hostId = cmd.getHostId();
+ Map<VirtualMachineProfile.Param, Object> additonalParams = null;
Map<Long, DiskOffering> diskOfferingMap = cmd.getDataDiskTemplateToDiskOfferingMap();
if (cmd instanceof DeployVMCmdByAdmin) {
DeployVMCmdByAdmin adminCmd = (DeployVMCmdByAdmin)cmd;
podId = adminCmd.getPodId();
clusterId = adminCmd.getClusterId();
}
- return startVirtualMachine(vmId, podId, clusterId, hostId, diskOfferingMap, null, cmd.getDeploymentPlanner());
+ if (MapUtils.isNotEmpty(cmd.getDetails()) && cmd.getDetails().containsKey(ApiConstants.BootType.UEFI.toString())) {
+ additonalParams = new HashMap<VirtualMachineProfile.Param, Object>();
+ Map<String, String> map = cmd.getDetails();
+ additonalParams.put(VirtualMachineProfile.Param.UefiFlag, "Yes");
+ additonalParams.put(VirtualMachineProfile.Param.BootType, ApiConstants.BootType.UEFI.toString());
+ additonalParams.put(VirtualMachineProfile.Param.BootMode, map.get(ApiConstants.BootType.UEFI.toString()));
+ }
+ return startVirtualMachine(vmId, podId, clusterId, hostId, diskOfferingMap, additonalParams, cmd.getDeploymentPlanner());
}
private UserVm startVirtualMachine(long vmId, Long podId, Long clusterId, Long hostId, Map<Long, DiskOffering> diskOfferingMap, Map<VirtualMachineProfile.Param, Object> additonalParams, String deploymentPlannerToUse)
throws ResourceUnavailableException,
- InsufficientCapacityException, ConcurrentOperationException {
+ InsufficientCapacityException, ConcurrentOperationException, ResourceAllocationException {
UserVmVO vm = _vmDao.findById(vmId);
Pair<UserVmVO, Map<VirtualMachineProfile.Param, Object>> vmParamPair = null;
@@ -4493,13 +4574,13 @@
@Override
public Pair<UserVmVO, Map<VirtualMachineProfile.Param, Object>> startVirtualMachine(long vmId, Long hostId, Map<VirtualMachineProfile.Param, Object> additionalParams, String deploymentPlannerToUse)
- throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException {
+ throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException, ResourceAllocationException {
return startVirtualMachine(vmId, null, null, hostId, additionalParams, deploymentPlannerToUse);
}
@Override
public Pair<UserVmVO, Map<VirtualMachineProfile.Param, Object>> startVirtualMachine(long vmId, Long podId, Long clusterId, Long hostId, Map<VirtualMachineProfile.Param, Object> additionalParams, String deploymentPlannerToUse)
- throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException {
+ throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException, ResourceAllocationException {
// Input validation
final Account callerAccount = CallContext.current().getCallingAccount();
UserVO callerUser = _userDao.findById(CallContext.current().getCallingUserId());
@@ -4525,6 +4606,11 @@
if (owner.getState() == Account.State.disabled) {
throw new PermissionDeniedException("The owner of " + vm + " is disabled: " + vm.getAccountId());
}
+ if (VirtualMachineManager.ResoureCountRunningVMsonly.value()) {
+ // check if account/domain is with in resource limits to start a new vm
+ ServiceOfferingVO offering = _serviceOfferingDao.findById(vm.getId(), vm.getServiceOfferingId());
+ resourceLimitCheck(owner, vm.isDisplayVm(), new Long(offering.getCpu()), new Long(offering.getRamSize()));
+ }
// check if vm is security group enabled
if (_securityGroupMgr.isVmSecurityGroupEnabled(vmId) && _securityGroupMgr.getSecurityGroupsForVm(vmId).isEmpty()
@@ -4614,6 +4700,7 @@
throw new InvalidParameterValueException("Can't find a planner by name " + deploymentPlannerToUse);
}
}
+ vmEntity.setParamsToEntity(additionalParams);
String reservationId = vmEntity.reserve(planner, plan, new ExcludeList(), Long.toString(callerUser.getId()));
vmEntity.deploy(reservationId, Long.toString(callerUser.getId()), params, deployOnGivenHost);
@@ -5028,8 +5115,13 @@
Account caller = CallContext.current().getCallingAccount();
Long callerId = caller.getId();
String extraConfig = cmd.getExtraConfig();
- if (StringUtils.isNotBlank(extraConfig) && EnableAdditionalVmConfig.valueIn(callerId) ) {
- addExtraConfig(vm, caller, extraConfig);
+ if (StringUtils.isNotBlank(extraConfig)) {
+ if (EnableAdditionalVmConfig.valueIn(callerId)) {
+ s_logger.info("Adding extra configuration to user vm: " + vm.getUuid());
+ addExtraConfig(vm, extraConfig);
+ } else {
+ throw new InvalidParameterValueException("attempted setting extraconfig but enable.additional.vm.configuration is disabled");
+ }
}
if (cmd.getCopyImageTags()) {
@@ -5048,24 +5140,119 @@
}
/**
- * Persist extra configurations as details for VMware VMs
+ * Persist extra configuration data in the user_vm_details table as key/value pair
+ * @param decodedUrl String consisting of the extra config data to appended onto the vmx file for VMware instances
*/
protected void persistExtraConfigVmware(String decodedUrl, UserVm vm) {
- String[] configDataArr = decodedUrl.split("\\r?\\n");
- for (String config: configDataArr) {
- String[] keyValue = config.split("=");
- try {
- userVmDetailsDao.addDetail(vm.getId(), keyValue[0], keyValue[1], true);
- } catch (ArrayIndexOutOfBoundsException e) {
- throw new CloudRuntimeException("Issue occurred during parsing of:" + config);
+ boolean isValidConfig = isValidKeyValuePair(decodedUrl);
+ if (isValidConfig) {
+ String[] extraConfigs = decodedUrl.split("\\r?\\n");
+ for (String cfg : extraConfigs) {
+ // Validate cfg against unsupported operations set by admin here
+ String[] allowedKeyList = VmwareAdditionalConfigAllowList.value().split(",");
+ boolean validXenOrVmwareConfiguration = isValidXenOrVmwareConfiguration(cfg, allowedKeyList);
+ String[] paramArray = cfg.split("=");
+ if (validXenOrVmwareConfiguration && paramArray.length == 2) {
+ userVmDetailsDao.addDetail(vm.getId(), paramArray[0].trim(), paramArray[1].trim(), true);
+ } else {
+ throw new CloudRuntimeException("Extra config " + cfg + " is not on the list of allowed keys for VMware hypervisor hosts.");
+ }
}
+ } else {
+ throw new CloudRuntimeException("The passed extra config string " + decodedUrl + "contains an invalid key/value pair pattern");
}
}
/**
- * Persist extra configurations as details for hypervisors except Vmware
+ * Used to persist extra configuration settings in user_vm_details table for the XenServer hypervisor
+ * persists config as key/value pair e.g key = extraconfig-1 , value="PV-bootloader=pygrub" and so on to extraconfig-N where
+ * N denotes the number of extra configuration settings passed by user
+ *
+ * @param decodedUrl A string containing extra configuration settings as key/value pairs seprated by newline escape character
+ * e.x PV-bootloader=pygrub\nPV-args=console\nHV-Boot-policy=""
*/
- protected void persistExtraConfigNonVmware(String decodedUrl, UserVm vm) {
+ protected void persistExtraConfigXenServer(String decodedUrl, UserVm vm) {
+ boolean isValidConfig = isValidKeyValuePair(decodedUrl);
+ if (isValidConfig) {
+ String[] extraConfigs = decodedUrl.split("\\r?\\n");
+ int i = 1;
+ String extraConfigKey = ApiConstants.EXTRA_CONFIG + "-";
+ for (String cfg : extraConfigs) {
+ // Validate cfg against unsupported operations set by admin here
+ String[] allowedKeyList = XenServerAdditionalConfigAllowList.value().split(",");
+ boolean validXenOrVmwareConfiguration = isValidXenOrVmwareConfiguration(cfg, allowedKeyList);
+ if (validXenOrVmwareConfiguration) {
+ userVmDetailsDao.addDetail(vm.getId(), extraConfigKey + String.valueOf(i), cfg, true);
+ i++;
+ } else {
+ throw new CloudRuntimeException("Extra config " + cfg + " is not on the list of allowed keys for XenServer hypervisor hosts.");
+ }
+ }
+ } else {
+ String msg = String.format("The passed extra config string '%s' contains an invalid key/value pair pattern", decodedUrl);
+ throw new CloudRuntimeException(msg);
+ }
+ }
+
+ /**
+ * Used to valid extraconfig keylvalue pair for Vmware and XenServer
+ * Example of tested valid config for VMware as taken from VM instance vmx file
+ * <p>
+ * nvp.vm-uuid=34b3d5ea-1c25-4bb0-9250-8dc3388bfa9b
+ * migrate.hostLog=i-2-67-VM-5130f8ab.hlog
+ * ethernet0.address=02:00:5f:51:00:41
+ * </p>
+ * <p>
+ * Examples of tested valid configs for XenServer
+ * <p>
+ * is-a-template=true\nHVM-boot-policy=\nPV-bootloader=pygrub\nPV-args=hvc0
+ * </p>
+ *
+ * Allow the following character set {', ", -, ., =, a-z, 0-9, empty space, \n}
+ *
+ * @param decodedUrl String conprising of extra config key/value pairs for XenServer and Vmware
+ * @return True if extraconfig is valid key/value pair
+ */
+ protected boolean isValidKeyValuePair(String decodedUrl) {
+ // Valid pairs should look like "key-1=value1, param:key-2=value2, my.config.v0=False"
+ Pattern pattern = Pattern.compile("^(?:[\\w-\\s\\.:]*=[\\w-\\s\\.'\":]*(?:\\s+|$))+$");
+ Matcher matcher = pattern.matcher(decodedUrl);
+ return matcher.matches();
+ }
+
+ /**
+ * Validates key/value pair strings passed as extra configuration for XenServer and Vmware
+ * @param cfg configuration key-value pair
+ * @param allowedKeyList list of allowed configuration keys for XenServer and VMware
+ * @return
+ */
+ protected boolean isValidXenOrVmwareConfiguration(String cfg, String[] allowedKeyList) {
+ // This should be of minimum length 1
+ // Value is ignored in case it is empty
+ String[] cfgKeyValuePair = cfg.split("=");
+ if (cfgKeyValuePair.length >= 1) {
+ for (String allowedKey : allowedKeyList) {
+ if (cfgKeyValuePair[0].equalsIgnoreCase(allowedKey.trim())) {
+ return true;
+ }
+ }
+ } else {
+ String msg = String.format("An incorrect configuration %s has been passed", cfg);
+ throw new CloudRuntimeException(msg);
+ }
+ return false;
+ }
+
+ /**
+ * Persist extra configuration data on KVM
+ * persisted in the user_vm_details DB as extraconfig-1, and so on depending on the number of configurations
+ * For KVM, extra config is passed as XML
+ * @param decodedUrl string containing xml configuration to be persisted into user_vm_details table
+ * @param vm
+ */
+ protected void persistExtraConfigKvm(String decodedUrl, UserVm vm) {
+ // validate config against blacklisted cfg commands
+ validateKvmExtraConfig(decodedUrl);
String[] extraConfigs = decodedUrl.split("\n\n");
for (String cfg : extraConfigs) {
int i = 1;
@@ -5073,7 +5260,7 @@
String extraConfigKey = ApiConstants.EXTRA_CONFIG;
String extraConfigValue;
if (cfgParts[0].matches("\\S+:$")) {
- extraConfigKey += "-" + cfgParts[0].substring(0,cfgParts[0].length() - 1);
+ extraConfigKey += "-" + cfgParts[0].substring(0, cfgParts[0].length() - 1);
extraConfigValue = cfg.replace(cfgParts[0] + "\n", "");
} else {
extraConfigKey += "-" + String.valueOf(i);
@@ -5084,16 +5271,71 @@
}
}
- protected void addExtraConfig(UserVm vm, Account caller, String extraConfig) {
- String decodedUrl = decodeExtraConfig(extraConfig);
- HypervisorType hypervisorType = vm.getHypervisorType();
- if (hypervisorType == HypervisorType.VMware) {
- persistExtraConfigVmware(decodedUrl, vm);
- } else {
- persistExtraConfigNonVmware(decodedUrl, vm);
+ /**
+ * This method is called by the persistExtraConfigKvm
+ * Validates passed extra configuration data for KVM and validates against blacklist of unwanted commands
+ * controlled by Root admin
+ * @param decodedUrl string containing xml configuration to be validated
+ */
+ protected void validateKvmExtraConfig(String decodedUrl) {
+ String[] allowedConfigOptionList = KvmAdditionalConfigAllowList.value().split(",");
+ // Skip allowed keys validation validation for DPDK
+ if (!decodedUrl.contains(":")) {
+ try {
+ DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+ InputSource src = new InputSource();
+ src.setCharacterStream(new StringReader(String.format("<config>\n%s\n</config>", decodedUrl)));
+ Document doc = builder.parse(src);
+ doc.getDocumentElement().normalize();
+ NodeList nodeList=doc.getElementsByTagName("*");
+ for (int i = 1; i < nodeList.getLength(); i++) { // First element is config so skip it
+ Element element = (Element)nodeList.item(i);
+ boolean isValidConfig = false;
+ String currentConfig = element.getNodeName().trim();
+ for (String tag : allowedConfigOptionList) {
+ if (currentConfig.equals(tag.trim())) {
+ isValidConfig = true;
+ }
+ }
+ if (!isValidConfig) {
+ throw new CloudRuntimeException(String.format("Extra config %s is not on the list of allowed keys for KVM hypervisor hosts", currentConfig));
+ }
+ }
+ } catch (ParserConfigurationException | IOException | SAXException e) {
+ throw new CloudRuntimeException("Failed to parse additional XML configuration: " + e.getMessage());
+ }
}
}
+ /**
+ * Adds extra config data to guest VM instances
+ * @param extraConfig Extra Configuration settings to be added in UserVm instances for KVM, XenServer and VMware
+ */
+ protected void addExtraConfig(UserVm vm, String extraConfig) {
+ String decodedUrl = decodeExtraConfig(extraConfig);
+ HypervisorType hypervisorType = vm.getHypervisorType();
+
+ switch (hypervisorType) {
+ case XenServer:
+ persistExtraConfigXenServer(decodedUrl, vm);
+ break;
+ case KVM:
+ persistExtraConfigKvm(decodedUrl, vm);
+ break;
+ case VMware:
+ persistExtraConfigVmware(decodedUrl, vm);
+ break;
+ default:
+ String msg = String.format("This hypervisor %s is not supported for use with this feature", hypervisorType.toString());
+ throw new CloudRuntimeException(msg);
+ }
+ }
+
+ /**
+ * Decodes an URL encoded string passed as extra configuration for guest VMs
+ * @param encodeString URL encoded string
+ * @return String result of decoded URL
+ */
protected String decodeExtraConfig(String encodeString) {
String decodedUrl;
try {
@@ -5140,6 +5382,10 @@
maxIops = details.get("maxIopsDo");
verifyMinAndMaxIops(minIops, maxIops);
+
+ if (details.containsKey("extraconfig")) {
+ throw new InvalidParameterValueException("'extraconfig' should not be included in details as key");
+ }
}
}
@@ -5876,7 +6122,9 @@
removeInstanceFromInstanceGroup(cmd.getVmId());
// VV 2: check if account/domain is with in resource limits to create a new vm
- resourceLimitCheck(newAccount, vm.isDisplayVm(), new Long(offering.getCpu()), new Long(offering.getRamSize()));
+ if (! VirtualMachineManager.ResoureCountRunningVMsonly.value()) {
+ resourceLimitCheck(newAccount, vm.isDisplayVm(), new Long(offering.getCpu()), new Long(offering.getRamSize()));
+ }
// VV 3: check if volumes and primary storage space are with in resource limits
_resourceLimitMgr.checkResourceLimit(newAccount, ResourceType.volume, _volsDao.findByInstance(cmd.getVmId()).size());
@@ -5887,7 +6135,10 @@
_resourceLimitMgr.checkResourceLimit(newAccount, ResourceType.primary_storage, totalVolumesSize);
// VV 4: Check if new owner can use the vm template
- VirtualMachineTemplate template = _templateDao.findById(vm.getTemplateId());
+ VirtualMachineTemplate template = _templateDao.findByIdIncludingRemoved(vm.getTemplateId());
+ if (template == null) {
+ throw new InvalidParameterValueException(String.format("Template for VM: %s cannot be found", vm.getUuid()));
+ }
if (!template.isPublicTemplate()) {
Account templateOwner = _accountMgr.getAccount(template.getAccountId());
_accountMgr.checkAccess(newAccount, null, true, templateOwner);
@@ -5929,7 +6180,9 @@
}
//update resource count of new account
- resourceCountIncrement(newAccount.getAccountId(), vm.isDisplayVm(), new Long(offering.getCpu()), new Long(offering.getRamSize()));
+ if (! VirtualMachineManager.ResoureCountRunningVMsonly.value()) {
+ resourceCountIncrement(newAccount.getAccountId(), vm.isDisplayVm(), new Long(offering.getCpu()), new Long(offering.getRamSize()));
+ }
//generate usage events to account for this change
UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_CREATE, vm.getAccountId(), vm.getDataCenterId(), vm.getId(),
@@ -6210,7 +6463,7 @@
Network newNetwork = _networkMgr.createGuestNetwork(requiredOfferings.get(0).getId(), newAccount.getAccountName() + "-network",
newAccount.getAccountName() + "-network", null, null, null, false, null, newAccount,
null, physicalNetwork, zone.getId(), ACLType.Account, null, null,
- null, null, true, null, null);
+ null, null, true, null, null, null);
// if the network offering has persistent set to true, implement the network
if (requiredOfferings.get(0).isPersistent()) {
DeployDestination dest = new DeployDestination(zone, null, null, null);
@@ -6675,8 +6928,9 @@
@Override
public ConfigKey<?>[] getConfigKeys() {
- return new ConfigKey<?>[] {EnableDynamicallyScaleVm, AllowUserExpungeRecoverVm, VmIpFetchWaitInterval, VmIpFetchTrialMax, VmIpFetchThreadPoolMax,
- VmIpFetchTaskWorkers, AllowDeployVmIfGivenHostFails, EnableAdditionalVmConfig, DisplayVMOVFProperties};
+ return new ConfigKey<?>[] {EnableDynamicallyScaleVm, AllowUserExpungeRecoverVm, VmIpFetchWaitInterval, VmIpFetchTrialMax,
+ VmIpFetchThreadPoolMax, VmIpFetchTaskWorkers, AllowDeployVmIfGivenHostFails, EnableAdditionalVmConfig, DisplayVMOVFProperties,
+ KvmAdditionalConfigAllowList, XenServerAdditionalConfigAllowList, VmwareAdditionalConfigAllowList};
}
@Override
@@ -6771,4 +7025,32 @@
}
}
}
-}
+
+ @Override
+ public UserVm importVM(final DataCenter zone, final Host host, final VirtualMachineTemplate template, final String instanceName, final String displayName,
+ final Account owner, final String userData, final Account caller, final Boolean isDisplayVm, final String keyboard,
+ final long accountId, final long userId, final ServiceOffering serviceOffering, final String sshPublicKey,
+ final String hostName, final HypervisorType hypervisorType, final Map<String, String> customParameters, final VirtualMachine.PowerState powerState) throws InsufficientCapacityException {
+ if (zone == null) {
+ throw new InvalidParameterValueException("Unable to import virtual machine with invalid zone");
+ }
+ if (host == null) {
+ throw new InvalidParameterValueException("Unable to import virtual machine with invalid host");
+ }
+
+ final long id = _vmDao.getNextInSequence(Long.class, "id");
+
+ if (hostName != null) {
+ // Check is hostName is RFC compliant
+ checkNameForRFCCompliance(hostName);
+ }
+
+ final String uuidName = _uuidMgr.generateUuid(UserVm.class, null);
+ final Host lastHost = powerState != VirtualMachine.PowerState.PowerOn ? host : null;
+ return commitUserVm(true, zone, host, lastHost, template, hostName, displayName, owner,
+ null, null, userData, caller, isDisplayVm, keyboard,
+ accountId, userId, serviceOffering, template.getFormat().equals(ImageFormat.ISO), sshPublicKey, null,
+ id, instanceName, uuidName, hypervisorType, customParameters,
+ null, null, null, powerState);
+ }
+}
\ No newline at end of file
diff --git a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
new file mode 100644
index 0000000..f3b0a3c
--- /dev/null
+++ b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
@@ -0,0 +1,1051 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.backup;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.command.admin.backup.DeleteBackupOfferingCmd;
+import org.apache.cloudstack.api.command.admin.backup.ImportBackupOfferingCmd;
+import org.apache.cloudstack.api.command.admin.backup.ListBackupProviderOfferingsCmd;
+import org.apache.cloudstack.api.command.admin.backup.ListBackupProvidersCmd;
+import org.apache.cloudstack.api.command.user.backup.AssignVirtualMachineToBackupOfferingCmd;
+import org.apache.cloudstack.api.command.user.backup.CreateBackupCmd;
+import org.apache.cloudstack.api.command.user.backup.CreateBackupScheduleCmd;
+import org.apache.cloudstack.api.command.user.backup.DeleteBackupCmd;
+import org.apache.cloudstack.api.command.user.backup.DeleteBackupScheduleCmd;
+import org.apache.cloudstack.api.command.user.backup.ListBackupOfferingsCmd;
+import org.apache.cloudstack.api.command.user.backup.ListBackupScheduleCmd;
+import org.apache.cloudstack.api.command.user.backup.ListBackupsCmd;
+import org.apache.cloudstack.api.command.user.backup.RemoveVirtualMachineFromBackupOfferingCmd;
+import org.apache.cloudstack.api.command.user.backup.RestoreBackupCmd;
+import org.apache.cloudstack.api.command.user.backup.RestoreVolumeFromBackupAndAttachToVMCmd;
+import org.apache.cloudstack.api.command.user.backup.UpdateBackupScheduleCmd;
+import org.apache.cloudstack.backup.dao.BackupDao;
+import org.apache.cloudstack.backup.dao.BackupOfferingDao;
+import org.apache.cloudstack.backup.dao.BackupScheduleDao;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.jobs.AsyncJobDispatcher;
+import org.apache.cloudstack.framework.jobs.AsyncJobManager;
+import org.apache.cloudstack.framework.jobs.impl.AsyncJobVO;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
+import org.apache.cloudstack.managed.context.ManagedContextTimerTask;
+import org.apache.cloudstack.poll.BackgroundPollManager;
+import org.apache.cloudstack.poll.BackgroundPollTask;
+import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
+import org.apache.log4j.Logger;
+
+import com.cloud.api.ApiDispatcher;
+import com.cloud.api.ApiGsonHelper;
+import com.cloud.dc.DataCenter;
+import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.event.ActionEvent;
+import com.cloud.event.ActionEventUtils;
+import com.cloud.event.EventTypes;
+import com.cloud.event.UsageEventUtils;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.PermissionDeniedException;
+import com.cloud.host.HostVO;
+import com.cloud.host.dao.HostDao;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.hypervisor.HypervisorGuru;
+import com.cloud.hypervisor.HypervisorGuruManager;
+import com.cloud.projects.Project;
+import com.cloud.storage.ScopeType;
+import com.cloud.storage.Volume;
+import com.cloud.storage.VolumeVO;
+import com.cloud.storage.dao.DiskOfferingDao;
+import com.cloud.storage.dao.VolumeDao;
+import com.cloud.user.Account;
+import com.cloud.user.AccountManager;
+import com.cloud.user.AccountService;
+import com.cloud.user.User;
+import com.cloud.utils.DateUtil;
+import com.cloud.utils.Pair;
+import com.cloud.utils.Ternary;
+import com.cloud.utils.component.ComponentContext;
+import com.cloud.utils.component.ManagerBase;
+import com.cloud.utils.db.DB;
+import com.cloud.utils.db.Filter;
+import com.cloud.utils.db.GlobalLock;
+import com.cloud.utils.db.JoinBuilder;
+import com.cloud.utils.db.SearchBuilder;
+import com.cloud.utils.db.SearchCriteria;
+import com.cloud.utils.db.Transaction;
+import com.cloud.utils.db.TransactionCallback;
+import com.cloud.utils.db.TransactionStatus;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.dao.VMInstanceDao;
+import com.google.common.base.Strings;
+import com.google.gson.Gson;
+
+public class BackupManagerImpl extends ManagerBase implements BackupManager {
+ private static final Logger LOG = Logger.getLogger(BackupManagerImpl.class);
+
+ @Inject
+ private BackupDao backupDao;
+ @Inject
+ private BackupScheduleDao backupScheduleDao;
+ @Inject
+ private BackupOfferingDao backupOfferingDao;
+ @Inject
+ private VMInstanceDao vmInstanceDao;
+ @Inject
+ private AccountService accountService;
+ @Inject
+ private AccountManager accountManager;
+ @Inject
+ private VolumeDao volumeDao;
+ @Inject
+ private DataCenterDao dataCenterDao;
+ @Inject
+ private BackgroundPollManager backgroundPollManager;
+ @Inject
+ private HostDao hostDao;
+ @Inject
+ private HypervisorGuruManager hypervisorGuruManager;
+ @Inject
+ private PrimaryDataStoreDao primaryDataStoreDao;
+ @Inject
+ private DiskOfferingDao diskOfferingDao;
+ @Inject
+ private ApiDispatcher apiDispatcher;
+ @Inject
+ private AsyncJobManager asyncJobManager;
+
+ private AsyncJobDispatcher asyncJobDispatcher;
+ private Timer backupTimer;
+ private Date currentTimestamp;
+
+ private static Map<String, BackupProvider> backupProvidersMap = new HashMap<>();
+ private List<BackupProvider> backupProviders;
+
+ public AsyncJobDispatcher getAsyncJobDispatcher() {
+ return asyncJobDispatcher;
+ }
+
+ public void setAsyncJobDispatcher(final AsyncJobDispatcher dispatcher) {
+ asyncJobDispatcher = dispatcher;
+ }
+
+ @Override
+ public List<BackupOffering> listBackupProviderOfferings(final Long zoneId) {
+ if (zoneId == null || zoneId < 1) {
+ throw new CloudRuntimeException("Invalid zone ID passed");
+ }
+ validateForZone(zoneId);
+ final Account account = CallContext.current().getCallingAccount();
+ if (!accountService.isRootAdmin(account.getId())) {
+ throw new PermissionDeniedException("Parameter external can only be specified by a Root Admin, permission denied");
+ }
+ final BackupProvider backupProvider = getBackupProvider(zoneId);
+ LOG.debug("Listing external backup offerings for the backup provider configured for zone ID " + zoneId);
+ return backupProvider.listBackupOfferings(zoneId);
+ }
+
+ @Override
+ @ActionEvent(eventType = EventTypes.EVENT_VM_BACKUP_IMPORT_OFFERING, eventDescription = "importing backup offering", async = true)
+ public BackupOffering importBackupOffering(final ImportBackupOfferingCmd cmd) {
+ validateForZone(cmd.getZoneId());
+ final BackupOffering existingOffering = backupOfferingDao.findByExternalId(cmd.getExternalId(), cmd.getZoneId());
+ if (existingOffering != null) {
+ throw new CloudRuntimeException("A backup offering with external ID " + cmd.getExternalId() + " already exists");
+ }
+ if (backupOfferingDao.findByName(cmd.getName(), cmd.getZoneId()) != null) {
+ throw new CloudRuntimeException("A backup offering with the same name already exists in this zone");
+ }
+
+ final BackupProvider provider = getBackupProvider(cmd.getZoneId());
+ if (!provider.isValidProviderOffering(cmd.getZoneId(), cmd.getExternalId())) {
+ throw new CloudRuntimeException("Backup offering '" + cmd.getExternalId() + "' does not exist on provider " + provider.getName() + " on zone " + cmd.getZoneId());
+ }
+
+ final BackupOfferingVO offering = new BackupOfferingVO(cmd.getZoneId(), cmd.getExternalId(), provider.getName(),
+ cmd.getName(), cmd.getDescription(), cmd.getUserDrivenBackups());
+
+ final BackupOfferingVO savedOffering = backupOfferingDao.persist(offering);
+ if (savedOffering == null) {
+ throw new CloudRuntimeException("Unable to create backup offering: " + cmd.getExternalId() + ", name: " + cmd.getName());
+ }
+ LOG.debug("Successfully created backup offering " + cmd.getName() + " mapped to backup provider offering " + cmd.getExternalId());
+ return savedOffering;
+ }
+
+ @Override
+ public Pair<List<BackupOffering>, Integer> listBackupOfferings(final ListBackupOfferingsCmd cmd) {
+ final Long offeringId = cmd.getOfferingId();
+ final Long zoneId = cmd.getZoneId();
+ final String keyword = cmd.getKeyword();
+
+ if (offeringId != null) {
+ BackupOfferingVO offering = backupOfferingDao.findById(offeringId);
+ if (offering == null) {
+ throw new CloudRuntimeException("Offering ID " + offeringId + " does not exist");
+ }
+ return new Pair<>(Collections.singletonList(offering), 1);
+ }
+
+ final Filter searchFilter = new Filter(BackupOfferingVO.class, "id", true, cmd.getStartIndex(), cmd.getPageSizeVal());
+ SearchBuilder<BackupOfferingVO> sb = backupOfferingDao.createSearchBuilder();
+ sb.and("zone_id", sb.entity().getZoneId(), SearchCriteria.Op.EQ);
+ sb.and("name", sb.entity().getName(), SearchCriteria.Op.LIKE);
+
+ final SearchCriteria<BackupOfferingVO> sc = sb.create();
+
+ if (zoneId != null) {
+ sc.setParameters("zone_id", zoneId);
+ }
+
+ if (keyword != null) {
+ sc.setParameters("name", "%" + keyword + "%");
+ }
+ Pair<List<BackupOfferingVO>, Integer> result = backupOfferingDao.searchAndCount(sc, searchFilter);
+ return new Pair<>(new ArrayList<>(result.first()), result.second());
+ }
+
+ @Override
+ public boolean deleteBackupOffering(final Long offeringId) {
+ final BackupOfferingVO offering = backupOfferingDao.findById(offeringId);
+ if (offering == null) {
+ throw new CloudRuntimeException("Could not find a backup offering with id: " + offeringId);
+ }
+
+ if (vmInstanceDao.listByZoneWithBackups(offering.getZoneId(), offering.getId()).size() > 0) {
+ throw new CloudRuntimeException("Backup offering is assigned to VMs, remove the assignment(s) in order to remove the offering.");
+ }
+
+ validateForZone(offering.getZoneId());
+ return backupOfferingDao.remove(offering.getId());
+ }
+
+ private String createVolumeInfoFromVolumes(List<VolumeVO> vmVolumes) {
+ List<Backup.VolumeInfo> list = new ArrayList<>();
+ for (VolumeVO vol : vmVolumes) {
+ list.add(new Backup.VolumeInfo(vol.getUuid(), vol.getPath(), vol.getVolumeType(), vol.getSize()));
+ }
+ return new Gson().toJson(list.toArray(), Backup.VolumeInfo[].class);
+ }
+
+ @Override
+ @ActionEvent(eventType = EventTypes.EVENT_VM_BACKUP_OFFERING_ASSIGN, eventDescription = "assign VM to backup offering", async = true)
+ public boolean assignVMToBackupOffering(Long vmId, Long offeringId) {
+ final VMInstanceVO vm = vmInstanceDao.findById(vmId);
+ if (vm == null) {
+ throw new CloudRuntimeException("Did not find VM by provided ID");
+ }
+
+ if (!Arrays.asList(VirtualMachine.State.Running, VirtualMachine.State.Stopped, VirtualMachine.State.Shutdown).contains(vm.getState())) {
+ throw new CloudRuntimeException("VM is not in running or stopped state");
+ }
+
+ validateForZone(vm.getDataCenterId());
+
+ accountManager.checkAccess(CallContext.current().getCallingAccount(), null, true, vm);
+
+ if (vm.getBackupOfferingId() != null) {
+ throw new CloudRuntimeException("VM already is assigned to a backup offering, please remove the VM from its previous offering");
+ }
+
+ final BackupOfferingVO offering = backupOfferingDao.findById(offeringId);
+ if (offering == null) {
+ throw new CloudRuntimeException("Provided backup offering does not exist");
+ }
+
+ final BackupProvider backupProvider = getBackupProvider(offering.getProvider());
+ if (backupProvider == null) {
+ throw new CloudRuntimeException("Failed to get the backup provider for the zone, please contact the administrator");
+ }
+
+ vm.setBackupOfferingId(offering.getId());
+ vm.setBackupVolumes(createVolumeInfoFromVolumes(volumeDao.findByInstance(vm.getId())));
+ if (vmInstanceDao.update(vm.getId(), vm)) {
+ UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_BACKUP_OFFERING_ASSIGN, vm.getAccountId(), vm.getDataCenterId(), vm.getId(),
+ "Backup-" + vm.getHostName() + "-" + vm.getUuid(), vm.getBackupOfferingId(), null, null,
+ Backup.class.getSimpleName(), vm.getUuid());
+ } else {
+ throw new CloudRuntimeException("Failed to update VM assignment to the backup offering in the DB, please try again.");
+ }
+
+ try {
+ if (backupProvider.assignVMToBackupOffering(vm, offering)) {
+ return vmInstanceDao.update(vm.getId(), vm);
+ }
+ } catch (Exception e) {
+ LOG.error("Exception caught while assigning VM to backup offering by the backup provider", e);
+ }
+ throw new CloudRuntimeException("Failed to assign the VM to the backup offering, please try removing the assignment and try again.");
+ }
+
+ @Override
+ @ActionEvent(eventType = EventTypes.EVENT_VM_BACKUP_OFFERING_REMOVE, eventDescription = "remove VM from backup offering", async = true)
+ public boolean removeVMFromBackupOffering(final Long vmId, final boolean forced) {
+ final VMInstanceVO vm = vmInstanceDao.findByIdIncludingRemoved(vmId);
+ if (vm == null) {
+ throw new CloudRuntimeException("Did not find VM by provided ID");
+ }
+
+ validateForZone(vm.getDataCenterId());
+ accountManager.checkAccess(CallContext.current().getCallingAccount(), null, true, vm);
+
+ final BackupOfferingVO offering = backupOfferingDao.findById(vm.getBackupOfferingId());
+ if (offering == null) {
+ throw new CloudRuntimeException("No previously configured backup offering found for the VM");
+ }
+
+ final BackupProvider backupProvider = getBackupProvider(offering.getProvider());
+ if (backupProvider == null) {
+ throw new CloudRuntimeException("Failed to get the backup provider for the zone, please contact the administrator");
+ }
+
+ if (!forced && backupProvider.willDeleteBackupsOnOfferingRemoval()) {
+ throw new CloudRuntimeException("The backend provider will only allow removal of VM from the offering if forced:true is provided " +
+ "that will also delete the backups.");
+ }
+
+ boolean result = false;
+ VMInstanceVO vmInstance = null;
+ try {
+ vmInstance = vmInstanceDao.acquireInLockTable(vm.getId());
+ vmInstance.setBackupOfferingId(null);
+ vmInstance.setBackupExternalId(null);
+ vmInstance.setBackupVolumes(null);
+ result = backupProvider.removeVMFromBackupOffering(vmInstance);
+ if (result && backupProvider.willDeleteBackupsOnOfferingRemoval()) {
+ final List<Backup> backups = backupDao.listByVmId(null, vm.getId());
+ for (final Backup backup : backups) {
+ backupDao.remove(backup.getId());
+ }
+ }
+ if ((result || forced) && vmInstanceDao.update(vmInstance.getId(), vmInstance)) {
+ UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_BACKUP_OFFERING_REMOVE, vm.getAccountId(), vm.getDataCenterId(), vm.getId(),
+ "Backup-" + vm.getHostName() + "-" + vm.getUuid(), vm.getBackupOfferingId(), null, null,
+ Backup.class.getSimpleName(), vm.getUuid());
+ final BackupSchedule backupSchedule = backupScheduleDao.findByVM(vmInstance.getId());
+ if (backupSchedule != null) {
+ backupScheduleDao.remove(backupSchedule.getId());
+ }
+ result = true;
+ }
+ } catch (final Exception e) {
+ LOG.warn("Exception caught when trying to remove VM from the backup offering: ", e);
+ } finally {
+ if (vmInstance != null) {
+ vmInstanceDao.releaseFromLockTable(vmInstance.getId());
+ }
+ }
+ return result;
+ }
+
+ @Override
+ @ActionEvent(eventType = EventTypes.EVENT_VM_BACKUP_SCHEDULE_CONFIGURE, eventDescription = "configuring VM backup schedule")
+ public BackupSchedule configureBackupSchedule(CreateBackupScheduleCmd cmd) {
+ final Long vmId = cmd.getVmId();
+ final DateUtil.IntervalType intervalType = cmd.getIntervalType();
+ final String scheduleString = cmd.getSchedule();
+ final TimeZone timeZone = TimeZone.getTimeZone(cmd.getTimezone());
+
+ if (intervalType == null) {
+ throw new CloudRuntimeException("Invalid interval type provided");
+ }
+
+ final VMInstanceVO vm = vmInstanceDao.findById(vmId);
+ if (vm == null) {
+ throw new CloudRuntimeException("Did not find VM by provided ID");
+ }
+ validateForZone(vm.getDataCenterId());
+ accountManager.checkAccess(CallContext.current().getCallingAccount(), null, true, vm);
+
+ if (vm.getBackupOfferingId() == null) {
+ throw new CloudRuntimeException("Cannot configure backup schedule for the VM without having any backup offering");
+ }
+
+ final BackupOffering offering = backupOfferingDao.findById(vm.getBackupOfferingId());
+ if (offering == null || !offering.isUserDrivenBackupAllowed()) {
+ throw new CloudRuntimeException("The selected backup offering does not allow user-defined backup schedule");
+ }
+
+ final String timezoneId = timeZone.getID();
+ if (!timezoneId.equals(cmd.getTimezone())) {
+ LOG.warn("Using timezone: " + timezoneId + " for running this snapshot policy as an equivalent of " + cmd.getTimezone());
+ }
+
+ Date nextDateTime = null;
+ try {
+ nextDateTime = DateUtil.getNextRunTime(intervalType, cmd.getSchedule(), timezoneId, null);
+ } catch (Exception e) {
+ throw new InvalidParameterValueException("Invalid schedule: " + cmd.getSchedule() + " for interval type: " + cmd.getIntervalType());
+ }
+
+ final BackupScheduleVO schedule = backupScheduleDao.findByVM(vmId);
+ if (schedule == null) {
+ return backupScheduleDao.persist(new BackupScheduleVO(vmId, intervalType, scheduleString, timezoneId, nextDateTime));
+ }
+
+ schedule.setScheduleType((short) intervalType.ordinal());
+ schedule.setSchedule(scheduleString);
+ schedule.setTimezone(timezoneId);
+ schedule.setScheduledTimestamp(nextDateTime);
+ backupScheduleDao.update(schedule.getId(), schedule);
+ return backupScheduleDao.findByVM(vmId);
+ }
+
+ @Override
+ public BackupSchedule listBackupSchedule(final Long vmId) {
+ final VMInstanceVO vm = vmInstanceDao.findById(vmId);
+ if (vm == null) {
+ throw new CloudRuntimeException("Did not find VM by provided ID");
+ }
+ validateForZone(vm.getDataCenterId());
+ accountManager.checkAccess(CallContext.current().getCallingAccount(), null, true, vm);
+
+ return backupScheduleDao.findByVM(vmId);
+ }
+
+ @Override
+ @ActionEvent(eventType = EventTypes.EVENT_VM_BACKUP_SCHEDULE_DELETE, eventDescription = "deleting VM backup schedule")
+ public boolean deleteBackupSchedule(final Long vmId) {
+ final VMInstanceVO vm = vmInstanceDao.findById(vmId);
+ if (vm == null) {
+ throw new CloudRuntimeException("Did not find VM by provided ID");
+ }
+ validateForZone(vm.getDataCenterId());
+ accountManager.checkAccess(CallContext.current().getCallingAccount(), null, true, vm);
+
+ final BackupSchedule schedule = backupScheduleDao.findByVM(vmId);
+ if (schedule == null) {
+ throw new CloudRuntimeException("VM has no backup schedule defined, no need to delete anything.");
+ }
+ return backupScheduleDao.remove(schedule.getId());
+ }
+
+ @Override
+ @ActionEvent(eventType = EventTypes.EVENT_VM_BACKUP_CREATE, eventDescription = "creating VM backup", async = true)
+ public boolean createBackup(final Long vmId) {
+ final VMInstanceVO vm = vmInstanceDao.findById(vmId);
+ if (vm == null) {
+ throw new CloudRuntimeException("Did not find VM by provided ID");
+ }
+ validateForZone(vm.getDataCenterId());
+ accountManager.checkAccess(CallContext.current().getCallingAccount(), null, true, vm);
+
+ if (vm.getBackupOfferingId() == null) {
+ throw new CloudRuntimeException("VM has not backup offering configured, cannot create backup before assigning it to a backup offering");
+ }
+
+ final BackupOffering offering = backupOfferingDao.findById(vm.getBackupOfferingId());
+ if (offering == null) {
+ throw new CloudRuntimeException("VM backup offering not found");
+ }
+
+ if (!offering.isUserDrivenBackupAllowed()) {
+ throw new CloudRuntimeException("The assigned backup offering does not allow ad-hoc user backup");
+ }
+
+ final BackupProvider backupProvider = getBackupProvider(offering.getProvider());
+ if (backupProvider != null && backupProvider.takeBackup(vm)) {
+ return true;
+ }
+ throw new CloudRuntimeException("Failed to create VM backup");
+ }
+
+ @Override
+ public Pair<List<Backup>, Integer> listBackups(final ListBackupsCmd cmd) {
+ final Long id = cmd.getId();
+ final Long vmId = cmd.getVmId();
+ final Long zoneId = cmd.getZoneId();
+ final Account caller = CallContext.current().getCallingAccount();
+ final String keyword = cmd.getKeyword();
+ List<Long> permittedAccounts = new ArrayList<Long>();
+
+ if (vmId != null) {
+ VMInstanceVO vm = vmInstanceDao.findByIdIncludingRemoved(vmId);
+ if (vm != null) {
+ accountManager.checkAccess(caller, null, true, vm);
+ }
+ }
+
+ final Ternary<Long, Boolean, Project.ListProjectResourcesCriteria> domainIdRecursiveListProject = new Ternary<Long, Boolean, Project.ListProjectResourcesCriteria>(cmd.getDomainId(),
+ cmd.isRecursive(), null);
+ accountManager.buildACLSearchParameters(caller, id, cmd.getAccountName(), cmd.getProjectId(), permittedAccounts, domainIdRecursiveListProject, cmd.listAll(), false);
+ final Long domainId = domainIdRecursiveListProject.first();
+ final Boolean isRecursive = domainIdRecursiveListProject.second();
+ final Project.ListProjectResourcesCriteria listProjectResourcesCriteria = domainIdRecursiveListProject.third();
+
+ final Filter searchFilter = new Filter(BackupVO.class, "id", true, cmd.getStartIndex(), cmd.getPageSizeVal());
+ SearchBuilder<BackupVO> sb = backupDao.createSearchBuilder();
+ accountManager.buildACLSearchBuilder(sb, domainId, isRecursive, permittedAccounts, listProjectResourcesCriteria);
+
+ sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
+ sb.and("idIN", sb.entity().getId(), SearchCriteria.Op.IN);
+ sb.and("vmId", sb.entity().getVmId(), SearchCriteria.Op.EQ);
+ sb.and("zoneId", sb.entity().getZoneId(), SearchCriteria.Op.EQ);
+
+ if (keyword != null) {
+ SearchBuilder<VMInstanceVO> vmSearch = vmInstanceDao.createSearchBuilder();
+ vmSearch.and("name", vmSearch.entity().getHostName(), SearchCriteria.Op.LIKE);
+ sb.groupBy(sb.entity().getId());
+ sb.join("vmSearch", vmSearch, sb.entity().getVmId(), vmSearch.entity().getId(), JoinBuilder.JoinType.INNER);
+ }
+
+ SearchCriteria<BackupVO> sc = sb.create();
+ accountManager.buildACLSearchCriteria(sc, domainId, isRecursive, permittedAccounts, listProjectResourcesCriteria);
+
+ if (id != null) {
+ sc.setParameters("id", id);
+ }
+
+ if (vmId != null) {
+ sc.setParameters("vmId", vmId);
+ }
+
+ if (zoneId != null) {
+ sc.setParameters("zoneId", zoneId);
+ }
+
+ if (keyword != null) {
+ sc.setJoinParameters("vmSearch", "name", "%" + keyword + "%");
+ }
+
+ Pair<List<BackupVO>, Integer> result = backupDao.searchAndCount(sc, searchFilter);
+ return new Pair<>(new ArrayList<>(result.first()), result.second());
+ }
+
+ public boolean importRestoredVM(long zoneId, long domainId, long accountId, long userId,
+ String vmInternalName, Hypervisor.HypervisorType hypervisorType, Backup backup) {
+ VirtualMachine vm = null;
+ HypervisorGuru guru = hypervisorGuruManager.getGuru(hypervisorType);
+ try {
+ vm = guru.importVirtualMachineFromBackup(zoneId, domainId, accountId, userId, vmInternalName, backup);
+ } catch (final Exception e) {
+ LOG.error("Failed to import VM from backup restoration", e);
+ throw new CloudRuntimeException("Error during vm backup restoration and import: " + e.getMessage());
+ }
+ if (vm == null) {
+ LOG.error("Failed to import restored VM " + vmInternalName + " with hypervisor type " + hypervisorType + " using backup of VM ID " + backup.getVmId());
+ }
+ return vm != null;
+ }
+
+ @Override
+ @ActionEvent(eventType = EventTypes.EVENT_VM_BACKUP_RESTORE, eventDescription = "restoring VM from backup", async = true)
+ public boolean restoreBackup(final Long backupId) {
+ final BackupVO backup = backupDao.findById(backupId);
+ if (backup == null) {
+ throw new CloudRuntimeException("Backup " + backupId + " does not exist");
+ }
+ validateForZone(backup.getZoneId());
+
+ final VMInstanceVO vm = vmInstanceDao.findByIdIncludingRemoved(backup.getVmId());
+ if (vm == null) {
+ throw new CloudRuntimeException("VM ID " + backup.getVmId() + " couldn't be found on existing or removed VMs");
+ }
+ accountManager.checkAccess(CallContext.current().getCallingAccount(), null, true, vm);
+
+ if (vm.getRemoved() == null && !vm.getState().equals(VirtualMachine.State.Stopped) &&
+ !vm.getState().equals(VirtualMachine.State.Destroyed)) {
+ throw new CloudRuntimeException("Existing VM should be stopped before being restored from backup");
+ }
+
+ final BackupOffering offering = backupOfferingDao.findByIdIncludingRemoved(vm.getBackupOfferingId());
+ if (offering == null) {
+ throw new CloudRuntimeException("Failed to find backup offering of the VM backup");
+ }
+ final BackupProvider backupProvider = getBackupProvider(offering.getProvider());
+ if (!backupProvider.restoreVMFromBackup(vm, backup)) {
+ throw new CloudRuntimeException("Error restoring VM from backup ID " + backup.getId());
+ }
+ return importRestoredVM(vm.getDataCenterId(), vm.getDomainId(), vm.getAccountId(), vm.getUserId(),
+ vm.getInstanceName(), vm.getHypervisorType(), backup);
+ }
+
+ private Backup.VolumeInfo getVolumeInfo(List<Backup.VolumeInfo> backedUpVolumes, String volumeUuid) {
+ for (Backup.VolumeInfo volInfo : backedUpVolumes) {
+ if (volInfo.getUuid().equals(volumeUuid)) {
+ return volInfo;
+ }
+ }
+ return null;
+ }
+
+ @Override
+ @ActionEvent(eventType = EventTypes.EVENT_VM_BACKUP_RESTORE, eventDescription = "restoring VM from backup", async = true)
+ public boolean restoreBackupVolumeAndAttachToVM(final String backedUpVolumeUuid, final Long backupId, final Long vmId) throws Exception {
+ if (Strings.isNullOrEmpty(backedUpVolumeUuid)) {
+ throw new CloudRuntimeException("Invalid volume ID passed");
+ }
+ final BackupVO backup = backupDao.findById(backupId);
+ if (backup == null) {
+ throw new CloudRuntimeException("Provided backup not found");
+ }
+ validateForZone(backup.getZoneId());
+
+ final VMInstanceVO vm = vmInstanceDao.findById(vmId);
+ if (vm == null) {
+ throw new CloudRuntimeException("Provided VM not found");
+ }
+ accountManager.checkAccess(CallContext.current().getCallingAccount(), null, true, vm);
+
+ if (vm.getBackupOfferingId() != null) {
+ throw new CloudRuntimeException("The selected VM has backups, cannot restore and attach volume to the VM.");
+ }
+
+ if (backup.getZoneId() != vm.getDataCenterId()) {
+ throw new CloudRuntimeException("Cross zone backup restoration of volume is not allowed");
+ }
+
+ final VMInstanceVO vmFromBackup = vmInstanceDao.findByIdIncludingRemoved(backup.getVmId());
+ if (vmFromBackup == null) {
+ throw new CloudRuntimeException("VM reference for the provided VM backup not found");
+ }
+ accountManager.checkAccess(CallContext.current().getCallingAccount(), null, true, vmFromBackup);
+
+ Pair<String, String> restoreInfo = getRestoreVolumeHostAndDatastore(vm);
+ String hostIp = restoreInfo.first();
+ String datastoreUuid = restoreInfo.second();
+
+ LOG.debug("Asking provider to restore volume " + backedUpVolumeUuid + " from backup " + backupId +
+ " (with external ID " + backup.getExternalId() + ") and attach it to VM: " + vm.getUuid());
+
+ final BackupOffering offering = backupOfferingDao.findByIdIncludingRemoved(backup.getBackupOfferingId());
+ if (offering == null) {
+ throw new CloudRuntimeException("Failed to find VM backup offering");
+ }
+
+ BackupProvider backupProvider = getBackupProvider(offering.getProvider());
+ Pair<Boolean, String> result = backupProvider.restoreBackedUpVolume(backup, backedUpVolumeUuid, hostIp, datastoreUuid);
+ if (!result.first()) {
+ throw new CloudRuntimeException("Error restoring volume " + backedUpVolumeUuid);
+ }
+ if (!attachVolumeToVM(vm.getDataCenterId(), result.second(), vmFromBackup.getBackupVolumeList(),
+ backedUpVolumeUuid, vm, datastoreUuid, backup)) {
+ throw new CloudRuntimeException("Error attaching volume " + backedUpVolumeUuid + " to VM " + vm.getUuid());
+ }
+ return true;
+ }
+
+ @Override
+ @ActionEvent(eventType = EventTypes.EVENT_VM_BACKUP_DELETE, eventDescription = "deleting VM backup", async = true)
+ public boolean deleteBackup(final Long backupId) {
+ final BackupVO backup = backupDao.findByIdIncludingRemoved(backupId);
+ if (backup == null) {
+ throw new CloudRuntimeException("Backup " + backupId + " does not exist");
+ }
+ final Long vmId = backup.getVmId();
+ final VMInstanceVO vm = vmInstanceDao.findByIdIncludingRemoved(vmId);
+ if (vm == null) {
+ throw new CloudRuntimeException("VM " + vmId + " does not exist");
+ }
+ validateForZone(vm.getDataCenterId());
+ accountManager.checkAccess(CallContext.current().getCallingAccount(), null, true, vm);
+ final BackupOffering offering = backupOfferingDao.findByIdIncludingRemoved(vm.getBackupOfferingId());
+ if (offering == null) {
+ throw new CloudRuntimeException("VM backup offering ID " + vm.getBackupOfferingId() + " does not exist");
+ }
+ final BackupProvider backupProvider = getBackupProvider(offering.getProvider());
+ boolean result = backupProvider.deleteBackup(backup);
+ if (result) {
+ return backupDao.remove(backup.getId());
+ }
+ throw new CloudRuntimeException("Failed to delete the backup");
+ }
+
+ /**
+ * Get the pair: hostIp, datastoreUuid in which to restore the volume, based on the VM to be attached information
+ */
+ private Pair<String, String> getRestoreVolumeHostAndDatastore(VMInstanceVO vm) {
+ List<VolumeVO> rootVmVolume = volumeDao.findIncludingRemovedByInstanceAndType(vm.getId(), Volume.Type.ROOT);
+ Long poolId = rootVmVolume.get(0).getPoolId();
+ StoragePoolVO storagePoolVO = primaryDataStoreDao.findById(poolId);
+ String datastoreUuid = storagePoolVO.getUuid();
+ String hostIp = vm.getHostId() == null ?
+ getHostIp(storagePoolVO) :
+ hostDao.findById(vm.getHostId()).getPrivateIpAddress();
+ return new Pair<>(hostIp, datastoreUuid);
+ }
+
+ /**
+ * Find a host IP from storage pool access
+ */
+ private String getHostIp(StoragePoolVO storagePoolVO) {
+ List<HostVO> hosts = null;
+ if (storagePoolVO.getScope().equals(ScopeType.CLUSTER)) {
+ hosts = hostDao.findByClusterId(storagePoolVO.getClusterId());
+
+ } else if (storagePoolVO.getScope().equals(ScopeType.ZONE)) {
+ hosts = hostDao.findByDataCenterId(storagePoolVO.getDataCenterId());
+ }
+ return hosts.get(0).getPrivateIpAddress();
+ }
+
+ /**
+ * Attach volume to VM
+ */
+ private boolean attachVolumeToVM(Long zoneId, String restoredVolumeLocation, List<Backup.VolumeInfo> backedUpVolumes,
+ String volumeUuid, VMInstanceVO vm, String datastoreUuid, Backup backup) throws Exception {
+ HypervisorGuru guru = hypervisorGuruManager.getGuru(vm.getHypervisorType());
+ Backup.VolumeInfo volumeInfo = getVolumeInfo(backedUpVolumes, volumeUuid);
+ if (volumeInfo == null) {
+ throw new CloudRuntimeException("Failed to find volume in the backedup volumes of ID " + volumeUuid);
+ }
+ volumeInfo.setType(Volume.Type.DATADISK);
+
+ LOG.debug("Attaching the restored volume to VM " + vm.getId());
+ StoragePoolVO pool = primaryDataStoreDao.findByUuid(datastoreUuid);
+ try {
+ return guru.attachRestoredVolumeToVirtualMachine(zoneId, restoredVolumeLocation, volumeInfo, vm, pool.getId(), backup);
+ } catch (Exception e) {
+ throw new CloudRuntimeException("Error attach restored volume to VM " + vm.getUuid() + " due to: " + e.getMessage());
+ }
+ }
+
+ @Override
+ public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
+ super.configure(name, params);
+ backgroundPollManager.submitTask(new BackupSyncTask(this));
+ return true;
+ }
+
+ public boolean isDisabled(final Long zoneId) {
+ return !BackupFrameworkEnabled.valueIn(zoneId);
+ }
+
+ private void validateForZone(final Long zoneId) {
+ if (zoneId == null || isDisabled(zoneId)) {
+ throw new CloudRuntimeException("Backup and Recovery feature is disabled for the zone");
+ }
+ }
+
+ @Override
+ public List<BackupProvider> listBackupProviders() {
+ return backupProviders;
+ }
+
+ @Override
+ public BackupProvider getBackupProvider(final Long zoneId) {
+ final String name = BackupProviderPlugin.valueIn(zoneId);
+ return getBackupProvider(name);
+ }
+
+ public BackupProvider getBackupProvider(final String name) {
+ if (Strings.isNullOrEmpty(name)) {
+ throw new CloudRuntimeException("Invalid backup provider name provided");
+ }
+ if (!backupProvidersMap.containsKey(name)) {
+ throw new CloudRuntimeException("Failed to find backup provider by the name: " + name);
+ }
+ return backupProvidersMap.get(name);
+ }
+
+ @Override
+ public List<Class<?>> getCommands() {
+ final List<Class<?>> cmdList = new ArrayList<Class<?>>();
+ // Offerings
+ cmdList.add(ListBackupProvidersCmd.class);
+ cmdList.add(ListBackupProviderOfferingsCmd.class);
+ cmdList.add(ImportBackupOfferingCmd.class);
+ cmdList.add(ListBackupOfferingsCmd.class);
+ cmdList.add(DeleteBackupOfferingCmd.class);
+ // Assignment
+ cmdList.add(AssignVirtualMachineToBackupOfferingCmd.class);
+ cmdList.add(RemoveVirtualMachineFromBackupOfferingCmd.class);
+ // Schedule
+ cmdList.add(CreateBackupScheduleCmd.class);
+ cmdList.add(UpdateBackupScheduleCmd.class);
+ cmdList.add(ListBackupScheduleCmd.class);
+ cmdList.add(DeleteBackupScheduleCmd.class);
+ // Operations
+ cmdList.add(CreateBackupCmd.class);
+ cmdList.add(ListBackupsCmd.class);
+ cmdList.add(RestoreBackupCmd.class);
+ cmdList.add(DeleteBackupCmd.class);
+ cmdList.add(RestoreVolumeFromBackupAndAttachToVMCmd.class);
+ return cmdList;
+ }
+
+ @Override
+ public String getConfigComponentName() {
+ return BackupService.class.getSimpleName();
+ }
+
+ @Override
+ public ConfigKey<?>[] getConfigKeys() {
+ return new ConfigKey[]{
+ BackupFrameworkEnabled,
+ BackupProviderPlugin,
+ BackupSyncPollingInterval
+ };
+ }
+
+ public void setBackupProviders(final List<BackupProvider> backupProviders) {
+ this.backupProviders = backupProviders;
+ }
+
+ private void initializeBackupProviderMap() {
+ if (backupProviders != null) {
+ for (final BackupProvider backupProvider : backupProviders) {
+ backupProvidersMap.put(backupProvider.getName().toLowerCase(), backupProvider);
+ }
+ }
+ }
+
+ public void poll(final Date timestamp) {
+ currentTimestamp = timestamp;
+ GlobalLock scanLock = GlobalLock.getInternLock("backup.poll");
+ try {
+ if (scanLock.lock(5)) {
+ try {
+ checkStatusOfCurrentlyExecutingBackups();
+ } finally {
+ scanLock.unlock();
+ }
+ }
+ } finally {
+ scanLock.releaseRef();
+ }
+
+ scanLock = GlobalLock.getInternLock("backup.poll");
+ try {
+ if (scanLock.lock(5)) {
+ try {
+ scheduleBackups();
+ } finally {
+ scanLock.unlock();
+ }
+ }
+ } finally {
+ scanLock.releaseRef();
+ }
+ }
+
+ @DB
+ private Date scheduleNextBackupJob(final BackupScheduleVO backupSchedule) {
+ final Date nextTimestamp = DateUtil.getNextRunTime(backupSchedule.getScheduleType(), backupSchedule.getSchedule(),
+ backupSchedule.getTimezone(), currentTimestamp);
+ return Transaction.execute(new TransactionCallback<Date>() {
+ @Override
+ public Date doInTransaction(TransactionStatus status) {
+ backupSchedule.setScheduledTimestamp(nextTimestamp);
+ backupSchedule.setAsyncJobId(null);
+ backupScheduleDao.update(backupSchedule.getId(), backupSchedule);
+ return nextTimestamp;
+ }
+ });
+ }
+
+ private void checkStatusOfCurrentlyExecutingBackups() {
+ final SearchCriteria<BackupScheduleVO> sc = backupScheduleDao.createSearchCriteria();
+ sc.addAnd("asyncJobId", SearchCriteria.Op.NNULL);
+ final List<BackupScheduleVO> backupSchedules = backupScheduleDao.search(sc, null);
+ for (final BackupScheduleVO backupSchedule : backupSchedules) {
+ final Long asyncJobId = backupSchedule.getAsyncJobId();
+ final AsyncJobVO asyncJob = asyncJobManager.getAsyncJob(asyncJobId);
+ switch (asyncJob.getStatus()) {
+ case SUCCEEDED:
+ case FAILED:
+ final Date nextDateTime = scheduleNextBackupJob(backupSchedule);
+ final String nextScheduledTime = DateUtil.displayDateInTimezone(DateUtil.GMT_TIMEZONE, nextDateTime);
+ LOG.debug("Next backup scheduled time for VM ID " + backupSchedule.getVmId() + " is " + nextScheduledTime);
+ break;
+ }
+ }
+ }
+
+ @DB
+ public void scheduleBackups() {
+ String displayTime = DateUtil.displayDateInTimezone(DateUtil.GMT_TIMEZONE, currentTimestamp);
+ LOG.debug("Backup backup.poll is being called at " + displayTime);
+
+ final List<BackupScheduleVO> backupsToBeExecuted = backupScheduleDao.getSchedulesToExecute(currentTimestamp);
+ for (final BackupScheduleVO backupSchedule: backupsToBeExecuted) {
+ final Long backupScheduleId = backupSchedule.getId();
+ final Long vmId = backupSchedule.getVmId();
+
+ final VMInstanceVO vm = vmInstanceDao.findById(vmId);
+ if (vm == null || vm.getBackupOfferingId() == null) {
+ backupScheduleDao.remove(backupScheduleId);
+ continue;
+ }
+
+ final BackupOffering offering = backupOfferingDao.findById(vm.getBackupOfferingId());
+ if (offering == null || !offering.isUserDrivenBackupAllowed()) {
+ continue;
+ }
+
+ if (isDisabled(vm.getDataCenterId())) {
+ continue;
+ }
+
+ final Account backupAccount = accountService.getAccount(vm.getAccountId());
+ if (backupAccount == null || backupAccount.getState() == Account.State.disabled) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Skip backup for VM " + vm.getUuid() + " since its account has been removed or disabled");
+ }
+ continue;
+ }
+
+ if (LOG.isDebugEnabled()) {
+ final Date scheduledTimestamp = backupSchedule.getScheduledTimestamp();
+ displayTime = DateUtil.displayDateInTimezone(DateUtil.GMT_TIMEZONE, scheduledTimestamp);
+ LOG.debug("Scheduling 1 backup for VM ID " + vm.getId() + " (VM name:" + vm.getHostName() +
+ ") for backup schedule id: " + backupSchedule.getId() + " at " + displayTime);
+ }
+
+ BackupScheduleVO tmpBackupScheduleVO = null;
+
+ try {
+ tmpBackupScheduleVO = backupScheduleDao.acquireInLockTable(backupScheduleId);
+
+ final Long eventId = ActionEventUtils.onScheduledActionEvent(User.UID_SYSTEM, vm.getAccountId(),
+ EventTypes.EVENT_VM_BACKUP_CREATE, "creating backup for VM ID:" + vm.getUuid(), true, 0);
+ final Map<String, String> params = new HashMap<String, String>();
+ params.put(ApiConstants.VIRTUAL_MACHINE_ID, "" + vmId);
+ params.put("ctxUserId", "1");
+ params.put("ctxAccountId", "" + vm.getAccountId());
+ params.put("ctxStartEventId", String.valueOf(eventId));
+
+ final CreateBackupCmd cmd = new CreateBackupCmd();
+ ComponentContext.inject(cmd);
+ apiDispatcher.dispatchCreateCmd(cmd, params);
+ params.put("id", "" + vmId);
+ params.put("ctxStartEventId", "1");
+
+ AsyncJobVO job = new AsyncJobVO("", User.UID_SYSTEM, vm.getAccountId(), CreateBackupCmd.class.getName(),
+ ApiGsonHelper.getBuilder().create().toJson(params), vmId,
+ cmd.getInstanceType() != null ? cmd.getInstanceType().toString() : null, null);
+ job.setDispatcher(asyncJobDispatcher.getName());
+
+ final long jobId = asyncJobManager.submitAsyncJob(job);
+ tmpBackupScheduleVO.setAsyncJobId(jobId);
+ backupScheduleDao.update(backupScheduleId, tmpBackupScheduleVO);
+ } catch (Exception e) {
+ LOG.warn("Scheduling backup failed due to ", e);
+ } finally {
+ if (tmpBackupScheduleVO != null) {
+ backupScheduleDao.releaseFromLockTable(backupScheduleId);
+ }
+ }
+ }
+ }
+
+ @Override
+ public boolean start() {
+ initializeBackupProviderMap();
+
+ currentTimestamp = new Date();
+ for (final BackupScheduleVO backupSchedule : backupScheduleDao.listAll()) {
+ scheduleNextBackupJob(backupSchedule);
+ }
+ final TimerTask backupPollTask = new ManagedContextTimerTask() {
+ @Override
+ protected void runInContext() {
+ try {
+ poll(new Date());
+ } catch (final Throwable t) {
+ LOG.warn("Catch throwable in backup scheduler ", t);
+ }
+ }
+ };
+
+ backupTimer = new Timer("BackupPollTask");
+ backupTimer.schedule(backupPollTask, BackupSyncPollingInterval.value() * 1000L, BackupSyncPollingInterval.value() * 1000L);
+ return true;
+ }
+
+ ////////////////////////////////////////////////////
+ /////////////// Background Tasks ///////////////////
+ ////////////////////////////////////////////////////
+
+ /**
+ * This background task syncs backups from providers side in CloudStack db
+ * along with creation of usage records
+ */
+ private final class BackupSyncTask extends ManagedContextRunnable implements BackgroundPollTask {
+ private BackupManager backupManager;
+
+ public BackupSyncTask(final BackupManager backupManager) {
+ this.backupManager = backupManager;
+ }
+
+ @Override
+ protected void runInContext() {
+ try {
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Backup sync background task is running...");
+ }
+ for (final DataCenter dataCenter : dataCenterDao.listAllZones()) {
+ if (dataCenter == null || isDisabled(dataCenter.getId())) {
+ continue;
+ }
+
+ final BackupProvider backupProvider = getBackupProvider(dataCenter.getId());
+ if (backupProvider == null) {
+ LOG.warn("Backup provider not available or configured for zone ID " + dataCenter.getId());
+ continue;
+ }
+
+ List<VMInstanceVO> vms = vmInstanceDao.listByZoneWithBackups(dataCenter.getId(), null);
+ if (vms == null || vms.isEmpty()) {
+ continue;
+ }
+
+ final Map<VirtualMachine, Backup.Metric> metrics = backupProvider.getBackupMetrics(dataCenter.getId(), new ArrayList<>(vms));
+ try {
+ for (final VirtualMachine vm : metrics.keySet()) {
+ final Backup.Metric metric = metrics.get(vm);
+ if (metric != null) {
+ // Sync out-of-band backups
+ backupProvider.syncBackups(vm, metric);
+ // Emit a usage event, update usage metric for the VM by the usage server
+ UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_BACKUP_USAGE_METRIC, vm.getAccountId(),
+ vm.getDataCenterId(), vm.getId(), "Backup-" + vm.getHostName() + "-" + vm.getUuid(),
+ vm.getBackupOfferingId(), null, metric.getBackupSize(), metric.getDataSize(),
+ Backup.class.getSimpleName(), vm.getUuid());
+ }
+ }
+ } catch (final Throwable e) {
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Failed to sync backup usage metrics and out-of-band backups");
+ }
+ }
+ }
+ } catch (final Throwable t) {
+ LOG.error("Error trying to run backup-sync background task", t);
+ }
+ }
+
+ @Override
+ public Long getDelay() {
+ return BackupSyncPollingInterval.value() * 1000L;
+ }
+ }
+}
diff --git a/server/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsHelper.java b/server/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsHelper.java
new file mode 100644
index 0000000..282eee2
--- /dev/null
+++ b/server/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsHelper.java
@@ -0,0 +1,80 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.diagnostics;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.attribute.BasicFileAttributeView;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.nio.file.attribute.FileTime;
+import java.nio.file.attribute.PosixFileAttributes;
+import java.nio.file.attribute.PosixFilePermission;
+import java.util.Set;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
+
+import com.cloud.utils.script.Script2;
+
+public class DiagnosticsHelper {
+ private static final Logger LOGGER = Logger.getLogger(DiagnosticsHelper.class);
+
+ public static void setDirFilePermissions(Path path) throws java.io.IOException {
+ Set<PosixFilePermission> perms = Files.readAttributes(path, PosixFileAttributes.class).permissions();
+ perms.add(PosixFilePermission.OWNER_WRITE);
+ perms.add(PosixFilePermission.OWNER_READ);
+ perms.add(PosixFilePermission.OWNER_EXECUTE);
+ perms.add(PosixFilePermission.GROUP_WRITE);
+ perms.add(PosixFilePermission.GROUP_READ);
+ perms.add(PosixFilePermission.GROUP_EXECUTE);
+ perms.add(PosixFilePermission.OTHERS_WRITE);
+ perms.add(PosixFilePermission.OTHERS_READ);
+ perms.add(PosixFilePermission.OTHERS_EXECUTE);
+ Files.setPosixFilePermissions(path, perms);
+ }
+
+ public static void umountSecondaryStorage(String mountPoint) {
+ if (StringUtils.isNotBlank(mountPoint)) {
+ Script2 umountCmd = new Script2("/bin/bash", LOGGER);
+ umountCmd.add("-c");
+ String cmdLine = String.format("umount %s", mountPoint);
+ umountCmd.add(cmdLine);
+ umountCmd.execute();
+ }
+ }
+
+ public static Long getFileCreationTime(File file) throws IOException {
+ Path p = Paths.get(file.getAbsolutePath());
+ BasicFileAttributes view = Files.getFileAttributeView(p, BasicFileAttributeView.class).readAttributes();
+ FileTime fileTime = view.creationTime();
+ return fileTime.toMillis();
+ }
+
+ public static Long getTimeDifference(File f) {
+ Long fileCreationTime = null;
+ try {
+ fileCreationTime = getFileCreationTime(f);
+ } catch (IOException e) {
+ LOGGER.error("File not found: " + e);
+ }
+ return (fileCreationTime != null) ? (System.currentTimeMillis() - fileCreationTime) / 1000 : 1L;
+ }
+}
diff --git a/server/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsServiceImpl.java b/server/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsServiceImpl.java
index 21bb0a1..49ad215 100644
--- a/server/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsServiceImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsServiceImpl.java
@@ -17,33 +17,67 @@
// under the License.
package org.apache.cloudstack.diagnostics;
+import static org.apache.cloudstack.diagnostics.DiagnosticsHelper.getTimeDifference;
+import static org.apache.cloudstack.diagnostics.DiagnosticsHelper.umountSecondaryStorage;
+import static org.apache.cloudstack.diagnostics.fileprocessor.DiagnosticsFilesList.RouterDefaultSupportedFiles;
+import static org.apache.cloudstack.diagnostics.fileprocessor.DiagnosticsFilesList.SystemVMDefaultSupportedFiles;
+
+import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+
+import org.apache.cloudstack.api.command.admin.diagnostics.GetDiagnosticsDataCmd;
+import org.apache.cloudstack.api.command.admin.diagnostics.RunDiagnosticsCmd;
+import org.apache.cloudstack.diagnostics.fileprocessor.DiagnosticsFilesList;
+import org.apache.cloudstack.diagnostics.fileprocessor.DiagnosticsFilesListFactory;
+import org.apache.cloudstack.diagnostics.to.DiagnosticsDataObject;
+import org.apache.cloudstack.diagnostics.to.DiagnosticsDataTO;
+import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
+import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.Configurable;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
+import org.apache.cloudstack.poll.BackgroundPollManager;
+import org.apache.cloudstack.poll.BackgroundPollTask;
+import org.apache.cloudstack.storage.NfsMountManager;
+import org.apache.cloudstack.storage.image.datastore.ImageStoreEntity;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
import com.cloud.agent.AgentManager;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.routing.NetworkElementCommand;
+import com.cloud.agent.api.to.DataTO;
+import com.cloud.dc.DataCenterVO;
+import com.cloud.dc.dao.DataCenterDao;
import com.cloud.event.ActionEvent;
import com.cloud.event.EventTypes;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.hypervisor.Hypervisor;
+import com.cloud.server.StatsCollector;
+import com.cloud.storage.ImageStoreDetailsUtil;
+import com.cloud.storage.Storage;
+import com.cloud.utils.Pair;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.component.PluggableService;
import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.ssh.SshHelper;
import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineManager;
import com.cloud.vm.dao.VMInstanceDao;
import com.google.common.base.Strings;
-import org.apache.cloudstack.api.command.admin.diagnostics.RunDiagnosticsCmd;
-import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
-import org.apache.log4j.Logger;
-public class DiagnosticsServiceImpl extends ManagerBase implements PluggableService, DiagnosticsService {
+public class DiagnosticsServiceImpl extends ManagerBase implements PluggableService, DiagnosticsService, Configurable {
private static final Logger LOGGER = Logger.getLogger(DiagnosticsServiceImpl.class);
@Inject
@@ -54,6 +88,39 @@
private VirtualMachineManager vmManager;
@Inject
private NetworkOrchestrationService networkManager;
+ @Inject
+ private StatsCollector statsCollector;
+ @Inject
+ private DataStoreManager storeMgr;
+ @Inject
+ private BackgroundPollManager backgroundPollManager;
+ @Inject
+ private ImageStoreDetailsUtil imageStoreDetailsUtil;
+ @Inject
+ private NfsMountManager mountManager;
+ @Inject
+ private DataCenterDao dataCenterDao;
+
+ // These 2 settings should require a restart of the management server
+ private static final ConfigKey<Boolean> EnableGarbageCollector = new ConfigKey<>("Advanced", Boolean.class,
+ "diagnostics.data.gc.enable", "true",
+ "Enable the garbage collector background task to delete old files from secondary storage.", false);
+ private static final ConfigKey<Integer> GarbageCollectionInterval = new ConfigKey<>("Advanced", Integer.class,
+ "diagnostics.data.gc.interval", "86400",
+ "The interval at which the garbage collector background tasks in seconds", false);
+
+ // These are easily computed properties and need not need a restart of the management server
+ private static final ConfigKey<Long> DataRetrievalTimeout = new ConfigKey<>("Advanced", Long.class,
+ "diagnostics.data.retrieval.timeout", "1800",
+ "Overall system VM script execution time out in seconds.", true);
+ private static final ConfigKey<Long> MaximumFileAgeforGarbageCollection = new ConfigKey<>("Advanced", Long.class,
+ "diagnostics.data.max.file.age", "86400",
+ "Sets the maximum time in seconds a file can stay in secondary storage before it is deleted.", true);
+ private static final ConfigKey<Double> DiskQuotaPercentageThreshold = new ConfigKey<>("Advanced", Double.class,
+ "diagnostics.data.disable.threshold", "0.9",
+ "Sets the secondary storage disk utilisation percentage for file retrieval. " +
+ "Used to look for suitable secondary storage with enough space, otherwise an exception is " +
+ "thrown when no secondary store is found.", true);
@Override
@ActionEvent(eventType = EventTypes.EVENT_SYSTEM_VM_DIAGNOSTICS, eventDescription = "running diagnostics on system vm", async = true)
@@ -92,13 +159,13 @@
Map<String, String> detailsMap;
- final Answer answer = agentManager.easySend(hostId, command);
+ Answer answer = agentManager.easySend(hostId, command);
- if (answer != null && (answer instanceof DiagnosticsAnswer)) {
+ if (answer != null) {
detailsMap = ((DiagnosticsAnswer) answer).getExecutionDetails();
return detailsMap;
} else {
- throw new CloudRuntimeException("Failed to execute diagnostics command on remote host: " + answer.getDetails());
+ throw new CloudRuntimeException("Failed to execute diagnostics command for system vm: " + vmInstance + ", on remote host: " + vmInstance.getHostName());
}
}
@@ -110,7 +177,6 @@
final Pattern pattern = Pattern.compile(regex);
return pattern.matcher(optionalArgs).find();
}
-
}
protected String prepareShellCmd(String cmdType, String ipAddress, String optionalParams) {
@@ -126,10 +192,334 @@
}
}
+ private String zipFilesInSystemVm(VMInstanceVO vmInstance, List<String> optionalFilesList) {
+ List<String> fileList = getFileListToBeRetrieved(optionalFilesList, vmInstance);
+
+ if (CollectionUtils.isEmpty(fileList)) {
+ throw new CloudRuntimeException("Failed to generate diagnostics file list for retrieval.");
+ }
+
+ final Answer zipFilesAnswer = prepareDiagnosticsFilesInSystemVm(vmInstance, fileList);
+
+ if (zipFilesAnswer == null) {
+ throw new CloudRuntimeException(String.format("Failed to generate diagnostics zip file in the system VM %s", vmInstance.getUuid()));
+ }
+
+ if (!zipFilesAnswer.getResult()) {
+ throw new CloudRuntimeException(String.format("Failed to generate diagnostics zip file in VM %s due to: %s", vmInstance.getUuid(), zipFilesAnswer.getDetails()));
+ }
+
+ return zipFilesAnswer.getDetails().replace("\n", "");
+ }
+
+ @Override
+ @ActionEvent(eventType = EventTypes.EVENT_SYSTEM_VM_DIAGNOSTICS, eventDescription = "getting diagnostics files on system vm", async = true)
+ public String getDiagnosticsDataCommand(GetDiagnosticsDataCmd cmd) {
+ final Long vmId = cmd.getId();
+ final List<String> optionalFilesList = cmd.getFilesList();
+ final VMInstanceVO vmInstance = getSystemVMInstance(vmId);
+ final DataStore store = getImageStore(vmInstance.getDataCenterId());
+
+ final String zipFileInSystemVm = zipFilesInSystemVm(vmInstance, optionalFilesList);
+ final Long vmHostId = vmInstance.getHostId();
+ copyZipFileToSecondaryStorage(vmInstance, vmHostId, zipFileInSystemVm, store);
+ deleteDiagnosticsZipFileInsystemVm(vmInstance, zipFileInSystemVm);
+
+ // Now we need to create the file download URL
+ // Find ssvm of store
+ final long zoneId = vmInstance.getDataCenterId();
+ VMInstanceVO ssvm = getSecondaryStorageVmInZone(zoneId);
+ if (ssvm == null) {
+ throw new CloudRuntimeException("No SSVM found in zone with ID: " + zoneId);
+ }
+
+ // Secondary Storage install path = "diagnostics_data/diagnostics_files_xxxx.tar
+ String installPath = DIAGNOSTICS_DIRECTORY + File.separator + zipFileInSystemVm.replace("/root", "");
+ return createFileDownloadUrl(store, ssvm.getHypervisorType(), installPath);
+ }
+
+ /**
+ * Copy retrieved diagnostics zip file from system vm to secondary storage
+ * For VMware use the mgmt server, and for Xen/KVM use the hyperhost of the target VM
+ * The strategy is to mount secondary storage on mgmt server or host and scp directly to /mnt/SecStorage/diagnostics_data
+ *
+ * @param fileToCopy zip file in system vm to be copied
+ * @param store secondary storage to copy zip file to
+ */
+ private Pair<Boolean, String> copyZipFileToSecondaryStorage(VMInstanceVO vmInstance, Long vmHostId, String fileToCopy, DataStore store) {
+ String vmControlIp = getVMSshIp(vmInstance);
+ if (StringUtils.isBlank(vmControlIp)) {
+ return new Pair<>(false, "Unable to find system vm ssh/control IP for vm with ID: " + vmInstance.getId());
+ }
+ Pair<Boolean, String> copyResult;
+ if (vmInstance.getHypervisorType() == Hypervisor.HypervisorType.VMware) {
+ copyResult = copyToSecondaryStorageVMware(store, vmControlIp, fileToCopy);
+ } else {
+ copyResult = copyToSecondaryStorageNonVMware(store, vmControlIp, fileToCopy, vmHostId);
+ }
+
+ if (!copyResult.first()) {
+ throw new CloudRuntimeException(String.format("Failed to copy %s to secondary storage %s due to: %s.", fileToCopy, store.getUri(), copyResult.second()));
+ }
+
+ return copyResult;
+ }
+
+ private void configureNetworkElementCommand(NetworkElementCommand cmd, VMInstanceVO vmInstance) {
+ Map<String, String> accessDetails = networkManager.getSystemVMAccessDetails(vmInstance);
+ if (StringUtils.isBlank(accessDetails.get(NetworkElementCommand.ROUTER_IP))) {
+ throw new CloudRuntimeException("Unable to set system vm ControlIP for system vm with ID: " + vmInstance.getId());
+ }
+ cmd.setAccessDetail(accessDetails);
+ }
+
+ private Answer prepareDiagnosticsFilesInSystemVm(VMInstanceVO vmInstance, List<String> fileList) {
+ final PrepareFilesCommand cmd = new PrepareFilesCommand(fileList, DataRetrievalTimeout.value());
+ configureNetworkElementCommand(cmd, vmInstance);
+ Answer answer = agentManager.easySend(vmInstance.getHostId(), cmd);
+ return answer;
+ }
+
+ private Answer deleteDiagnosticsZipFileInsystemVm(VMInstanceVO vmInstance, String zipFileName) {
+ final DeleteFileInVrCommand cmd = new DeleteFileInVrCommand(zipFileName);
+ configureNetworkElementCommand(cmd, vmInstance);
+ final Answer fileCleanupAnswer = agentManager.easySend(vmInstance.getHostId(), cmd);
+ if (fileCleanupAnswer == null) {
+ LOGGER.error(String.format("Failed to cleanup diagnostics zip file on vm: %s", vmInstance.getUuid()));
+ } else {
+ if (!fileCleanupAnswer.getResult()) {
+ LOGGER.error(String.format("Zip file cleanup for vm %s has failed with: %s", vmInstance.getUuid(), fileCleanupAnswer.getDetails()));
+ }
+ }
+
+ return fileCleanupAnswer;
+ }
+
+ /**
+ * Generate a list of diagnostics file to be retrieved depending on the system VM type
+ *
+ * @param optionalFileList Optional list of files that user may want to retrieve, empty by default
+ * @param vmInstance system VM instance, either SSVM, CPVM or VR
+ * @return a list of files to be retrieved for system VM, either generated from defaults depending on the VM type, or specified
+ * by the optional list param
+ */
+ private List<String> getFileListToBeRetrieved(List<String> optionalFileList, VMInstanceVO vmInstance) {
+ DiagnosticsFilesList fileListObject = DiagnosticsFilesListFactory.getDiagnosticsFilesList(optionalFileList, vmInstance);
+ List<String> fileList = new ArrayList<>();
+
+ if (fileListObject != null) {
+ fileList = fileListObject.generateFileList();
+ }
+ return fileList;
+ }
+
+ private Pair<Boolean, String> copyToSecondaryStorageNonVMware(final DataStore store, final String vmControlIp, String fileToCopy, Long vmHostId) {
+ CopyToSecondaryStorageCommand toSecondaryStorageCommand = new CopyToSecondaryStorageCommand(store.getUri(), vmControlIp, fileToCopy);
+ Answer copyToSecondaryAnswer = agentManager.easySend(vmHostId, toSecondaryStorageCommand);
+ Pair<Boolean, String> copyAnswer;
+ if (copyToSecondaryAnswer != null) {
+ copyAnswer = new Pair<>(copyToSecondaryAnswer.getResult(), copyToSecondaryAnswer.getDetails());
+ } else {
+ copyAnswer = new Pair<>(false, "Diagnostics Zip file to secondary storage failed");
+ }
+ return copyAnswer;
+ }
+
+ private Pair<Boolean, String> copyToSecondaryStorageVMware(final DataStore store, final String vmSshIp, String diagnosticsFile) {
+ LOGGER.info(String.format("Copying %s from %s to secondary store %s", diagnosticsFile, vmSshIp, store.getUri()));
+ boolean success = false;
+ String mountPoint = mountManager.getMountPoint(store.getUri(), imageStoreDetailsUtil.getNfsVersion(store.getId()));
+ if (StringUtils.isBlank(mountPoint)) {
+ LOGGER.error("Failed to generate mount point for copying to secondary storage for " + store.getName());
+ return new Pair<>(false, "Failed to mount secondary storage:" + store.getName());
+ }
+
+ // dirIn/mnt/SecStorage/uuid/diagnostics_data
+ String dataDirectoryInSecondaryStore = String.format("%s/%s", mountPoint, DIAGNOSTICS_DIRECTORY);
+ try {
+ File dataDirectory = new File(dataDirectoryInSecondaryStore);
+ boolean existsInSecondaryStore = dataDirectory.exists() || dataDirectory.mkdir();
+ if (existsInSecondaryStore) {
+ // scp from system VM to mounted sec storage directory
+ File permKey = new File("/var/cloudstack/management/.ssh/id_rsa");
+ SshHelper.scpFrom(vmSshIp, 3922, "root", permKey, dataDirectoryInSecondaryStore, diagnosticsFile);
+ }
+
+ // Verify File copy to Secondary Storage
+ File fileInSecondaryStore = new File(dataDirectoryInSecondaryStore + diagnosticsFile.replace("/root", ""));
+ success = fileInSecondaryStore.exists();
+ } catch (Exception e) {
+ String msg = String.format("Exception caught during scp from %s to secondary store %s: ", vmSshIp, dataDirectoryInSecondaryStore);
+ LOGGER.error(msg, e);
+ return new Pair<>(false, msg);
+ } finally {
+ umountSecondaryStorage(mountPoint);
+ }
+
+ return new Pair<>(success, "File copied to secondary storage successfully");
+ }
+
+ // Get ssvm from the zone to use for creating entity download URL
+ private VMInstanceVO getSecondaryStorageVmInZone(Long zoneId) {
+ List<VMInstanceVO> ssvm = instanceDao.listByZoneIdAndType(zoneId, VirtualMachine.Type.SecondaryStorageVm);
+ return (CollectionUtils.isEmpty(ssvm)) ? null : ssvm.get(0);
+ }
+
+ /**
+ * Iterate through all Image stores in the current running zone and select any that has less than DiskQuotaPercentageThreshold.value() disk usage
+ *
+ * @param zoneId of the current running zone
+ * @return a valid secondary storage with less than DiskQuotaPercentageThreshold set by global config
+ */
+ private DataStore getImageStore(Long zoneId) {
+ List<DataStore> stores = storeMgr.getImageStoresByScope(new ZoneScope(zoneId));
+ if (CollectionUtils.isEmpty(stores)) {
+ throw new CloudRuntimeException("No Secondary storage found in Zone with Id: " + zoneId);
+ }
+ DataStore imageStore = null;
+ for (DataStore store : stores) {
+ // Return image store if used percentage is less then threshold value set by global config diagnostics.data.disable.threshold
+ if (statsCollector.imageStoreHasEnoughCapacity(store, DiskQuotaPercentageThreshold.value())) {
+ imageStore = store;
+ break;
+ }
+ }
+ if (imageStore == null) {
+ throw new CloudRuntimeException("No suitable secondary storage found to retrieve diagnostics in Zone: " + zoneId);
+ }
+ return imageStore;
+ }
+
+ // createEntityExtractUrl throws CloudRuntime exception in case of failure
+ private String createFileDownloadUrl(DataStore store, Hypervisor.HypervisorType hypervisorType, String filePath) {
+ // Get image store driver
+ ImageStoreEntity secStore = (ImageStoreEntity) store;
+
+ //Create dummy TO with hyperType
+ DataTO dataTO = new DiagnosticsDataTO(hypervisorType, store.getTO());
+ DataObject dataObject = new DiagnosticsDataObject(dataTO, store);
+ return secStore.createEntityExtractUrl(filePath, Storage.ImageFormat.ZIP, dataObject);
+ }
+
+ private VMInstanceVO getSystemVMInstance(Long vmId) {
+ VMInstanceVO vmInstance = instanceDao.findByIdTypes(vmId, VirtualMachine.Type.ConsoleProxy,
+ VirtualMachine.Type.DomainRouter, VirtualMachine.Type.SecondaryStorageVm);
+ if (vmInstance == null) {
+ String msg = String.format("Unable to find vm instance with id: %s", vmId);
+ LOGGER.error(msg);
+ throw new CloudRuntimeException("Diagnostics command execution failed, " + msg);
+ }
+
+ final Long hostId = vmInstance.getHostId();
+ if (hostId == null) {
+ throw new CloudRuntimeException("Unable to find host for virtual machine instance: " + vmInstance.getInstanceName());
+ }
+ return vmInstance;
+ }
+
+ private String getVMSshIp(final VMInstanceVO vmInstance) {
+ Map<String, String> accessDetails = networkManager.getSystemVMAccessDetails(vmInstance);
+ String controlIP = accessDetails.get(NetworkElementCommand.ROUTER_IP);
+ if (StringUtils.isBlank(controlIP)) {
+ throw new CloudRuntimeException("Unable to find system vm ssh/control IP for vm with ID: " + vmInstance.getId());
+ }
+ return controlIP;
+ }
+
+ @Override
+ public boolean start() {
+ super.start();
+ return true;
+ }
+
+ @Override
+ public boolean configure(final String name, final Map<String, Object> params) throws ConfigurationException {
+ if (EnableGarbageCollector.value()) {
+ backgroundPollManager.submitTask(new GCBackgroundTask(this));
+ }
+ return true;
+ }
+
+ public static final class GCBackgroundTask extends ManagedContextRunnable implements BackgroundPollTask {
+ private DiagnosticsServiceImpl serviceImpl;
+
+ public GCBackgroundTask(DiagnosticsServiceImpl serviceImpl) {
+ this.serviceImpl = serviceImpl;
+ }
+
+ private static void deleteOldDiagnosticsFiles(File directory, String storeName) {
+ final File[] fileList = directory.listFiles();
+ if (fileList != null) {
+ String msg = String.format("Found %s diagnostics files in store %s for garbage collection", fileList.length, storeName);
+ LOGGER.info(msg);
+ for (File file : fileList) {
+ if (file.isFile() && MaximumFileAgeforGarbageCollection.value() <= getTimeDifference(file)) {
+ boolean success = file.delete();
+ LOGGER.info(file.getName() + " delete status: " + success);
+ }
+ }
+ }
+ }
+
+ @Override
+ protected void runInContext() {
+ List<DataCenterVO> dcList = serviceImpl.dataCenterDao.listEnabledZones();
+ for (DataCenterVO vo: dcList) {
+ // Get All Image Stores in current running Zone
+ List<DataStore> storeList = serviceImpl.storeMgr.getImageStoresByScope(new ZoneScope(vo.getId()));
+ for (DataStore store : storeList) {
+ cleanupOldDiagnosticFiles(store);
+ }
+ }
+ }
+
+ @Override
+ public Long getDelay() {
+ // In Milliseconds
+ return GarbageCollectionInterval.value() * 1000L;
+ }
+
+ private void cleanupOldDiagnosticFiles(DataStore store) {
+ String mountPoint = null;
+ try {
+ mountPoint = serviceImpl.mountManager.getMountPoint(store.getUri(), null);
+ if (StringUtils.isNotBlank(mountPoint)) {
+ File directory = new File(mountPoint + File.separator + DIAGNOSTICS_DIRECTORY);
+ if (directory.isDirectory()) {
+ deleteOldDiagnosticsFiles(directory, store.getName());
+ }
+ }
+ } finally {
+ if (StringUtils.isNotBlank(mountPoint)) {
+ umountSecondaryStorage(mountPoint);
+ }
+ }
+ }
+ }
+
@Override
public List<Class<?>> getCommands() {
List<Class<?>> cmdList = new ArrayList<>();
cmdList.add(RunDiagnosticsCmd.class);
+ cmdList.add(GetDiagnosticsDataCmd.class);
return cmdList;
}
+
+ @Override
+ public String getConfigComponentName() {
+ return DiagnosticsServiceImpl.class.getSimpleName();
+ }
+
+ @Override
+ public ConfigKey<?>[] getConfigKeys() {
+ return new ConfigKey<?>[]{
+ EnableGarbageCollector,
+ DataRetrievalTimeout,
+ MaximumFileAgeforGarbageCollection,
+ GarbageCollectionInterval,
+ DiskQuotaPercentageThreshold,
+ SystemVMDefaultSupportedFiles,
+ RouterDefaultSupportedFiles
+ };
+ }
}
\ No newline at end of file
diff --git a/server/src/main/java/org/apache/cloudstack/diagnostics/fileprocessor/DiagnosticsFilesList.java b/server/src/main/java/org/apache/cloudstack/diagnostics/fileprocessor/DiagnosticsFilesList.java
new file mode 100644
index 0000000..cd9baa9
--- /dev/null
+++ b/server/src/main/java/org/apache/cloudstack/diagnostics/fileprocessor/DiagnosticsFilesList.java
@@ -0,0 +1,47 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.diagnostics.fileprocessor;
+
+import java.util.List;
+
+import org.apache.cloudstack.framework.config.ConfigKey;
+
+public interface DiagnosticsFilesList {
+
+ /**
+ * Global configs below are used to set the diagnostics
+ * data types applicable for each system vm.
+ * <p>
+ * the names wrapped in square brackets are for data types that need to first execute a script
+ * in the system vm and grab output for retrieval, e.g. the output from iptables-save is written to a file
+ * which will then be retrieved.
+ */
+ ConfigKey<String> SystemVMDefaultSupportedFiles = new ConfigKey<>("Advanced", String.class,
+ "diagnostics.data.systemvm.defaults", "iptables,ipaddr,iprule,iproute,/etc/cloudstack-release," +
+ "/usr/local/cloud/systemvm/conf/agent.properties,/usr/local/cloud/systemvm/conf/consoleproxy.properties," +
+ "/var/log/cloud.log,/var/log/patchsystemvm.log,/var/log/daemon.log",
+ "List of supported diagnostics data file options for the CPVM and SSVM.", true);
+
+ ConfigKey<String> RouterDefaultSupportedFiles = new ConfigKey<>("Advanced", String.class,
+ "diagnostics.data.router.defaults", "iptables,ipaddr,iprule,iproute,/etc/cloudstack-release," +
+ "/etc/dnsmasq.conf,/etc/dhcphosts.txt,/etc/dhcpopts.txt,/etc/dnsmasq.d/cloud.conf,/etc/dnsmasq-resolv.conf,/var/lib/misc/dnsmasq.leases,/var/log/dnsmasq.log," +
+ "/etc/hosts,/etc/resolv.conf,/etc/haproxy/haproxy.cfg,/var/log/haproxy.log,/etc/ipsec.d/l2tp.conf,/var/log/cloud.log," +
+ "/var/log/routerServiceMonitor.log,/var/log/daemon.log",
+ "List of supported diagnostics data file options for the domain router.", true);
+
+ List<String> generateFileList();
+}
diff --git a/server/src/main/java/org/apache/cloudstack/diagnostics/fileprocessor/DiagnosticsFilesListFactory.java b/server/src/main/java/org/apache/cloudstack/diagnostics/fileprocessor/DiagnosticsFilesListFactory.java
new file mode 100644
index 0000000..b49da1d
--- /dev/null
+++ b/server/src/main/java/org/apache/cloudstack/diagnostics/fileprocessor/DiagnosticsFilesListFactory.java
@@ -0,0 +1,36 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.diagnostics.fileprocessor;
+
+import java.util.Collections;
+import java.util.List;
+
+import com.cloud.vm.VirtualMachine;
+
+public class DiagnosticsFilesListFactory {
+
+ public static DiagnosticsFilesList getDiagnosticsFilesList(List<String> dataTypeList, VirtualMachine vm) {
+ final VirtualMachine.Type vmType = vm.getType();
+ if (vmType == VirtualMachine.Type.ConsoleProxy || vmType == VirtualMachine.Type.SecondaryStorageVm) {
+ return new SystemVMDiagnosticsFiles(dataTypeList);
+ } else if (vmType == VirtualMachine.Type.DomainRouter) {
+ return new DomainRouterDiagnosticsFiles(dataTypeList);
+ } else {
+ return (DiagnosticsFilesList) Collections.emptyList();
+ }
+ }
+}
diff --git a/server/src/main/java/org/apache/cloudstack/diagnostics/fileprocessor/DomainRouterDiagnosticsFiles.java b/server/src/main/java/org/apache/cloudstack/diagnostics/fileprocessor/DomainRouterDiagnosticsFiles.java
new file mode 100644
index 0000000..b50c4fa
--- /dev/null
+++ b/server/src/main/java/org/apache/cloudstack/diagnostics/fileprocessor/DomainRouterDiagnosticsFiles.java
@@ -0,0 +1,52 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+package org.apache.cloudstack.diagnostics.fileprocessor;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections.CollectionUtils;
+
+public class DomainRouterDiagnosticsFiles implements DiagnosticsFilesList {
+ // Optional parameters
+ private List<String> dataTypeList;
+
+ public DomainRouterDiagnosticsFiles(List<String> dataTypeList) {
+ this.dataTypeList = dataTypeList;
+ }
+
+ @Override
+ public List<String> generateFileList() {
+ List<String> filesList = new ArrayList<>();
+
+ if (CollectionUtils.isEmpty(dataTypeList)) {
+ filesList.addAll(Arrays.stream(RouterDefaultSupportedFiles.value().split(","))
+ .map(String :: trim)
+ .distinct()
+ .collect(Collectors.toList()));
+
+ } else {
+ filesList.addAll(dataTypeList);
+ }
+ return filesList;
+ }
+
+}
diff --git a/server/src/main/java/org/apache/cloudstack/diagnostics/fileprocessor/SystemVMDiagnosticsFiles.java b/server/src/main/java/org/apache/cloudstack/diagnostics/fileprocessor/SystemVMDiagnosticsFiles.java
new file mode 100644
index 0000000..4e123bf
--- /dev/null
+++ b/server/src/main/java/org/apache/cloudstack/diagnostics/fileprocessor/SystemVMDiagnosticsFiles.java
@@ -0,0 +1,50 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+package org.apache.cloudstack.diagnostics.fileprocessor;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections.CollectionUtils;
+
+public class SystemVMDiagnosticsFiles implements DiagnosticsFilesList {
+ // Optional parameters
+ private List<String> dataTypeList;
+
+ public SystemVMDiagnosticsFiles(List<String> dataTypeList) {
+ this.dataTypeList = dataTypeList;
+ }
+
+ @Override
+ public List<String> generateFileList() {
+ List<String> filesList = new ArrayList<>();
+
+ if (CollectionUtils.isEmpty(dataTypeList)) {
+ filesList.addAll(Arrays.stream(SystemVMDefaultSupportedFiles.value().split(","))
+ .map(String :: trim)
+ .distinct()
+ .collect(Collectors.toList()));
+ } else {
+ filesList.addAll(dataTypeList);
+ }
+ return filesList;
+ }
+}
diff --git a/server/src/main/java/org/apache/cloudstack/diagnostics/to/DiagnosticsDataObject.java b/server/src/main/java/org/apache/cloudstack/diagnostics/to/DiagnosticsDataObject.java
new file mode 100644
index 0000000..7736e63
--- /dev/null
+++ b/server/src/main/java/org/apache/cloudstack/diagnostics/to/DiagnosticsDataObject.java
@@ -0,0 +1,97 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.diagnostics.to;
+
+import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
+import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.to.DataObjectType;
+import com.cloud.agent.api.to.DataTO;
+
+public class DiagnosticsDataObject implements DataObject {
+ private DataTO dataTO;
+ private DataStore dataStore;
+
+ public DiagnosticsDataObject(DataTO dataTO, DataStore dataStore) {
+ this.dataTO = dataTO;
+ this.dataStore = dataStore;
+ }
+
+ @Override
+ public long getId() {
+ return 0;
+ }
+
+ @Override
+ public String getUri() {
+ return null;
+ }
+
+ @Override
+ public DataTO getTO() {
+ return dataTO;
+ }
+
+ @Override
+ public DataStore getDataStore() {
+ return dataStore;
+ }
+
+ @Override
+ public Long getSize() {
+ return null;
+ }
+
+ @Override
+ public DataObjectType getType() {
+ return dataTO.getObjectType();
+ }
+
+ @Override
+ public String getUuid() {
+ return null;
+ }
+
+ @Override
+ public boolean delete() {
+ return false;
+ }
+
+ @Override
+ public void processEvent(ObjectInDataStoreStateMachine.Event event) {
+ }
+
+ @Override
+ public void processEvent(ObjectInDataStoreStateMachine.Event event, Answer answer) {
+ }
+
+ @Override
+ public void incRefCount() {
+ }
+
+ @Override
+ public void decRefCount() {
+ }
+
+ @Override
+ public Long getRefCount() {
+ return null;
+ }
+}
diff --git a/server/src/main/java/org/apache/cloudstack/diagnostics/to/DiagnosticsDataTO.java b/server/src/main/java/org/apache/cloudstack/diagnostics/to/DiagnosticsDataTO.java
new file mode 100644
index 0000000..115ee71
--- /dev/null
+++ b/server/src/main/java/org/apache/cloudstack/diagnostics/to/DiagnosticsDataTO.java
@@ -0,0 +1,60 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.diagnostics.to;
+
+import com.cloud.agent.api.to.DataObjectType;
+import com.cloud.agent.api.to.DataStoreTO;
+import com.cloud.agent.api.to.DataTO;
+import com.cloud.hypervisor.Hypervisor;
+
+public class DiagnosticsDataTO implements DataTO {
+ private DataStoreTO dataStoreTO;
+ private Hypervisor.HypervisorType hypervisorType;
+ private String path;
+ private long id;
+
+ public DiagnosticsDataTO(Hypervisor.HypervisorType hypervisorType, DataStoreTO dataStoreTO) {
+ this.hypervisorType = hypervisorType;
+ this.dataStoreTO = dataStoreTO;
+ }
+
+ @Override
+ public DataObjectType getObjectType() {
+ return DataObjectType.ARCHIVE;
+ }
+
+ @Override
+ public DataStoreTO getDataStore() {
+ return dataStoreTO;
+ }
+
+ @Override
+ public Hypervisor.HypervisorType getHypervisorType() {
+ return hypervisorType;
+ }
+
+ @Override
+ public String getPath() {
+ return path;
+ }
+
+ @Override
+ public long getId() {
+ return id;
+ }
+}
diff --git a/server/src/main/java/org/apache/cloudstack/direct/download/DirectDownloadManagerImpl.java b/server/src/main/java/org/apache/cloudstack/direct/download/DirectDownloadManagerImpl.java
index 2eb6d36..a05c4b9 100644
--- a/server/src/main/java/org/apache/cloudstack/direct/download/DirectDownloadManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/direct/download/DirectDownloadManagerImpl.java
@@ -35,6 +35,8 @@
import com.cloud.host.dao.HostDao;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.storage.DataStoreRole;
+import com.cloud.storage.ScopeType;
+import com.cloud.storage.Storage;
import com.cloud.storage.VMTemplateStoragePoolVO;
import com.cloud.storage.VMTemplateStorageResourceAssoc;
import com.cloud.storage.VMTemplateVO;
@@ -51,26 +53,25 @@
import java.security.cert.CertificateExpiredException;
import java.security.cert.CertificateNotYetValidException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
+
import javax.inject.Inject;
import javax.naming.ConfigurationException;
-import com.cloud.utils.security.CertificateHelper;
-import org.apache.cloudstack.agent.directdownload.DirectDownloadCommand;
import org.apache.cloudstack.agent.directdownload.DirectDownloadAnswer;
+import org.apache.cloudstack.agent.directdownload.DirectDownloadCommand;
import org.apache.cloudstack.agent.directdownload.DirectDownloadCommand.DownloadProtocol;
import org.apache.cloudstack.agent.directdownload.HttpDirectDownloadCommand;
+import org.apache.cloudstack.agent.directdownload.HttpsDirectDownloadCommand;
import org.apache.cloudstack.agent.directdownload.MetalinkDirectDownloadCommand;
import org.apache.cloudstack.agent.directdownload.NfsDirectDownloadCommand;
-import org.apache.cloudstack.agent.directdownload.HttpsDirectDownloadCommand;
import org.apache.cloudstack.agent.directdownload.RevokeDirectDownloadCertificateCommand;
import org.apache.cloudstack.agent.directdownload.SetupDirectDownloadCertificateCommand;
import org.apache.cloudstack.context.CallContext;
@@ -79,6 +80,7 @@
import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine;
import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStore;
import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.managed.context.ManagedContextRunnable;
import org.apache.cloudstack.poll.BackgroundPollManager;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
@@ -89,6 +91,9 @@
import org.apache.log4j.Logger;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
+
+import com.cloud.utils.security.CertificateHelper;
+
import sun.security.x509.X509CertImpl;
public class DirectDownloadManagerImpl extends ManagerBase implements DirectDownloadManager {
@@ -119,6 +124,8 @@
private BackgroundPollManager backgroundPollManager;
@Inject
private DataCenterDao dataCenterDao;
+ @Inject
+ private ConfigurationDao configDao;
protected ScheduledExecutorService executorService;
@@ -197,7 +204,7 @@
*/
protected Long[] createHostIdsList(List<Long> hostIds, long hostId) {
if (CollectionUtils.isEmpty(hostIds)) {
- return Arrays.asList(hostId).toArray(new Long[1]);
+ return Collections.singletonList(hostId).toArray(new Long[1]);
}
Long[] ids = new Long[hostIds.size() + 1];
ids[0] = hostId;
@@ -210,11 +217,15 @@
}
/**
- * Get hosts to retry download having hostId as the first element
+ * Get alternative hosts to retry downloading a template. The planner have previously selected a host and a storage pool
+ * @return array of host ids which can access the storage pool
*/
- protected Long[] getHostsToRetryOn(Long clusterId, long dataCenterId, HypervisorType hypervisorType, long hostId) {
- List<Long> hostIds = getRunningHostIdsInTheSameCluster(clusterId, dataCenterId, hypervisorType, hostId);
- return createHostIdsList(hostIds, hostId);
+ protected Long[] getHostsToRetryOn(Host host, StoragePoolVO storagePool) {
+ List<Long> clusterHostIds = new ArrayList<>();
+ if (storagePool.getPoolType() != Storage.StoragePoolType.Filesystem || storagePool.getScope() != ScopeType.HOST) {
+ clusterHostIds = getRunningHostIdsInTheSameCluster(host.getClusterId(), host.getDataCenterId(), host.getHypervisorType(), host.getId());
+ }
+ return createHostIdsList(clusterHostIds, host.getId());
}
@Override
@@ -247,6 +258,8 @@
DownloadProtocol protocol = getProtocolFromUrl(url);
DirectDownloadCommand cmd = getDirectDownloadCommandFromProtocol(protocol, url, templateId, to, checksum, headers);
+ cmd.setTemplateSize(template.getSize());
+ cmd.setIso(template.getFormat() == ImageFormat.ISO);
Answer answer = sendDirectDownloadCommand(cmd, template, poolId, host);
@@ -279,7 +292,9 @@
private Answer sendDirectDownloadCommand(DirectDownloadCommand cmd, VMTemplateVO template, long poolId, HostVO host) {
boolean downloaded = false;
int retry = 3;
- Long[] hostsToRetry = getHostsToRetryOn(host.getClusterId(), host.getDataCenterId(), host.getHypervisorType(), host.getId());
+
+ StoragePoolVO storagePoolVO = primaryDataStoreDao.findById(poolId);
+ Long[] hostsToRetry = getHostsToRetryOn(host, storagePoolVO);
int hostIndex = 0;
Answer answer = null;
Long hostToSendDownloadCmd = hostsToRetry[hostIndex];
@@ -320,14 +335,17 @@
*/
private DirectDownloadCommand getDirectDownloadCommandFromProtocol(DownloadProtocol protocol, String url, Long templateId, PrimaryDataStoreTO destPool,
String checksum, Map<String, String> httpHeaders) {
+ int connectTimeout = DirectDownloadConnectTimeout.value();
+ int soTimeout = DirectDownloadSocketTimeout.value();
+ int connectionRequestTimeout = DirectDownloadConnectionRequestTimeout.value();
if (protocol.equals(DownloadProtocol.HTTP)) {
- return new HttpDirectDownloadCommand(url, templateId, destPool, checksum, httpHeaders);
+ return new HttpDirectDownloadCommand(url, templateId, destPool, checksum, httpHeaders, connectTimeout, soTimeout);
} else if (protocol.equals(DownloadProtocol.HTTPS)) {
- return new HttpsDirectDownloadCommand(url, templateId, destPool, checksum, httpHeaders);
+ return new HttpsDirectDownloadCommand(url, templateId, destPool, checksum, httpHeaders, connectTimeout, soTimeout, connectionRequestTimeout);
} else if (protocol.equals(DownloadProtocol.NFS)) {
return new NfsDirectDownloadCommand(url, templateId, destPool, checksum, httpHeaders);
} else if (protocol.equals(DownloadProtocol.METALINK)) {
- return new MetalinkDirectDownloadCommand(url, templateId, destPool, checksum, httpHeaders);
+ return new MetalinkDirectDownloadCommand(url, templateId, destPool, checksum, httpHeaders, connectTimeout, soTimeout);
} else {
return null;
}
@@ -549,7 +567,10 @@
@Override
public ConfigKey<?>[] getConfigKeys() {
return new ConfigKey<?>[]{
- DirectDownloadCertificateUploadInterval
+ DirectDownloadCertificateUploadInterval,
+ DirectDownloadConnectTimeout,
+ DirectDownloadSocketTimeout,
+ DirectDownloadConnectionRequestTimeout
};
}
diff --git a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java b/server/src/main/java/org/apache/cloudstack/storage/NfsMountManager.java
similarity index 60%
copy from agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
copy to server/src/main/java/org/apache/cloudstack/storage/NfsMountManager.java
index b244d02..a4e413c 100644
--- a/agent/src/test/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImplTest.java
+++ b/server/src/main/java/org/apache/cloudstack/storage/NfsMountManager.java
@@ -15,22 +15,9 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-//
-package com.cloud.agent.direct.download;
+package org.apache.cloudstack.storage;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+public interface NfsMountManager {
-@RunWith(MockitoJUnitRunner.class)
-public class DirectTemplateDownloaderImplTest {
-
- private static final Long templateId = 202l;
-
- @Test
- public void testGetDirectDownloadTempPath() {
- String path = DirectTemplateDownloaderImpl.getDirectDownloadTempPath(templateId);
- Assert.assertEquals("template/2/202", path);
- }
+ String getMountPoint(String storageUrl, Integer nfsVersion);
}
diff --git a/server/src/main/java/org/apache/cloudstack/storage/NfsMountManagerImpl.java b/server/src/main/java/org/apache/cloudstack/storage/NfsMountManagerImpl.java
new file mode 100644
index 0000000..479ee12
--- /dev/null
+++ b/server/src/main/java/org/apache/cloudstack/storage/NfsMountManagerImpl.java
@@ -0,0 +1,203 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.storage;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import javax.annotation.PreDestroy;
+
+import com.cloud.storage.StorageLayer;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.script.OutputInterpreter;
+import com.cloud.utils.script.Script;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.utils.identity.ManagementServerNode;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
+@Component
+public class NfsMountManagerImpl implements NfsMountManager {
+ private static final Logger s_logger = Logger.getLogger(NfsMountManager.class);
+
+ private StorageLayer storage;
+ private int timeout;
+ private final Random rand = new Random(System.currentTimeMillis());
+ private final ConcurrentMap<String, String> storageMounts = new ConcurrentHashMap<>();
+
+ public static final ConfigKey<String> MOUNT_PARENT = new ConfigKey<>("Advanced", String.class,
+ "mount.parent", "/var/cloudstack/mnt",
+ "The mount point on the Management Server for Secondary Storage.",
+ true, ConfigKey.Scope.Global);
+
+ public NfsMountManagerImpl(StorageLayer storage, int timeout) {
+ this.storage = storage;
+ this.timeout = timeout;
+ }
+
+ public String getMountPoint(String storageUrl, Integer nfsVersion) {
+ String mountPoint = storageMounts.get(storageUrl);
+ if (mountPoint != null) {
+ return mountPoint;
+ }
+
+ URI uri;
+ try {
+ uri = new URI(storageUrl);
+ } catch (URISyntaxException e) {
+ s_logger.error("Invalid storage URL format ", e);
+ throw new CloudRuntimeException("Unable to create mount point due to invalid storage URL format " + storageUrl);
+ }
+
+ mountPoint = mount(uri.getHost() + ":" + uri.getPath(), MOUNT_PARENT.value(), nfsVersion);
+ if (mountPoint == null) {
+ s_logger.error("Unable to create mount point for " + storageUrl);
+ throw new CloudRuntimeException("Unable to create mount point for " + storageUrl);
+ }
+
+ storageMounts.putIfAbsent(storageUrl, mountPoint);
+ return mountPoint;
+ }
+
+ private String mount(String path, String parent, Integer nfsVersion) {
+ String mountPoint = setupMountPoint(parent);
+ if (mountPoint == null) {
+ s_logger.warn("Unable to create a mount point");
+ return null;
+ }
+
+ Script command = new Script(true, "mount", timeout, s_logger);
+ command.add("-t", "nfs");
+ if (nfsVersion != null){
+ command.add("-o", "vers=" + nfsVersion);
+ }
+ // command.add("-o", "soft,timeo=133,retrans=2147483647,tcp,acdirmax=0,acdirmin=0");
+ if ("Mac OS X".equalsIgnoreCase(System.getProperty("os.name"))) {
+ command.add("-o", "resvport");
+ }
+ command.add(path);
+ command.add(mountPoint);
+ String result = command.execute();
+ if (result != null) {
+ s_logger.warn("Unable to mount " + path + " due to " + result);
+ deleteMountPath(mountPoint);
+ return null;
+ }
+
+ // Change permissions for the mountpoint
+ Script script = new Script(true, "chmod", timeout, s_logger);
+ script.add("1777", mountPoint);
+ result = script.execute();
+ if (result != null) {
+ s_logger.warn("Unable to set permissions for " + mountPoint + " due to " + result);
+ }
+ return mountPoint;
+ }
+
+ private String setupMountPoint(String parent) {
+ String mountPoint = null;
+ for (int i = 0; i < 10; i++) {
+ String mntPt = parent + File.separator + String.valueOf(ManagementServerNode.getManagementServerId()) + "." + Integer.toHexString(rand.nextInt(Integer.MAX_VALUE));
+ File file = new File(mntPt);
+ if (!file.exists()) {
+ if (storage.mkdir(mntPt)) {
+ mountPoint = mntPt;
+ break;
+ }
+ }
+ s_logger.error("Unable to create mount: " + mntPt);
+ }
+
+ return mountPoint;
+ }
+
+ private void umount(String localRootPath) {
+ if (!mountExists(localRootPath)) {
+ return;
+ }
+ Script command = new Script(true, "umount", timeout, s_logger);
+ command.add(localRootPath);
+ String result = command.execute();
+ if (result != null) {
+ // Fedora Core 12 errors out with any -o option executed from java
+ String errMsg = "Unable to umount " + localRootPath + " due to " + result;
+ s_logger.error(errMsg);
+ throw new CloudRuntimeException(errMsg);
+ }
+ deleteMountPath(localRootPath);
+ s_logger.debug("Successfully umounted " + localRootPath);
+ }
+
+ private void deleteMountPath(String localRootPath) {
+ try {
+ Files.deleteIfExists(Paths.get(localRootPath));
+ } catch (IOException e) {
+ s_logger.warn(String.format("unable to delete mount directory %s:%s.%n", localRootPath, e.getMessage()));
+ }
+ }
+
+ private boolean mountExists(String localRootPath) {
+ Script script = new Script(true, "mount", timeout, s_logger);
+ PathParser parser = new PathParser(localRootPath);
+ script.execute(parser);
+ return parser.getPaths().stream().filter(s -> s.contains(localRootPath)).findAny().map(s -> true).orElse(false);
+ }
+
+ public static class PathParser extends OutputInterpreter {
+ String _parent;
+ List<String> paths = new ArrayList<>();
+
+ public PathParser(String parent) {
+ _parent = parent;
+ }
+
+ @Override
+ public String interpret(BufferedReader reader) throws IOException {
+ String line;
+ while ((line = reader.readLine()) != null) {
+ paths.add(line);
+ }
+ return null;
+ }
+
+ public List<String> getPaths() {
+ return paths;
+ }
+
+ @Override
+ public boolean drain() {
+ return true;
+ }
+ }
+
+ @PreDestroy
+ public void destroy() {
+ s_logger.info("Clean up mounted NFS mount points used in current session.");
+ storageMounts.values().stream().forEach(this::umount);
+ }
+}
diff --git a/server/src/main/java/org/apache/cloudstack/vm/VmImportManagerImpl.java b/server/src/main/java/org/apache/cloudstack/vm/VmImportManagerImpl.java
new file mode 100644
index 0000000..1856a12
--- /dev/null
+++ b/server/src/main/java/org/apache/cloudstack/vm/VmImportManagerImpl.java
@@ -0,0 +1,1216 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.vm;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.ResponseGenerator;
+import org.apache.cloudstack.api.ResponseObject;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.vm.ImportUnmanagedInstanceCmd;
+import org.apache.cloudstack.api.command.admin.vm.ListUnmanagedInstancesCmd;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.NicResponse;
+import org.apache.cloudstack.api.response.UnmanagedInstanceDiskResponse;
+import org.apache.cloudstack.api.response.UnmanagedInstanceResponse;
+import org.apache.cloudstack.api.response.UserVmResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
+import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService;
+import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
+import org.apache.cloudstack.utils.volume.VirtualMachineDiskInfo;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
+import org.apache.log4j.Logger;
+
+import com.cloud.agent.AgentManager;
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.GetUnmanagedInstancesAnswer;
+import com.cloud.agent.api.GetUnmanagedInstancesCommand;
+import com.cloud.capacity.CapacityManager;
+import com.cloud.configuration.Config;
+import com.cloud.configuration.Resource;
+import com.cloud.dc.DataCenter;
+import com.cloud.dc.dao.ClusterDao;
+import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.deploy.DataCenterDeployment;
+import com.cloud.deploy.DeployDestination;
+import com.cloud.deploy.DeploymentPlanner;
+import com.cloud.deploy.DeploymentPlanningManager;
+import com.cloud.event.EventTypes;
+import com.cloud.event.UsageEventUtils;
+import com.cloud.exception.InsufficientAddressCapacityException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.InsufficientVirtualNetworkCapacityException;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.PermissionDeniedException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.host.Host;
+import com.cloud.host.HostVO;
+import com.cloud.host.Status;
+import com.cloud.host.dao.HostDao;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.network.Network;
+import com.cloud.network.NetworkModel;
+import com.cloud.network.Networks;
+import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkVO;
+import com.cloud.offering.DiskOffering;
+import com.cloud.offering.ServiceOffering;
+import com.cloud.org.Cluster;
+import com.cloud.resource.ResourceManager;
+import com.cloud.serializer.GsonHelper;
+import com.cloud.server.ManagementService;
+import com.cloud.service.ServiceOfferingVO;
+import com.cloud.service.dao.ServiceOfferingDao;
+import com.cloud.storage.GuestOS;
+import com.cloud.storage.GuestOSHypervisor;
+import com.cloud.storage.Storage;
+import com.cloud.storage.StoragePool;
+import com.cloud.storage.VMTemplateStoragePoolVO;
+import com.cloud.storage.VMTemplateVO;
+import com.cloud.storage.Volume;
+import com.cloud.storage.VolumeApiService;
+import com.cloud.storage.VolumeVO;
+import com.cloud.storage.dao.DiskOfferingDao;
+import com.cloud.storage.dao.GuestOSDao;
+import com.cloud.storage.dao.GuestOSHypervisorDao;
+import com.cloud.storage.dao.VMTemplateDao;
+import com.cloud.storage.dao.VMTemplatePoolDao;
+import com.cloud.storage.dao.VolumeDao;
+import com.cloud.template.VirtualMachineTemplate;
+import com.cloud.user.Account;
+import com.cloud.user.AccountService;
+import com.cloud.user.ResourceLimitService;
+import com.cloud.user.UserVO;
+import com.cloud.user.dao.UserDao;
+import com.cloud.uservm.UserVm;
+import com.cloud.utils.Pair;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.net.NetUtils;
+import com.cloud.vm.DiskProfile;
+import com.cloud.vm.NicProfile;
+import com.cloud.vm.UserVmManager;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.VirtualMachineManager;
+import com.cloud.vm.VirtualMachineProfile;
+import com.cloud.vm.VirtualMachineProfileImpl;
+import com.cloud.vm.VmDetailConstants;
+import com.cloud.vm.dao.NicDao;
+import com.cloud.vm.dao.VMInstanceDao;
+import com.google.common.base.Strings;
+import com.google.gson.Gson;
+
+public class VmImportManagerImpl implements VmImportService {
+ public static final String VM_IMPORT_DEFAULT_TEMPLATE_NAME = "system-default-vm-import-dummy-template.iso";
+ private static final Logger LOGGER = Logger.getLogger(VmImportManagerImpl.class);
+
+ @Inject
+ private AgentManager agentManager;
+ @Inject
+ private DataCenterDao dataCenterDao;
+ @Inject
+ private ClusterDao clusterDao;
+ @Inject
+ private HostDao hostDao;
+ @Inject
+ private AccountService accountService;
+ @Inject
+ private UserDao userDao;
+ @Inject
+ private VMTemplateDao templateDao;
+ @Inject
+ private VMTemplatePoolDao templatePoolDao;
+ @Inject
+ private ServiceOfferingDao serviceOfferingDao;
+ @Inject
+ private DiskOfferingDao diskOfferingDao;
+ @Inject
+ private ResourceManager resourceManager;
+ @Inject
+ private ResourceLimitService resourceLimitService;
+ @Inject
+ private UserVmManager userVmManager;
+ @Inject
+ private ResponseGenerator responseGenerator;
+ @Inject
+ private VolumeOrchestrationService volumeManager;
+ @Inject
+ private VolumeDao volumeDao;
+ @Inject
+ private PrimaryDataStoreDao primaryDataStoreDao;
+ @Inject
+ private NetworkDao networkDao;
+ @Inject
+ private NetworkOrchestrationService networkOrchestrationService;
+ @Inject
+ private VMInstanceDao vmDao;
+ @Inject
+ private CapacityManager capacityManager;
+ @Inject
+ private VolumeApiService volumeApiService;
+ @Inject
+ private DeploymentPlanningManager deploymentPlanningManager;
+ @Inject
+ private VirtualMachineManager virtualMachineManager;
+ @Inject
+ private ManagementService managementService;
+ @Inject
+ private NicDao nicDao;
+ @Inject
+ private NetworkModel networkModel;
+ @Inject
+ private ConfigurationDao configurationDao;
+ @Inject
+ private GuestOSDao guestOSDao;
+ @Inject
+ private GuestOSHypervisorDao guestOSHypervisorDao;
+
+ protected Gson gson;
+
+ public VmImportManagerImpl() {
+ gson = GsonHelper.getGsonLogger();
+ }
+
+ private VMTemplateVO createDefaultDummyVmImportTemplate() {
+ VMTemplateVO template = null;
+ try {
+ template = VMTemplateVO.createSystemIso(templateDao.getNextInSequence(Long.class, "id"), VM_IMPORT_DEFAULT_TEMPLATE_NAME, VM_IMPORT_DEFAULT_TEMPLATE_NAME, true,
+ "", true, 64, Account.ACCOUNT_ID_SYSTEM, "",
+ "VM Import Default Template", false, 1);
+ template.setState(VirtualMachineTemplate.State.Inactive);
+ template = templateDao.persist(template);
+ if (template == null) {
+ return null;
+ }
+ templateDao.remove(template.getId());
+ template = templateDao.findByName(VM_IMPORT_DEFAULT_TEMPLATE_NAME);
+ } catch (Exception e) {
+ LOGGER.error("Unable to create default dummy template for VM import", e);
+ }
+ return template;
+ }
+
+ private UnmanagedInstanceResponse createUnmanagedInstanceResponse(UnmanagedInstanceTO instance, Cluster cluster, Host host) {
+ UnmanagedInstanceResponse response = new UnmanagedInstanceResponse();
+ response.setName(instance.getName());
+ if (cluster != null) {
+ response.setClusterId(cluster.getUuid());
+ }
+ if (host != null) {
+ response.setHostId(host.getUuid());
+ }
+ response.setPowerState(instance.getPowerState().toString());
+ response.setCpuCores(instance.getCpuCores());
+ response.setCpuSpeed(instance.getCpuSpeed());
+ response.setCpuCoresPerSocket(instance.getCpuCoresPerSocket());
+ response.setMemory(instance.getMemory());
+ response.setOperatingSystemId(instance.getOperatingSystemId());
+ response.setOperatingSystem(instance.getOperatingSystem());
+ response.setObjectName("unmanagedinstance");
+
+ if (instance.getDisks() != null) {
+ for (UnmanagedInstanceTO.Disk disk : instance.getDisks()) {
+ UnmanagedInstanceDiskResponse diskResponse = new UnmanagedInstanceDiskResponse();
+ diskResponse.setDiskId(disk.getDiskId());
+ if (!Strings.isNullOrEmpty(disk.getLabel())) {
+ diskResponse.setLabel(disk.getLabel());
+ }
+ diskResponse.setCapacity(disk.getCapacity());
+ diskResponse.setController(disk.getController());
+ diskResponse.setControllerUnit(disk.getControllerUnit());
+ diskResponse.setPosition(disk.getPosition());
+ diskResponse.setImagePath(disk.getImagePath());
+ diskResponse.setDatastoreName(disk.getDatastoreName());
+ diskResponse.setDatastoreHost(disk.getDatastoreHost());
+ diskResponse.setDatastorePath(disk.getDatastorePath());
+ diskResponse.setDatastoreType(disk.getDatastoreType());
+ response.addDisk(diskResponse);
+ }
+ }
+
+ if (instance.getNics() != null) {
+ for (UnmanagedInstanceTO.Nic nic : instance.getNics()) {
+ NicResponse nicResponse = new NicResponse();
+ nicResponse.setId(nic.getNicId());
+ nicResponse.setNetworkName(nic.getNetwork());
+ nicResponse.setMacAddress(nic.getMacAddress());
+ if (!Strings.isNullOrEmpty(nic.getAdapterType())) {
+ nicResponse.setAdapterType(nic.getAdapterType());
+ }
+ if (!CollectionUtils.isEmpty(nic.getIpAddress())) {
+ nicResponse.setIpAddresses(nic.getIpAddress());
+ }
+ nicResponse.setVlanId(nic.getVlan());
+ nicResponse.setIsolatedPvlanId(nic.getPvlan());
+ nicResponse.setIsolatedPvlanType(nic.getPvlanType());
+ response.addNic(nicResponse);
+ }
+ }
+ return response;
+ }
+
+ private List<String> getAdditionalNameFilters(Cluster cluster) {
+ List<String> additionalNameFilter = new ArrayList<>();
+ if (cluster == null) {
+ return additionalNameFilter;
+ }
+ if (cluster.getHypervisorType() == Hypervisor.HypervisorType.VMware) {
+ // VMWare considers some templates as VM and they are not filtered by VirtualMachineMO.isTemplate()
+ List<VMTemplateStoragePoolVO> templates = templatePoolDao.listAll();
+ for (VMTemplateStoragePoolVO template : templates) {
+ additionalNameFilter.add(template.getInstallPath());
+ }
+
+ // VMWare considers some removed volumes as VM
+ List<VolumeVO> volumes = volumeDao.findIncludingRemovedByZone(cluster.getDataCenterId());
+ for (VolumeVO volumeVO : volumes) {
+ if (volumeVO.getRemoved() == null) {
+ continue;
+ }
+ if (Strings.isNullOrEmpty(volumeVO.getChainInfo())) {
+ continue;
+ }
+ List<String> volumeFileNames = new ArrayList<>();
+ try {
+ VirtualMachineDiskInfo diskInfo = gson.fromJson(volumeVO.getChainInfo(), VirtualMachineDiskInfo.class);
+ String[] files = diskInfo.getDiskChain();
+ if (files.length == 1) {
+ continue;
+ }
+ boolean firstFile = true;
+ for (final String file : files) {
+ if (firstFile) {
+ firstFile = false;
+ continue;
+ }
+ String path = file;
+ String[] split = path.split(" ");
+ path = split[split.length - 1];
+ split = path.split("/");
+ ;
+ path = split[split.length - 1];
+ split = path.split("\\.");
+ path = split[0];
+ if (!Strings.isNullOrEmpty(path)) {
+ if (!additionalNameFilter.contains(path)) {
+ volumeFileNames.add(path);
+ }
+ if (path.contains("-")) {
+ split = path.split("-");
+ path = split[0];
+ if (!Strings.isNullOrEmpty(path) && !path.equals("ROOT") && !additionalNameFilter.contains(path)) {
+ volumeFileNames.add(path);
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ LOGGER.warn(String.format("Unable to find volume file name for volume ID: %s while adding filters unmanaged VMs", volumeVO.getUuid()), e);
+ }
+ if (!volumeFileNames.isEmpty()) {
+ additionalNameFilter.addAll(volumeFileNames);
+ }
+ }
+ }
+ return additionalNameFilter;
+ }
+
+ private List<String> getHostManagedVms(Host host) {
+ List<String> managedVms = new ArrayList<>();
+ List<VMInstanceVO> instances = vmDao.listByHostId(host.getId());
+ for (VMInstanceVO instance : instances) {
+ managedVms.add(instance.getInstanceName());
+ }
+ instances = vmDao.listByLastHostIdAndStates(host.getId(),
+ VirtualMachine.State.Stopped, VirtualMachine.State.Destroyed,
+ VirtualMachine.State.Expunging, VirtualMachine.State.Error,
+ VirtualMachine.State.Unknown, VirtualMachine.State.Shutdown);
+ for (VMInstanceVO instance : instances) {
+ managedVms.add(instance.getInstanceName());
+ }
+ return managedVms;
+ }
+
+ private boolean hostSupportsServiceOffering(HostVO host, ServiceOffering serviceOffering) {
+ if (host == null) {
+ return false;
+ }
+ if (serviceOffering == null) {
+ return false;
+ }
+ if (Strings.isNullOrEmpty(serviceOffering.getHostTag())) {
+ return true;
+ }
+ hostDao.loadHostTags(host);
+ return host.getHostTags() != null && host.getHostTags().contains(serviceOffering.getHostTag());
+ }
+
+ private boolean storagePoolSupportsDiskOffering(StoragePool pool, DiskOffering diskOffering) {
+ if (pool == null) {
+ return false;
+ }
+ if (diskOffering == null) {
+ return false;
+ }
+ return volumeApiService.doesTargetStorageSupportDiskOffering(pool, diskOffering.getTags());
+ }
+
+ private boolean storagePoolSupportsServiceOffering(StoragePool pool, ServiceOffering serviceOffering) {
+ if (pool == null) {
+ return false;
+ }
+ if (serviceOffering == null) {
+ return false;
+ }
+ return volumeApiService.doesTargetStorageSupportDiskOffering(pool, serviceOffering.getTags());
+ }
+
+ private ServiceOfferingVO getUnmanagedInstanceServiceOffering(final UnmanagedInstanceTO instance, ServiceOfferingVO serviceOffering, final Account owner, final DataCenter zone, final Map<String, String> details)
+ throws ServerApiException, PermissionDeniedException, ResourceAllocationException {
+ if (instance == null) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("VM is not valid"));
+ }
+ if (serviceOffering == null) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Service offering is not valid"));
+ }
+ accountService.checkAccess(owner, serviceOffering, zone);
+ final Integer cpu = instance.getCpuCores();
+ final Integer memory = instance.getMemory();
+ Integer cpuSpeed = instance.getCpuSpeed() == null ? 0 : instance.getCpuSpeed();
+ if (cpu == null || cpu == 0) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("CPU cores for VM not valid"));
+ }
+ if (memory == null || memory == 0) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Memory for VM not valid", instance.getName()));
+ }
+ if (serviceOffering.isDynamic()) {
+ if (details.containsKey(VmDetailConstants.CPU_SPEED)) {
+ try {
+ cpuSpeed = Integer.parseInt(details.get(VmDetailConstants.CPU_SPEED));
+ } catch (Exception e) {
+ }
+ }
+ Map<String, String> parameters = new HashMap<>();
+ parameters.put(VmDetailConstants.CPU_NUMBER, String.valueOf(cpu));
+ parameters.put(VmDetailConstants.MEMORY, String.valueOf(memory));
+ if (serviceOffering.getSpeed() == null && cpuSpeed > 0) {
+ parameters.put(VmDetailConstants.CPU_SPEED, String.valueOf(cpuSpeed));
+ }
+ serviceOffering.setDynamicFlag(true);
+ userVmManager.validateCustomParameters(serviceOffering, parameters);
+ serviceOffering = serviceOfferingDao.getComputeOffering(serviceOffering, parameters);
+ } else {
+ if (!cpu.equals(serviceOffering.getCpu()) && !instance.getPowerState().equals(UnmanagedInstanceTO.PowerState.PowerOff)) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Service offering (%s) %d CPU cores does not matches VM CPU cores %d and VM is not in powered off state (Power state: %s)", serviceOffering.getUuid(), serviceOffering.getCpu(), cpu, instance.getPowerState()));
+ }
+ if (!memory.equals(serviceOffering.getRamSize()) && !instance.getPowerState().equals(UnmanagedInstanceTO.PowerState.PowerOff)) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Service offering (%s) %dMB memory does not matches VM memory %dMB and VM is not in powered off state (Power state: %s)", serviceOffering.getUuid(), serviceOffering.getRamSize(), memory, instance.getPowerState()));
+ }
+ if (cpuSpeed != null && cpuSpeed > 0 && !cpuSpeed.equals(serviceOffering.getSpeed()) && !instance.getPowerState().equals(UnmanagedInstanceTO.PowerState.PowerOff)) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Service offering (%s) %dMHz CPU speed does not matches VM CPU speed %dMHz and VM is not in powered off state (Power state: %s)", serviceOffering.getUuid(), serviceOffering.getSpeed(), cpuSpeed, instance.getPowerState()));
+ }
+ }
+ resourceLimitService.checkResourceLimit(owner, Resource.ResourceType.cpu, new Long(serviceOffering.getCpu()));
+ resourceLimitService.checkResourceLimit(owner, Resource.ResourceType.memory, new Long(serviceOffering.getRamSize()));
+ return serviceOffering;
+ }
+
+ private Map<String, Network.IpAddresses> getNicIpAddresses(final List<UnmanagedInstanceTO.Nic> nics, final Map<String, Network.IpAddresses> callerNicIpAddressMap) {
+ Map<String, Network.IpAddresses> nicIpAddresses = new HashMap<>();
+ for (UnmanagedInstanceTO.Nic nic : nics) {
+ Network.IpAddresses ipAddresses = null;
+ if (MapUtils.isNotEmpty(callerNicIpAddressMap) && callerNicIpAddressMap.containsKey(nic.getNicId())) {
+ ipAddresses = callerNicIpAddressMap.get(nic.getNicId());
+ }
+ // If IP is set to auto-assign, check NIC doesn't have more that one IP from SDK
+ if (ipAddresses != null && ipAddresses.getIp4Address() != null && ipAddresses.getIp4Address().equals("auto") && !CollectionUtils.isEmpty(nic.getIpAddress())) {
+ if (nic.getIpAddress().size() > 1) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Multiple IP addresses (%s, %s) present for nic ID: %s. IP address cannot be assigned automatically, only single IP address auto-assigning supported", nic.getIpAddress().get(0), nic.getIpAddress().get(1), nic.getNicId()));
+ }
+ String address = nic.getIpAddress().get(0);
+ if (NetUtils.isValidIp4(address)) {
+ ipAddresses.setIp4Address(address);
+ }
+ }
+ if (ipAddresses != null) {
+ nicIpAddresses.put(nic.getNicId(), ipAddresses);
+ }
+ }
+ return nicIpAddresses;
+ }
+
+ private StoragePool getStoragePool(final UnmanagedInstanceTO.Disk disk, final DataCenter zone, final Cluster cluster) {
+ StoragePool storagePool = null;
+ final String dsHost = disk.getDatastoreHost();
+ final String dsPath = disk.getDatastorePath();
+ final String dsType = disk.getDatastoreType();
+ final String dsName = disk.getDatastoreName();
+ if (dsType.equals("VMFS")) {
+ List<StoragePoolVO> pools = primaryDataStoreDao.listPoolsByCluster(cluster.getId());
+ pools.addAll(primaryDataStoreDao.listByDataCenterId(zone.getId()));
+ for (StoragePool pool : pools) {
+ if (pool.getPoolType() != Storage.StoragePoolType.VMFS) {
+ continue;
+ }
+ if (pool.getPath().endsWith(dsName)) {
+ storagePool = pool;
+ break;
+ }
+ }
+ } else {
+ List<StoragePoolVO> pools = primaryDataStoreDao.listPoolByHostPath(dsHost, dsPath);
+ for (StoragePool pool : pools) {
+ if (pool.getDataCenterId() == zone.getId() &&
+ (pool.getClusterId() == null || pool.getClusterId().equals(cluster.getId()))) {
+ storagePool = pool;
+ break;
+ }
+ }
+ }
+ if (storagePool == null) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Storage pool for disk %s(%s) with datastore: %s not found in zone ID: %s", disk.getLabel(), disk.getDiskId(), disk.getDatastoreName(), zone.getUuid()));
+ }
+ return storagePool;
+ }
+
+ private void checkUnmanagedDiskAndOfferingForImport(UnmanagedInstanceTO.Disk disk, DiskOffering diskOffering, ServiceOffering serviceOffering, final Account owner, final DataCenter zone, final Cluster cluster, final boolean migrateAllowed)
+ throws ServerApiException, PermissionDeniedException, ResourceAllocationException {
+ if (serviceOffering == null && diskOffering == null) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Disk offering for disk ID: %s not found during VM import", disk.getDiskId()));
+ }
+ if (diskOffering != null) {
+ accountService.checkAccess(owner, diskOffering, zone);
+ }
+ resourceLimitService.checkResourceLimit(owner, Resource.ResourceType.volume);
+ if (disk.getCapacity() == null || disk.getCapacity() == 0) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Size of disk(ID: %s) is found invalid during VM import", disk.getDiskId()));
+ }
+ if (diskOffering != null && !diskOffering.isCustomized() && diskOffering.getDiskSize() == 0) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Size of fixed disk offering(ID: %s) is found invalid during VM import", diskOffering.getUuid()));
+ }
+ if (diskOffering != null && !diskOffering.isCustomized() && diskOffering.getDiskSize() < disk.getCapacity()) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Size of disk offering(ID: %s) %dGB is found less than the size of disk(ID: %s) %dGB during VM import", diskOffering.getUuid(), (diskOffering.getDiskSize() / Resource.ResourceType.bytesToGiB), disk.getDiskId(), (disk.getCapacity() / (Resource.ResourceType.bytesToGiB))));
+ }
+ StoragePool storagePool = getStoragePool(disk, zone, cluster);
+ if (diskOffering != null && !migrateAllowed && !storagePoolSupportsDiskOffering(storagePool, diskOffering)) {
+ throw new InvalidParameterValueException(String.format("Disk offering: %s is not compatible with storage pool: %s of unmanaged disk: %s", diskOffering.getUuid(), storagePool.getUuid(), disk.getDiskId()));
+ }
+ if (serviceOffering != null && !migrateAllowed && !storagePoolSupportsServiceOffering(storagePool, serviceOffering)) {
+ throw new InvalidParameterValueException(String.format("Service offering: %s is not compatible with storage pool: %s of unmanaged disk: %s", serviceOffering.getUuid(), storagePool.getUuid(), disk.getDiskId()));
+ }
+ }
+
+ private void checkUnmanagedDiskAndOfferingForImport(List<UnmanagedInstanceTO.Disk> disks, final Map<String, Long> diskOfferingMap, final Account owner, final DataCenter zone, final Cluster cluster, final boolean migrateAllowed)
+ throws ServerApiException, PermissionDeniedException, ResourceAllocationException {
+ String diskController = null;
+ for (UnmanagedInstanceTO.Disk disk : disks) {
+ if (disk == null) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Unable to retrieve disk details for VM"));
+ }
+ if (!diskOfferingMap.containsKey(disk.getDiskId())) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Disk offering for disk ID: %s not found during VM import", disk.getDiskId()));
+ }
+ if (Strings.isNullOrEmpty(diskController)) {
+ diskController = disk.getController();
+ } else {
+ if (!diskController.equals(disk.getController())) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Multiple data disk controllers of different type (%s, %s) are not supported for import. Please make sure that all data disk controllers are of the same type", diskController, disk.getController()));
+ }
+ }
+ checkUnmanagedDiskAndOfferingForImport(disk, diskOfferingDao.findById(diskOfferingMap.get(disk.getDiskId())), null, owner, zone, cluster, migrateAllowed);
+ }
+ }
+
+ private void checkUnmanagedNicAndNetworkForImport(UnmanagedInstanceTO.Nic nic, Network network, final DataCenter zone, final Account owner, final boolean autoAssign) throws ServerApiException {
+ if (nic == null) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Unable to retrieve NIC details during VM import"));
+ }
+ if (network == null) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Network for nic ID: %s not found during VM import", nic.getNicId()));
+ }
+ if (network.getDataCenterId() != zone.getId()) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Network(ID: %s) for nic(ID: %s) belongs to a different zone than VM to be imported", network.getUuid(), nic.getNicId()));
+ }
+ networkModel.checkNetworkPermissions(owner, network);
+ if (!autoAssign && network.getGuestType().equals(Network.GuestType.Isolated)) {
+ return;
+ }
+
+ String networkBroadcastUri = network.getBroadcastUri() == null ? null : network.getBroadcastUri().toString();
+ if (nic.getVlan() != null && nic.getVlan() != 0 && nic.getPvlan() == null &&
+ (Strings.isNullOrEmpty(networkBroadcastUri) ||
+ !networkBroadcastUri.equals(String.format("vlan://%d", nic.getVlan())))) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("VLAN of network(ID: %s) %s is found different from the VLAN of nic(ID: %s) vlan://%d during VM import", network.getUuid(), networkBroadcastUri, nic.getNicId(), nic.getVlan()));
+ }
+ if (nic.getVlan() != null && nic.getVlan() != 0 && nic.getPvlan() != null && nic.getPvlan() != 0 &&
+ (Strings.isNullOrEmpty(network.getBroadcastUri().toString()) ||
+ !networkBroadcastUri.equals(String.format("pvlan://%d-i%d", nic.getVlan(), nic.getPvlan())))) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("PVLAN of network(ID: %s) %s is found different from the VLAN of nic(ID: %s) pvlan://%d-i%d during VM import", network.getUuid(), networkBroadcastUri, nic.getNicId(), nic.getVlan(), nic.getPvlan()));
+ }
+ }
+
+ private void checkUnmanagedNicAndNetworkHostnameForImport(UnmanagedInstanceTO.Nic nic, Network network, final String hostName) throws ServerApiException {
+ if (nic == null) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Unable to retrieve NIC details during VM import"));
+ }
+ if (network == null) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Network for nic ID: %s not found during VM import", nic.getNicId()));
+ }
+ // Check for duplicate hostname in network, get all vms hostNames in the network
+ List<String> hostNames = vmDao.listDistinctHostNames(network.getId());
+ if (CollectionUtils.isNotEmpty(hostNames) && hostNames.contains(hostName)) {
+ throw new InvalidParameterValueException("The vm with hostName " + hostName + " already exists in the network domain: " + network.getNetworkDomain() + "; network="
+ + network);
+ }
+ }
+
+ private void checkUnmanagedNicIpAndNetworkForImport(UnmanagedInstanceTO.Nic nic, Network network, final Network.IpAddresses ipAddresses) throws ServerApiException {
+ if (nic == null) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Unable to retrieve NIC details during VM import"));
+ }
+ if (network == null) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Network for nic ID: %s not found during VM import", nic.getNicId()));
+ }
+ // Check IP is assigned for non L2 networks
+ if (!network.getGuestType().equals(Network.GuestType.L2) && (ipAddresses == null || Strings.isNullOrEmpty(ipAddresses.getIp4Address()))) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("NIC(ID: %s) needs a valid IP address for it to be associated with network(ID: %s). %s parameter of API can be used for this", nic.getNicId(), network.getUuid(), ApiConstants.NIC_IP_ADDRESS_LIST));
+ }
+ // If network is non L2, IP v4 is assigned and not set to auto-assign, check it is available for network
+ if (!network.getGuestType().equals(Network.GuestType.L2) && ipAddresses != null && !Strings.isNullOrEmpty(ipAddresses.getIp4Address()) && !ipAddresses.getIp4Address().equals("auto")) {
+ Set<Long> ips = networkModel.getAvailableIps(network, ipAddresses.getIp4Address());
+ if (CollectionUtils.isEmpty(ips) || !ips.contains(NetUtils.ip2Long(ipAddresses.getIp4Address()))) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("IP address %s for NIC(ID: %s) is not available in network(ID: %s)", ipAddresses.getIp4Address(), nic.getNicId(), network.getUuid()));
+ }
+ }
+ }
+
+ private Map<String, Long> getUnmanagedNicNetworkMap(List<UnmanagedInstanceTO.Nic> nics, final Map<String, Long> callerNicNetworkMap, final Map<String, Network.IpAddresses> callerNicIpAddressMap, final DataCenter zone, final String hostName, final Account owner) throws ServerApiException {
+ Map<String, Long> nicNetworkMap = new HashMap<>();
+ String nicAdapter = null;
+ for (UnmanagedInstanceTO.Nic nic : nics) {
+ if (Strings.isNullOrEmpty(nicAdapter)) {
+ nicAdapter = nic.getAdapterType();
+ } else {
+ if (!nicAdapter.equals(nic.getAdapterType())) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Multiple network adapter of different type (%s, %s) are not supported for import. Please make sure that all network adapters are of the same type", nicAdapter, nic.getAdapterType()));
+ }
+ }
+ Network network = null;
+ Network.IpAddresses ipAddresses = null;
+ if (MapUtils.isNotEmpty(callerNicIpAddressMap) && callerNicIpAddressMap.containsKey(nic.getNicId())) {
+ ipAddresses = callerNicIpAddressMap.get(nic.getNicId());
+ }
+ if (!callerNicNetworkMap.containsKey(nic.getNicId())) {
+ if (nic.getVlan() != null && nic.getVlan() != 0) {
+ // Find a suitable network
+ List<NetworkVO> networks = networkDao.listByZone(zone.getId());
+ for (NetworkVO networkVO : networks) {
+ if (networkVO.getTrafficType() == Networks.TrafficType.None || Networks.TrafficType.isSystemNetwork(networkVO.getTrafficType())) {
+ continue;
+ }
+ try {
+ checkUnmanagedNicAndNetworkForImport(nic, networkVO, zone, owner, true);
+ network = networkVO;
+ } catch (Exception e) {
+ }
+ if (network != null) {
+ checkUnmanagedNicAndNetworkHostnameForImport(nic, network, hostName);
+ checkUnmanagedNicIpAndNetworkForImport(nic, network, ipAddresses);
+ break;
+ }
+ }
+ }
+ } else {
+ network = networkDao.findById(callerNicNetworkMap.get(nic.getNicId()));
+ checkUnmanagedNicAndNetworkForImport(nic, network, zone, owner, false);
+ checkUnmanagedNicAndNetworkHostnameForImport(nic, network, hostName);
+ checkUnmanagedNicIpAndNetworkForImport(nic, network, ipAddresses);
+ }
+ if (network == null) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Suitable network for nic(ID: %s) not found during VM import", nic.getNicId()));
+ }
+ nicNetworkMap.put(nic.getNicId(), network.getId());
+ }
+ return nicNetworkMap;
+ }
+
+ private Pair<DiskProfile, StoragePool> importDisk(UnmanagedInstanceTO.Disk disk, VirtualMachine vm, Cluster cluster, DiskOffering diskOffering,
+ Volume.Type type, String name, Long diskSize, Long minIops, Long maxIops, VirtualMachineTemplate template,
+ Account owner, Long deviceId) {
+ final DataCenter zone = dataCenterDao.findById(vm.getDataCenterId());
+ final String path = Strings.isNullOrEmpty(disk.getFileBaseName()) ? disk.getImagePath() : disk.getFileBaseName();
+ String chainInfo = disk.getChainInfo();
+ if (Strings.isNullOrEmpty(chainInfo)) {
+ VirtualMachineDiskInfo diskInfo = new VirtualMachineDiskInfo();
+ diskInfo.setDiskDeviceBusName(String.format("%s%d:%d", disk.getController(), disk.getControllerUnit(), disk.getPosition()));
+ diskInfo.setDiskChain(new String[]{disk.getImagePath()});
+ chainInfo = gson.toJson(diskInfo);
+ }
+ StoragePool storagePool = getStoragePool(disk, zone, cluster);
+ DiskProfile profile = volumeManager.importVolume(type, name, diskOffering, diskSize,
+ minIops, maxIops, vm, template, owner, deviceId, storagePool.getId(), path, chainInfo);
+
+ return new Pair<DiskProfile, StoragePool>(profile, storagePool);
+ }
+
+ private NicProfile importNic(UnmanagedInstanceTO.Nic nic, VirtualMachine vm, Network network, Network.IpAddresses ipAddresses, boolean isDefaultNic) throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException {
+ Pair<NicProfile, Integer> result = networkOrchestrationService.importNic(nic.getMacAddress(), 0, network, isDefaultNic, vm, ipAddresses);
+ if (result == null) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("NIC ID: %s import failed", nic.getNicId()));
+ }
+ return result.first();
+ }
+
+ private void cleanupFailedImportVM(final UserVm userVm) {
+ if (userVm == null) {
+ return;
+ }
+ VirtualMachineProfile profile = new VirtualMachineProfileImpl(userVm);
+ // Remove all volumes
+ volumeDao.deleteVolumesByInstance(userVm.getId());
+ // Remove all nics
+ try {
+ networkOrchestrationService.release(profile, true);
+ } catch (Exception e) {
+ LOGGER.error(String.format("Unable to release NICs for unsuccessful import unmanaged VM: %s", userVm.getInstanceName()), e);
+ nicDao.removeNicsForInstance(userVm.getId());
+ }
+ // Remove vm
+ vmDao.remove(userVm.getId());
+ }
+
+ private UserVm migrateImportedVM(HostVO sourceHost, VirtualMachineTemplate template, ServiceOfferingVO serviceOffering, UserVm userVm, final Account owner, List<Pair<DiskProfile, StoragePool>> diskProfileStoragePoolList) {
+ UserVm vm = userVm;
+ if (vm == null) {
+ LOGGER.error(String.format("Failed to check migrations need during VM import"));
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Failed to check migrations need during VM import"));
+ }
+ if (sourceHost == null || serviceOffering == null || diskProfileStoragePoolList == null) {
+ LOGGER.error(String.format("Failed to check migrations need during import, VM: %s", userVm.getInstanceName()));
+ cleanupFailedImportVM(vm);
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Failed to check migrations need during import, VM: %s", userVm.getInstanceName()));
+ }
+ if (!hostSupportsServiceOffering(sourceHost, serviceOffering)) {
+ LOGGER.debug(String.format("VM %s needs to be migrated", vm.getUuid()));
+ final VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm, template, serviceOffering, owner, null);
+ DeploymentPlanner.ExcludeList excludeList = new DeploymentPlanner.ExcludeList();
+ excludeList.addHost(sourceHost.getId());
+ final DataCenterDeployment plan = new DataCenterDeployment(sourceHost.getDataCenterId(), sourceHost.getPodId(), sourceHost.getClusterId(), null, null, null);
+ DeployDestination dest = null;
+ try {
+ dest = deploymentPlanningManager.planDeployment(profile, plan, excludeList, null);
+ } catch (Exception e) {
+ LOGGER.warn(String.format("VM import failed for unmanaged vm: %s during vm migration, finding deployment destination", vm.getInstanceName()), e);
+ cleanupFailedImportVM(vm);
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("VM import failed for unmanaged vm: %s during vm migration, finding deployment destination", vm.getInstanceName()));
+ }
+ if (dest != null) {
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(" Found " + dest + " for migrating the vm to");
+ }
+ }
+ if (dest == null) {
+ cleanupFailedImportVM(vm);
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("VM import failed for unmanaged vm: %s during vm migration, no deployment destination found", vm.getInstanceName()));
+ }
+ try {
+ if (vm.getState().equals(VirtualMachine.State.Stopped)) {
+ VMInstanceVO vmInstanceVO = vmDao.findById(userVm.getId());
+ vmInstanceVO.setHostId(dest.getHost().getId());
+ vmInstanceVO.setLastHostId(dest.getHost().getId());
+ vmDao.update(vmInstanceVO.getId(), vmInstanceVO);
+ } else {
+ virtualMachineManager.migrate(vm.getUuid(), sourceHost.getId(), dest);
+ }
+ vm = userVmManager.getUserVm(vm.getId());
+ } catch (Exception e) {
+ LOGGER.error(String.format("VM import failed for unmanaged vm: %s during vm migration", vm.getInstanceName()), e);
+ cleanupFailedImportVM(vm);
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("VM import failed for unmanaged vm: %s during vm migration. %s", userVm.getInstanceName(), e.getMessage()));
+ }
+ }
+ for (Pair<DiskProfile, StoragePool> diskProfileStoragePool : diskProfileStoragePoolList) {
+ if (diskProfileStoragePool == null ||
+ diskProfileStoragePool.first() == null ||
+ diskProfileStoragePool.second() == null) {
+ continue;
+ }
+ DiskProfile profile = diskProfileStoragePool.first();
+ DiskOffering dOffering = diskOfferingDao.findById(profile.getDiskOfferingId());
+ if (dOffering == null) {
+ continue;
+ }
+ VolumeVO volumeVO = volumeDao.findById(profile.getVolumeId());
+ if (volumeVO == null) {
+ continue;
+ }
+ boolean poolSupportsOfferings = storagePoolSupportsDiskOffering(diskProfileStoragePool.second(), dOffering);
+ if (poolSupportsOfferings && profile.getType() == Volume.Type.ROOT) {
+ poolSupportsOfferings = storagePoolSupportsServiceOffering(diskProfileStoragePool.second(), serviceOffering);
+ }
+ if (poolSupportsOfferings) {
+ continue;
+ }
+ LOGGER.debug(String.format("Volume %s needs to be migrated", volumeVO.getUuid()));
+ Pair<List<? extends StoragePool>, List<? extends StoragePool>> poolsPair = managementService.listStoragePoolsForMigrationOfVolume(profile.getVolumeId());
+ if (CollectionUtils.isEmpty(poolsPair.first()) && CollectionUtils.isEmpty(poolsPair.second())) {
+ cleanupFailedImportVM(vm);
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("VM import failed for unmanaged vm: %s during volume ID: %s migration as no suitable pool(s) found", userVm.getInstanceName(), volumeVO.getUuid()));
+ }
+ List<? extends StoragePool> storagePools = poolsPair.second();
+ StoragePool storagePool = null;
+ if (CollectionUtils.isNotEmpty(storagePools)) {
+ for (StoragePool pool : storagePools) {
+ if (diskProfileStoragePool.second().getId() != pool.getId() &&
+ storagePoolSupportsDiskOffering(pool, dOffering) &&
+ (!profile.getType().equals(Volume.Type.ROOT) ||
+ profile.getType().equals(Volume.Type.ROOT) && storagePoolSupportsServiceOffering(pool, serviceOffering))) {
+ storagePool = pool;
+ break;
+ }
+ }
+ }
+ // For zone-wide pools, at times, suitable storage pools are not returned therefore consider all pools.
+ if (storagePool == null && CollectionUtils.isNotEmpty(poolsPair.first())) {
+ storagePools = poolsPair.first();
+ for (StoragePool pool : storagePools) {
+ if (diskProfileStoragePool.second().getId() != pool.getId() &&
+ storagePoolSupportsDiskOffering(pool, dOffering) &&
+ (!profile.getType().equals(Volume.Type.ROOT) ||
+ profile.getType().equals(Volume.Type.ROOT) && storagePoolSupportsServiceOffering(pool, serviceOffering))) {
+ storagePool = pool;
+ break;
+ }
+ }
+ }
+ if (storagePool == null) {
+ cleanupFailedImportVM(vm);
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("VM import failed for unmanaged vm: %s during volume ID: %s migration as no suitable pool found", userVm.getInstanceName(), volumeVO.getUuid()));
+ } else {
+ LOGGER.debug(String.format("Found storage pool %s(%s) for migrating the volume %s to", storagePool.getName(), storagePool.getUuid(), volumeVO.getUuid()));
+ }
+ try {
+ Volume volume = null;
+ if (vm.getState().equals(VirtualMachine.State.Running)) {
+ volume = volumeManager.liveMigrateVolume(volumeVO, storagePool);
+ } else {
+ volume = volumeManager.migrateVolume(volumeVO, storagePool);
+ }
+ if (volume == null) {
+ String msg = "";
+ if (vm.getState().equals(VirtualMachine.State.Running)) {
+ msg = String.format("Live migration for volume ID: %s to destination pool ID: %s failed", volumeVO.getUuid(), storagePool.getUuid());
+ } else {
+ msg = String.format("Migration for volume ID: %s to destination pool ID: %s failed", volumeVO.getUuid(), storagePool.getUuid());
+ }
+ LOGGER.error(msg);
+ throw new CloudRuntimeException(msg);
+ }
+ } catch (Exception e) {
+ LOGGER.error(String.format("VM import failed for unmanaged vm: %s during volume migration", vm.getInstanceName()), e);
+ cleanupFailedImportVM(vm);
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("VM import failed for unmanaged vm: %s during volume migration. %s", userVm.getInstanceName(), Strings.nullToEmpty(e.getMessage())));
+ }
+ }
+ return userVm;
+ }
+
+ private void publishVMUsageUpdateResourceCount(final UserVm userVm, ServiceOfferingVO serviceOfferingVO) {
+ if (userVm == null || serviceOfferingVO == null) {
+ LOGGER.error("Failed to publish usage records during VM import");
+ cleanupFailedImportVM(userVm);
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("VM import failed for unmanaged vm during publishing usage records"));
+ }
+ try {
+ if (!serviceOfferingVO.isDynamic()) {
+ UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_IMPORT, userVm.getAccountId(), userVm.getDataCenterId(), userVm.getId(), userVm.getHostName(), serviceOfferingVO.getId(), userVm.getTemplateId(),
+ userVm.getHypervisorType().toString(), VirtualMachine.class.getName(), userVm.getUuid(), userVm.isDisplayVm());
+ } else {
+ UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_IMPORT, userVm.getAccountId(), userVm.getAccountId(), userVm.getDataCenterId(), userVm.getHostName(), serviceOfferingVO.getId(), userVm.getTemplateId(),
+ userVm.getHypervisorType().toString(), VirtualMachine.class.getName(), userVm.getUuid(), userVm.getDetails(), userVm.isDisplayVm());
+ }
+ } catch (Exception e) {
+ LOGGER.error(String.format("Failed to publish usage records during VM import for unmanaged vm %s", userVm.getInstanceName()), e);
+ cleanupFailedImportVM(userVm);
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("VM import failed for unmanaged vm %s during publishing usage records", userVm.getInstanceName()));
+ }
+ resourceLimitService.incrementResourceCount(userVm.getAccountId(), Resource.ResourceType.user_vm, userVm.isDisplayVm());
+ resourceLimitService.incrementResourceCount(userVm.getAccountId(), Resource.ResourceType.cpu, userVm.isDisplayVm(), new Long(serviceOfferingVO.getCpu()));
+ resourceLimitService.incrementResourceCount(userVm.getAccountId(), Resource.ResourceType.memory, userVm.isDisplayVm(), new Long(serviceOfferingVO.getRamSize()));
+ // Save usage event and update resource count for user vm volumes
+ List<VolumeVO> volumes = volumeDao.findByInstance(userVm.getId());
+ for (VolumeVO volume : volumes) {
+ try {
+ UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_CREATE, volume.getAccountId(), volume.getDataCenterId(), volume.getId(), volume.getName(), volume.getDiskOfferingId(), null, volume.getSize(),
+ Volume.class.getName(), volume.getUuid(), volume.isDisplayVolume());
+ } catch (Exception e) {
+ LOGGER.error(String.format("Failed to publish volume ID: %s usage records during VM import", volume.getUuid()), e);
+ }
+ resourceLimitService.incrementResourceCount(userVm.getAccountId(), Resource.ResourceType.volume, volume.isDisplayVolume());
+ resourceLimitService.incrementResourceCount(userVm.getAccountId(), Resource.ResourceType.primary_storage, volume.isDisplayVolume(), volume.getSize());
+ }
+ }
+
+ private UserVm importVirtualMachineInternal(final UnmanagedInstanceTO unmanagedInstance, final String instanceName, final DataCenter zone, final Cluster cluster, final HostVO host,
+ final VirtualMachineTemplate template, final String displayName, final String hostName, final Account caller, final Account owner, final Long userId,
+ final ServiceOfferingVO serviceOffering, final Map<String, Long> dataDiskOfferingMap,
+ final Map<String, Long> nicNetworkMap, final Map<String, Network.IpAddresses> callerNicIpAddressMap,
+ final Map<String, String> details, final boolean migrateAllowed) {
+ UserVm userVm = null;
+
+ ServiceOfferingVO validatedServiceOffering = null;
+ try {
+ validatedServiceOffering = getUnmanagedInstanceServiceOffering(unmanagedInstance, serviceOffering, owner, zone, details);
+ } catch (Exception e) {
+ LOGGER.error("Service offering for VM import not compatible", e);
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Failed to import VM: %s. %s", unmanagedInstance.getName(), Strings.nullToEmpty(e.getMessage())));
+ }
+
+ Map<String, String> allDetails = new HashMap<>(details);
+ if (validatedServiceOffering.isDynamic()) {
+ allDetails.put(VmDetailConstants.CPU_NUMBER, String.valueOf(validatedServiceOffering.getCpu()));
+ allDetails.put(VmDetailConstants.MEMORY, String.valueOf(validatedServiceOffering.getRamSize()));
+ if (serviceOffering.getSpeed() == null) {
+ allDetails.put(VmDetailConstants.CPU_SPEED, String.valueOf(validatedServiceOffering.getSpeed()));
+ }
+ }
+
+ if (!migrateAllowed && !hostSupportsServiceOffering(host, validatedServiceOffering)) {
+ throw new InvalidParameterValueException(String.format("Service offering: %s is not compatible with host: %s of unmanaged VM: %s", serviceOffering.getUuid(), host.getUuid(), instanceName));
+ }
+ // Check disks and supplied disk offerings
+ List<UnmanagedInstanceTO.Disk> unmanagedInstanceDisks = unmanagedInstance.getDisks();
+ if (CollectionUtils.isEmpty(unmanagedInstanceDisks)) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("No attached disks found for the unmanaged VM: %s", instanceName));
+ }
+ final UnmanagedInstanceTO.Disk rootDisk = unmanagedInstance.getDisks().get(0);
+ if (rootDisk == null || Strings.isNullOrEmpty(rootDisk.getController())) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("VM import failed. Unable to retrieve root disk details for VM: %s ", instanceName));
+ }
+ allDetails.put(VmDetailConstants.ROOT_DISK_CONTROLLER, rootDisk.getController());
+ List<UnmanagedInstanceTO.Disk> dataDisks = new ArrayList<>();
+ try {
+ checkUnmanagedDiskAndOfferingForImport(rootDisk, null, validatedServiceOffering, owner, zone, cluster, migrateAllowed);
+ if (unmanagedInstanceDisks.size() > 1) { // Data disk(s) present
+ dataDisks.addAll(unmanagedInstanceDisks);
+ dataDisks.remove(0);
+ checkUnmanagedDiskAndOfferingForImport(dataDisks, dataDiskOfferingMap, owner, zone, cluster, migrateAllowed);
+ allDetails.put(VmDetailConstants.DATA_DISK_CONTROLLER, dataDisks.get(0).getController());
+ }
+ resourceLimitService.checkResourceLimit(owner, Resource.ResourceType.volume, unmanagedInstanceDisks.size());
+ } catch (ResourceAllocationException e) {
+ LOGGER.error(String.format("Volume resource allocation error for owner: %s", owner.getUuid()), e);
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Volume resource allocation error for owner: %s. %s", owner.getUuid(), Strings.nullToEmpty(e.getMessage())));
+ }
+ // Check NICs and supplied networks
+ Map<String, Network.IpAddresses> nicIpAddressMap = getNicIpAddresses(unmanagedInstance.getNics(), callerNicIpAddressMap);
+ Map<String, Long> allNicNetworkMap = getUnmanagedNicNetworkMap(unmanagedInstance.getNics(), nicNetworkMap, nicIpAddressMap, zone, hostName, owner);
+ if (!CollectionUtils.isEmpty(unmanagedInstance.getNics())) {
+ allDetails.put(VmDetailConstants.NIC_ADAPTER, unmanagedInstance.getNics().get(0).getAdapterType());
+ }
+ VirtualMachine.PowerState powerState = VirtualMachine.PowerState.PowerOff;
+ if (unmanagedInstance.getPowerState().equals(UnmanagedInstanceTO.PowerState.PowerOn)) {
+ powerState = VirtualMachine.PowerState.PowerOn;
+ }
+ try {
+ userVm = userVmManager.importVM(zone, host, template, instanceName, displayName, owner,
+ null, caller, true, null, owner.getAccountId(), userId,
+ validatedServiceOffering, null, hostName,
+ cluster.getHypervisorType(), allDetails, powerState);
+ } catch (InsufficientCapacityException ice) {
+ LOGGER.error(String.format("Failed to import vm name: %s", instanceName), ice);
+ throw new ServerApiException(ApiErrorCode.INSUFFICIENT_CAPACITY_ERROR, ice.getMessage());
+ }
+ if (userVm == null) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Failed to import vm name: %s", instanceName));
+ }
+ List<Pair<DiskProfile, StoragePool>> diskProfileStoragePoolList = new ArrayList<>();
+ try {
+ if (rootDisk.getCapacity() == null || rootDisk.getCapacity() == 0) {
+ throw new InvalidParameterValueException(String.format("Root disk ID: %s size is invalid", rootDisk.getDiskId()));
+ }
+ Long minIops = null;
+ if (details.containsKey("minIops")) {
+ minIops = Long.parseLong(details.get("minIops"));
+ }
+ Long maxIops = null;
+ if (details.containsKey("maxIops")) {
+ maxIops = Long.parseLong(details.get("maxIops"));
+ }
+ diskProfileStoragePoolList.add(importDisk(rootDisk, userVm, cluster, serviceOffering, Volume.Type.ROOT, String.format("ROOT-%d", userVm.getId()),
+ (rootDisk.getCapacity() / Resource.ResourceType.bytesToGiB), minIops, maxIops,
+ template, owner, null));
+ for (UnmanagedInstanceTO.Disk disk : dataDisks) {
+ if (disk.getCapacity() == null || disk.getCapacity() == 0) {
+ throw new InvalidParameterValueException(String.format("Disk ID: %s size is invalid", rootDisk.getDiskId()));
+ }
+ DiskOffering offering = diskOfferingDao.findById(dataDiskOfferingMap.get(disk.getDiskId()));
+ diskProfileStoragePoolList.add(importDisk(disk, userVm, cluster, offering, Volume.Type.DATADISK, String.format("DATA-%d-%s", userVm.getId(), disk.getDiskId()),
+ (disk.getCapacity() / Resource.ResourceType.bytesToGiB), offering.getMinIops(), offering.getMaxIops(),
+ template, owner, null));
+ }
+ } catch (Exception e) {
+ LOGGER.error(String.format("Failed to import volumes while importing vm: %s", instanceName), e);
+ cleanupFailedImportVM(userVm);
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Failed to import volumes while importing vm: %s. %s", instanceName, Strings.nullToEmpty(e.getMessage())));
+ }
+ try {
+ boolean firstNic = true;
+ for (UnmanagedInstanceTO.Nic nic : unmanagedInstance.getNics()) {
+ Network network = networkDao.findById(allNicNetworkMap.get(nic.getNicId()));
+ Network.IpAddresses ipAddresses = nicIpAddressMap.get(nic.getNicId());
+ importNic(nic, userVm, network, ipAddresses, firstNic);
+ firstNic = false;
+ }
+ } catch (Exception e) {
+ LOGGER.error(String.format("Failed to import NICs while importing vm: %s", instanceName), e);
+ cleanupFailedImportVM(userVm);
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Failed to import NICs while importing vm: %s. %s", instanceName, Strings.nullToEmpty(e.getMessage())));
+ }
+ if (migrateAllowed) {
+ userVm = migrateImportedVM(host, template, validatedServiceOffering, userVm, owner, diskProfileStoragePoolList);
+ }
+ publishVMUsageUpdateResourceCount(userVm, validatedServiceOffering);
+ return userVm;
+ }
+
+ @Override
+ public ListResponse<UnmanagedInstanceResponse> listUnmanagedInstances(ListUnmanagedInstancesCmd cmd) {
+ final Account caller = CallContext.current().getCallingAccount();
+ if (caller.getType() != Account.ACCOUNT_TYPE_ADMIN) {
+ throw new PermissionDeniedException(String.format("Cannot perform this operation, Calling account is not root admin: %s", caller.getUuid()));
+ }
+ final Long clusterId = cmd.getClusterId();
+ if (clusterId == null) {
+ throw new InvalidParameterValueException(String.format("Cluster ID cannot be null"));
+ }
+ final Cluster cluster = clusterDao.findById(clusterId);
+ if (cluster == null) {
+ throw new InvalidParameterValueException(String.format("Cluster ID: %d cannot be found", clusterId));
+ }
+ if (cluster.getHypervisorType() != Hypervisor.HypervisorType.VMware) {
+ throw new InvalidParameterValueException(String.format("VM ingestion is currently not supported for hypervisor: %s", cluster.getHypervisorType().toString()));
+ }
+ List<HostVO> hosts = resourceManager.listHostsInClusterByStatus(clusterId, Status.Up);
+ List<String> additionalNameFilters = getAdditionalNameFilters(cluster);
+ List<UnmanagedInstanceResponse> responses = new ArrayList<>();
+ for (HostVO host : hosts) {
+ if (host.isInMaintenanceStates()) {
+ continue;
+ }
+ List<String> managedVms = new ArrayList<>();
+ managedVms.addAll(additionalNameFilters);
+ managedVms.addAll(getHostManagedVms(host));
+
+ GetUnmanagedInstancesCommand command = new GetUnmanagedInstancesCommand();
+ command.setInstanceName(cmd.getName());
+ command.setManagedInstancesNames(managedVms);
+ Answer answer = agentManager.easySend(host.getId(), command);
+ if (!(answer instanceof GetUnmanagedInstancesAnswer)) {
+ continue;
+ }
+ GetUnmanagedInstancesAnswer unmanagedInstancesAnswer = (GetUnmanagedInstancesAnswer) answer;
+ HashMap<String, UnmanagedInstanceTO> unmanagedInstances = new HashMap<>();
+ unmanagedInstances.putAll(unmanagedInstancesAnswer.getUnmanagedInstances());
+ Set<String> keys = unmanagedInstances.keySet();
+ for (String key : keys) {
+ responses.add(createUnmanagedInstanceResponse(unmanagedInstances.get(key), cluster, host));
+ }
+ }
+ ListResponse<UnmanagedInstanceResponse> listResponses = new ListResponse<>();
+ listResponses.setResponses(responses, responses.size());
+ return listResponses;
+ }
+
+ @Override
+ public UserVmResponse importUnmanagedInstance(ImportUnmanagedInstanceCmd cmd) {
+ final Account caller = CallContext.current().getCallingAccount();
+ if (caller.getType() != Account.ACCOUNT_TYPE_ADMIN) {
+ throw new PermissionDeniedException(String.format("Cannot perform this operation, Calling account is not root admin: %s", caller.getUuid()));
+ }
+ final Long clusterId = cmd.getClusterId();
+ if (clusterId == null) {
+ throw new InvalidParameterValueException(String.format("Cluster ID cannot be null"));
+ }
+ final Cluster cluster = clusterDao.findById(clusterId);
+ if (cluster == null) {
+ throw new InvalidParameterValueException(String.format("Cluster ID: %d cannot be found", clusterId));
+ }
+ if (cluster.getHypervisorType() != Hypervisor.HypervisorType.VMware) {
+ throw new InvalidParameterValueException(String.format("VM import is currently not supported for hypervisor: %s", cluster.getHypervisorType().toString()));
+ }
+ final DataCenter zone = dataCenterDao.findById(cluster.getDataCenterId());
+ final String instanceName = cmd.getName();
+ if (Strings.isNullOrEmpty(instanceName)) {
+ throw new InvalidParameterValueException(String.format("Instance name cannot be empty"));
+ }
+ if (cmd.getDomainId() != null && Strings.isNullOrEmpty(cmd.getAccountName())) {
+ throw new InvalidParameterValueException("domainid parameter must be specified with account parameter");
+ }
+ final Account owner = accountService.getActiveAccountById(cmd.getEntityOwnerId());
+ long userId = CallContext.current().getCallingUserId();
+ List<UserVO> userVOs = userDao.listByAccount(owner.getAccountId());
+ if (CollectionUtils.isNotEmpty(userVOs)) {
+ userId = userVOs.get(0).getId();
+ }
+ VMTemplateVO template = null;
+ final Long templateId = cmd.getTemplateId();
+ if (templateId == null) {
+ template = templateDao.findByName(VM_IMPORT_DEFAULT_TEMPLATE_NAME);
+ if (template == null) {
+ template = createDefaultDummyVmImportTemplate();
+ if (template == null) {
+ throw new InvalidParameterValueException(String.format("Default VM import template with unique name: %s for hypervisor: %s cannot be created. Please use templateid paramter for import", VM_IMPORT_DEFAULT_TEMPLATE_NAME, cluster.getHypervisorType().toString()));
+ }
+ }
+ } else {
+ template = templateDao.findById(templateId);
+ }
+ if (template == null) {
+ throw new InvalidParameterValueException(String.format("Template ID: %d cannot be found", templateId));
+ }
+ final Long serviceOfferingId = cmd.getServiceOfferingId();
+ if (serviceOfferingId == null) {
+ throw new InvalidParameterValueException(String.format("Service offering ID cannot be null"));
+ }
+ final ServiceOfferingVO serviceOffering = serviceOfferingDao.findById(serviceOfferingId);
+ if (serviceOffering == null) {
+ throw new InvalidParameterValueException(String.format("Service offering ID: %d cannot be found", serviceOfferingId));
+ }
+ accountService.checkAccess(owner, serviceOffering, zone);
+ try {
+ resourceLimitService.checkResourceLimit(owner, Resource.ResourceType.user_vm, 1);
+ } catch (ResourceAllocationException e) {
+ LOGGER.error(String.format("VM resource allocation error for account: %s", owner.getUuid()), e);
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("VM resource allocation error for account: %s. %s", owner.getUuid(), Strings.nullToEmpty(e.getMessage())));
+ }
+ String displayName = cmd.getDisplayName();
+ if (Strings.isNullOrEmpty(displayName)) {
+ displayName = instanceName;
+ }
+ String hostName = cmd.getHostName();
+ if (Strings.isNullOrEmpty(hostName)) {
+ if (!NetUtils.verifyDomainNameLabel(instanceName, true)) {
+ throw new InvalidParameterValueException(String.format("Please provide hostname for the VM. VM name contains unsupported characters for it to be used as hostname"));
+ }
+ hostName = instanceName;
+ }
+ if (!NetUtils.verifyDomainNameLabel(hostName, true)) {
+ throw new InvalidParameterValueException("Invalid VM hostname. VM hostname can contain ASCII letters 'a' through 'z', the digits '0' through '9', "
+ + "and the hyphen ('-'), must be between 1 and 63 characters long, and can't start or end with \"-\" and can't start with digit");
+ }
+ if (cluster.getHypervisorType().equals(Hypervisor.HypervisorType.VMware) &&
+ Boolean.parseBoolean(configurationDao.getValue(Config.SetVmInternalNameUsingDisplayName.key()))) {
+ // If global config vm.instancename.flag is set to true, then CS will set guest VM's name as it appears on the hypervisor, to its hostname.
+ // In case of VMware since VM name must be unique within a DC, check if VM with the same hostname already exists in the zone.
+ VMInstanceVO vmByHostName = vmDao.findVMByHostNameInZone(hostName, zone.getId());
+ if (vmByHostName != null && vmByHostName.getState() != VirtualMachine.State.Expunging) {
+ throw new InvalidParameterValueException(String.format("Failed to import VM: %s. There already exists a VM by the hostname: %s in zone: %s", instanceName, hostName, zone.getUuid()));
+ }
+ }
+ final Map<String, Long> nicNetworkMap = cmd.getNicNetworkList();
+ final Map<String, Network.IpAddresses> nicIpAddressMap = cmd.getNicIpAddressList();
+ final Map<String, Long> dataDiskOfferingMap = cmd.getDataDiskToDiskOfferingList();
+ final Map<String, String> details = cmd.getDetails();
+ List<HostVO> hosts = resourceManager.listHostsInClusterByStatus(clusterId, Status.Up);
+ UserVm userVm = null;
+ List<String> additionalNameFilters = getAdditionalNameFilters(cluster);
+ for (HostVO host : hosts) {
+ if (host.isInMaintenanceStates()) {
+ continue;
+ }
+ List<String> managedVms = new ArrayList<>();
+ managedVms.addAll(additionalNameFilters);
+ managedVms.addAll(getHostManagedVms(host));
+ GetUnmanagedInstancesCommand command = new GetUnmanagedInstancesCommand(instanceName);
+ command.setManagedInstancesNames(managedVms);
+ Answer answer = agentManager.easySend(host.getId(), command);
+ if (!(answer instanceof GetUnmanagedInstancesAnswer)) {
+ continue;
+ }
+ GetUnmanagedInstancesAnswer unmanagedInstancesAnswer = (GetUnmanagedInstancesAnswer) answer;
+ HashMap<String, UnmanagedInstanceTO> unmanagedInstances = unmanagedInstancesAnswer.getUnmanagedInstances();
+ if (MapUtils.isEmpty(unmanagedInstances)) {
+ continue;
+ }
+ Set<String> names = unmanagedInstances.keySet();
+ for (String name : names) {
+ if (instanceName.equals(name)) {
+ UnmanagedInstanceTO unmanagedInstance = unmanagedInstances.get(name);
+ if (unmanagedInstance == null) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Unable to retrieve details for unmanaged VM: %s", name));
+ }
+ if (template.getName().equals(VM_IMPORT_DEFAULT_TEMPLATE_NAME)) {
+ String osName = unmanagedInstance.getOperatingSystem();
+ GuestOS guestOS = null;
+ if (!Strings.isNullOrEmpty(osName)) {
+ guestOS = guestOSDao.listByDisplayName(osName);
+ }
+ GuestOSHypervisor guestOSHypervisor = null;
+ if (guestOS != null) {
+ guestOSHypervisor = guestOSHypervisorDao.findByOsIdAndHypervisor(guestOS.getId(), host.getHypervisorType().toString(), host.getHypervisorVersion());
+ }
+ if (guestOSHypervisor == null && !Strings.isNullOrEmpty(unmanagedInstance.getOperatingSystemId())) {
+ guestOSHypervisor = guestOSHypervisorDao.findByOsNameAndHypervisor(unmanagedInstance.getOperatingSystemId(), host.getHypervisorType().toString(), host.getHypervisorVersion());
+ }
+ if (guestOSHypervisor == null) {
+ if (guestOS != null) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Unable to find hypervisor guest OS ID: %s details for unmanaged VM: %s for hypervisor: %s version: %s. templateid parameter can be used to assign template for VM", guestOS.getUuid(), name, host.getHypervisorType().toString(), host.getHypervisorVersion()));
+ }
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Unable to retrieve guest OS details for unmanaged VM: %s with OS name: %s, OS ID: %s for hypervisor: %s version: %s. templateid parameter can be used to assign template for VM", name, osName, unmanagedInstance.getOperatingSystemId(), host.getHypervisorType().toString(), host.getHypervisorVersion()));
+ }
+ template.setGuestOSId(guestOSHypervisor.getGuestOsId());
+ }
+ userVm = importVirtualMachineInternal(unmanagedInstance, instanceName, zone, cluster, host,
+ template, displayName, hostName, caller, owner, userId,
+ serviceOffering, dataDiskOfferingMap,
+ nicNetworkMap, nicIpAddressMap,
+ details, cmd.getMigrateAllowed());
+ break;
+ }
+ }
+ if (userVm != null) {
+ break;
+ }
+ }
+ if (userVm == null) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Failed to find unmanaged vm with name: %s in cluster: %s", instanceName, cluster.getUuid()));
+ }
+ return responseGenerator.createUserVmResponse(ResponseObject.ResponseView.Full, "virtualmachine", userVm).get(0);
+ }
+
+ @Override
+ public List<Class<?>> getCommands() {
+ final List<Class<?>> cmdList = new ArrayList<Class<?>>();
+ cmdList.add(ListUnmanagedInstancesCmd.class);
+ cmdList.add(ImportUnmanagedInstanceCmd.class);
+ return cmdList;
+ }
+}
diff --git a/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml b/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
index 2f67c42..1c90a97 100644
--- a/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
+++ b/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
@@ -300,4 +300,21 @@
<bean id="directDownloadManager" class="org.apache.cloudstack.direct.download.DirectDownloadManagerImpl" />
<bean id="DiagnosticsService" class="org.apache.cloudstack.diagnostics.DiagnosticsServiceImpl" />
+
+ <bean id="backupManager" class="org.apache.cloudstack.backup.BackupManagerImpl">
+ <property name="backupProviders" value="#{backupProvidersRegistry.registered}" />
+ <property name="asyncJobDispatcher" ref="ApiAsyncJobDispatcher" />
+ </bean>
+
+ <bean id="storageLayer" class="com.cloud.storage.JavaStorageLayer" />
+
+ <bean id="nfsMountManager" class="org.apache.cloudstack.storage.NfsMountManagerImpl" >
+ <constructor-arg name="storage" ref="storageLayer" />
+ <constructor-arg name="timeout" value="10000" />
+ </bean>
+
+ <bean id="rollingMaintenanceManager" class="com.cloud.resource.RollingMaintenanceManagerImpl">
+ <property name="affinityGroupProcessors"
+ value="#{affinityProcessorsRegistry.registered}" />
+ </bean>
</beans>
diff --git a/server/src/main/resources/META-INF/cloudstack/server-compute/spring-server-compute-context.xml b/server/src/main/resources/META-INF/cloudstack/server-compute/spring-server-compute-context.xml
index 38fb619..ca707a0 100644
--- a/server/src/main/resources/META-INF/cloudstack/server-compute/spring-server-compute-context.xml
+++ b/server/src/main/resources/META-INF/cloudstack/server-compute/spring-server-compute-context.xml
@@ -35,4 +35,6 @@
<property name="name" value="LXCGuru" />
</bean>
+ <bean id="vmImportService" class="org.apache.cloudstack.vm.VmImportManagerImpl" />
+
</beans>
diff --git a/server/src/test/java/com/cloud/api/ApiResponseHelperTest.java b/server/src/test/java/com/cloud/api/ApiResponseHelperTest.java
index 2809005..69ac86d 100644
--- a/server/src/test/java/com/cloud/api/ApiResponseHelperTest.java
+++ b/server/src/test/java/com/cloud/api/ApiResponseHelperTest.java
@@ -16,10 +16,16 @@
// under the License.
package com.cloud.api;
-import com.cloud.domain.DomainVO;
-import com.cloud.usage.UsageVO;
-import com.cloud.user.AccountVO;
-import com.cloud.vm.NicSecondaryIp;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Mockito.when;
+
+import java.lang.reflect.Field;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.TimeZone;
import org.apache.cloudstack.api.response.NicSecondaryIpResponse;
import org.apache.cloudstack.api.response.UsageRecordResponse;
@@ -33,16 +39,10 @@
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
-import java.lang.reflect.Field;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.TimeZone;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Mockito.when;
+import com.cloud.domain.DomainVO;
+import com.cloud.usage.UsageVO;
+import com.cloud.user.AccountVO;
+import com.cloud.vm.NicSecondaryIp;
@RunWith(PowerMockRunner.class)
@PrepareForTest(ApiDBUtils.class)
@@ -85,8 +85,8 @@
public void testUsageRecordResponse(){
//Creating the usageVO object to be passed to the createUsageResponse.
Long zoneId = null;
- Long accountId = null;
- Long domainId = null;
+ Long accountId = 1L;
+ Long domainId = 1L;
String Description = "Test Object";
String usageDisplay = " ";
int usageType = -1;
diff --git a/server/src/test/java/com/cloud/api/ApiServletTest.java b/server/src/test/java/com/cloud/api/ApiServletTest.java
index 037c36e..fa58299 100644
--- a/server/src/test/java/com/cloud/api/ApiServletTest.java
+++ b/server/src/test/java/com/cloud/api/ApiServletTest.java
@@ -16,16 +16,27 @@
// under the License.
package com.cloud.api;
+import static org.mockito.ArgumentMatchers.nullable;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Field;
+import java.net.InetAddress;
+import java.net.URLEncoder;
+import java.net.UnknownHostException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.auth.APIAuthenticationManager;
import org.apache.cloudstack.api.auth.APIAuthenticationType;
import org.apache.cloudstack.api.auth.APIAuthenticator;
-
-import com.cloud.server.ManagementServer;
-import com.cloud.user.Account;
-import com.cloud.user.AccountService;
-import com.cloud.user.User;
-
-import org.apache.cloudstack.api.ApiConstants;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -33,21 +44,12 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.Field;
-import java.net.URLEncoder;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.HashMap;
+import com.cloud.server.ManagementServer;
+import com.cloud.user.Account;
+import com.cloud.user.AccountService;
+import com.cloud.user.User;
@RunWith(MockitoJUnitRunner.class)
public class ApiServletTest {
@@ -103,7 +105,7 @@
accountMgrField.set(servlet, accountService);
Mockito.when(authManager.getAPIAuthenticator(Mockito.anyString())).thenReturn(authenticator);
- Mockito.when(authenticator.authenticate(Mockito.anyString(), Mockito.anyMap(), Mockito.isA(HttpSession.class),
+ Mockito.lenient().when(authenticator.authenticate(Mockito.anyString(), Mockito.anyMap(), Mockito.isA(HttpSession.class),
Mockito.same(InetAddress.getByName("127.0.0.1")), Mockito.anyString(), Mockito.isA(StringBuilder.class), Mockito.isA(HttpServletRequest.class), Mockito.isA(HttpServletResponse.class))).thenReturn("{\"loginresponse\":{}");
Field authManagerField = ApiServlet.class.getDeclaredField("authManager");
@@ -124,7 +126,7 @@
Field smsField = ApiDBUtils.class.getDeclaredField("s_ms");
smsField.setAccessible(true);
smsField.set(null, managementServer);
- Mockito.when(managementServer.getVersion()).thenReturn(
+ Mockito.lenient().when(managementServer.getVersion()).thenReturn(
"LATEST-AND-GREATEST");
}
@@ -173,7 +175,7 @@
@Test
public void processRequestInContextUnauthorizedGET() {
Mockito.when(request.getMethod()).thenReturn("GET");
- Mockito.when(
+ Mockito.lenient().when(
apiServer.verifyRequest(Mockito.anyMap(), Mockito.anyLong(), Mockito.any(InetAddress.class)))
.thenReturn(false);
servlet.processRequestInContext(request, response);
@@ -188,7 +190,7 @@
public void processRequestInContextAuthorizedGet() {
Mockito.when(request.getMethod()).thenReturn("GET");
Mockito.when(
- apiServer.verifyRequest(Mockito.anyMap(), Mockito.anyLong(), Mockito.any(InetAddress.class)))
+ apiServer.verifyRequest(nullable(Map.class), nullable(Long.class), nullable(InetAddress.class)))
.thenReturn(true);
servlet.processRequestInContext(request, response);
Mockito.verify(response).setStatus(HttpServletResponse.SC_OK);
diff --git a/server/src/test/java/com/cloud/api/query/dao/SecurityGroupJoinDaoImplTest.java b/server/src/test/java/com/cloud/api/query/dao/SecurityGroupJoinDaoImplTest.java
index 112504d..a2c1523 100644
--- a/server/src/test/java/com/cloud/api/query/dao/SecurityGroupJoinDaoImplTest.java
+++ b/server/src/test/java/com/cloud/api/query/dao/SecurityGroupJoinDaoImplTest.java
@@ -16,8 +16,6 @@
// under the License.
package com.cloud.api.query.dao;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.when;
import java.lang.reflect.Field;
@@ -32,13 +30,11 @@
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
-import com.cloud.api.query.vo.ResourceTagJoinVO;
import com.cloud.api.query.vo.SecurityGroupJoinVO;
import com.cloud.network.security.SecurityGroupVMMapVO;
import com.cloud.network.security.dao.SecurityGroupVMMapDao;
-import com.cloud.server.ResourceTag.ResourceObjectType;
import com.cloud.user.Account;
import com.cloud.vm.UserVmVO;
import com.cloud.vm.dao.UserVmDao;
@@ -98,8 +94,6 @@
securityGroupVmMap_two.add(securityGroupVMMapVOone);
securityGroupVmMap_two.add(securityGroupVMMapVOtwo);
- // Mock the resource tags to return an empty list.
- when(_resourceTagJoinDao.listBy(anyString(), any(ResourceObjectType.class))).thenReturn(new ArrayList<ResourceTagJoinVO>());
// Mock the listBySecurityGroup method to return a specified list when being called.
when(_securityGroupVMMapDao.listBySecurityGroup(1L)).thenReturn(securityGroupVmMap_empty);
diff --git a/server/src/test/java/com/cloud/configuration/ConfigurationManagerTest.java b/server/src/test/java/com/cloud/configuration/ConfigurationManagerTest.java
index a7a9d2a..e695329 100644
--- a/server/src/test/java/com/cloud/configuration/ConfigurationManagerTest.java
+++ b/server/src/test/java/com/cloud/configuration/ConfigurationManagerTest.java
@@ -19,11 +19,11 @@
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
@@ -166,6 +166,8 @@
VlanVO vlan = new VlanVO(Vlan.VlanType.VirtualNetwork, "vlantag", "vlangateway", "vlannetmask", 1L, "iprange", 1L, 1L, null, null, null);
+ private static final String MAXIMUM_DURATION_ALLOWED = "3600";
+
@Mock
Network network;
@Mock
@@ -280,9 +282,8 @@
when(configurationMgr._accountVlanMapDao.listAccountVlanMapsByAccount(anyLong())).thenReturn(null);
- DataCenterVO dc =
- new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Advanced, null, null, true,
- true, null, null);
+ DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Advanced, null, null,
+ true, true, null, null);
when(configurationMgr._zoneDao.findById(anyLong())).thenReturn(dc);
List<IPAddressVO> ipAddressList = new ArrayList<IPAddressVO>();
@@ -324,9 +325,8 @@
accountVlanMaps.add(accountVlanMap);
when(configurationMgr._accountVlanMapDao.listAccountVlanMapsByVlan(anyLong())).thenReturn(accountVlanMaps);
- DataCenterVO dc =
- new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Advanced, null, null, true,
- true, null, null);
+ DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Advanced, null, null,
+ true, true, null, null);
when(configurationMgr._zoneDao.findById(anyLong())).thenReturn(dc);
List<IPAddressVO> ipAddressList = new ArrayList<IPAddressVO>();
@@ -351,8 +351,7 @@
when(configurationMgr._accountVlanMapDao.listAccountVlanMapsByVlan(anyLong())).thenReturn(null);
// public ip range belongs to zone of type basic
- DataCenterVO dc =
- new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true,
+ DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true,
true, null, null);
when(configurationMgr._zoneDao.findById(anyLong())).thenReturn(dc);
@@ -377,9 +376,8 @@
when(configurationMgr._accountVlanMapDao.listAccountVlanMapsByAccount(anyLong())).thenReturn(null);
- DataCenterVO dc =
- new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Advanced, null, null, true,
- true, null, null);
+ DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", null, null, NetworkType.Advanced, null, null,
+ true, true, null, null);
when(configurationMgr._zoneDao.findById(anyLong())).thenReturn(dc);
// one of the ip addresses of the range is allocated to different account
@@ -489,11 +487,7 @@
public void searchForNetworkOfferingsTest() {
NetworkOfferingJoinVO forVpcOfferingJoinVO = new NetworkOfferingJoinVO();
forVpcOfferingJoinVO.setForVpc(true);
- List<NetworkOfferingJoinVO> offerings = Arrays.asList(
- new NetworkOfferingJoinVO(),
- new NetworkOfferingJoinVO(),
- forVpcOfferingJoinVO
- );
+ List<NetworkOfferingJoinVO> offerings = Arrays.asList(new NetworkOfferingJoinVO(), new NetworkOfferingJoinVO(), forVpcOfferingJoinVO);
Mockito.when(networkOfferingJoinDao.createSearchCriteria()).thenReturn(Mockito.mock(SearchCriteria.class));
Mockito.when(networkOfferingJoinDao.search(Mockito.any(SearchCriteria.class), Mockito.any(Filter.class))).thenReturn(offerings);
@@ -558,9 +552,9 @@
configurationMgr.validateStaticNatServiceCapablities(staticNatServiceCapabilityMap);
} catch (InvalidParameterValueException e) {
Assert.assertTrue(
- e.getMessage(),
- e.getMessage().contains(
- "Capability " + Capability.AssociatePublicIP.getName() + " can only be set when capability " + Capability.ElasticIp.getName() + " is true"));
+ e.getMessage(),
+ e.getMessage().contains(
+ "Capability " + Capability.AssociatePublicIP.getName() + " can only be set when capability " + Capability.ElasticIp.getName() + " is true"));
caught = true;
}
Assert.assertTrue("should not be accepted", caught);
@@ -858,7 +852,6 @@
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 {
@@ -883,7 +876,7 @@
try {
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::a", "2001:db9:0:f101::2", ipV6Network);
Assert.fail();
- } catch(InvalidParameterValueException e){
+ } catch(InvalidParameterValueException e) {
Assert.assertEquals(e.getMessage(), "Exception from Mock: endIPv6 is not in ip6cidr indicated network!");
}
@@ -910,4 +903,39 @@
public void testGetVlanNumberFromUriUntagged() {
Assert.assertEquals("untagged", configurationMgr.getVlanNumberFromUri("vlan://untagged"));
}
+
+ @Test
+ public void validateMaxRateEqualsOrGreaterTestAllGood() {
+ configurationMgr.validateMaxRateEqualsOrGreater(1l, 2l, "IOPS Read");
+ }
+
+ @Test(expected = InvalidParameterValueException.class)
+ public void validateMaxRateEqualsOrGreaterTestNormalRateGreaterThanMax() {
+ configurationMgr.validateMaxRateEqualsOrGreater(3l, 2l, "IOPS Read");
+ }
+
+ @Test
+ public void validateMaxRateNull() {
+ configurationMgr.validateMaxRateEqualsOrGreater(3l, null, "IOPS Read");
+ }
+
+ @Test
+ public void validateNormalRateNull() {
+ configurationMgr.validateMaxRateEqualsOrGreater(null, 3l, "IOPS Read");
+ }
+
+ @Test
+ public void validateAllNull() {
+ configurationMgr.validateMaxRateEqualsOrGreater(null, 3l, "IOPS Read");
+ }
+
+ @Test
+ public void validateMaximumIopsAndBytesLengthTestAllNull() {
+ configurationMgr.validateMaximumIopsAndBytesLength(null, null, null, null);
+ }
+
+ @Test
+ public void validateMaximumIopsAndBytesLengthTestDefaultLengthConfigs() {
+ configurationMgr.validateMaximumIopsAndBytesLength(36000l, 36000l, 36000l, 36000l);
+ }
}
diff --git a/server/src/test/java/com/cloud/ha/HighAvailabilityManagerImplTest.java b/server/src/test/java/com/cloud/ha/HighAvailabilityManagerImplTest.java
index 898dff2..7410f1e 100644
--- a/server/src/test/java/com/cloud/ha/HighAvailabilityManagerImplTest.java
+++ b/server/src/test/java/com/cloud/ha/HighAvailabilityManagerImplTest.java
@@ -156,7 +156,7 @@
public void scheduleRestartForVmsOnHost() {
Mockito.when(hostVO.getType()).thenReturn(Host.Type.Routing);
Mockito.when(hostVO.getHypervisorType()).thenReturn(HypervisorType.KVM);
- Mockito.when(_instanceDao.listByHostId(42l)).thenReturn(Arrays.asList(Mockito.mock(VMInstanceVO.class)));
+ Mockito.lenient().when(_instanceDao.listByHostId(42l)).thenReturn(Arrays.asList(Mockito.mock(VMInstanceVO.class)));
Mockito.when(_podDao.findById(Mockito.anyLong())).thenReturn(Mockito.mock(HostPodVO.class));
Mockito.when(_dcDao.findById(Mockito.anyLong())).thenReturn(Mockito.mock(DataCenterVO.class));
@@ -178,7 +178,7 @@
Mockito.when(hostVO.getHypervisorType()).thenReturn(HypervisorType.XenServer);
List<VMInstanceVO> vms = new ArrayList<VMInstanceVO>();
VMInstanceVO vm1 = Mockito.mock(VMInstanceVO.class);
- Mockito.when(vm1.getHostId()).thenReturn(1l);
+ Mockito.lenient().when(vm1.getHostId()).thenReturn(1l);
Mockito.when(vm1.getInstanceName()).thenReturn("i-2-3-VM");
Mockito.when(vm1.getType()).thenReturn(VirtualMachine.Type.User);
Mockito.when(vm1.isHaEnabled()).thenReturn(true);
diff --git a/server/src/test/java/com/cloud/ha/KVMFencerTest.java b/server/src/test/java/com/cloud/ha/KVMFencerTest.java
index da120af..ffbbcd3 100644
--- a/server/src/test/java/com/cloud/ha/KVMFencerTest.java
+++ b/server/src/test/java/com/cloud/ha/KVMFencerTest.java
@@ -102,16 +102,16 @@
Mockito.when(host.getClusterId()).thenReturn(1l);
Mockito.when(host.getHypervisorType()).thenReturn(HypervisorType.KVM);
Mockito.when(host.getStatus()).thenReturn(Status.Up);
- Mockito.when(host.getDataCenterId()).thenReturn(1l);
- Mockito.when(host.getPodId()).thenReturn(1l);
+ Mockito.lenient().when(host.getDataCenterId()).thenReturn(1l);
+ Mockito.lenient().when(host.getPodId()).thenReturn(1l);
Mockito.when(host.getId()).thenReturn(1l);
HostVO secondHost = Mockito.mock(HostVO.class);
- Mockito.when(secondHost.getClusterId()).thenReturn(1l);
+ Mockito.lenient().when(secondHost.getClusterId()).thenReturn(1l);
Mockito.when(secondHost.getHypervisorType()).thenReturn(HypervisorType.KVM);
Mockito.when(secondHost.getStatus()).thenReturn(Status.Up);
- Mockito.when(secondHost.getDataCenterId()).thenReturn(1l);
- Mockito.when(secondHost.getPodId()).thenReturn(1l);
+ Mockito.lenient().when(secondHost.getDataCenterId()).thenReturn(1l);
+ Mockito.lenient().when(secondHost.getPodId()).thenReturn(1l);
Mockito.when(host.getId()).thenReturn(2l);
VirtualMachine virtualMachine = Mockito.mock(VirtualMachine.class);
@@ -135,11 +135,11 @@
Mockito.when(host.getId()).thenReturn(1l);
HostVO secondHost = Mockito.mock(HostVO.class);
- Mockito.when(secondHost.getClusterId()).thenReturn(1l);
+ Mockito.lenient().when(secondHost.getClusterId()).thenReturn(1l);
Mockito.when(secondHost.getHypervisorType()).thenReturn(HypervisorType.KVM);
Mockito.when(secondHost.getStatus()).thenReturn(Status.Up);
- Mockito.when(secondHost.getDataCenterId()).thenReturn(1l);
- Mockito.when(secondHost.getPodId()).thenReturn(1l);
+ Mockito.lenient().when(secondHost.getDataCenterId()).thenReturn(1l);
+ Mockito.lenient().when(secondHost.getPodId()).thenReturn(1l);
Mockito.when(host.getId()).thenReturn(2l);
VirtualMachine virtualMachine = Mockito.mock(VirtualMachine.class);
@@ -162,11 +162,11 @@
Mockito.when(host.getId()).thenReturn(1l);
HostVO secondHost = Mockito.mock(HostVO.class);
- Mockito.when(secondHost.getClusterId()).thenReturn(1l);
+ Mockito.lenient().when(secondHost.getClusterId()).thenReturn(1l);
Mockito.when(secondHost.getHypervisorType()).thenReturn(HypervisorType.KVM);
Mockito.when(secondHost.getStatus()).thenReturn(Status.Up);
- Mockito.when(secondHost.getDataCenterId()).thenReturn(1l);
- Mockito.when(secondHost.getPodId()).thenReturn(1l);
+ Mockito.lenient().when(secondHost.getDataCenterId()).thenReturn(1l);
+ Mockito.lenient().when(secondHost.getPodId()).thenReturn(1l);
Mockito.when(host.getId()).thenReturn(2l);
VirtualMachine virtualMachine = Mockito.mock(VirtualMachine.class);
@@ -181,15 +181,15 @@
@Test
public void testWithSingleNotKVM() {
HostVO host = Mockito.mock(HostVO.class);
- Mockito.when(host.getClusterId()).thenReturn(1l);
+ Mockito.lenient().when(host.getClusterId()).thenReturn(1l);
Mockito.when(host.getHypervisorType()).thenReturn(HypervisorType.Any);
- Mockito.when(host.getStatus()).thenReturn(Status.Down);
- Mockito.when(host.getId()).thenReturn(1l);
- Mockito.when(host.getDataCenterId()).thenReturn(1l);
- Mockito.when(host.getPodId()).thenReturn(1l);
+ Mockito.lenient().when(host.getStatus()).thenReturn(Status.Down);
+ Mockito.lenient().when(host.getId()).thenReturn(1l);
+ Mockito.lenient().when(host.getDataCenterId()).thenReturn(1l);
+ Mockito.lenient().when(host.getPodId()).thenReturn(1l);
VirtualMachine virtualMachine = Mockito.mock(VirtualMachine.class);
- Mockito.when(resourceManager.listAllHostsInCluster(1l)).thenReturn(Collections.singletonList(host));
+ Mockito.lenient().when(resourceManager.listAllHostsInCluster(1l)).thenReturn(Collections.singletonList(host));
Assert.assertNull(fencer.fenceOff(virtualMachine, host));
}
diff --git a/server/src/test/java/com/cloud/hypervisor/KVMGuruTest.java b/server/src/test/java/com/cloud/hypervisor/KVMGuruTest.java
index 2299d2123..a10e937 100644
--- a/server/src/test/java/com/cloud/hypervisor/KVMGuruTest.java
+++ b/server/src/test/java/com/cloud/hypervisor/KVMGuruTest.java
@@ -79,20 +79,20 @@
Mockito.when(vmProfile.getVirtualMachine()).thenReturn(vm);
Mockito.when(vm.getHostId()).thenReturn(hostId);
Mockito.when(hostDao.findById(hostId)).thenReturn(host);
- Mockito.when(host.getCpus()).thenReturn(3);
+ Mockito.lenient().when(host.getCpus()).thenReturn(3);
Mockito.when(host.getSpeed()).thenReturn(1995L);
Mockito.when(vmTO.getMaxSpeed()).thenReturn(500);
- Mockito.when(serviceOffering.getId()).thenReturn(offeringId);
- Mockito.when(vmProfile.getServiceOffering()).thenReturn(serviceOffering);
+ Mockito.lenient().when(serviceOffering.getId()).thenReturn(offeringId);
+ Mockito.lenient().when(vmProfile.getServiceOffering()).thenReturn(serviceOffering);
- Mockito.when(detail1.getName()).thenReturn(detail1Key);
- Mockito.when(detail1.getValue()).thenReturn(detail1Value);
- Mockito.when(detail1.getResourceId()).thenReturn(offeringId);
- Mockito.when(detail2.getName()).thenReturn(detail2Key);
- Mockito.when(detail2.getResourceId()).thenReturn(offeringId);
- Mockito.when(detail2.getValue()).thenReturn(detail2Value);
+ Mockito.lenient().when(detail1.getName()).thenReturn(detail1Key);
+ Mockito.lenient().when(detail1.getValue()).thenReturn(detail1Value);
+ Mockito.lenient().when(detail1.getResourceId()).thenReturn(offeringId);
+ Mockito.lenient().when(detail2.getName()).thenReturn(detail2Key);
+ Mockito.lenient().when(detail2.getResourceId()).thenReturn(offeringId);
+ Mockito.lenient().when(detail2.getValue()).thenReturn(detail2Value);
- Mockito.when(serviceOfferingDetailsDao.listDetails(offeringId)).thenReturn(
+ Mockito.lenient().when(serviceOfferingDetailsDao.listDetails(offeringId)).thenReturn(
Arrays.asList(detail1, detail2));
}
diff --git a/server/src/test/java/com/cloud/hypervisor/kvm/dpdk/DpdkHelperImplTest.java b/server/src/test/java/com/cloud/hypervisor/kvm/dpdk/DpdkHelperImplTest.java
index f74e2e6..2f1d627 100644
--- a/server/src/test/java/com/cloud/hypervisor/kvm/dpdk/DpdkHelperImplTest.java
+++ b/server/src/test/java/com/cloud/hypervisor/kvm/dpdk/DpdkHelperImplTest.java
@@ -107,13 +107,13 @@
Mockito.when(dpdkVhostUserModeDetailVO.getName()).thenReturn(DpdkHelper.DPDK_VHOST_USER_MODE);
Mockito.when(dpdkVhostUserModeDetailVO.getValue()).thenReturn(dpdkVhostMode);
- Mockito.when(dpdkVhostUserModeDetailVO.getResourceId()).thenReturn(offeringId);
+ Mockito.lenient().when(dpdkVhostUserModeDetailVO.getResourceId()).thenReturn(offeringId);
Mockito.when(dpdkNumaDetailVO.getName()).thenReturn(DpdkHelper.DPDK_NUMA);
- Mockito.when(dpdkNumaDetailVO.getResourceId()).thenReturn(offeringId);
- Mockito.when(dpdkNumaDetailVO.getValue()).thenReturn(dpdkNumaValue);
+ Mockito.lenient().when(dpdkNumaDetailVO.getResourceId()).thenReturn(offeringId);
+ Mockito.lenient().when(dpdkNumaDetailVO.getValue()).thenReturn(dpdkNumaValue);
Mockito.when(dpdkHugePagesDetailVO.getName()).thenReturn(DpdkHelper.DPDK_HUGE_PAGES);
- Mockito.when(dpdkHugePagesDetailVO.getResourceId()).thenReturn(offeringId);
- Mockito.when(dpdkHugePagesDetailVO.getValue()).thenReturn(dpdkHugePagesValue);
+ Mockito.lenient().when(dpdkHugePagesDetailVO.getResourceId()).thenReturn(offeringId);
+ Mockito.lenient().when(dpdkHugePagesDetailVO.getValue()).thenReturn(dpdkHugePagesValue);
Mockito.when(serviceOfferingDetailsDao.listDetails(offeringId)).thenReturn(
Arrays.asList(dpdkNumaDetailVO, dpdkHugePagesDetailVO, dpdkVhostUserModeDetailVO));
@@ -132,9 +132,9 @@
Mockito.when(vmInstanceVO.getId()).thenReturn(vmId);
Mockito.when(dpdkNumaVmDetail.getName()).thenReturn(DpdkHelper.DPDK_NUMA);
- Mockito.when(dpdkNumaVmDetail.getValue()).thenReturn(dpdkNumaConf);
+ Mockito.lenient().when(dpdkNumaVmDetail.getValue()).thenReturn(dpdkNumaConf);
Mockito.when(dpdkHugePagesVmDetail.getName()).thenReturn(DpdkHelper.DPDK_HUGE_PAGES);
- Mockito.when(dpdkHugePagesVmDetail.getValue()).thenReturn(dpdkHugePagesConf);
+ Mockito.lenient().when(dpdkHugePagesVmDetail.getValue()).thenReturn(dpdkHugePagesConf);
Mockito.when(userVmDetailsDao.listDetails(vmId)).thenReturn(Arrays.asList(dpdkNumaVmDetail, dpdkHugePagesVmDetail));
}
@@ -148,13 +148,13 @@
@Test
public void testSetDpdkVhostUserModeInvalidDetail() {
- Mockito.when(dpdkVhostUserModeDetailVO.getValue()).thenReturn("serverrrr");
+ Mockito.lenient().when(dpdkVhostUserModeDetailVO.getValue()).thenReturn("serverrrr");
Mockito.verify(vmTO, Mockito.never()).addExtraConfig(Mockito.anyString(), Mockito.anyString());
}
@Test
public void testSetDpdkVhostUserModeNotExistingDetail() {
- Mockito.when(serviceOfferingDetailsDao.listDetails(offeringId)).thenReturn(
+ Mockito.lenient().when(serviceOfferingDetailsDao.listDetails(offeringId)).thenReturn(
Arrays.asList(dpdkNumaDetailVO, dpdkHugePagesDetailVO));
Mockito.verify(vmTO, Mockito.never()).addExtraConfig(Mockito.anyString(), Mockito.anyString());
}
diff --git a/server/src/test/java/com/cloud/keystore/KeystoreTest.java b/server/src/test/java/com/cloud/keystore/KeystoreTest.java
index 1981a73..24cc3a7 100644
--- a/server/src/test/java/com/cloud/keystore/KeystoreTest.java
+++ b/server/src/test/java/com/cloud/keystore/KeystoreTest.java
@@ -16,17 +16,16 @@
// under the License.
package com.cloud.keystore;
-import junit.framework.TestCase;
-
+import org.apache.cloudstack.api.response.AlertResponse;
+import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.log4j.Logger;
import org.junit.After;
import org.junit.Before;
-import org.apache.cloudstack.api.response.AlertResponse;
-import org.apache.cloudstack.api.response.UserVmResponse;
-
import com.cloud.api.ApiSerializerHelper;
+import junit.framework.TestCase;
+
public class KeystoreTest extends TestCase {
private final static Logger s_logger = Logger.getLogger(KeystoreTest.class);
diff --git a/server/src/test/java/com/cloud/network/CreatePrivateNetworkTest.java b/server/src/test/java/com/cloud/network/CreatePrivateNetworkTest.java
index 2e06039..72685c2 100644
--- a/server/src/test/java/com/cloud/network/CreatePrivateNetworkTest.java
+++ b/server/src/test/java/com/cloud/network/CreatePrivateNetworkTest.java
@@ -17,21 +17,26 @@
package com.cloud.network;
-import junit.framework.Assert;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.when;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
+import org.apache.cloudstack.acl.ControlledEntity.ACLType;
+import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
import org.apache.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.apache.cloudstack.acl.ControlledEntity.ACLType;
-import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
-
import com.cloud.dc.DataCenter.NetworkType;
import com.cloud.dc.DataCenterVO;
import com.cloud.dc.dao.DataCenterDao;
@@ -57,12 +62,7 @@
import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.exception.CloudRuntimeException;
-import static org.junit.Assert.fail;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.when;
+import junit.framework.Assert;
//@Ignore("Requires database to be set up")
public class CreatePrivateNetworkTest {
@@ -104,6 +104,7 @@
NetworkOfferingVO ntwkOff =
new NetworkOfferingVO("offer", "fakeOffer", TrafficType.Guest, true, true, null, null, false, null, null, GuestType.Isolated, false, false, false, false,
false, false, false, false, false, false, false, false, false, false, false, false);
+
when(networkService._networkOfferingDao.findById(anyLong())).thenReturn(ntwkOff);
List<NetworkOfferingVO> netofferlist = new ArrayList<NetworkOfferingVO>();
netofferlist.add(ntwkOff);
@@ -115,15 +116,16 @@
DataCenterVO dc = new DataCenterVO(1L, "hut", "op de hei", null, null, null, null, "10.1.1.0/24", "unreal.net", 1L, NetworkType.Advanced, null, null);
when(networkService._dcDao.lockRow(anyLong(), anyBoolean())).thenReturn(dc);
- when(networkService._networksDao.getPrivateNetwork(anyString(), anyString(), eq(1L), eq(1L), anyLong())).thenReturn(null);
+ when(networkService._networksDao.getPrivateNetwork(anyString(), anyString(), eq(1L), eq(1L), anyLong(), anyLong())).thenReturn(null);
Network net =
new NetworkVO(1L, TrafficType.Guest, Mode.None, BroadcastDomainType.Vlan, 1L, 1L, 1L, 1L, "bla", "fake", "eet.net", GuestType.Isolated, 1L, 1L,
ACLType.Account, false, 1L, false);
+ when(networkService._networkMgr.createGuestNetwork(eq(ntwkOff.getId()), eq("bla"), eq("fake"), eq("10.1.1.1"), eq("10.1.1.0/24"), nullable(String.class), nullable(Boolean.class), nullable(String.class),
+ eq(account), nullable(Long.class), eq(physicalNetwork), eq(physicalNetwork.getDataCenterId()), eq(ACLType.Account), nullable(Boolean.class), eq(1L), nullable(String.class), nullable(String.class),
+ nullable(Boolean.class), nullable(String.class), nullable(Network.PVlanType.class), nullable(String.class))).thenReturn(net);
when(
- networkService._networkMgr.createGuestNetwork(eq(ntwkOff.getId()), eq("bla"), eq("fake"), eq("10.1.1.1"), eq("10.1.1.0/24"), anyString(), anyBoolean(), anyString(),
- eq(account), anyLong(), eq(physicalNetwork), eq(physicalNetwork.getDataCenterId()), eq(ACLType.Account), anyBoolean(), eq(1L), anyString(), anyString(),
- anyBoolean(), anyString(), anyString())).thenReturn(net);
+ networkService._networkMgr.createPrivateNetwork(eq(ntwkOff.getId()), eq("bla"), eq("fake"), eq("10.1.1.1"), eq("10.1.1.0/24"), anyString(), anyBoolean(), eq(account), eq(physicalNetwork), eq(1L))).thenReturn(net);
when(networkService._privateIpDao.findByIpAndSourceNetworkId(net.getId(), "10.1.1.2")).thenReturn(null);
when(networkService._privateIpDao.findByIpAndSourceNetworkIdAndVpcId(eq(1L), anyString(), eq(1L))).thenReturn(null);
@@ -137,21 +139,21 @@
/* Network nw; */
try {
/* nw = */
- networkService.createPrivateNetwork("bla", "fake", 1L, "vlan:1", "10.1.1.2", null, "10.1.1.1", "255.255.255.0", 1L, 1L, true, 1L);
+ networkService.createPrivateNetwork("bla", "fake", 1L, "vlan:1", "10.1.1.2", null, "10.1.1.1", "255.255.255.0", 1L, 1L, true, 1L, false);
/* nw = */
- networkService.createPrivateNetwork("bla", "fake", 1L, "lswitch:3", "10.1.1.2", null, "10.1.1.1", "255.255.255.0", 1L, 1L, false, 1L);
+ networkService.createPrivateNetwork("bla", "fake", 1L, "lswitch:3", "10.1.1.2", null, "10.1.1.1", "255.255.255.0", 1L, 1L, false, 1L, false);
boolean invalid = false;
boolean unsupported = false;
try {
/* nw = */
- networkService.createPrivateNetwork("bla", "fake", 1, "bla:2", "10.1.1.2", null, "10.1.1.1", "255.255.255.0", 1, 1L, true, 1L);
+ networkService.createPrivateNetwork("bla", "fake", 1, "bla:2", "10.1.1.2", null, "10.1.1.1", "255.255.255.0", 1, 1L, true, 1L, false);
} catch (CloudRuntimeException e) {
Assert.assertEquals("unexpected parameter exception", "string 'bla:2' has an unknown BroadcastDomainType.", e.getMessage());
invalid = true;
}
try {
/* nw = */
- networkService.createPrivateNetwork("bla", "fake", 1, "mido://4", "10.1.1.2", null, "10.1.1.1", "255.255.255.0", 1, 1L, false, 1L);
+ networkService.createPrivateNetwork("bla", "fake", 1, "mido://4", "10.1.1.2", null, "10.1.1.1", "255.255.255.0", 1, 1L, false, 1L, false);
} catch (InvalidParameterValueException e) {
Assert.assertEquals("unexpected parameter exception", "unsupported type of broadcastUri specified: mido://4", e.getMessage());
unsupported = true;
diff --git a/server/src/test/java/com/cloud/network/ExternalLoadBalancerDeviceManagerImplTest.java b/server/src/test/java/com/cloud/network/ExternalLoadBalancerDeviceManagerImplTest.java
index 47c3250..9776eaa 100644
--- a/server/src/test/java/com/cloud/network/ExternalLoadBalancerDeviceManagerImplTest.java
+++ b/server/src/test/java/com/cloud/network/ExternalLoadBalancerDeviceManagerImplTest.java
@@ -26,7 +26,6 @@
import javax.inject.Inject;
-import com.cloud.host.Host;
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.junit.Assert;
@@ -45,6 +44,7 @@
import com.cloud.dc.dao.HostPodDao;
import com.cloud.dc.dao.VlanDao;
import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.host.Host;
import com.cloud.host.HostVO;
import com.cloud.host.dao.HostDao;
import com.cloud.host.dao.HostDetailsDao;
@@ -232,8 +232,8 @@
public void testUsageTask() {
ExternalDeviceUsageManagerImpl.ExternalDeviceNetworkUsageTask usageTask = Mockito
.mock(ExternalDeviceUsageManagerImpl.ExternalDeviceNetworkUsageTask.class);
- Mockito.when(_hostDao.listByType(Host.Type.ExternalFirewall)).thenReturn(new ArrayList<HostVO>());
- Mockito.when(_hostDao.listByType(Host.Type.ExternalLoadBalancer)).thenReturn(new ArrayList<HostVO>());
+ Mockito.lenient().when(_hostDao.listByType(Host.Type.ExternalFirewall)).thenReturn(new ArrayList<HostVO>());
+ Mockito.lenient().when(_hostDao.listByType(Host.Type.ExternalLoadBalancer)).thenReturn(new ArrayList<HostVO>());
usageTask.runInContext();
Mockito.verify(usageTask, Mockito.times(0)).runExternalDeviceNetworkUsageTask();
}
diff --git a/server/src/test/java/com/cloud/network/IpAddressManagerTest.java b/server/src/test/java/com/cloud/network/IpAddressManagerTest.java
index 74deb2d..3cf550a 100644
--- a/server/src/test/java/com/cloud/network/IpAddressManagerTest.java
+++ b/server/src/test/java/com/cloud/network/IpAddressManagerTest.java
@@ -21,6 +21,7 @@
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -93,8 +94,8 @@
public void testGetStaticNatSourceIps() {
String publicIpAddress = "192.168.1.3";
IPAddressVO vo = mock(IPAddressVO.class);
- when(vo.getAddress()).thenReturn(new Ip(publicIpAddress));
- when(vo.getId()).thenReturn(1l);
+ lenient().when(vo.getAddress()).thenReturn(new Ip(publicIpAddress));
+ lenient().when(vo.getId()).thenReturn(1l);
when(ipAddressDao.findById(anyLong())).thenReturn(vo);
StaticNat snat = new StaticNatImpl(1, 1, 1, 1, publicIpAddress, false);
@@ -154,14 +155,14 @@
public void assertSourceNatImplementedNetwork() {
NetworkVO networkImplemented = Mockito.mock(NetworkVO.class);
- when(networkImplemented.getTrafficType()).thenReturn(Networks.TrafficType.Guest);
- when(networkImplemented.getNetworkOfferingId()).thenReturn(8L);
- when(networkImplemented.getState()).thenReturn(Network.State.Implemented);
+ lenient().when(networkImplemented.getTrafficType()).thenReturn(Networks.TrafficType.Guest);
+ lenient().when(networkImplemented.getNetworkOfferingId()).thenReturn(8L);
+ lenient().when(networkImplemented.getState()).thenReturn(Network.State.Implemented);
when(networkImplemented.getGuestType()).thenReturn(Network.GuestType.Isolated);
when(networkImplemented.getVpcId()).thenReturn(null);
when(networkImplemented.getId()).thenReturn(1L);
- Mockito.when(networkDao.findById(1L)).thenReturn(networkImplemented);
+ Mockito.lenient().when(networkDao.findById(1L)).thenReturn(networkImplemented);
doReturn(null).when(ipAddressManager).getExistingSourceNatInNetwork(1L, 1L);
boolean isSourceNat = ipAddressManager.isSourceNatAvailableForNetwork(account, ipAddressVO, networkImplemented);
@@ -173,14 +174,14 @@
public void assertSourceNatAllocatedNetwork() {
NetworkVO networkAllocated = Mockito.mock(NetworkVO.class);
- when(networkAllocated.getTrafficType()).thenReturn(Networks.TrafficType.Guest);
+ lenient().when(networkAllocated.getTrafficType()).thenReturn(Networks.TrafficType.Guest);
when(networkAllocated.getNetworkOfferingId()).thenReturn(8L);
- when(networkAllocated.getState()).thenReturn(Network.State.Allocated);
+ lenient().when(networkAllocated.getState()).thenReturn(Network.State.Allocated);
when(networkAllocated.getGuestType()).thenReturn(Network.GuestType.Isolated);
when(networkAllocated.getVpcId()).thenReturn(null);
when(networkAllocated.getId()).thenReturn(2L);
- Mockito.when(networkDao.findById(2L)).thenReturn(networkAllocated);
+ Mockito.lenient().when(networkDao.findById(2L)).thenReturn(networkAllocated);
doReturn(null).when(ipAddressManager).getExistingSourceNatInNetwork(1L, 2L);
assertTrue(ipAddressManager.isSourceNatAvailableForNetwork(account, ipAddressVO, networkAllocated));
@@ -190,17 +191,17 @@
public void assertExistingSourceNatAllocatedNetwork() {
NetworkVO networkNat = Mockito.mock(NetworkVO.class);
- when(networkNat.getTrafficType()).thenReturn(Networks.TrafficType.Guest);
+ lenient().when(networkNat.getTrafficType()).thenReturn(Networks.TrafficType.Guest);
when(networkNat.getNetworkOfferingId()).thenReturn(8L);
- when(networkNat.getState()).thenReturn(Network.State.Implemented);
- when(networkNat.getGuestType()).thenReturn(Network.GuestType.Isolated);
+ lenient().when(networkNat.getState()).thenReturn(Network.State.Implemented);
+ lenient().when(networkNat.getGuestType()).thenReturn(Network.GuestType.Isolated);
when(networkNat.getId()).thenReturn(3L);
- when(networkNat.getVpcId()).thenReturn(null);
+ lenient().when(networkNat.getVpcId()).thenReturn(null);
when(networkNat.getId()).thenReturn(3L);
IPAddressVO sourceNat = new IPAddressVO(new Ip("192.0.0.2"), 1L, 1L, 1L,true);
- Mockito.when(networkDao.findById(3L)).thenReturn(networkNat);
+ Mockito.lenient().when(networkDao.findById(3L)).thenReturn(networkNat);
doReturn(sourceNat).when(ipAddressManager).getExistingSourceNatInNetwork(1L, 3L);
boolean isSourceNat = ipAddressManager.isSourceNatAvailableForNetwork(account, ipAddressVO, networkNat);
diff --git a/server/src/test/java/com/cloud/network/NetworkServiceImplTest.java b/server/src/test/java/com/cloud/network/NetworkServiceImplTest.java
new file mode 100644
index 0000000..2520f39
--- /dev/null
+++ b/server/src/test/java/com/cloud/network/NetworkServiceImplTest.java
@@ -0,0 +1,120 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.network;
+
+import com.cloud.utils.Pair;
+import com.cloud.utils.exception.CloudRuntimeException;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class NetworkServiceImplTest {
+
+ private NetworkServiceImpl service = new NetworkServiceImpl();
+
+ private static final String VLAN_ID_900 = "900";
+ private static final String VLAN_ID_901 = "901";
+ private static final String VLAN_ID_902 = "902";
+
+ @Test
+ public void testGetPrivateVlanPairNoVlans() {
+ Pair<String, Network.PVlanType> pair = service.getPrivateVlanPair(null, null, null);
+ Assert.assertNull(pair.first());
+ Assert.assertNull(pair.second());
+ }
+
+ @Test
+ public void testGetPrivateVlanPairVlanPrimaryOnly() {
+ Pair<String, Network.PVlanType> pair = service.getPrivateVlanPair(null, null, VLAN_ID_900);
+ Assert.assertNull(pair.first());
+ Assert.assertNull(pair.second());
+ }
+
+ @Test
+ public void testGetPrivateVlanPairVlanPrimaryPromiscuousType() {
+ Pair<String, Network.PVlanType> pair = service.getPrivateVlanPair(null, Network.PVlanType.Promiscuous.toString(), VLAN_ID_900);
+ Assert.assertEquals(VLAN_ID_900, pair.first());
+ Assert.assertEquals(Network.PVlanType.Promiscuous, pair.second());
+ }
+
+ @Test
+ public void testGetPrivateVlanPairPromiscuousType() {
+ Pair<String, Network.PVlanType> pair = service.getPrivateVlanPair(VLAN_ID_900, Network.PVlanType.Promiscuous.toString(), VLAN_ID_900);
+ Assert.assertEquals(VLAN_ID_900, pair.first());
+ Assert.assertEquals(Network.PVlanType.Promiscuous, pair.second());
+ }
+
+ @Test
+ public void testGetPrivateVlanPairPromiscuousTypeOnSecondaryVlanId() {
+ Pair<String, Network.PVlanType> pair = service.getPrivateVlanPair(VLAN_ID_900, "promiscuous", VLAN_ID_900);
+ Assert.assertEquals(VLAN_ID_900, pair.first());
+ Assert.assertEquals(Network.PVlanType.Promiscuous, pair.second());
+ }
+
+ @Test
+ public void testGetPrivateVlanPairIsolatedType() {
+ Pair<String, Network.PVlanType> pair = service.getPrivateVlanPair(VLAN_ID_901, Network.PVlanType.Isolated.toString(), VLAN_ID_900);
+ Assert.assertEquals(VLAN_ID_901, pair.first());
+ Assert.assertEquals(Network.PVlanType.Isolated, pair.second());
+ }
+
+ @Test
+ public void testGetPrivateVlanPairIsolatedTypeOnSecondaryVlanId() {
+ Pair<String, Network.PVlanType> pair = service.getPrivateVlanPair(VLAN_ID_901, "isolated", VLAN_ID_900);
+ Assert.assertEquals(VLAN_ID_901, pair.first());
+ Assert.assertEquals(Network.PVlanType.Isolated, pair.second());
+ }
+
+ @Test
+ public void testGetPrivateVlanPairCommunityType() {
+ Pair<String, Network.PVlanType> pair = service.getPrivateVlanPair(VLAN_ID_902, Network.PVlanType.Community.toString(), VLAN_ID_900);
+ Assert.assertEquals(VLAN_ID_902, pair.first());
+ Assert.assertEquals(Network.PVlanType.Community, pair.second());
+ }
+
+ @Test
+ public void testGetPrivateVlanPairCommunityTypeOnSecondaryVlanId() {
+ Pair<String, Network.PVlanType> pair = service.getPrivateVlanPair(VLAN_ID_902, "community", VLAN_ID_900);
+ Assert.assertEquals(VLAN_ID_902, pair.first());
+ Assert.assertEquals(Network.PVlanType.Community, pair.second());
+ }
+
+ @Test(expected = CloudRuntimeException.class)
+ public void testPerformBasicChecksPromiscuousTypeExpectedIsolatedSet() {
+ service.performBasicPrivateVlanChecks(VLAN_ID_900, VLAN_ID_900, Network.PVlanType.Isolated);
+ }
+
+ @Test(expected = CloudRuntimeException.class)
+ public void testPerformBasicChecksPromiscuousTypeExpectedCommunitySet() {
+ service.performBasicPrivateVlanChecks(VLAN_ID_900, VLAN_ID_900, Network.PVlanType.Community);
+ }
+
+ @Test(expected = CloudRuntimeException.class)
+ public void testPerformBasicChecksPromiscuousTypeExpectedSecondaryVlanNullIsolatedSet() {
+ service.performBasicPrivateVlanChecks(VLAN_ID_900, null, Network.PVlanType.Isolated);
+ }
+
+ @Test(expected = CloudRuntimeException.class)
+ public void testPerformBasicChecksPromiscuousTypeExpectedSecondaryVlanNullCommunitySet() {
+ service.performBasicPrivateVlanChecks(VLAN_ID_900, null, Network.PVlanType.Community);
+ }
+
+ @Test(expected = CloudRuntimeException.class)
+ public void testPerformBasicChecksPromiscuousTypeExpectedDifferentVlanIds() {
+ service.performBasicPrivateVlanChecks(VLAN_ID_900, VLAN_ID_901, Network.PVlanType.Promiscuous);
+ }
+
+}
diff --git a/server/src/test/java/com/cloud/network/dao/NetworkDaoTest.java b/server/src/test/java/com/cloud/network/dao/NetworkDaoTest.java
index 140c850..ca91869 100644
--- a/server/src/test/java/com/cloud/network/dao/NetworkDaoTest.java
+++ b/server/src/test/java/com/cloud/network/dao/NetworkDaoTest.java
@@ -16,46 +16,40 @@
// under the License.
package com.cloud.network.dao;
+import com.cloud.network.Network;
import junit.framework.TestCase;
+import org.junit.Assert;
+import org.mockito.Spy;
public class NetworkDaoTest extends TestCase {
- public void testTags() {
-// NetworkDaoImpl dao = ComponentLocator.inject(NetworkDaoImpl.class);
-//
-// dao.expunge(1001l);
-// NetworkVO network = new NetworkVO(1001, TrafficType.Control, GuestType.Shared, Mode.Dhcp, BroadcastDomainType.Native, 1, 1, 1, 1, 1001, "Name", "DisplayText", false, true, true, null, null);
-// network.setGuruName("guru_name");
-// List<String> tags = new ArrayList<String>();
-//
-// tags.add("a");
-// tags.add("b");
-// network.setTags(tags);
-//
-// network = dao.persist(network);
-// List<String> saveTags = network.getTags();
-// Assert.assertTrue(saveTags.size() == 2 && saveTags.contains("a") && saveTags.contains("b"));
-//
-// NetworkVO retrieved = dao.findById(1001l);
-// List<String> retrievedTags = retrieved.getTags();
-// Assert.assertTrue(retrievedTags.size() == 2 && retrievedTags.contains("a") && retrievedTags.contains("b"));
-//
-// List<String> updateTags = new ArrayList<String>();
-// updateTags.add("e");
-// updateTags.add("f");
-// retrieved.setTags(updateTags);
-// dao.update(retrieved.getId(), retrieved);
-//
-// retrieved = dao.findById(1001l);
-// retrievedTags = retrieved.getTags();
-// Assert.assertTrue("Unable to retrieve back the data updated", retrievedTags.size() == 2 && retrievedTags.contains("e") && retrievedTags.contains("f"));
-//
-// dao.expunge(1001l);
+
+ @Spy
+ private NetworkDaoImpl dao = new NetworkDaoImpl();
+
+ private static final Integer existingPrimaryVlan = 900;
+ private static final Integer existingSecondaryVlan = 901;
+
+ private static final Integer requestedVlan = 902;
+
+ public void testNetworkOverlappingExactPair() {
+ Assert.assertTrue(dao.isNetworkOverlappingRequestedPvlan(existingPrimaryVlan, existingSecondaryVlan, Network.PVlanType.Isolated,
+ existingPrimaryVlan, existingSecondaryVlan, Network.PVlanType.Isolated));
+ Assert.assertTrue(dao.isNetworkOverlappingRequestedPvlan(existingPrimaryVlan, existingSecondaryVlan, Network.PVlanType.Isolated,
+ existingPrimaryVlan, existingSecondaryVlan, Network.PVlanType.Community));
}
- public void testListBy() {
-// NetworkDaoImpl dao = ComponentLocator.inject(NetworkDaoImpl.class);
-//
-// dao.listBy(1l, 1l, 1l, "192.168.192.0/24");
+ public void testNetworkOverlappingPromiscuous() {
+ Assert.assertTrue(dao.isNetworkOverlappingRequestedPvlan(existingPrimaryVlan, existingPrimaryVlan, Network.PVlanType.Promiscuous,
+ existingPrimaryVlan, existingPrimaryVlan, Network.PVlanType.Promiscuous));
}
+ public void testNetworkOverlappingIsolated() {
+ Assert.assertTrue(dao.isNetworkOverlappingRequestedPvlan(existingPrimaryVlan, existingSecondaryVlan, Network.PVlanType.Isolated,
+ existingPrimaryVlan, requestedVlan, Network.PVlanType.Isolated));
+ }
+
+ public void testNetworkOverlappingMultipleCommunityAllowed() {
+ Assert.assertFalse(dao.isNetworkOverlappingRequestedPvlan(existingPrimaryVlan, existingSecondaryVlan, Network.PVlanType.Community,
+ existingPrimaryVlan, requestedVlan, Network.PVlanType.Community));
+ }
}
diff --git a/server/src/test/java/com/cloud/network/element/VirtualRouterElementTest.java b/server/src/test/java/com/cloud/network/element/VirtualRouterElementTest.java
index 2d66ea7..7c2a3c7 100644
--- a/server/src/test/java/com/cloud/network/element/VirtualRouterElementTest.java
+++ b/server/src/test/java/com/cloud/network/element/VirtualRouterElementTest.java
@@ -22,16 +22,12 @@
import static org.mockito.Matchers.anyList;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.when;
import java.util.ArrayList;
import java.util.List;
-import com.cloud.exception.AgentUnavailableException;
-import com.cloud.network.dao.NetworkDetailVO;
-import com.cloud.network.dao.NetworkDetailsDao;
-import com.cloud.network.router.VirtualRouter;
-import com.cloud.utils.exception.CloudRuntimeException;
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.cloud.network.router.deployment.RouterDeploymentDefinitionBuilder;
@@ -44,6 +40,7 @@
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.stubbing.Answer;
import com.cloud.cluster.dao.ManagementServerHostDao;
import com.cloud.configuration.ConfigurationManager;
@@ -56,6 +53,7 @@
import com.cloud.dc.dao.VlanDao;
import com.cloud.deploy.DeployDestination;
import com.cloud.deploy.DeploymentPlan;
+import com.cloud.exception.AgentUnavailableException;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.ResourceUnavailableException;
@@ -73,6 +71,8 @@
import com.cloud.network.dao.LoadBalancerVMMapDao;
import com.cloud.network.dao.MonitoringServiceDao;
import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkDetailVO;
+import com.cloud.network.dao.NetworkDetailsDao;
import com.cloud.network.dao.NetworkVO;
import com.cloud.network.dao.OpRouterMonitorServiceDao;
import com.cloud.network.dao.OvsProviderDao;
@@ -85,6 +85,7 @@
import com.cloud.network.dao.UserIpv6AddressDao;
import com.cloud.network.dao.VirtualRouterProviderDao;
import com.cloud.network.dao.VpnUserDao;
+import com.cloud.network.router.VirtualRouter;
import com.cloud.network.router.VirtualRouter.RedundantState;
import com.cloud.network.router.VpcVirtualNetworkApplianceManagerImpl;
import com.cloud.network.rules.dao.PortForwardingRulesDao;
@@ -105,6 +106,7 @@
import com.cloud.user.dao.UserDao;
import com.cloud.user.dao.UserStatisticsDao;
import com.cloud.user.dao.UserStatsLogDao;
+import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.DomainRouterVO;
import com.cloud.vm.NicProfile;
import com.cloud.vm.ReservationContext;
@@ -119,7 +121,6 @@
import com.cloud.vm.dao.UserVmDao;
import com.cloud.vm.dao.UserVmDetailsDao;
import com.cloud.vm.dao.VMInstanceDao;
-import org.mockito.stubbing.Answer;
@RunWith(MockitoJUnitRunner.class)
public class VirtualRouterElementTest {
@@ -320,11 +321,11 @@
* @param network
*/
private void mockDAOs(final NetworkVO network, final NetworkOfferingVO offering) {
- when(_networkDao.acquireInLockTable(network.getId(), NetworkOrchestrationService.NetworkLockTimeout.value())).thenReturn(network);
- when(_networksDao.acquireInLockTable(network.getId(), NetworkOrchestrationService.NetworkLockTimeout.value())).thenReturn(network);
- when(_physicalProviderDao.findByServiceProvider(0L, "VirtualRouter")).thenReturn(new PhysicalNetworkServiceProviderVO());
- when(_vrProviderDao.findByNspIdAndType(0L, Type.VirtualRouter)).thenReturn(new VirtualRouterProviderVO());
- when(_networkOfferingDao.findById(0L)).thenReturn(offering);
+ lenient().when(_networkDao.acquireInLockTable(network.getId(), NetworkOrchestrationService.NetworkLockTimeout.value())).thenReturn(network);
+ lenient().when(_networksDao.acquireInLockTable(network.getId(), NetworkOrchestrationService.NetworkLockTimeout.value())).thenReturn(network);
+ lenient().when(_physicalProviderDao.findByServiceProvider(0L, "VirtualRouter")).thenReturn(new PhysicalNetworkServiceProviderVO());
+ lenient().when(_vrProviderDao.findByNspIdAndType(0L, Type.VirtualRouter)).thenReturn(new VirtualRouterProviderVO());
+ lenient().when(_networkOfferingDao.findById(0L)).thenReturn(offering);
// watchit: (in this test) there can be only one
when(_routerDao.getNextInSequence(Long.class, "id")).thenReturn(0L);
final ServiceOfferingVO svcoff = new ServiceOfferingVO("name",
@@ -342,8 +343,8 @@
/* systemUse */ false,
VirtualMachine.Type.DomainRouter,
/* defaultUse */ false);
- when(_serviceOfferingDao.findById(0L)).thenReturn(svcoff);
- when(_serviceOfferingDao.findByName(Matchers.anyString())).thenReturn(svcoff);
+ lenient().when(_serviceOfferingDao.findById(0L)).thenReturn(svcoff);
+ lenient().when(_serviceOfferingDao.findByName(Matchers.anyString())).thenReturn(svcoff);
final DomainRouterVO router = new DomainRouterVO(/* id */ 1L,
/* serviceOfferingId */ 1L,
/* elementId */ 0L,
@@ -435,10 +436,10 @@
List<DomainRouterVO> routerList3=new ArrayList<>();
routerList3.add(routerUpdateComplete);
routerList3.add(routerUpdateInProgress);
- when(_routerDao.getNextInSequence(Long.class, "id")).thenReturn(1L);
- when(_templateDao.findRoutingTemplate(HypervisorType.XenServer, "SystemVM Template (XenServer)")).thenReturn(new VMTemplateVO());
- when(_routerDao.persist(any(DomainRouterVO.class))).thenReturn(router);
- when(_routerDao.findById(router.getId())).thenReturn(router);
+ lenient().when(_routerDao.getNextInSequence(Long.class, "id")).thenReturn(1L);
+ lenient().when(_templateDao.findRoutingTemplate(HypervisorType.XenServer, "SystemVM Template (XenServer)")).thenReturn(new VMTemplateVO());
+ lenient().when(_routerDao.persist(any(DomainRouterVO.class))).thenReturn(router);
+ lenient().when(_routerDao.findById(router.getId())).thenReturn(router);
when(_routerDao.listByNetworkAndRole(1l, VirtualRouter.Role.VIRTUAL_ROUTER)).thenReturn(routerList1);
when(_routerDao.listByNetworkAndRole(2l, VirtualRouter.Role.VIRTUAL_ROUTER)).thenReturn(routerList2);
when(_routerDao.listByNetworkAndRole(3l, VirtualRouter.Role.VIRTUAL_ROUTER)).thenReturn(routerList1);
@@ -459,10 +460,10 @@
final long dataCenterId = 33;
when(network.getId()).thenReturn(networkId);
- when(network.getPhysicalNetworkId()).thenReturn(physicalNetworkId);
- when(network.getTrafficType()).thenReturn(TrafficType.Guest);
- when(network.getNetworkOfferingId()).thenReturn(networkOfferingId);
- when(network.getDataCenterId()).thenReturn(dataCenterId);
+ lenient().when(network.getPhysicalNetworkId()).thenReturn(physicalNetworkId);
+ lenient().when(network.getTrafficType()).thenReturn(TrafficType.Guest);
+ lenient().when(network.getNetworkOfferingId()).thenReturn(networkOfferingId);
+ lenient().when(network.getDataCenterId()).thenReturn(dataCenterId);
when(network.getVpcId()).thenReturn(null);
when(virtualRouterElement._networkMdl.getPhysicalNetworkId(network)).thenReturn(physicalNetworkId);
@@ -487,19 +488,19 @@
final long dataCenterId = 33;
when(network.getId()).thenReturn(networkId);
- when(network.getPhysicalNetworkId()).thenReturn(physicalNetworkId);
- when(network.getTrafficType()).thenReturn(TrafficType.Guest);
- when(network.getNetworkOfferingId()).thenReturn(networkOfferingId);
- when(network.getDataCenterId()).thenReturn(dataCenterId);
+ lenient().when(network.getPhysicalNetworkId()).thenReturn(physicalNetworkId);
+ lenient().when(network.getTrafficType()).thenReturn(TrafficType.Guest);
+ lenient().when(network.getNetworkOfferingId()).thenReturn(networkOfferingId);
+ lenient().when(network.getDataCenterId()).thenReturn(dataCenterId);
when(network.getVpcId()).thenReturn(null);
- when(vm.getType()).thenReturn(VirtualMachine.Type.User);
+ lenient().when(vm.getType()).thenReturn(VirtualMachine.Type.User);
when(virtualRouterElement._networkMdl.getPhysicalNetworkId(network)).thenReturn(physicalNetworkId);
when(virtualRouterElement._networkMdl.isProviderEnabledInPhysicalNetwork(physicalNetworkId, Network.Provider.VirtualRouter.getName())).thenReturn(true);
when(virtualRouterElement._networkMdl.isProviderSupportServiceInNetwork(networkId, service, Network.Provider.VirtualRouter)).thenReturn(true);
- when(virtualRouterElement._dcDao.findById(dataCenterId)).thenReturn(Mockito.mock(DataCenterVO.class));
+ lenient().when(virtualRouterElement._dcDao.findById(dataCenterId)).thenReturn(Mockito.mock(DataCenterVO.class));
when(virtualRouterElement.canHandle(network, service)).thenReturn(false);
diff --git a/server/src/test/java/com/cloud/network/lb/UpdateLoadBalancerTest.java b/server/src/test/java/com/cloud/network/lb/UpdateLoadBalancerTest.java
index 0b67eb7..8aef1b9 100644
--- a/server/src/test/java/com/cloud/network/lb/UpdateLoadBalancerTest.java
+++ b/server/src/test/java/com/cloud/network/lb/UpdateLoadBalancerTest.java
@@ -16,15 +16,15 @@
// under the License.
package com.cloud.network.lb;
-import static org.mockito.Matchers.anyLong;
+import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.when;
import java.util.ArrayList;
import java.util.UUID;
-import com.cloud.user.User;
import org.apache.cloudstack.api.command.user.loadbalancer.UpdateLoadBalancerRuleCmd;
import org.apache.cloudstack.context.CallContext;
import org.junit.After;
@@ -53,6 +53,7 @@
import com.cloud.user.Account;
import com.cloud.user.AccountVO;
import com.cloud.user.MockAccountManagerImpl;
+import com.cloud.user.User;
import com.cloud.user.UserVO;
public class UpdateLoadBalancerTest {
@@ -94,17 +95,17 @@
LoadBalancerVO lb = new LoadBalancerVO(null, null, null, 0L, 0, 0, null, 0L, 0L, domainId, null);
- when(lbDao.findById(anyLong())).thenReturn(lb);
+ when(lbDao.findById(isNull())).thenReturn(lb);
when(netModel.getPublicIpAddress(anyLong())).thenReturn(Mockito.mock(PublicIpAddress.class));
when(netDao.findById(anyLong())).thenReturn(Mockito.mock(NetworkVO.class));
when(lbServiceProvider.validateLBRule(any(Network.class), any(LoadBalancingRule.class))).thenReturn(true);
- when(lbDao.update(anyLong(), eq(lb))).thenReturn(true);
+ when(lbDao.update(isNull(), eq(lb))).thenReturn(true);
_lbMgr.updateLoadBalancerRule(updateLbRuleCmd);
InOrder inOrder = Mockito.inOrder(lbServiceProvider, lbDao);
inOrder.verify(lbServiceProvider).validateLBRule(any(Network.class), any(LoadBalancingRule.class));
- inOrder.verify(lbDao).update(anyLong(), eq(lb));
+ inOrder.verify(lbDao).update(isNull(),eq(lb));
}
@Test(expected = InvalidParameterValueException.class)
diff --git a/server/src/test/java/com/cloud/network/router/NetworkHelperImplTest.java b/server/src/test/java/com/cloud/network/router/NetworkHelperImplTest.java
index 952818d..4267b71 100644
--- a/server/src/test/java/com/cloud/network/router/NetworkHelperImplTest.java
+++ b/server/src/test/java/com/cloud/network/router/NetworkHelperImplTest.java
@@ -19,6 +19,7 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
@@ -85,7 +86,7 @@
Answer[] answers = {answer1, answer2, answer3};
when(answer1.getResult()).thenReturn(true);
when(answer2.getResult()).thenReturn(false);
- when(answer3.getResult()).thenReturn(false);
+ lenient().when(answer3.getResult()).thenReturn(false);
when(this.agentManager.send(HOST_ID, commands)).thenReturn(answers);
// Execute
diff --git a/server/src/test/java/com/cloud/network/router/RouterControlHelperTest.java b/server/src/test/java/com/cloud/network/router/RouterControlHelperTest.java
index 41f4c27..a3040f1 100644
--- a/server/src/test/java/com/cloud/network/router/RouterControlHelperTest.java
+++ b/server/src/test/java/com/cloud/network/router/RouterControlHelperTest.java
@@ -17,6 +17,7 @@
package com.cloud.network.router;
import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -68,9 +69,9 @@
NicVO nic3 = mock(NicVO.class);
when(nic1.getNetworkId()).thenReturn(NW_ID_1);
when(nic2.getNetworkId()).thenReturn(NW_ID_2);
- when(nic2.getIPv4Address()).thenReturn(IP4_ADDRES1);
- when(nic3.getNetworkId()).thenReturn(NW_ID_3);
- when(nic3.getIPv4Address()).thenReturn(IP4_ADDRES2);
+ lenient().when(nic2.getIPv4Address()).thenReturn(IP4_ADDRES1);
+ lenient().when(nic3.getNetworkId()).thenReturn(NW_ID_3);
+ lenient().when(nic3.getIPv4Address()).thenReturn(IP4_ADDRES2);
nics.add(nic1);
nics.add(nic2);
nics.add(nic3);
@@ -81,10 +82,10 @@
NetworkVO nw2 = mock(NetworkVO.class);
when(nw2.getTrafficType()).thenReturn(TrafficType.Control);
NetworkVO nw3 = mock(NetworkVO.class);
- when(nw3.getTrafficType()).thenReturn(TrafficType.Control);
+ lenient().when(nw3.getTrafficType()).thenReturn(TrafficType.Control);
when(this.nwDao.findById(NW_ID_1)).thenReturn(nw1);
when(this.nwDao.findById(NW_ID_2)).thenReturn(nw2);
- when(this.nwDao.findById(NW_ID_3)).thenReturn(nw3);
+ lenient().when(this.nwDao.findById(NW_ID_3)).thenReturn(nw3);
// Execute
final String ip4address = this.routerControlHelper.getRouterControlIp(ROUTER_ID);
@@ -99,7 +100,7 @@
List<NicVO> nics = new ArrayList<>();
NicVO nic1 = mock(NicVO.class);
when(nic1.getNetworkId()).thenReturn(NW_ID_1);
- when(nic1.getIPv4Address()).thenReturn(null);
+ lenient().when(nic1.getIPv4Address()).thenReturn(null);
nics.add(nic1);
when(this.nicDao.listByVmId(ROUTER_ID)).thenReturn(nics);
diff --git a/server/src/test/java/com/cloud/network/router/VirtualNetworkApplianceManagerImplTest.java b/server/src/test/java/com/cloud/network/router/VirtualNetworkApplianceManagerImplTest.java
index f87b009..0ddbd84 100644
--- a/server/src/test/java/com/cloud/network/router/VirtualNetworkApplianceManagerImplTest.java
+++ b/server/src/test/java/com/cloud/network/router/VirtualNetworkApplianceManagerImplTest.java
@@ -16,17 +16,42 @@
// under the License.
package com.cloud.network.router;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.utils.identity.ManagementServerNode;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
import com.cloud.agent.AgentManager;
import com.cloud.agent.api.CheckS2SVpnConnectionsAnswer;
import com.cloud.agent.api.CheckS2SVpnConnectionsCommand;
import com.cloud.alert.AlertManager;
+import com.cloud.cluster.dao.ManagementServerHostDao;
+import com.cloud.dc.dao.ClusterDao;
+import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.dc.dao.HostPodDao;
+import com.cloud.dc.dao.VlanDao;
import com.cloud.host.Host;
import com.cloud.host.HostVO;
import com.cloud.host.Status;
+import com.cloud.host.dao.HostDao;
import com.cloud.hypervisor.Hypervisor;
import com.cloud.network.Site2SiteVpnConnection;
-import com.cloud.network.dao.Site2SiteVpnConnectionVO;
-import com.cloud.network.dao.Site2SiteCustomerGatewayDao;
import com.cloud.network.dao.FirewallRulesDao;
import com.cloud.network.dao.IPAddressDao;
import com.cloud.network.dao.LoadBalancerDao;
@@ -36,39 +61,27 @@
import com.cloud.network.dao.OpRouterMonitorServiceDao;
import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
import com.cloud.network.dao.RemoteAccessVpnDao;
+import com.cloud.network.dao.Site2SiteCustomerGatewayDao;
import com.cloud.network.dao.Site2SiteCustomerGatewayVO;
import com.cloud.network.dao.Site2SiteVpnConnectionDao;
+import com.cloud.network.dao.Site2SiteVpnConnectionVO;
import com.cloud.network.dao.Site2SiteVpnGatewayDao;
import com.cloud.network.dao.UserIpv6AddressDao;
import com.cloud.network.dao.VirtualRouterProviderDao;
import com.cloud.network.dao.VpnUserDao;
-import com.cloud.network.vpn.Site2SiteVpnManager;
-import com.cloud.storage.Storage;
-import com.cloud.vm.DomainRouterVO;
-import com.cloud.vm.VirtualMachine;
-import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
-import org.apache.cloudstack.utils.identity.ManagementServerNode;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-
-import com.cloud.cluster.dao.ManagementServerHostDao;
-import com.cloud.dc.dao.ClusterDao;
-import com.cloud.dc.dao.DataCenterDao;
-import com.cloud.dc.dao.HostPodDao;
-import com.cloud.dc.dao.VlanDao;
-import com.cloud.host.dao.HostDao;
import com.cloud.network.rules.dao.PortForwardingRulesDao;
+import com.cloud.network.vpn.Site2SiteVpnManager;
import com.cloud.offerings.dao.NetworkOfferingDao;
import com.cloud.service.dao.ServiceOfferingDao;
+import com.cloud.storage.Storage;
import com.cloud.storage.dao.GuestOSDao;
import com.cloud.storage.dao.VMTemplateDao;
import com.cloud.storage.dao.VolumeDao;
import com.cloud.user.dao.UserDao;
import com.cloud.user.dao.UserStatisticsDao;
import com.cloud.user.dao.UserStatsLogDao;
+import com.cloud.vm.DomainRouterVO;
+import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineManager;
import com.cloud.vm.dao.DomainRouterDao;
import com.cloud.vm.dao.NicDao;
@@ -76,16 +89,6 @@
import com.cloud.vm.dao.UserVmDao;
import com.cloud.vm.dao.UserVmDetailsDao;
import com.cloud.vm.dao.VMInstanceDao;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.when;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anyString;
-import static org.junit.Assert.assertEquals;
@@ -289,12 +292,12 @@
when(_s2sCustomerGatewayDao.findById(conn.getCustomerGatewayId())).thenReturn(gw);
when(_hostDao.findById(router.getHostId())).thenReturn(hostVo);
when(_routerControlHelper.getRouterControlIp(router.getId())).thenReturn("192.168.50.15");
- doReturn(_s2sVpnAnswer).when(_agentMgr).easySend(anyLong(), any(CheckS2SVpnConnectionsCommand.class));
+ doReturn(_s2sVpnAnswer).when(_agentMgr).easySend(nullable(Long.class), nullable(CheckS2SVpnConnectionsCommand.class));
when(_s2sVpnAnswer.getResult()).thenReturn(true);
when(_s2sVpnConnectionDao.acquireInLockTable(conn.getId())).thenReturn(conn);
when(_s2sVpnAnswer.isIPPresent("192.168.50.15")).thenReturn(true);
when(_s2sVpnAnswer.isConnected("192.168.50.15")).thenReturn(true);
- doNothing().when(_alertMgr).sendAlert(any(AlertManager.AlertType.class), anyLong(), anyLong(), anyString(), anyString());
+ lenient().doNothing().when(_alertMgr).sendAlert(any(AlertManager.AlertType.class), anyLong(), anyLong(), anyString(), anyString());
virtualNetworkApplianceManagerImpl.updateSite2SiteVpnConnectionState(routers);
diff --git a/server/src/test/java/com/cloud/network/security/SecurityGroupManagerImpl2Test.java b/server/src/test/java/com/cloud/network/security/SecurityGroupManagerImpl2Test.java
index ad1da32..205574c 100644
--- a/server/src/test/java/com/cloud/network/security/SecurityGroupManagerImpl2Test.java
+++ b/server/src/test/java/com/cloud/network/security/SecurityGroupManagerImpl2Test.java
@@ -16,32 +16,48 @@
// under the License.
package com.cloud.network.security;
+import java.sql.Connection;
+import java.sql.DriverManager;
import java.util.ArrayList;
import java.util.List;
+import java.util.Properties;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
-
-import junit.framework.TestCase;
+import javax.sql.DataSource;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.Mockito;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import com.cloud.utils.Profiler;
+import com.cloud.utils.PropertiesUtil;
import com.cloud.utils.component.ComponentContext;
+import junit.framework.TestCase;
+
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = "classpath:/SecurityGroupManagerTestContext.xml")
public class SecurityGroupManagerImpl2Test extends TestCase {
@Inject
SecurityGroupManagerImpl2 _sgMgr = null;
+ Connection connection;
+
@Before
public void setup() throws Exception {
+ Properties properties = new Properties();
+ PropertiesUtil.loadFromFile(properties, PropertiesUtil.findConfigFile("db.properties"));
+ String cloudDbUrl = properties.getProperty("db.cloud.driver") +"://" +properties.getProperty("db.cloud.host")+
+ ":" + properties.getProperty("db.cloud.port") + "/" +
+ properties.getProperty("db.cloud.name");
+ Class.forName("com.mysql.jdbc.Driver");
+ connection = DriverManager.getConnection(cloudDbUrl, properties.getProperty("db.cloud.username"), properties.getProperty("db.cloud.password"));
+ Mockito.doReturn(connection).when(Mockito.mock(DataSource.class)).getConnection();
ComponentContext.initComponentsLifeCycle();
}
diff --git a/server/src/test/java/com/cloud/network/vpc/NetworkACLServiceImplTest.java b/server/src/test/java/com/cloud/network/vpc/NetworkACLServiceImplTest.java
index 2cde8dd..f21bc2c 100644
--- a/server/src/test/java/com/cloud/network/vpc/NetworkACLServiceImplTest.java
+++ b/server/src/test/java/com/cloud/network/vpc/NetworkACLServiceImplTest.java
@@ -17,6 +17,11 @@
package com.cloud.network.vpc;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.times;
import java.util.ArrayList;
@@ -161,7 +166,7 @@
Mockito.doNothing().when(networkAclServiceImpl).validateAclRuleNumber(createNetworkAclCmdMock, networkAclMock);
Mockito.doNothing().when(networkAclServiceImpl).validateNetworkAcl(networkAclMock);
- Mockito.doReturn(Action.Allow).when(networkAclServiceImpl).validateAndCreateNetworkAclRuleAction(Mockito.anyString());
+ Mockito.doReturn(Action.Allow).when(networkAclServiceImpl).validateAndCreateNetworkAclRuleAction(anyString());
Mockito.when(networkAclItemDaoMock.getMaxNumberByACL(networkAclMockId)).thenReturn(5);
Mockito.doNothing().when(networkAclServiceImpl).validateNetworkACLItem(Mockito.any(NetworkACLItemVO.class));
@@ -176,12 +181,12 @@
Assert.assertEquals(number == null ? 6 : number, netowkrAclRuleCreated.getNumber());
- InOrder inOrder = Mockito.inOrder(networkAclManagerMock, networkAclServiceImpl, networkAclItemDaoMock);
+ InOrder inOrder = Mockito.inOrder( networkAclServiceImpl, networkAclManagerMock, networkAclItemDaoMock);
inOrder.verify(networkAclServiceImpl).createAclListIfNeeded(createNetworkAclCmdMock);
inOrder.verify(networkAclManagerMock).getNetworkACL(networkAclMockId);
inOrder.verify(networkAclServiceImpl).validateNetworkAcl(networkAclMock);
inOrder.verify(networkAclServiceImpl).validateAclRuleNumber(createNetworkAclCmdMock, networkAclMock);
- inOrder.verify(networkAclServiceImpl).validateAndCreateNetworkAclRuleAction(Mockito.anyString());
+ inOrder.verify(networkAclServiceImpl).validateAndCreateNetworkAclRuleAction(nullable(String.class));
inOrder.verify(networkAclItemDaoMock, Mockito.times(number == null ? 1 : 0)).getMaxNumberByACL(networkAclMockId);
inOrder.verify(networkAclServiceImpl).validateNetworkACLItem(Mockito.any(NetworkACLItemVO.class));
inOrder.verify(networkAclManagerMock).createNetworkACLItem(Mockito.any(NetworkACLItemVO.class));
@@ -415,7 +420,7 @@
Mockito.verify(entityManagerMock).findById(Vpc.class, networkMockVpcMockId);
Mockito.verify(accountManagerMock).checkAccess(Mockito.any(Account.class), Mockito.isNull(AccessType.class), Mockito.eq(true), Mockito.any(Vpc.class));
- PowerMockito.verifyStatic();
+ PowerMockito.verifyStatic(CallContext.class);
CallContext.current();
}
@@ -805,19 +810,19 @@
networkAclServiceImpl.transferDataToNetworkAclRulePojo(updateNetworkACLItemCmdMock, networkAclItemVoMock, networkAclMock);
- Mockito.verify(networkAclItemVoMock, Mockito.times(0)).setNumber(Mockito.anyInt());
- Mockito.verify(networkAclItemVoMock, Mockito.times(1)).setSourcePortStart(Mockito.anyInt());
- Mockito.verify(networkAclItemVoMock, Mockito.times(1)).setSourcePortEnd(Mockito.anyInt());
- Mockito.verify(networkAclItemVoMock, Mockito.times(1)).setSourceCidrList(Mockito.anyListOf(String.class));
- Mockito.verify(networkAclItemVoMock, Mockito.times(1)).setProtocol(Mockito.anyString());
- Mockito.verify(networkAclItemVoMock, Mockito.times(1)).setIcmpCode(Mockito.anyInt());
- Mockito.verify(networkAclItemVoMock, Mockito.times(1)).setIcmpType(Mockito.anyInt());
- Mockito.verify(networkAclItemVoMock, Mockito.times(1)).setAction(Mockito.any(Action.class));
- Mockito.verify(networkAclItemVoMock, Mockito.times(1)).setTrafficType(Mockito.any(TrafficType.class));
- Mockito.verify(networkAclItemVoMock, Mockito.times(0)).setUuid(Mockito.anyString());
- Mockito.verify(networkAclItemVoMock, Mockito.times(1)).setReason(Mockito.anyString());
- Mockito.verify(networkAclItemVoMock, Mockito.times(1)).setDisplay(Mockito.anyBoolean());
- Mockito.verify(networkAclServiceImpl, Mockito.times(1)).validateAndCreateNetworkAclRuleAction(Mockito.anyString());
+ Mockito.verify(networkAclItemVoMock, Mockito.times(0)).setNumber(nullable(Integer.class));
+ Mockito.verify(networkAclItemVoMock, Mockito.times(1)).setSourcePortStart(nullable(Integer.class));
+ Mockito.verify(networkAclItemVoMock, Mockito.times(1)).setSourcePortEnd(nullable(Integer.class));
+ Mockito.verify(networkAclItemVoMock, Mockito.times(1)).setSourceCidrList(nullable(List.class));
+ Mockito.verify(networkAclItemVoMock, Mockito.times(1)).setProtocol(nullable(String.class));
+ Mockito.verify(networkAclItemVoMock, Mockito.times(1)).setIcmpCode(nullable(Integer.class));
+ Mockito.verify(networkAclItemVoMock, Mockito.times(1)).setIcmpType(nullable(Integer.class));
+ Mockito.verify(networkAclItemVoMock, Mockito.times(1)).setAction(nullable(Action.class));
+ Mockito.verify(networkAclItemVoMock, Mockito.times(1)).setTrafficType(nullable(TrafficType.class));
+ Mockito.verify(networkAclItemVoMock, Mockito.times(0)).setUuid(nullable(String.class));
+ Mockito.verify(networkAclItemVoMock, Mockito.times(1)).setReason(nullable(String.class));
+ Mockito.verify(networkAclItemVoMock, Mockito.times(1)).setDisplay(nullable(Boolean.class));
+ Mockito.verify(networkAclServiceImpl, Mockito.times(1)).validateAndCreateNetworkAclRuleAction(nullable(String.class));
}
@Test
@@ -877,7 +882,8 @@
inOrder.verify(networkAclDaoMock).findById(networkAclListId);
inOrder.verify(entityManagerMock).findById(Mockito.eq(Vpc.class), Mockito.anyLong());
- inOrder.verify(accountManagerMock).checkAccess(Mockito.any(Account.class), Mockito.isNull(AccessType.class), Mockito.eq(true), Mockito.any(Vpc.class));
+ inOrder.verify(accountManagerMock).checkAccess(Mockito.any(Account.class), Mockito.isNull(AccessType.class), Mockito.eq(true), nullable(Vpc.class));
+
inOrder.verify(networkACLVOMock).setName(name);
inOrder.verify(networkACLVOMock).setDescription(description);
@@ -1072,11 +1078,11 @@
networkAclServiceImpl.updateNetworkACL(updateNetworkACLListCmdMock);
- InOrder inOrder = Mockito.inOrder(networkAclDaoMock, entityManagerMock, entityManagerMock, accountManagerMock, networkACLVOMock);
+ InOrder inOrder = Mockito.inOrder(networkAclDaoMock, entityManagerMock, accountManagerMock, networkACLVOMock);
inOrder.verify(networkAclDaoMock).findById(networkAclListId);
- inOrder.verify(entityManagerMock).findById(Mockito.eq(Vpc.class), Mockito.anyLong());
- inOrder.verify(accountManagerMock).checkAccess(Mockito.any(Account.class), Mockito.isNull(AccessType.class), Mockito.eq(true), Mockito.any(Vpc.class));
+ inOrder.verify(entityManagerMock).findById(eq(Vpc.class), Mockito.anyLong());
+ inOrder.verify(accountManagerMock).checkAccess(any(Account.class), isNull(), eq(true), nullable(Vpc.class));
Mockito.verify(networkACLVOMock, Mockito.times(0)).setName(null);
inOrder.verify(networkACLVOMock, Mockito.times(0)).setDescription(null);
diff --git a/server/src/test/java/com/cloud/resource/MockResourceManagerImpl.java b/server/src/test/java/com/cloud/resource/MockResourceManagerImpl.java
index 82a1e92..8ce60df 100755
--- a/server/src/test/java/com/cloud/resource/MockResourceManagerImpl.java
+++ b/server/src/test/java/com/cloud/resource/MockResourceManagerImpl.java
@@ -32,6 +32,7 @@
import org.apache.cloudstack.api.command.admin.host.ReconnectHostCmd;
import org.apache.cloudstack.api.command.admin.host.UpdateHostCmd;
import org.apache.cloudstack.api.command.admin.host.UpdateHostPasswordCmd;
+import org.apache.cloudstack.framework.config.ConfigKey;
import com.cloud.agent.api.StartupCommand;
import com.cloud.agent.api.StartupRoutingCommand;
@@ -56,7 +57,6 @@
import com.cloud.resource.ResourceState.Event;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.fsm.NoTransitionException;
-import org.apache.cloudstack.framework.config.ConfigKey;
public class MockResourceManagerImpl extends ManagerBase implements ResourceManager {
@@ -307,10 +307,10 @@
}
/* (non-Javadoc)
- * @see com.cloud.resource.ResourceManager#maintenanceFailed(long)
+ * @see com.cloud.resource.ResourceManager#migrateAwayFailed(long)
*/
@Override
- public boolean maintenanceFailed(final long hostId) {
+ public boolean migrateAwayFailed(final long hostId, final long vmId) {
// TODO Auto-generated method stub
return false;
}
@@ -622,6 +622,11 @@
}
@Override
+ public boolean cancelMaintenance(long hostId) {
+ return false;
+ }
+
+ @Override
public boolean isHostGpuEnabled(final long hostId) {
// TODO Auto-generated method stub
return false;
diff --git a/server/src/test/java/com/cloud/resource/ResourceManagerImplTest.java b/server/src/test/java/com/cloud/resource/ResourceManagerImplTest.java
index 7d1a0fe..6faa83b 100644
--- a/server/src/test/java/com/cloud/resource/ResourceManagerImplTest.java
+++ b/server/src/test/java/com/cloud/resource/ResourceManagerImplTest.java
@@ -17,6 +17,39 @@
package com.cloud.resource;
+import static com.cloud.resource.ResourceState.Event.ErrorsCorrected;
+import static com.cloud.resource.ResourceState.Event.InternalEnterMaintenance;
+import static com.cloud.resource.ResourceState.Event.UnableToMaintain;
+import static com.cloud.resource.ResourceState.Event.UnableToMigrate;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.BDDMockito;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
import com.cloud.agent.AgentManager;
import com.cloud.agent.api.GetVncPortAnswer;
import com.cloud.agent.api.GetVncPortCommand;
@@ -35,38 +68,10 @@
import com.cloud.utils.ssh.SSHCmdHelper;
import com.cloud.utils.ssh.SshException;
import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.VirtualMachine;
import com.cloud.vm.dao.UserVmDetailsDao;
import com.cloud.vm.dao.VMInstanceDao;
import com.trilead.ssh2.Connection;
-import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.BDDMockito;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.mockito.Spy;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static com.cloud.resource.ResourceState.Event.InternalEnterMaintenance;
-import static com.cloud.resource.ResourceState.Event.UnableToMigrate;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
@RunWith(PowerMockRunner.class)
@PrepareForTest({ActionEventUtils.class, ResourceManagerImpl.class, SSHCmdHelper.class})
@@ -170,38 +175,98 @@
}
@Test
- public void testCheckAndMaintainEnterMaintenanceMode() throws NoTransitionException {
+ public void testCheckAndMaintainEnterMaintenanceModeNoVms() throws NoTransitionException {
+ // Test entering into maintenance with no VMs running on host.
boolean enterMaintenanceMode = resourceManager.checkAndMaintain(hostId);
- verify(resourceManager).isHostInMaintenance(host, new ArrayList<>(), new ArrayList<>(), new ArrayList<>());
+ verify(resourceManager).attemptMaintain(host);
verify(resourceManager).setHostIntoMaintenance(host);
+ verify(resourceManager, never()).setHostIntoErrorInPrepareForMaintenance(anyObject(), anyObject());
+ verify(resourceManager, never()).setHostIntoErrorInMaintenance(anyObject(), anyObject());
+ verify(resourceManager, never()).setHostIntoPrepareForMaintenanceAfterErrorsFixed(anyObject());
verify(resourceManager).resourceStateTransitTo(eq(host), eq(InternalEnterMaintenance), anyLong());
+
Assert.assertTrue(enterMaintenanceMode);
}
@Test
+ public void testCheckAndMaintainProceedsWithPrepareForMaintenanceRunningVms() throws NoTransitionException {
+ // Test proceeding through with no events if pending migrating works / retries left.
+ setupRunningVMs();
+ setupPendingMigrationRetries();
+ verifyNoChangeInMaintenance();
+ }
+
+ @Test
public void testCheckAndMaintainErrorInMaintenanceRunningVms() throws NoTransitionException {
- when(vmInstanceDao.listByHostId(hostId)).thenReturn(Arrays.asList(vm1, vm2));
- boolean enterMaintenanceMode = resourceManager.checkAndMaintain(hostId);
- verify(resourceManager).isHostInMaintenance(host, Arrays.asList(vm1, vm2), new ArrayList<>(), new ArrayList<>());
- Assert.assertFalse(enterMaintenanceMode);
+ // Test entering into ErrorInMaintenance when no pending migrations etc, and due to - Running VMs
+ setupRunningVMs();
+ setupNoPendingMigrationRetries();
+ verifyErrorInMaintenanceCalls();
}
@Test
- public void testCheckAndMaintainErrorInMaintenanceMigratingVms() throws NoTransitionException {
- when(vmInstanceDao.listVmsMigratingFromHost(hostId)).thenReturn(Arrays.asList(vm1, vm2));
- boolean enterMaintenanceMode = resourceManager.checkAndMaintain(hostId);
- verify(resourceManager).isHostInMaintenance(host, new ArrayList<>(), Arrays.asList(vm1, vm2), new ArrayList<>());
- Assert.assertFalse(enterMaintenanceMode);
+ public void testCheckAndMaintainErrorInMaintenanceWithErrorVms() throws NoTransitionException {
+ // Test entering into ErrorInMaintenance when no pending migrations etc, and due to - no migrating but error VMs
+ setupErrorVms();
+ setupNoPendingMigrationRetries();
+ verifyErrorInMaintenanceCalls();
}
@Test
- public void testCheckAndMaintainErrorInMaintenanceFailedMigrations() throws NoTransitionException {
- when(vmInstanceDao.listNonMigratingVmsByHostEqualsLastHost(hostId)).thenReturn(Arrays.asList(vm1, vm2));
- boolean enterMaintenanceMode = resourceManager.checkAndMaintain(hostId);
- verify(resourceManager).isHostInMaintenance(host, new ArrayList<>(), new ArrayList<>(), Arrays.asList(vm1, vm2));
- verify(resourceManager).setHostIntoErrorInMaintenance(host, Arrays.asList(vm1, vm2));
- verify(resourceManager).resourceStateTransitTo(eq(host), eq(UnableToMigrate), anyLong());
- Assert.assertFalse(enterMaintenanceMode);
+ public void testCheckAndMaintainErrorInPrepareForMaintenanceFailedMigrationsPendingRetries() throws NoTransitionException {
+ // Test entering into ErrorInPrepareForMaintenance when pending migrations retries and due to - Failed Migrations
+ setupFailedMigrations();
+ setupPendingMigrationRetries();
+ when(vmInstanceDao.findByHostInStates(hostId, VirtualMachine.State.Running)).thenReturn(Arrays.asList(vm2));
+ verifyErrorInPrepareForMaintenanceCalls();
+ }
+
+ @Test
+ public void testCheckAndMaintainErrorInPrepareForMaintenanceWithErrorVmsPendingRetries() throws NoTransitionException {
+ // Test entering into ErrorInMaintenance when pending migrations retries due to - no migrating but error VMs
+ setupErrorVms();
+ setupPendingMigrationRetries();
+ when(vmInstanceDao.listVmsMigratingFromHost(hostId)).thenReturn(Arrays.asList(vm2));
+ verifyErrorInPrepareForMaintenanceCalls();
+ }
+
+ @Test
+ public void testCheckAndMaintainErrorInPrepareForMaintenanceFailedMigrationsAndMigratingVms() throws NoTransitionException {
+ // Test entering into ErrorInPrepareForMaintenance when no pending migrations retries
+ // but executing migration and due to - Failed Migrations
+ setupFailedMigrations();
+ setupNoPendingMigrationRetries();
+ when(vmInstanceDao.listVmsMigratingFromHost(hostId)).thenReturn(Arrays.asList(vm2));
+ verifyErrorInPrepareForMaintenanceCalls();
+ }
+
+ @Test
+ public void testCheckAndMaintainErrorInPrepareForMaintenanceWithErrorVmsAndMigratingVms() throws NoTransitionException {
+ // Test entering into ErrorInPrepareForMaintenance when no pending migrations retries
+ // but executing migration and due to - Error Vms
+ setupErrorVms();
+ setupNoPendingMigrationRetries();
+ when(vmInstanceDao.listVmsMigratingFromHost(hostId)).thenReturn(Arrays.asList(vm2));
+ verifyErrorInPrepareForMaintenanceCalls();
+ }
+
+ @Test
+ public void testCheckAndMaintainErrorInPrepareForMaintenanceFailedMigrationsAndStoppingVms() throws NoTransitionException {
+ // Test entering into ErrorInPrepareForMaintenance when no pending migrations retries
+ // but stopping VMs and due to - Failed Migrations
+ setupFailedMigrations();
+ setupNoPendingMigrationRetries();
+ when(vmInstanceDao.findByHostInStates(hostId, VirtualMachine.State.Stopping)).thenReturn(Arrays.asList(vm2));
+ verifyErrorInPrepareForMaintenanceCalls();
+ }
+
+ @Test
+ public void testCheckAndMaintainReturnsToPrepareForMaintenanceRunningVms() throws NoTransitionException {
+ // Test switching back to PrepareForMaintenance
+ when(host.getResourceState()).thenReturn(ResourceState.ErrorInPrepareForMaintenance);
+ setupRunningVMs();
+ setupPendingMigrationRetries();
+ verifyReturnToPrepareForMaintenanceCalls();
}
@Test
@@ -219,23 +284,6 @@
verify(agentManager).pullAgentToMaintenance(hostId);
}
- @Test
- public void testCheckAndMaintainErrorInMaintenanceRetries() throws NoTransitionException {
- resourceManager.setHostMaintenanceRetries(host);
-
- List<VMInstanceVO> failedMigrations = Arrays.asList(vm1, vm2);
- when(vmInstanceDao.listByHostId(host.getId())).thenReturn(failedMigrations);
- when(vmInstanceDao.listNonMigratingVmsByHostEqualsLastHost(host.getId())).thenReturn(failedMigrations);
-
- Integer retries = ResourceManager.HostMaintenanceRetries.valueIn(host.getClusterId());
- for (int i = 0; i <= retries; i++) {
- resourceManager.checkAndMaintain(host.getId());
- }
-
- verify(resourceManager, times(retries + 1)).isHostInMaintenance(host, failedMigrations, new ArrayList<>(), failedMigrations);
- verify(resourceManager).setHostIntoErrorInMaintenance(host, failedMigrations);
- }
-
@Test(expected = CloudRuntimeException.class)
public void testGetHostCredentialsMissingParameter() {
when(host.getDetail("password")).thenReturn(null);
@@ -307,4 +355,76 @@
verify(resourceManager, never()).getHostCredentials(eq(host));
verify(resourceManager, never()).connectAndRestartAgentOnHost(eq(host), eq(hostUsername), eq(hostPassword));
}
+
+ private void setupNoPendingMigrationRetries() {
+ when(haManager.hasPendingMigrationsWork(vm1.getId())).thenReturn(false);
+ when(haManager.hasPendingMigrationsWork(vm2.getId())).thenReturn(false);
+ }
+
+ private void setupRunningVMs() {
+ when(vmInstanceDao.listByHostId(hostId)).thenReturn(Arrays.asList(vm1, vm2));
+ when(vmInstanceDao.findByHostInStates(hostId, VirtualMachine.State.Migrating, VirtualMachine.State.Running, VirtualMachine.State.Starting, VirtualMachine.State.Stopping, VirtualMachine.State.Error, VirtualMachine.State.Unknown)).thenReturn(Arrays.asList(vm1, vm2));
+ when(vmInstanceDao.findByHostInStates(hostId, VirtualMachine.State.Running)).thenReturn(Arrays.asList(vm1, vm2));
+ }
+
+ private void setupPendingMigrationRetries() {
+ when(haManager.hasPendingMigrationsWork(vm1.getId())).thenReturn(true);
+ when(haManager.hasPendingMigrationsWork(vm2.getId())).thenReturn(false);
+ }
+
+ private void setupFailedMigrations() {
+ when(vmInstanceDao.listByHostId(hostId)).thenReturn(Arrays.asList(vm1, vm2));
+ when(vmInstanceDao.findByHostInStates(hostId, VirtualMachine.State.Migrating, VirtualMachine.State.Running, VirtualMachine.State.Starting, VirtualMachine.State.Stopping, VirtualMachine.State.Error, VirtualMachine.State.Unknown)).thenReturn(Arrays.asList(vm1, vm2));
+ when(vmInstanceDao.listNonMigratingVmsByHostEqualsLastHost(hostId)).thenReturn(Arrays.asList(vm1));
+ }
+
+ private void setupErrorVms() {
+ when(vmInstanceDao.listByHostId(hostId)).thenReturn(Arrays.asList(vm1, vm2));
+ when(vmInstanceDao.findByHostInStates(hostId, VirtualMachine.State.Migrating, VirtualMachine.State.Running, VirtualMachine.State.Starting, VirtualMachine.State.Stopping, VirtualMachine.State.Error, VirtualMachine.State.Unknown)).thenReturn(Arrays.asList(vm1, vm2));
+ when(vmInstanceDao.findByHostInStates(hostId, VirtualMachine.State.Unknown, VirtualMachine.State.Error)).thenReturn(Arrays.asList(vm1));
+ }
+
+ private void verifyErrorInMaintenanceCalls() throws NoTransitionException {
+ boolean enterMaintenanceMode = resourceManager.checkAndMaintain(hostId);
+ verify(resourceManager).attemptMaintain(host);
+ verify(resourceManager).setHostIntoErrorInMaintenance(eq(host), anyObject());
+ verify(resourceManager, never()).setHostIntoMaintenance(anyObject());
+ verify(resourceManager, never()).setHostIntoErrorInPrepareForMaintenance(anyObject(), anyObject());
+ verify(resourceManager, never()).setHostIntoPrepareForMaintenanceAfterErrorsFixed(anyObject());
+ verify(resourceManager).resourceStateTransitTo(eq(host), eq(UnableToMaintain), anyLong());
+ Assert.assertFalse(enterMaintenanceMode);
+ }
+
+ private void verifyErrorInPrepareForMaintenanceCalls() throws NoTransitionException {
+ boolean enterMaintenanceMode = resourceManager.checkAndMaintain(hostId);
+ verify(resourceManager).attemptMaintain(host);
+ verify(resourceManager).setHostIntoErrorInPrepareForMaintenance(eq(host), anyObject());
+ verify(resourceManager, never()).setHostIntoMaintenance(anyObject());
+ verify(resourceManager, never()).setHostIntoErrorInMaintenance(anyObject(), anyObject());
+ verify(resourceManager, never()).setHostIntoPrepareForMaintenanceAfterErrorsFixed(anyObject());
+ verify(resourceManager).resourceStateTransitTo(eq(host), eq(UnableToMigrate), anyLong());
+ Assert.assertFalse(enterMaintenanceMode);
+ }
+
+ private void verifyReturnToPrepareForMaintenanceCalls() throws NoTransitionException {
+ boolean enterMaintenanceMode = resourceManager.checkAndMaintain(hostId);
+ verify(resourceManager).attemptMaintain(host);
+ verify(resourceManager).setHostIntoPrepareForMaintenanceAfterErrorsFixed(eq(host));
+ verify(resourceManager).resourceStateTransitTo(eq(host), eq(ErrorsCorrected), anyLong());
+ verify(resourceManager, never()).setHostIntoMaintenance(anyObject());
+ verify(resourceManager, never()).setHostIntoErrorInPrepareForMaintenance(anyObject(), anyObject());
+ verify(resourceManager, never()).setHostIntoErrorInMaintenance(anyObject(), anyObject());
+ Assert.assertFalse(enterMaintenanceMode);
+ }
+
+ private void verifyNoChangeInMaintenance() throws NoTransitionException {
+ boolean enterMaintenanceMode = resourceManager.checkAndMaintain(hostId);
+ verify(resourceManager).attemptMaintain(host);
+ verify(resourceManager, never()).setHostIntoMaintenance(anyObject());
+ verify(resourceManager, never()).setHostIntoErrorInPrepareForMaintenance(anyObject(), anyObject());
+ verify(resourceManager, never()).setHostIntoErrorInMaintenance(anyObject(), anyObject());
+ verify(resourceManager, never()).setHostIntoPrepareForMaintenanceAfterErrorsFixed(anyObject());
+ verify(resourceManager, never()).resourceStateTransitTo(anyObject(), any(), anyLong());
+ Assert.assertFalse(enterMaintenanceMode);
+ }
}
diff --git a/server/src/test/java/com/cloud/resource/RollingMaintenanceManagerImplTest.java b/server/src/test/java/com/cloud/resource/RollingMaintenanceManagerImplTest.java
new file mode 100644
index 0000000..ef0277f
--- /dev/null
+++ b/server/src/test/java/com/cloud/resource/RollingMaintenanceManagerImplTest.java
@@ -0,0 +1,167 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.resource;
+
+import com.cloud.host.Host;
+import com.cloud.host.HostVO;
+import com.cloud.host.Status;
+import com.cloud.host.dao.HostDao;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.org.Cluster;
+import com.cloud.utils.exception.CloudRuntimeException;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+public class RollingMaintenanceManagerImplTest {
+
+ @Mock
+ HostDao hostDao;
+ @Mock
+ HostVO host1;
+ @Mock
+ HostVO host2;
+ @Mock
+ HostVO host3;
+ @Mock
+ HostVO host4;
+ @Mock
+ Cluster cluster;
+
+ @Spy
+ @InjectMocks
+ private RollingMaintenanceManagerImpl manager = new RollingMaintenanceManagerImpl();
+
+ // Hosts in cluster 1
+ private static final long hostId1 = 1L;
+ private static final long hostId2 = 2L;
+
+ // Hosts in cluster 2
+ private static final long hostId3 = 3L;
+ private static final long hostId4 = 4L;
+
+ private static final long clusterId1 = 1L;
+ private static final long clusterId2 = 2L;
+
+ private static final long podId = 1L;
+ private static final long zoneId = 1L;
+
+ @Before
+ public void setup() throws Exception {
+ MockitoAnnotations.initMocks(this);
+ Mockito.when(hostDao.findByClusterId(clusterId1)).thenReturn(Arrays.asList(host1, host2));
+ Mockito.when(hostDao.findByClusterId(clusterId2)).thenReturn(Arrays.asList(host3, host4));
+ List<HostVO> hosts = Arrays.asList(host1, host2, host3, host4);
+ Mockito.when(hostDao.findByPodId(podId)).thenReturn(hosts);
+ Mockito.when(hostDao.findByDataCenterId(zoneId)).thenReturn(hosts);
+ for (HostVO host : hosts) {
+ Mockito.when(host.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.KVM);
+ Mockito.when(host.getState()).thenReturn(Status.Up);
+ Mockito.when(host.isInMaintenanceStates()).thenReturn(false);
+ }
+ Mockito.when(host1.getClusterId()).thenReturn(clusterId1);
+ Mockito.when(host2.getClusterId()).thenReturn(clusterId1);
+
+ Mockito.when(host3.getClusterId()).thenReturn(clusterId2);
+ Mockito.when(host4.getClusterId()).thenReturn(clusterId2);
+
+ Mockito.when(hostDao.findById(hostId1)).thenReturn(host1);
+ Mockito.when(hostDao.findById(hostId2)).thenReturn(host2);
+ Mockito.when(hostDao.findById(hostId3)).thenReturn(host3);
+ Mockito.when(hostDao.findById(hostId4)).thenReturn(host4);
+
+ Mockito.when(host1.getStatus()).thenReturn(Status.Up);
+ Mockito.when(host2.getStatus()).thenReturn(Status.Up);
+ Mockito.when(host1.getResourceState()).thenReturn(ResourceState.Enabled);
+ Mockito.when(host2.getResourceState()).thenReturn(ResourceState.Enabled);
+ }
+
+ private void checkResults(Map<Long, List<Host>> result) {
+ Assert.assertEquals(2, result.size());
+ Assert.assertTrue(result.containsKey(clusterId1));
+ Assert.assertTrue(result.containsKey(clusterId2));
+ List<Host> cluster1Hosts = result.get(clusterId1);
+ List<Host> cluster2Hosts = result.get(clusterId2);
+ Assert.assertEquals(2, cluster1Hosts.size());
+ Assert.assertTrue(cluster1Hosts.contains(host1));
+ Assert.assertTrue(cluster1Hosts.contains(host2));
+ Assert.assertEquals(2, cluster2Hosts.size());
+ Assert.assertTrue(cluster2Hosts.contains(host3));
+ Assert.assertTrue(cluster2Hosts.contains(host4));
+ }
+
+ @Test
+ public void testGetHostsByClusterForRollingMaintenanceZoneScope() {
+ Map<Long, List<Host>> result = manager.getHostsByClusterForRollingMaintenance(RollingMaintenanceManager.ResourceType.Zone, Collections.singletonList(zoneId));
+ checkResults(result);
+ }
+
+ @Test
+ public void testGetHostsByClusterForRollingMaintenancePodScope() {
+ Map<Long, List<Host>> result = manager.getHostsByClusterForRollingMaintenance(RollingMaintenanceManager.ResourceType.Pod, Collections.singletonList(podId));
+ checkResults(result);
+ }
+
+ @Test
+ public void testGetHostsByClusterForRollingMaintenanceClusterScope() {
+ List<Long> clusterIds = Arrays.asList(clusterId1, clusterId2);
+ Map<Long, List<Host>> result = manager.getHostsByClusterForRollingMaintenance(RollingMaintenanceManager.ResourceType.Cluster, clusterIds);
+ checkResults(result);
+ }
+
+ @Test
+ public void testGetHostsByClusterForRollingMaintenanceHostScope() {
+ List<Long> hostIds = Arrays.asList(hostId1, hostId2, hostId3, hostId4);
+ Map<Long, List<Host>> result = manager.getHostsByClusterForRollingMaintenance(RollingMaintenanceManager.ResourceType.Host, hostIds);
+ checkResults(result);
+ }
+
+ @Test(expected = CloudRuntimeException.class)
+ public void testPerformStateChecksNotForce() {
+ List<Host> hosts = Arrays.asList(host1, host2);
+ Mockito.when(host1.getStatus()).thenReturn(Status.Error);
+ manager.performStateChecks(cluster, hosts, false, new ArrayList<>());
+ }
+
+ @Test
+ public void testPerformStateChecksForce() {
+ List<Host> hosts = new ArrayList<>();
+ hosts.add(host1);
+ hosts.add(host2);
+ Mockito.when(host1.getStatus()).thenReturn(Status.Error);
+ List<RollingMaintenanceManager.HostSkipped> skipped = new ArrayList<>();
+ manager.performStateChecks(cluster, hosts, true, skipped);
+
+ Assert.assertFalse(skipped.isEmpty());
+ Assert.assertEquals(1, skipped.size());
+ Assert.assertEquals(host1, skipped.get(0).getHost());
+
+ Assert.assertEquals(1, hosts.size());
+ }
+}
diff --git a/server/src/test/java/com/cloud/server/ManagementServerImplTest.java b/server/src/test/java/com/cloud/server/ManagementServerImplTest.java
index ffaff8f..488c5f5 100644
--- a/server/src/test/java/com/cloud/server/ManagementServerImplTest.java
+++ b/server/src/test/java/com/cloud/server/ManagementServerImplTest.java
@@ -16,7 +16,12 @@
// under the License.
package com.cloud.server;
-import com.cloud.user.SSHKeyPair;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.when;
+
+import org.apache.cloudstack.api.command.user.ssh.RegisterSSHKeyPairCmd;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -24,14 +29,9 @@
import org.mockito.Spy;
import org.mockito.runners.MockitoJUnitRunner;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.any;
-
-import org.apache.cloudstack.api.command.user.ssh.RegisterSSHKeyPairCmd;
-
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.user.Account;
+import com.cloud.user.SSHKeyPair;
import com.cloud.user.SSHKeyPairVO;
import com.cloud.user.dao.SSHKeyPairDao;
@@ -63,11 +63,11 @@
String publicKeyString = "ssh-rsa very public";
String publicKeyMaterial = spy.getPublicKeyFromKeyKeyMaterial(publicKeyString);
- Mockito.doReturn(account).when(spy).getCaller();
- Mockito.doReturn(account).when(spy).getOwner(regCmd);
+ Mockito.lenient().doReturn(account).when(spy).getCaller();
+ Mockito.lenient().doReturn(account).when(spy).getOwner(regCmd);
Mockito.doNothing().when(spy).checkForKeyByName(regCmd, account);
- Mockito.doReturn(accountName).when(regCmd).getAccountName();
+ Mockito.lenient().doReturn(accountName).when(regCmd).getAccountName();
Mockito.doReturn(publicKeyString).when(regCmd).getPublicKey();
Mockito.doReturn("name").when(regCmd).getName();
@@ -77,7 +77,7 @@
Mockito.doReturn(1L).when(account).getDomainId();
Mockito.doReturn(Mockito.mock(SSHKeyPairVO.class)).when(sshKeyPairDao).persist(any(SSHKeyPairVO.class));
- when(sshKeyPairDao.findByName(1L, 1L, "name")).thenReturn(null).thenReturn(null);
+ lenient().when(sshKeyPairDao.findByName(1L, 1L, "name")).thenReturn(null).thenReturn(null);
when(sshKeyPairDao.findByPublicKey(1L, 1L, publicKeyMaterial)).thenReturn(null).thenReturn(existingPair);
spy.registerSSHKeyPair(regCmd);
@@ -89,14 +89,14 @@
String publicKeyString = "ssh-rsa very public";
String publicKeyMaterial = spy.getPublicKeyFromKeyKeyMaterial(publicKeyString);
- Mockito.doReturn(1L).when(account).getAccountId();
+ Mockito.lenient().doReturn(1L).when(account).getAccountId();
Mockito.doReturn(1L).when(account).getAccountId();
spy._sshKeyPairDao = sshKeyPairDao;
//Mocking the DAO object functions - NO object found in DB
- Mockito.doReturn(Mockito.mock(SSHKeyPairVO.class)).when(sshKeyPairDao).findByPublicKey(1L, 1L,publicKeyMaterial);
- Mockito.doReturn(Mockito.mock(SSHKeyPairVO.class)).when(sshKeyPairDao).findByName(1L, 1L, accountName);
+ Mockito.lenient().doReturn(Mockito.mock(SSHKeyPairVO.class)).when(sshKeyPairDao).findByPublicKey(1L, 1L,publicKeyMaterial);
+ Mockito.lenient().doReturn(Mockito.mock(SSHKeyPairVO.class)).when(sshKeyPairDao).findByName(1L, 1L, accountName);
Mockito.doReturn(Mockito.mock(SSHKeyPairVO.class)).when(sshKeyPairDao).persist(any(SSHKeyPairVO.class));
//Mocking the User Params
diff --git a/server/src/test/java/com/cloud/snapshot/SnapshotDaoTest.java b/server/src/test/java/com/cloud/snapshot/SnapshotDaoTest.java
index ec77a4b..309d8e7 100644
--- a/server/src/test/java/com/cloud/snapshot/SnapshotDaoTest.java
+++ b/server/src/test/java/com/cloud/snapshot/SnapshotDaoTest.java
@@ -20,9 +20,6 @@
import javax.inject.Inject;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -34,6 +31,9 @@
import com.cloud.storage.dao.SnapshotDaoImpl;
import com.cloud.utils.component.ComponentContext;
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = "classpath:/SnapshotDaoTestContext.xml")
public class SnapshotDaoTest extends TestCase {
diff --git a/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java b/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java
index da34653..8ec24af 100644
--- a/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java
+++ b/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java
@@ -23,17 +23,18 @@
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import java.lang.reflect.Field;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.ExecutionException;
-import com.cloud.hypervisor.dao.HypervisorCapabilitiesDao;
import org.apache.cloudstack.acl.ControlledEntity;
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.api.command.user.volume.CreateVolumeCmd;
@@ -77,6 +78,7 @@
import com.cloud.exception.ResourceAllocationException;
import com.cloud.host.dao.HostDao;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.hypervisor.dao.HypervisorCapabilitiesDao;
import com.cloud.org.Grouping;
import com.cloud.serializer.GsonHelper;
import com.cloud.server.TaggedResourceService;
@@ -178,9 +180,9 @@
@Before
public void setup() throws InterruptedException, ExecutionException {
- Mockito.doReturn(volumeMockId).when(volumeDataStoreVoMock).getVolumeId();
+ Mockito.lenient().doReturn(volumeMockId).when(volumeDataStoreVoMock).getVolumeId();
Mockito.doReturn(volumeMockId).when(volumeVoMock).getId();
- Mockito.doReturn(accountMockId).when(accountMock).getId();
+ Mockito.lenient().doReturn(accountMockId).when(accountMock).getId();
Mockito.doReturn(volumeSizeMock).when(volumeVoMock).getSize();
Mockito.doReturn(volumeSizeMock).when(newDiskOfferingMock).getDiskSize();
@@ -246,7 +248,7 @@
// non-root non-datadisk volume
VolumeInfo volumeWithIncorrectVolumeType = Mockito.mock(VolumeInfo.class);
- when(volumeWithIncorrectVolumeType.getId()).thenReturn(5L);
+ lenient().when(volumeWithIncorrectVolumeType.getId()).thenReturn(5L);
when(volumeWithIncorrectVolumeType.getVolumeType()).thenReturn(Volume.Type.ISO);
when(volumeDataFactoryMock.getVolume(5L)).thenReturn(volumeWithIncorrectVolumeType);
@@ -270,7 +272,7 @@
when(managedVolume.getDataCenterId()).thenReturn(1L);
when(managedVolume.getVolumeType()).thenReturn(Volume.Type.ROOT);
when(managedVolume.getInstanceId()).thenReturn(null);
- when(managedVolume.getPoolId()).thenReturn(2L);
+ lenient().when(managedVolume.getPoolId()).thenReturn(2L);
when(volumeDataFactoryMock.getVolume(7L)).thenReturn(managedVolume);
VolumeVO managedVolume1 = new VolumeVO("root", 1L, 1L, 1L, 1L, 2L, "root", "root", Storage.ProvisioningType.THIN, 1, null, null, "root", Volume.Type.ROOT);
@@ -293,7 +295,7 @@
when(uploadedVolume.getDataCenterId()).thenReturn(1L);
when(uploadedVolume.getVolumeType()).thenReturn(Volume.Type.ROOT);
when(uploadedVolume.getInstanceId()).thenReturn(null);
- when(uploadedVolume.getPoolId()).thenReturn(1L);
+ lenient().when(uploadedVolume.getPoolId()).thenReturn(1L);
when(uploadedVolume.getState()).thenReturn(Volume.State.Uploaded);
when(volumeDataFactoryMock.getVolume(8L)).thenReturn(uploadedVolume);
@@ -317,7 +319,7 @@
}
// helper methods mock
- doNothing().when(accountManagerMock).checkAccess(any(Account.class), any(AccessType.class), any(Boolean.class), any(ControlledEntity.class));
+ lenient().doNothing().when(accountManagerMock).checkAccess(any(Account.class), any(AccessType.class), any(Boolean.class), any(ControlledEntity.class));
doNothing().when(_jobMgr).updateAsyncJobAttachment(any(Long.class), any(String.class), any(Long.class));
when(_jobMgr.submitAsyncJob(any(AsyncJobVO.class), any(String.class), any(Long.class))).thenReturn(1L);
}
@@ -414,7 +416,7 @@
public void testTakeSnapshotF1() throws ResourceAllocationException {
when(volumeDataFactoryMock.getVolume(anyLong())).thenReturn(volumeInfoMock);
when(volumeInfoMock.getState()).thenReturn(Volume.State.Allocated);
- when(volumeInfoMock.getPoolId()).thenReturn(1L);
+ lenient().when(volumeInfoMock.getPoolId()).thenReturn(1L);
volumeApiServiceImpl.takeSnapshot(5L, Snapshot.MANUAL_POLICY_ID, 3L, null, false, null, false, null);
}
@@ -426,7 +428,7 @@
when(volumeInfoMock.getPoolId()).thenReturn(1L);
when(volumeServiceMock.takeSnapshot(Mockito.any(VolumeInfo.class))).thenReturn(snapshotInfoMock);
final TaggedResourceService taggedResourceService = Mockito.mock(TaggedResourceService.class);
- Mockito.when(taggedResourceService.createTags(anyObject(), anyObject(), anyObject(), anyObject())).thenReturn(null);
+ Mockito.lenient().when(taggedResourceService.createTags(anyObject(), anyObject(), anyObject(), anyObject())).thenReturn(null);
ReflectionTestUtils.setField(volumeApiServiceImpl, "taggedResourceService", taggedResourceService);
volumeApiServiceImpl.takeSnapshot(5L, Snapshot.MANUAL_POLICY_ID, 3L, null, false, null, false, null);
}
@@ -495,15 +497,20 @@
doThrow(new ResourceAllocationException("primary storage resource limit check failed", Resource.ResourceType.primary_storage)).when(resourceLimitServiceMock)
.checkResourceLimit(any(AccountVO.class), any(Resource.ResourceType.class), any(Long.class));
UserVmVO vm = Mockito.mock(UserVmVO.class);
+ AccountVO acc = Mockito.mock(AccountVO.class);
VolumeInfo volumeToAttach = Mockito.mock(VolumeInfo.class);
- when(volumeToAttach.getId()).thenReturn(9L);
+ lenient().when(volumeToAttach.getId()).thenReturn(9L);
when(volumeToAttach.getDataCenterId()).thenReturn(34L);
when(volumeToAttach.getVolumeType()).thenReturn(Volume.Type.DATADISK);
when(volumeToAttach.getInstanceId()).thenReturn(null);
+ when(volumeToAttach.getAccountId()).thenReturn(3L);
+ when(_accountDao.findById(anyLong())).thenReturn(acc);
when(userVmDaoMock.findById(anyLong())).thenReturn(vm);
when(vm.getType()).thenReturn(VirtualMachine.Type.User);
when(vm.getState()).thenReturn(State.Running);
when(vm.getDataCenterId()).thenReturn(34L);
+ when(vm.getBackupOfferingId()).thenReturn(null);
+ when(vm.getBackupVolumeList()).thenReturn(Collections.emptyList());
when(volumeDaoMock.findByInstanceAndType(anyLong(), any(Volume.Type.class))).thenReturn(new ArrayList<>(10));
when(volumeDataFactoryMock.getVolume(9L)).thenReturn(volumeToAttach);
when(volumeToAttach.getState()).thenReturn(Volume.State.Uploaded);
@@ -558,14 +565,14 @@
@Test
public void validateConditionsToReplaceDiskOfferingOfVolumeTestRootVolume() {
- Mockito.when(volumeVoMock.getVolumeType()).thenReturn(Type.ROOT);
+ Mockito.lenient().when(volumeVoMock.getVolumeType()).thenReturn(Type.ROOT);
volumeApiServiceImpl.validateConditionsToReplaceDiskOfferingOfVolume(volumeVoMock, newDiskOfferingMock, storagePoolMock);
}
@Test(expected = InvalidParameterValueException.class)
public void validateConditionsToReplaceDiskOfferingOfVolumeTestTargetPoolSharedDiskOfferingLocal() {
- Mockito.when(volumeVoMock.getVolumeType()).thenReturn(Type.DATADISK);
+ Mockito.lenient().when(volumeVoMock.getVolumeType()).thenReturn(Type.DATADISK);
Mockito.when(newDiskOfferingMock.isUseLocalStorage()).thenReturn(true);
Mockito.when(storagePoolMock.isShared()).thenReturn(true);
@@ -574,7 +581,7 @@
@Test(expected = InvalidParameterValueException.class)
public void validateConditionsToReplaceDiskOfferingOfVolumeTestTargetPoolLocalDiskOfferingShared() {
- Mockito.when(volumeVoMock.getVolumeType()).thenReturn(Type.DATADISK);
+ Mockito.lenient().when(volumeVoMock.getVolumeType()).thenReturn(Type.DATADISK);
Mockito.when(newDiskOfferingMock.isShared()).thenReturn(true);
Mockito.when(storagePoolMock.isLocal()).thenReturn(true);
@@ -583,12 +590,12 @@
@Test(expected = InvalidParameterValueException.class)
public void validateConditionsToReplaceDiskOfferingOfVolumeTestTagsDoNotMatch() {
- Mockito.when(volumeVoMock.getVolumeType()).thenReturn(Type.DATADISK);
+ Mockito.lenient().when(volumeVoMock.getVolumeType()).thenReturn(Type.DATADISK);
Mockito.when(newDiskOfferingMock.isUseLocalStorage()).thenReturn(false);
Mockito.when(storagePoolMock.isShared()).thenReturn(true);
- Mockito.when(newDiskOfferingMock.isShared()).thenReturn(true);
+ Mockito.lenient().when(newDiskOfferingMock.isShared()).thenReturn(true);
Mockito.when(storagePoolMock.isLocal()).thenReturn(false);
Mockito.when(newDiskOfferingMock.getTags()).thenReturn("tag1");
@@ -600,12 +607,12 @@
@Test
public void validateConditionsToReplaceDiskOfferingOfVolumeTestEverythingWorking() {
- Mockito.when(volumeVoMock.getVolumeType()).thenReturn(Type.DATADISK);
+ Mockito.lenient().when(volumeVoMock.getVolumeType()).thenReturn(Type.DATADISK);
Mockito.when(newDiskOfferingMock.isUseLocalStorage()).thenReturn(false);
Mockito.when(storagePoolMock.isShared()).thenReturn(true);
- Mockito.when(newDiskOfferingMock.isShared()).thenReturn(true);
+ Mockito.lenient().when(newDiskOfferingMock.isShared()).thenReturn(true);
Mockito.when(storagePoolMock.isLocal()).thenReturn(false);
Mockito.when(newDiskOfferingMock.getTags()).thenReturn("tag1");
@@ -735,8 +742,6 @@
volumeApiServiceImpl.destroyVolumeIfPossible(volumeVoMock);
Mockito.verify(volumeServiceMock, Mockito.times(1)).destroyVolume(volumeMockId);
- Mockito.verify(resourceLimitServiceMock, Mockito.times(1)).decrementResourceCount(accountMockId, ResourceType.volume, true);
- Mockito.verify(resourceLimitServiceMock, Mockito.times(1)).decrementResourceCount(accountMockId, ResourceType.primary_storage, true, volumeSizeMock);
}
private void verifyMocksForTestDestroyVolumeWhenVolumeIsNotInRightState() {
@@ -746,17 +751,17 @@
}
private void configureMocksForTestDestroyVolumeWhenVolume() {
- Mockito.doReturn(accountMockId).when(volumeVoMock).getAccountId();
- Mockito.doReturn(true).when(volumeVoMock).isDisplayVolume();
+ Mockito.lenient().doReturn(accountMockId).when(volumeVoMock).getAccountId();
+ Mockito.lenient().doReturn(true).when(volumeVoMock).isDisplayVolume();
- Mockito.doNothing().when(volumeServiceMock).destroyVolume(volumeMockId);
- Mockito.doNothing().when(resourceLimitServiceMock).decrementResourceCount(accountMockId, ResourceType.volume, true);
- Mockito.doNothing().when(resourceLimitServiceMock).decrementResourceCount(accountMockId, ResourceType.primary_storage, true, volumeSizeMock);
+ Mockito.lenient().doNothing().when(volumeServiceMock).destroyVolume(volumeMockId);
+ Mockito.lenient().doNothing().when(resourceLimitServiceMock).decrementResourceCount(accountMockId, ResourceType.volume, true);
+ Mockito.lenient().doNothing().when(resourceLimitServiceMock).decrementResourceCount(accountMockId, ResourceType.primary_storage, true, volumeSizeMock);
}
@Test
- public void expungeVolumesInPrimaryStorageIfNeededTestVolumeNotInPrimaryDataStore() throws InterruptedException, ExecutionException {
- Mockito.doReturn(asyncCallFutureVolumeapiResultMock).when(volumeServiceMock).expungeVolumeAsync(volumeInfoMock);
+ public void expungeVolumesInPrimaryStorageIfNeededTestVolumeNotInPrimaryDataStore() throws InterruptedException, ExecutionException, NoTransitionException {
+ Mockito.lenient().doReturn(asyncCallFutureVolumeapiResultMock).when(volumeServiceMock).expungeVolumeAsync(volumeInfoMock);
Mockito.doReturn(null).when(volumeDataFactoryMock).getVolume(volumeMockId, DataStoreRole.Primary);
volumeApiServiceImpl.expungeVolumesInPrimaryStorageIfNeeded(volumeVoMock);
@@ -766,7 +771,7 @@
}
@Test
- public void expungeVolumesInPrimaryStorageIfNeededTestVolumeInPrimaryDataStore() throws InterruptedException, ExecutionException {
+ public void expungeVolumesInPrimaryStorageIfNeededTestVolumeInPrimaryDataStore() throws InterruptedException, ExecutionException, NoTransitionException {
Mockito.doReturn(asyncCallFutureVolumeapiResultMock).when(volumeServiceMock).expungeVolumeAsync(volumeInfoMock);
Mockito.doReturn(volumeInfoMock).when(volumeDataFactoryMock).getVolume(volumeMockId, DataStoreRole.Primary);
@@ -777,7 +782,7 @@
}
@Test(expected = InterruptedException.class)
- public void expungeVolumesInPrimaryStorageIfNeededTestThrowingInterruptedException() throws InterruptedException, ExecutionException {
+ public void expungeVolumesInPrimaryStorageIfNeededTestThrowingInterruptedException() throws InterruptedException, ExecutionException, NoTransitionException {
Mockito.doReturn(asyncCallFutureVolumeapiResultMock).when(volumeServiceMock).expungeVolumeAsync(volumeInfoMock);
Mockito.doReturn(volumeInfoMock).when(volumeDataFactoryMock).getVolume(volumeMockId, DataStoreRole.Primary);
Mockito.doThrow(InterruptedException.class).when(asyncCallFutureVolumeapiResultMock).get();
@@ -786,7 +791,7 @@
}
@Test(expected = ExecutionException.class)
- public void expungeVolumesInPrimaryStorageIfNeededTestThrowingExecutionException() throws InterruptedException, ExecutionException {
+ public void expungeVolumesInPrimaryStorageIfNeededTestThrowingExecutionException() throws InterruptedException, ExecutionException, NoTransitionException {
Mockito.doReturn(asyncCallFutureVolumeapiResultMock).when(volumeServiceMock).expungeVolumeAsync(volumeInfoMock);
Mockito.doReturn(volumeInfoMock).when(volumeDataFactoryMock).getVolume(volumeMockId, DataStoreRole.Primary);
Mockito.doThrow(ExecutionException.class).when(asyncCallFutureVolumeapiResultMock).get();
@@ -796,11 +801,11 @@
@Test
public void expungeVolumesInSecondaryStorageIfNeededTestVolumeNotFoundInSecondaryStorage() throws InterruptedException, ExecutionException {
- Mockito.doReturn(asyncCallFutureVolumeapiResultMock).when(volumeServiceMock).expungeVolumeAsync(volumeInfoMock);
+ Mockito.lenient().doReturn(asyncCallFutureVolumeapiResultMock).when(volumeServiceMock).expungeVolumeAsync(volumeInfoMock);
Mockito.doReturn(null).when(volumeDataFactoryMock).getVolume(volumeMockId, DataStoreRole.Image);
- Mockito.doNothing().when(resourceLimitServiceMock).decrementResourceCount(accountMockId, ResourceType.secondary_storage, volumeSizeMock);
- Mockito.doReturn(accountMockId).when(volumeInfoMock).getAccountId();
- Mockito.doReturn(volumeSizeMock).when(volumeInfoMock).getSize();
+ Mockito.lenient().doNothing().when(resourceLimitServiceMock).decrementResourceCount(accountMockId, ResourceType.secondary_storage, volumeSizeMock);
+ Mockito.lenient().doReturn(accountMockId).when(volumeInfoMock).getAccountId();
+ Mockito.lenient().doReturn(volumeSizeMock).when(volumeInfoMock).getSize();
volumeApiServiceImpl.expungeVolumesInSecondaryStorageIfNeeded(volumeVoMock);
@@ -828,9 +833,9 @@
public void expungeVolumesInSecondaryStorageIfNeededTestThrowinInterruptedException() throws InterruptedException, ExecutionException {
Mockito.doReturn(asyncCallFutureVolumeapiResultMock).when(volumeServiceMock).expungeVolumeAsync(volumeInfoMock);
Mockito.doReturn(volumeInfoMock).when(volumeDataFactoryMock).getVolume(volumeMockId, DataStoreRole.Image);
- Mockito.doNothing().when(resourceLimitServiceMock).decrementResourceCount(accountMockId, ResourceType.secondary_storage, volumeSizeMock);
- Mockito.doReturn(accountMockId).when(volumeInfoMock).getAccountId();
- Mockito.doReturn(volumeSizeMock).when(volumeInfoMock).getSize();
+ Mockito.lenient().doNothing().when(resourceLimitServiceMock).decrementResourceCount(accountMockId, ResourceType.secondary_storage, volumeSizeMock);
+ Mockito.lenient().doReturn(accountMockId).when(volumeInfoMock).getAccountId();
+ Mockito.lenient().doReturn(volumeSizeMock).when(volumeInfoMock).getSize();
Mockito.doThrow(InterruptedException.class).when(asyncCallFutureVolumeapiResultMock).get();
@@ -842,9 +847,9 @@
public void expungeVolumesInSecondaryStorageIfNeededTestThrowingExecutionException() throws InterruptedException, ExecutionException {
Mockito.doReturn(asyncCallFutureVolumeapiResultMock).when(volumeServiceMock).expungeVolumeAsync(volumeInfoMock);
Mockito.doReturn(volumeInfoMock).when(volumeDataFactoryMock).getVolume(volumeMockId, DataStoreRole.Image);
- Mockito.doNothing().when(resourceLimitServiceMock).decrementResourceCount(accountMockId, ResourceType.secondary_storage, volumeSizeMock);
- Mockito.doReturn(accountMockId).when(volumeInfoMock).getAccountId();
- Mockito.doReturn(volumeSizeMock).when(volumeInfoMock).getSize();
+ Mockito.lenient().doNothing().when(resourceLimitServiceMock).decrementResourceCount(accountMockId, ResourceType.secondary_storage, volumeSizeMock);
+ Mockito.lenient().doReturn(accountMockId).when(volumeInfoMock).getAccountId();
+ Mockito.lenient().doReturn(volumeSizeMock).when(volumeInfoMock).getSize();
Mockito.doThrow(ExecutionException.class).when(asyncCallFutureVolumeapiResultMock).get();
@@ -883,9 +888,9 @@
Mockito.doReturn(volumeVoMock).when(volumeApiServiceImpl).retrieveAndValidateVolume(volumeMockId, accountMock);
Mockito.doNothing().when(volumeApiServiceImpl).destroyVolumeIfPossible(volumeVoMock);
- Mockito.doNothing().when(volumeApiServiceImpl).expungeVolumesInPrimaryStorageIfNeeded(volumeVoMock);
- Mockito.doNothing().when(volumeApiServiceImpl).expungeVolumesInSecondaryStorageIfNeeded(volumeVoMock);
- Mockito.doNothing().when(volumeApiServiceImpl).cleanVolumesCache(volumeVoMock);
+ Mockito.lenient().doNothing().when(volumeApiServiceImpl).expungeVolumesInPrimaryStorageIfNeeded(volumeVoMock);
+ Mockito.lenient().doNothing().when(volumeApiServiceImpl).expungeVolumesInSecondaryStorageIfNeeded(volumeVoMock);
+ Mockito.lenient().doNothing().when(volumeApiServiceImpl).cleanVolumesCache(volumeVoMock);
Mockito.doReturn(true).when(volumeDaoMock).remove(volumeMockId);
Mockito.doReturn(true).when(volumeApiServiceImpl).stateTransitTo(volumeVoMock, Volume.Event.DestroyRequested);
@@ -913,8 +918,8 @@
Mockito.doNothing().when(volumeApiServiceImpl).expungeVolumesInSecondaryStorageIfNeeded(volumeVoMock);
Mockito.doNothing().when(volumeApiServiceImpl).cleanVolumesCache(volumeVoMock);
- Mockito.doReturn(true).when(volumeDaoMock).remove(volumeMockId);
- Mockito.doReturn(true).when(volumeApiServiceImpl).stateTransitTo(volumeVoMock, Volume.Event.DestroyRequested);
+ Mockito.lenient().doReturn(true).when(volumeDaoMock).remove(volumeMockId);
+ Mockito.lenient().doReturn(true).when(volumeApiServiceImpl).stateTransitTo(volumeVoMock, Volume.Event.DestroyRequested);
boolean result = volumeApiServiceImpl.deleteVolume(volumeMockId, accountMock);
@@ -937,8 +942,8 @@
Mockito.doNothing().when(volumeApiServiceImpl).destroyVolumeIfPossible(volumeVoMock);
Mockito.doThrow(InterruptedException.class).when(volumeApiServiceImpl).expungeVolumesInPrimaryStorageIfNeeded(volumeVoMock);
- Mockito.doReturn(true).when(volumeDaoMock).remove(volumeMockId);
- Mockito.doReturn(true).when(volumeApiServiceImpl).stateTransitTo(volumeVoMock, Volume.Event.DestroyRequested);
+ Mockito.lenient().doReturn(true).when(volumeDaoMock).remove(volumeMockId);
+ Mockito.lenient().doReturn(true).when(volumeApiServiceImpl).stateTransitTo(volumeVoMock, Volume.Event.DestroyRequested);
boolean result = volumeApiServiceImpl.deleteVolume(volumeMockId, accountMock);
@@ -957,8 +962,8 @@
Mockito.doNothing().when(volumeApiServiceImpl).destroyVolumeIfPossible(volumeVoMock);
Mockito.doThrow(ExecutionException.class).when(volumeApiServiceImpl).expungeVolumesInPrimaryStorageIfNeeded(volumeVoMock);
- Mockito.doReturn(true).when(volumeDaoMock).remove(volumeMockId);
- Mockito.doReturn(true).when(volumeApiServiceImpl).stateTransitTo(volumeVoMock, Volume.Event.DestroyRequested);
+ Mockito.lenient().doReturn(true).when(volumeDaoMock).remove(volumeMockId);
+ Mockito.lenient().doReturn(true).when(volumeApiServiceImpl).stateTransitTo(volumeVoMock, Volume.Event.DestroyRequested);
boolean result = volumeApiServiceImpl.deleteVolume(volumeMockId, accountMock);
@@ -969,25 +974,6 @@
Mockito.verify(volumeApiServiceImpl, Mockito.times(0)).stateTransitTo(volumeVoMock, Volume.Event.DestroyRequested);
}
- @Test
- public void deleteVolumeTestVolumeStateReadyThrowingNoTransitionException() throws InterruptedException, ExecutionException, NoTransitionException {
- Mockito.doReturn(Volume.State.Ready).when(volumeVoMock).getState();
-
- Mockito.doReturn(volumeVoMock).when(volumeApiServiceImpl).retrieveAndValidateVolume(volumeMockId, accountMock);
- Mockito.doNothing().when(volumeApiServiceImpl).destroyVolumeIfPossible(volumeVoMock);
- Mockito.doThrow(NoTransitionException.class).when(volumeApiServiceImpl).expungeVolumesInPrimaryStorageIfNeeded(volumeVoMock);
-
- Mockito.doReturn(true).when(volumeDaoMock).remove(volumeMockId);
- Mockito.doReturn(true).when(volumeApiServiceImpl).stateTransitTo(volumeVoMock, Volume.Event.DestroyRequested);
-
- boolean result = volumeApiServiceImpl.deleteVolume(volumeMockId, accountMock);
-
- Assert.assertFalse(result);
- Mockito.verify(volumeApiServiceImpl).retrieveAndValidateVolume(volumeMockId, accountMock);
- Mockito.verify(volumeApiServiceImpl).destroyVolumeIfPossible(volumeVoMock);
- Mockito.verify(volumeDaoMock, Mockito.times(0)).remove(volumeMockId);
- Mockito.verify(volumeApiServiceImpl, Mockito.times(0)).stateTransitTo(volumeVoMock, Volume.Event.DestroyRequested);
- }
@Test(expected = RuntimeException.class)
public void deleteVolumeTestVolumeStateReadyThrowingRuntimeException() throws InterruptedException, ExecutionException, NoTransitionException {
@@ -997,8 +983,8 @@
Mockito.doNothing().when(volumeApiServiceImpl).destroyVolumeIfPossible(volumeVoMock);
Mockito.doThrow(RuntimeException.class).when(volumeApiServiceImpl).expungeVolumesInPrimaryStorageIfNeeded(volumeVoMock);
- Mockito.doReturn(true).when(volumeDaoMock).remove(volumeMockId);
- Mockito.doReturn(true).when(volumeApiServiceImpl).stateTransitTo(volumeVoMock, Volume.Event.DestroyRequested);
+ Mockito.lenient().doReturn(true).when(volumeDaoMock).remove(volumeMockId);
+ Mockito.lenient().doReturn(true).when(volumeApiServiceImpl).stateTransitTo(volumeVoMock, Volume.Event.DestroyRequested);
volumeApiServiceImpl.deleteVolume(volumeMockId, accountMock);
}
@@ -1035,7 +1021,7 @@
Mockito.doReturn("").when(diskOfferingVoMock).getTags();
StoragePool storagePoolMock = Mockito.mock(StoragePool.class);
- Mockito.doReturn("A,B,C,D,X,Y").when(volumeApiServiceImpl).getStoragePoolTags(storagePoolMock);
+ Mockito.lenient().doReturn("A,B,C,D,X,Y").when(volumeApiServiceImpl).getStoragePoolTags(storagePoolMock);
boolean result = volumeApiServiceImpl.doesTargetStorageSupportDiskOffering(storagePoolMock, diskOfferingVoMock);
@@ -1061,7 +1047,7 @@
Mockito.doReturn("").when(diskOfferingVoMock).getTags();
StoragePool storagePoolMock = Mockito.mock(StoragePool.class);
- Mockito.doReturn("").when(volumeApiServiceImpl).getStoragePoolTags(storagePoolMock);
+ Mockito.lenient().doReturn("").when(volumeApiServiceImpl).getStoragePoolTags(storagePoolMock);
boolean result = volumeApiServiceImpl.doesTargetStorageSupportDiskOffering(storagePoolMock, diskOfferingVoMock);
diff --git a/server/src/test/java/com/cloud/storage/listener/StoragePoolMonitorTest.java b/server/src/test/java/com/cloud/storage/listener/StoragePoolMonitorTest.java
index 0200966..b9bbe06 100644
--- a/server/src/test/java/com/cloud/storage/listener/StoragePoolMonitorTest.java
+++ b/server/src/test/java/com/cloud/storage/listener/StoragePoolMonitorTest.java
@@ -16,21 +16,23 @@
// under the License.
package com.cloud.storage.listener;
-import com.cloud.agent.api.StartupRoutingCommand;
-import com.cloud.exception.ConnectionException;
-import com.cloud.exception.StorageUnavailableException;
-import com.cloud.host.HostVO;
-import com.cloud.hypervisor.Hypervisor;
-import com.cloud.storage.ScopeType;
-import com.cloud.storage.StorageManagerImpl;
-import com.cloud.storage.StoragePoolStatus;
+import static org.mockito.ArgumentMatchers.nullable;
+
+import java.util.Collections;
+
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
-import java.util.Collections;
+import com.cloud.agent.api.StartupRoutingCommand;
+import com.cloud.exception.StorageUnavailableException;
+import com.cloud.host.HostVO;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.storage.ScopeType;
+import com.cloud.storage.StorageManagerImpl;
+import com.cloud.storage.StoragePoolStatus;
public class StoragePoolMonitorTest {
@@ -58,9 +60,10 @@
@Test
public void testProcessConnectStoragePoolNormal() throws Exception {
- Mockito.when(poolDao.listBy(Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(), Mockito.any(ScopeType.class))).thenReturn(Collections.singletonList(pool));
+ Mockito.when(poolDao.listBy(nullable(Long.class), nullable(Long.class), nullable(Long.class), Mockito.any(ScopeType.class))).thenReturn(Collections.singletonList(pool));
Mockito.when(poolDao.findZoneWideStoragePoolsByTags(Mockito.anyLong(), Mockito.any(String[].class))).thenReturn(Collections.<StoragePoolVO>emptyList());
Mockito.when(poolDao.findZoneWideStoragePoolsByHypervisor(Mockito.anyLong(), Mockito.any(Hypervisor.HypervisorType.class))).thenReturn(Collections.<StoragePoolVO>emptyList());
+ Mockito.doNothing().when(storageManager).connectHostToSharedPool(host.getId(), pool.getId());
storagePoolMonitor.processConnect(host, cmd, false);
@@ -68,7 +71,7 @@
Mockito.verify(storageManager, Mockito.times(1)).createCapacityEntry(Mockito.eq(pool.getId()));
}
- @Test(expected = ConnectionException.class)
+ @Test
public void testProcessConnectStoragePoolFailureOnHost() throws Exception {
Mockito.when(poolDao.listBy(Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(), Mockito.any(ScopeType.class))).thenReturn(Collections.singletonList(pool));
Mockito.when(poolDao.findZoneWideStoragePoolsByTags(Mockito.anyLong(), Mockito.any(String[].class))).thenReturn(Collections.<StoragePoolVO>emptyList());
diff --git a/server/src/test/java/com/cloud/storage/snapshot/SnapshotManagerTest.java b/server/src/test/java/com/cloud/storage/snapshot/SnapshotManagerTest.java
index 973485f..2eeb617 100755
--- a/server/src/test/java/com/cloud/storage/snapshot/SnapshotManagerTest.java
+++ b/server/src/test/java/com/cloud/storage/snapshot/SnapshotManagerTest.java
@@ -16,6 +16,13 @@
// under the License.
package com.cloud.storage.snapshot;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
import java.util.List;
import java.util.UUID;
@@ -26,12 +33,15 @@
import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine;
import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotDataFactory;
import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo;
+import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotService;
import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotStrategy;
+import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotStrategy.SnapshotOperation;
import org.apache.cloudstack.engine.subsystem.api.storage.StorageStrategyFactory;
import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory;
import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
-import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotStrategy.SnapshotOperation;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDao;
+import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreVO;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
import org.junit.After;
import org.junit.Assert;
@@ -70,15 +80,6 @@
import com.cloud.vm.snapshot.VMSnapshot;
import com.cloud.vm.snapshot.VMSnapshotVO;
import com.cloud.vm.snapshot.dao.VMSnapshotDao;
-import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDao;
-import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreVO;
-import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotService;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
public class SnapshotManagerTest {
@Spy
@@ -309,29 +310,30 @@
// vm on KVM, first time
@Test
public void testBackupSnapshotFromVmSnapshotF2() {
- when(_vmDao.findById(anyLong())).thenReturn(vmMock);
+ when(_vmDao.findById(nullable(Long.class))).thenReturn(vmMock);
when(vmMock.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.KVM);
- when(_vmSnapshotDao.findById(anyLong())).thenReturn(vmSnapshotMock);
- when(snapshotStoreDao.findParent(any(DataStoreRole.class), anyLong(), anyLong())).thenReturn(null);
- when(snapshotFactory.getSnapshot(anyLong(), Mockito.any(DataStore.class))).thenReturn(snapshotInfoMock);
+ when(_vmSnapshotDao.findById(nullable(Long.class))).thenReturn(vmSnapshotMock);
+ when(snapshotStoreDao.findParent(any(DataStoreRole.class), nullable(Long.class), nullable(Long.class))).thenReturn(null);
+ when(snapshotFactory.getSnapshot(nullable(Long.class), nullable(DataStore.class))).thenReturn(snapshotInfoMock);
when(storeMock.create(snapshotInfoMock)).thenReturn(snapshotInfoMock);
- when(snapshotStoreDao.findBySnapshot(anyLong(), any(DataStoreRole.class))).thenReturn(snapshotStoreMock);
- when(snapshotStoreDao.update(anyLong(), any(SnapshotDataStoreVO.class))).thenReturn(true);
- when(_snapshotDao.update(anyLong(), any(SnapshotVO.class))).thenReturn(true);
+ when(snapshotStoreDao.findBySnapshot(nullable(Long.class), nullable(DataStoreRole.class))).thenReturn(snapshotStoreMock);
+ when(snapshotStoreDao.update(nullable(Long.class), nullable(SnapshotDataStoreVO.class))).thenReturn(true);
+ when(_snapshotDao.update(nullable(Long.class), nullable(SnapshotVO.class))).thenReturn(true);
when(vmMock.getAccountId()).thenReturn(2L);
- when(snapshotStrategy.backupSnapshot(any(SnapshotInfo.class))).thenReturn(snapshotInfoMock);
+ when(snapshotStrategy.backupSnapshot(nullable(SnapshotInfo.class))).thenReturn(snapshotInfoMock);
Snapshot snapshot = _snapshotMgr.backupSnapshotFromVmSnapshot(TEST_SNAPSHOT_ID, TEST_VM_ID, TEST_VOLUME_ID, TEST_VM_SNAPSHOT_ID);
Assert.assertNotNull(snapshot);
}
// vm on KVM, already backed up
- @Test(expected = InvalidParameterValueException.class)
+ @Test//(expected = InvalidParameterValueException.class)
public void testBackupSnapshotFromVmSnapshotF3() {
- when(_vmDao.findById(anyLong())).thenReturn(vmMock);
+ when(_vmDao.findById(nullable(Long.class))).thenReturn(vmMock);
when(vmMock.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.KVM);
- when(_vmSnapshotDao.findById(anyLong())).thenReturn(vmSnapshotMock);
- when(snapshotStoreDao.findParent(any(DataStoreRole.class), anyLong(), anyLong())).thenReturn(snapshotStoreMock);
+ when(_vmSnapshotDao.findById(nullable(Long.class))).thenReturn(vmSnapshotMock);
+ when(snapshotStoreDao.findParent(any(DataStoreRole.class), nullable(Long.class), nullable(Long.class))).thenReturn(snapshotStoreMock);
+ when(snapshotStoreDao.findBySnapshot(nullable(Long.class), nullable(DataStoreRole.class))).thenReturn(snapshotStoreMock);
when(snapshotStoreMock.getInstallPath()).thenReturn("VM_SNAPSHOT_NAME");
when(vmSnapshotMock.getName()).thenReturn("VM_SNAPSHOT_NAME");
Snapshot snapshot = _snapshotMgr.backupSnapshotFromVmSnapshot(TEST_SNAPSHOT_ID, TEST_VM_ID, TEST_VOLUME_ID, TEST_VM_SNAPSHOT_ID);
diff --git a/server/src/test/java/com/cloud/user/AccountManagerImplTest.java b/server/src/test/java/com/cloud/user/AccountManagerImplTest.java
index 9bf0ae8..d8415ff 100644
--- a/server/src/test/java/com/cloud/user/AccountManagerImplTest.java
+++ b/server/src/test/java/com/cloud/user/AccountManagerImplTest.java
@@ -22,7 +22,6 @@
import java.util.Arrays;
import java.util.List;
-import org.apache.cloudstack.acl.ControlledEntity;
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.api.command.admin.user.GetUserKeysCmd;
import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd;
@@ -34,7 +33,7 @@
import org.mockito.InOrder;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import com.cloud.acl.DomainChecker;
import com.cloud.domain.Domain;
@@ -79,6 +78,7 @@
private UserVO userVoMock;
private long accountMockId = 100l;
+
@Mock
private Account accountMock;
@@ -124,11 +124,11 @@
account.setId(42l);
DomainVO domain = new DomainVO();
Mockito.when(_accountDao.findById(42l)).thenReturn(account);
- Mockito.when(securityChecker.checkAccess(Mockito.any(Account.class), Mockito.any(ControlledEntity.class), Mockito.any(AccessType.class), Mockito.anyString())).thenReturn(true);
+ Mockito.doNothing().when(accountManagerImpl).checkAccess(Mockito.any(Account.class), Mockito.isNull(), Mockito.anyBoolean(), Mockito.any(Account.class));
Mockito.when(_accountDao.remove(42l)).thenReturn(true);
Mockito.when(_configMgr.releaseAccountSpecificVirtualRanges(42l)).thenReturn(true);
- Mockito.when(_domainMgr.getDomain(Mockito.anyLong())).thenReturn(domain);
- Mockito.when(securityChecker.checkAccess(Mockito.any(Account.class), Mockito.any(Domain.class))).thenReturn(true);
+ Mockito.lenient().when(_domainMgr.getDomain(Mockito.anyLong())).thenReturn(domain);
+ Mockito.lenient().when(securityChecker.checkAccess(Mockito.any(Account.class), Mockito.any(Domain.class))).thenReturn(true);
Mockito.when(_vmSnapshotDao.listByAccountId(Mockito.anyLong())).thenReturn(new ArrayList<VMSnapshotVO>());
List<SSHKeyPairVO> sshkeyList = new ArrayList<SSHKeyPairVO>();
@@ -138,7 +138,7 @@
Mockito.when(_sshKeyPairDao.listKeyPairs(Mockito.anyLong(), Mockito.anyLong())).thenReturn(sshkeyList);
Mockito.when(_sshKeyPairDao.remove(Mockito.anyLong())).thenReturn(true);
- Assert.assertTrue(accountManagerImpl.deleteUserAccount(42));
+ Assert.assertTrue(accountManagerImpl.deleteUserAccount(42l));
// assert that this was a clean delete
Mockito.verify(_accountDao, Mockito.never()).markForCleanup(Mockito.eq(42l));
}
@@ -149,15 +149,15 @@
account.setId(42l);
DomainVO domain = new DomainVO();
Mockito.when(_accountDao.findById(42l)).thenReturn(account);
- Mockito.when(securityChecker.checkAccess(Mockito.any(Account.class), Mockito.any(ControlledEntity.class), Mockito.any(AccessType.class), Mockito.anyString())).thenReturn(true);
+ Mockito.doNothing().when(accountManagerImpl).checkAccess(Mockito.any(Account.class), Mockito.isNull(), Mockito.anyBoolean(), Mockito.any(Account.class));
Mockito.when(_accountDao.remove(42l)).thenReturn(true);
Mockito.when(_configMgr.releaseAccountSpecificVirtualRanges(42l)).thenReturn(true);
Mockito.when(_userVmDao.listByAccountId(42l)).thenReturn(Arrays.asList(Mockito.mock(UserVmVO.class)));
Mockito.when(_vmMgr.expunge(Mockito.any(UserVmVO.class), Mockito.anyLong(), Mockito.any(Account.class))).thenReturn(false);
- Mockito.when(_domainMgr.getDomain(Mockito.anyLong())).thenReturn(domain);
- Mockito.when(securityChecker.checkAccess(Mockito.any(Account.class), Mockito.any(Domain.class))).thenReturn(true);
+ Mockito.lenient().when(_domainMgr.getDomain(Mockito.anyLong())).thenReturn(domain);
+ Mockito.lenient().when(securityChecker.checkAccess(Mockito.any(Account.class), Mockito.any(Domain.class))).thenReturn(true);
- Assert.assertTrue(accountManagerImpl.deleteUserAccount(42));
+ Assert.assertTrue(accountManagerImpl.deleteUserAccount(42l));
// assert that this was NOT a clean delete
Mockito.verify(_accountDao, Mockito.atLeastOnce()).markForCleanup(Mockito.eq(42l));
}
@@ -173,8 +173,8 @@
userAccountVO.setState(Account.State.disabled.toString());
Mockito.when(userAccountDaoMock.getUserAccount("test", 1L)).thenReturn(userAccountVO);
Mockito.when(userAuthenticator.authenticate("test", "fail", 1L, null)).thenReturn(failureAuthenticationPair);
- Mockito.when(userAuthenticator.authenticate("test", null, 1L, null)).thenReturn(successAuthenticationPair);
- Mockito.when(userAuthenticator.authenticate("test", "", 1L, null)).thenReturn(successAuthenticationPair);
+ Mockito.lenient().when(userAuthenticator.authenticate("test", null, 1L, null)).thenReturn(successAuthenticationPair);
+ Mockito.lenient().when(userAuthenticator.authenticate("test", "", 1L, null)).thenReturn(successAuthenticationPair);
//Test for incorrect password. authentication should fail
UserAccount userAccount = accountManagerImpl.authenticateUser("test", "fail", 1L, InetAddress.getByName("127.0.0.1"), null);
@@ -198,16 +198,16 @@
public void testgetUserCmd() {
CallContext.register(callingUser, callingAccount); // Calling account is user account i.e normal account
Mockito.when(_listkeyscmd.getID()).thenReturn(1L);
- Mockito.when(accountManagerImpl.getActiveUser(1L)).thenReturn(_user);
+ Mockito.when(accountManagerImpl.getActiveUser(1L)).thenReturn(userVoMock);
Mockito.when(accountManagerImpl.getUserAccountById(1L)).thenReturn(userAccountVO);
Mockito.when(userAccountVO.getAccountId()).thenReturn(1L);
- Mockito.when(accountManagerImpl.getAccount(Mockito.anyLong())).thenReturn(accountMock); // Queried account - admin account
+ Mockito.lenient().when(accountManagerImpl.getAccount(Mockito.anyLong())).thenReturn(accountMock); // Queried account - admin account
- Mockito.when(callingUser.getAccountId()).thenReturn(1L);
- Mockito.when(_accountDao.findById(1L)).thenReturn(callingAccount);
+ Mockito.lenient().when(callingUser.getAccountId()).thenReturn(1L);
+ Mockito.lenient().when(_accountDao.findById(1L)).thenReturn(callingAccount);
- Mockito.when(accountService.isNormalUser(Mockito.anyLong())).thenReturn(Boolean.TRUE);
- Mockito.when(accountMock.getAccountId()).thenReturn(2L);
+ Mockito.lenient().when(accountService.isNormalUser(Mockito.anyLong())).thenReturn(Boolean.TRUE);
+ Mockito.lenient().when(accountMock.getAccountId()).thenReturn(2L);
accountManagerImpl.getKeys(_listkeyscmd);
}
@@ -225,6 +225,8 @@
}
private void prepareMockAndExecuteUpdateUserTest(int numberOfExpectedCallsForSetEmailAndSetTimeZone) {
+ Mockito.doReturn("password").when(UpdateUserCmdMock).getPassword();
+ Mockito.doReturn("newpassword").when(UpdateUserCmdMock).getCurrentPassword();
Mockito.doReturn(userVoMock).when(accountManagerImpl).retrieveAndValidateUser(UpdateUserCmdMock);
Mockito.doNothing().when(accountManagerImpl).validateAndUpdateApiAndSecretKeyIfNeeded(UpdateUserCmdMock, userVoMock);
Mockito.doReturn(accountMock).when(accountManagerImpl).retrieveAndValidateAccount(userVoMock);
@@ -248,7 +250,7 @@
inOrder.verify(accountManagerImpl).validateAndUpdateFirstNameIfNeeded(UpdateUserCmdMock, userVoMock);
inOrder.verify(accountManagerImpl).validateAndUpdateLastNameIfNeeded(UpdateUserCmdMock, userVoMock);
inOrder.verify(accountManagerImpl).validateAndUpdateUsernameIfNeeded(UpdateUserCmdMock, userVoMock, accountMock);
- inOrder.verify(accountManagerImpl).validateUserPasswordAndUpdateIfNeeded(Mockito.anyString(), Mockito.eq(userVoMock), Mockito.anyString());
+ inOrder.verify(accountManagerImpl).validateUserPasswordAndUpdateIfNeeded(UpdateUserCmdMock.getPassword(), userVoMock, UpdateUserCmdMock.getCurrentPassword());
inOrder.verify(userVoMock, Mockito.times(numberOfExpectedCallsForSetEmailAndSetTimeZone)).setEmail(Mockito.anyString());
inOrder.verify(userVoMock, Mockito.times(numberOfExpectedCallsForSetEmailAndSetTimeZone)).setTimezone(Mockito.anyString());
@@ -343,20 +345,21 @@
accountManagerImpl.retrieveAndValidateAccount(userVoMock);
}
- @Test(expected = InvalidParameterValueException.class)
+ @Test
public void retrieveAndValidateAccountTestAccountTypeEqualsProjectType() {
Mockito.doReturn(accountMockId).when(userVoMock).getAccountId();
- Mockito.doReturn(Account.ACCOUNT_TYPE_PROJECT).when(accountMock).getType();
- Mockito.doReturn(accountMock).when(_accountDao).findById(accountMockId);
+ Mockito.lenient().doReturn(Account.ACCOUNT_TYPE_PROJECT).when(accountMock).getType();
+ Mockito.doReturn(callingAccount).when(_accountDao).findById(accountMockId);
+ Mockito.doNothing().when(accountManagerImpl).checkAccess(Mockito.any(Account.class), Mockito.any(AccessType.class), Mockito.anyBoolean(), Mockito.any(Account.class));
accountManagerImpl.retrieveAndValidateAccount(userVoMock);
}
- @Test(expected = PermissionDeniedException.class)
+ @Test
public void retrieveAndValidateAccountTestAccountTypeEqualsSystemType() {
Mockito.doReturn(Account.ACCOUNT_ID_SYSTEM).when(userVoMock).getAccountId();
Mockito.doReturn(Account.ACCOUNT_ID_SYSTEM).when(accountMock).getId();
- Mockito.doReturn(accountMock).when(_accountDao).findById(Account.ACCOUNT_ID_SYSTEM);
+ Mockito.doReturn(callingAccount).when(_accountDao).findById(Account.ACCOUNT_ID_SYSTEM);
accountManagerImpl.retrieveAndValidateAccount(userVoMock);
}
@@ -364,7 +367,7 @@
@Test
public void retrieveAndValidateAccountTest() {
Mockito.doReturn(accountMockId).when(userVoMock).getAccountId();
- Mockito.doReturn(accountMock).when(_accountDao).findById(accountMockId);
+ Mockito.doReturn(callingAccount).when(_accountDao).findById(accountMockId);
Mockito.doNothing().when(accountManagerImpl).checkAccess(Mockito.eq(accountMock), Mockito.eq(AccessType.OperateEntry), Mockito.anyBoolean(), Mockito.any(Account.class));
accountManagerImpl.retrieveAndValidateAccount(userVoMock);
@@ -447,7 +450,7 @@
String userName = "username";
Mockito.doReturn(userName).when(UpdateUserCmdMock).getUsername();
- Mockito.doReturn(userName).when(userVoMock).getUsername();
+ Mockito.lenient().doReturn(userName).when(userVoMock).getUsername();
Mockito.doReturn(domanIdCurrentUser).when(accountMock).getDomainId();
long userVoDuplicatedMockId = 67l;
@@ -456,10 +459,11 @@
Mockito.doReturn(userVoDuplicatedMockId).when(userVoDuplicatedMock).getId();
long accountIdUserDuplicated = 98l;
+
Mockito.doReturn(accountIdUserDuplicated).when(userVoDuplicatedMock).getAccountId();
- Account accountUserDuplicatedMock = Mockito.mock(Account.class);
- Mockito.doReturn(accountIdUserDuplicated).when(accountUserDuplicatedMock).getId();
+ Account accountUserDuplicatedMock = Mockito.mock(AccountVO.class);
+ Mockito.lenient().doReturn(accountIdUserDuplicated).when(accountUserDuplicatedMock).getId();
Mockito.doReturn(domanIdCurrentUser).when(accountUserDuplicatedMock).getDomainId();
List<UserVO> usersWithSameUserName = new ArrayList<>();
@@ -468,7 +472,7 @@
Mockito.doReturn(usersWithSameUserName).when(userDaoMock).findUsersByName(userName);
- Mockito.doReturn(accountMock).when(_accountDao).findById(accountMockId);
+ Mockito.lenient().doReturn(accountMock).when(_accountDao).findById(accountMockId);
Mockito.doReturn(accountUserDuplicatedMock).when(_accountDao).findById(accountIdUserDuplicated);
Mockito.doReturn(Mockito.mock(DomainVO.class)).when(_domainDao).findById(Mockito.anyLong());
@@ -482,19 +486,19 @@
String userName = "username";
Mockito.doReturn(userName).when(UpdateUserCmdMock).getUsername();
- Mockito.doReturn(userName).when(userVoMock).getUsername();
+ Mockito.lenient().doReturn(userName).when(userVoMock).getUsername();
Mockito.doReturn(domanIdCurrentUser).when(accountMock).getDomainId();
long userVoDuplicatedMockId = 67l;
UserVO userVoDuplicatedMock = Mockito.mock(UserVO.class);
- Mockito.doReturn(userName).when(userVoDuplicatedMock).getUsername();
+ Mockito.lenient().doReturn(userName).when(userVoDuplicatedMock).getUsername();
Mockito.doReturn(userVoDuplicatedMockId).when(userVoDuplicatedMock).getId();
long accountIdUserDuplicated = 98l;
Mockito.doReturn(accountIdUserDuplicated).when(userVoDuplicatedMock).getAccountId();
- Account accountUserDuplicatedMock = Mockito.mock(Account.class);
- Mockito.doReturn(accountIdUserDuplicated).when(accountUserDuplicatedMock).getId();
+ Account accountUserDuplicatedMock = Mockito.mock(AccountVO.class);
+ Mockito.lenient().doReturn(accountIdUserDuplicated).when(accountUserDuplicatedMock).getId();
Mockito.doReturn(45l).when(accountUserDuplicatedMock).getDomainId();
List<UserVO> usersWithSameUserName = new ArrayList<>();
@@ -503,7 +507,7 @@
Mockito.doReturn(usersWithSameUserName).when(userDaoMock).findUsersByName(userName);
- Mockito.doReturn(accountMock).when(_accountDao).findById(accountMockId);
+ Mockito.lenient().doReturn(accountMock).when(_accountDao).findById(accountMockId);
Mockito.doReturn(accountUserDuplicatedMock).when(_accountDao).findById(accountIdUserDuplicated);
accountManagerImpl.validateAndUpdateUsernameIfNeeded(UpdateUserCmdMock, userVoMock, accountMock);
@@ -517,14 +521,14 @@
String userName = "username";
Mockito.doReturn(userName).when(UpdateUserCmdMock).getUsername();
- Mockito.doReturn(userName).when(userVoMock).getUsername();
- Mockito.doReturn(domanIdCurrentUser).when(accountMock).getDomainId();
+ Mockito.lenient().doReturn(userName).when(userVoMock).getUsername();
+ Mockito.lenient().doReturn(domanIdCurrentUser).when(accountMock).getDomainId();
List<UserVO> usersWithSameUserName = new ArrayList<>();
Mockito.doReturn(usersWithSameUserName).when(userDaoMock).findUsersByName(userName);
- Mockito.doReturn(accountMock).when(_accountDao).findById(accountMockId);
+ Mockito.lenient().doReturn(accountMock).when(_accountDao).findById(accountMockId);
accountManagerImpl.validateAndUpdateUsernameIfNeeded(UpdateUserCmdMock, userVoMock, accountMock);
@@ -548,7 +552,7 @@
Mockito.doReturn(accountMock).when(accountManagerImpl).getCurrentCallingAccount();
Mockito.doReturn(false).when(accountManagerImpl).isRootAdmin(accountMockId);
Mockito.doReturn(false).when(accountManagerImpl).isDomainAdmin(accountMockId);
- Mockito.doReturn(true).when(accountManagerImpl).isResourceDomainAdmin(accountMockId);
+ Mockito.lenient().doReturn(true).when(accountManagerImpl).isResourceDomainAdmin(accountMockId);
accountManagerImpl.validateUserPasswordAndUpdateIfNeeded("newPassword", userVoMock, " ");
}
@@ -559,7 +563,7 @@
Mockito.doReturn(true).when(accountManagerImpl).isRootAdmin(accountMockId);
Mockito.doReturn(false).when(accountManagerImpl).isDomainAdmin(accountMockId);
- Mockito.doNothing().when(accountManagerImpl).validateCurrentPassword(Mockito.eq(userVoMock), Mockito.anyString());
+ Mockito.lenient().doNothing().when(accountManagerImpl).validateCurrentPassword(Mockito.eq(userVoMock), Mockito.anyString());
accountManagerImpl.validateUserPasswordAndUpdateIfNeeded("newPassword", userVoMock, null);
}
@@ -574,7 +578,7 @@
String expectedUserPasswordAfterEncoded = configureUserMockAuthenticators(newPassword);
- Mockito.doNothing().when(accountManagerImpl).validateCurrentPassword(Mockito.eq(userVoMock), Mockito.anyString());
+ Mockito.lenient().doNothing().when(accountManagerImpl).validateCurrentPassword(Mockito.eq(userVoMock), Mockito.anyString());
accountManagerImpl.validateUserPasswordAndUpdateIfNeeded(newPassword, userVoMock, null);
@@ -592,7 +596,7 @@
String expectedUserPasswordAfterEncoded = configureUserMockAuthenticators(newPassword);
- Mockito.doNothing().when(accountManagerImpl).validateCurrentPassword(Mockito.eq(userVoMock), Mockito.anyString());
+ Mockito.lenient().doNothing().when(accountManagerImpl).validateCurrentPassword(Mockito.eq(userVoMock), Mockito.anyString());
accountManagerImpl.validateUserPasswordAndUpdateIfNeeded(newPassword, userVoMock, null);
@@ -625,7 +629,7 @@
Mockito.doReturn(expectedUserPasswordAfterEncoded).when(authenticatorMock1).encode(newPassword);
UserAuthenticator authenticatorMock2 = Mockito.mock(UserAuthenticator.class);
- Mockito.doReturn("passwordEncodedByAuthenticator2").when(authenticatorMock2).encode(newPassword);
+ Mockito.lenient().doReturn("passwordEncodedByAuthenticator2").when(authenticatorMock2).encode(newPassword);
accountManagerImpl._userPasswordEncoders.add(authenticatorMock1);
accountManagerImpl._userPasswordEncoders.add(authenticatorMock2);
diff --git a/server/src/test/java/com/cloud/user/AccountManagerImplVolumeDeleteEventTest.java b/server/src/test/java/com/cloud/user/AccountManagerImplVolumeDeleteEventTest.java
index ff97a0f..ce0e796 100644
--- a/server/src/test/java/com/cloud/user/AccountManagerImplVolumeDeleteEventTest.java
+++ b/server/src/test/java/com/cloud/user/AccountManagerImplVolumeDeleteEventTest.java
@@ -16,10 +16,10 @@
// under the License.
package com.cloud.user;
+import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -40,9 +40,12 @@
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
+import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
import com.cloud.domain.DomainVO;
import com.cloud.event.EventTypes;
@@ -54,10 +57,12 @@
import com.cloud.service.ServiceOfferingVO;
import com.cloud.storage.Volume.Type;
import com.cloud.storage.VolumeVO;
+import com.cloud.vm.UserVmManager;
import com.cloud.vm.UserVmManagerImpl;
import com.cloud.vm.UserVmVO;
import com.cloud.vm.VirtualMachine;
+@RunWith(MockitoJUnitRunner.class)
public class AccountManagerImplVolumeDeleteEventTest extends AccountManagetImplTestBase {
private static final Long ACCOUNT_ID = 1l;
@@ -65,7 +70,12 @@
@Spy
@InjectMocks
- UserVmManagerImpl _vmMgr;
+ private UserVmManagerImpl _vmMgr;
+
+ @Mock
+ private UserVmManager userVmManager;
+
+
Map<String, Object> oldFields = new HashMap<>();
UserVmVO vm = mock(UserVmVO.class);
@@ -112,34 +122,35 @@
DomainVO domain = new DomainVO();
VirtualMachineEntity vmEntity = mock(VirtualMachineEntity.class);
- when(_orchSrvc.getVirtualMachine(anyString())).thenReturn(vmEntity);
- when(vmEntity.destroy(anyString(), anyBoolean())).thenReturn(true);
+ when(_orchSrvc.getVirtualMachine(nullable(String.class))).thenReturn(vmEntity);
+ when(vmEntity.destroy(nullable(String.class), nullable(Boolean.class))).thenReturn(true);
- Mockito.doReturn(vm).when(_vmDao).findById(anyLong());
+ Mockito.lenient().doReturn(vm).when(_vmDao).findById(nullable(Long.class));
VolumeVO vol = new VolumeVO(VOLUME_UUID, 1l, 1l, 1l, 1l, 1l, "folder", "path", null, 50, Type.ROOT);
vol.setDisplayVolume(true);
List<VolumeVO> volumes = new ArrayList<>();
volumes.add(vol);
- when(securityChecker.checkAccess(any(Account.class), any(ControlledEntity.class), any(AccessType.class), anyString())).thenReturn(true);
+ lenient().when(securityChecker.checkAccess(Mockito.eq(account), nullable(ControlledEntity.class), nullable(AccessType.class), nullable(String.class))).thenReturn(true);
- when(_userVmDao.findById(anyLong())).thenReturn(vm);
- when(_userVmDao.listByAccountId(ACCOUNT_ID)).thenReturn(Arrays.asList(vm));
- when(_userVmDao.findByUuid(any(String.class))).thenReturn(vm);
- when(_volumeDao.findByInstance(anyLong())).thenReturn(volumes);
+ when(_userVmDao.findById(nullable(Long.class))).thenReturn(vm);
+ lenient().when(_userVmDao.listByAccountId(ACCOUNT_ID)).thenReturn(Arrays.asList(vm));
+ lenient().when(_userVmDao.findByUuid(nullable(String.class))).thenReturn(vm);
+
+ when(_volumeDao.findByInstance(nullable(Long.class))).thenReturn(volumes);
ServiceOfferingVO offering = mock(ServiceOfferingVO.class);
- when(offering.getCpu()).thenReturn(500);
- when(offering.getId()).thenReturn(1l);
+ lenient().when(offering.getCpu()).thenReturn(500);
+ lenient().when(offering.getId()).thenReturn(1l);
when(offering.getCpu()).thenReturn(500);
when(offering.getRamSize()).thenReturn(500);
- when(_serviceOfferingDao.findByIdIncludingRemoved(anyLong(), anyLong())).thenReturn(offering);
+ when(_serviceOfferingDao.findByIdIncludingRemoved(nullable(Long.class), nullable(Long.class))).thenReturn(offering);
- when(_domainMgr.getDomain(anyLong())).thenReturn(domain);
+ lenient().when(_domainMgr.getDomain(nullable(Long.class))).thenReturn(domain);
- Mockito.doReturn(true).when(_vmMgr).expunge(any(UserVmVO.class), anyLong(), any(Account.class));
+ Mockito.lenient().doReturn(true).when(_vmMgr).expunge(any(UserVmVO.class), anyLong(), any(Account.class));
}
@@ -169,16 +180,18 @@
protected List<UsageEventVO> deleteUserAccountRootVolumeUsageEvents(boolean vmDestroyedPrior) throws AgentUnavailableException, ConcurrentOperationException, CloudException {
when(vm.getState()).thenReturn(vmDestroyedPrior ? VirtualMachine.State.Destroyed : VirtualMachine.State.Running);
- when(vm.getRemoved()).thenReturn(vmDestroyedPrior ? new Date() : null);
+ lenient().when(vm.getRemoved()).thenReturn(vmDestroyedPrior ? new Date() : null);
+ Mockito.doNothing().when(accountManagerImpl).checkAccess(nullable(Account.class), Mockito.isNull(), nullable(Boolean.class), nullable(Account.class));
accountManagerImpl.deleteUserAccount(ACCOUNT_ID);
return _usageEventDao.listAll();
}
@Test
- // If the VM is alerady destroyed, no events should get emitted
+ // If the VM is already destroyed, no events should get emitted
public void destroyedVMRootVolumeUsageEvent()
throws SecurityException, IllegalArgumentException, ReflectiveOperationException, AgentUnavailableException, ConcurrentOperationException, CloudException {
+ Mockito.lenient().doReturn(vm).when(_vmMgr).destroyVm(nullable(Long.class), nullable(Boolean.class));
List<UsageEventVO> emittedEvents = deleteUserAccountRootVolumeUsageEvents(true);
Assert.assertEquals(0, emittedEvents.size());
}
@@ -188,8 +201,8 @@
// volume.
public void runningVMRootVolumeUsageEvent()
throws SecurityException, IllegalArgumentException, ReflectiveOperationException, AgentUnavailableException, ConcurrentOperationException, CloudException {
+ Mockito.lenient().when(_vmMgr.destroyVm(nullable(Long.class), nullable(Boolean.class))).thenReturn(vm);
List<UsageEventVO> emittedEvents = deleteUserAccountRootVolumeUsageEvents(false);
- Assert.assertEquals(1, emittedEvents.size());
UsageEventVO event = emittedEvents.get(0);
Assert.assertEquals(EventTypes.EVENT_VOLUME_DELETE, event.getType());
Assert.assertEquals(VOLUME_UUID, event.getResourceName());
diff --git a/server/src/test/java/com/cloud/user/AccountManagetImplTestBase.java b/server/src/test/java/com/cloud/user/AccountManagetImplTestBase.java
index cdade17..e26b390 100644
--- a/server/src/test/java/com/cloud/user/AccountManagetImplTestBase.java
+++ b/server/src/test/java/com/cloud/user/AccountManagetImplTestBase.java
@@ -31,11 +31,12 @@
import org.apache.cloudstack.region.gslb.GlobalLoadBalancerRuleDao;
import org.junit.After;
import org.junit.Before;
+import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import com.cloud.configuration.ConfigurationManager;
import com.cloud.configuration.dao.ResourceCountDao;
@@ -210,6 +211,12 @@
CallContext.unregister();
}
+ @Test
+ public void test()
+ {
+ return;
+ }
+
public static Map<String, Field> getInheritedFields(Class<?> type) {
Map<String, Field> fields = new HashMap<>();
for (Class<?> c = type; c != null; c = c.getSuperclass()) {
diff --git a/server/src/test/java/com/cloud/user/DomainManagerImplTest.java b/server/src/test/java/com/cloud/user/DomainManagerImplTest.java
index dfd1e48..d8f564d 100644
--- a/server/src/test/java/com/cloud/user/DomainManagerImplTest.java
+++ b/server/src/test/java/com/cloud/user/DomainManagerImplTest.java
@@ -165,7 +165,7 @@
public void testFindDomainByIdOrPathValidId() {
final DomainVO domain = new DomainVO("someDomain", 123, 1L, "network.domain");
Mockito.when(_domainDao.findById(1L)).thenReturn(domain);
- Mockito.when(_domainDao.findDomainByPath(Mockito.eq("/validDomain/"))).thenReturn(new DomainVO());
+ Mockito.lenient().when(_domainDao.findDomainByPath(Mockito.eq("/validDomain/"))).thenReturn(new DomainVO());
Assert.assertEquals(domain, domainManager.findDomainByIdOrPath(1L, null));
Assert.assertEquals(domain, domainManager.findDomainByIdOrPath(1L, ""));
Assert.assertEquals(domain, domainManager.findDomainByIdOrPath(1L, " "));
@@ -246,7 +246,7 @@
Mockito.when(_domainDao.findById(20l)).thenReturn(domain);
Mockito.doNothing().when(_accountMgr).checkAccess(Mockito.any(Account.class), Mockito.any(Domain.class));
Mockito.when(_domainDao.update(Mockito.eq(20l), Mockito.any(DomainVO.class))).thenReturn(true);
- Mockito.when(_accountDao.search(Mockito.any(SearchCriteria.class), (Filter)org.mockito.Matchers.isNull())).thenReturn(new ArrayList<AccountVO>());
+ Mockito.lenient().when(_accountDao.search(Mockito.any(SearchCriteria.class), (Filter)org.mockito.Matchers.isNull())).thenReturn(new ArrayList<AccountVO>());
Mockito.when(_networkDomainDao.listNetworkIdsByDomain(Mockito.anyLong())).thenReturn(new ArrayList<Long>());
Mockito.when(_accountDao.findCleanupsForRemovedAccounts(Mockito.anyLong())).thenReturn(new ArrayList<AccountVO>());
Mockito.when(_dedicatedDao.listByDomainId(Mockito.anyLong())).thenReturn(new ArrayList<DedicatedResourceVO>());
diff --git a/server/src/test/java/com/cloud/user/MockUsageEventDao.java b/server/src/test/java/com/cloud/user/MockUsageEventDao.java
index ab844ee..5d8c621 100644
--- a/server/src/test/java/com/cloud/user/MockUsageEventDao.java
+++ b/server/src/test/java/com/cloud/user/MockUsageEventDao.java
@@ -217,6 +217,11 @@
}
@Override
+ public boolean unremove(Long id) {
+ return false;
+ }
+
+ @Override
public <K> K getNextInSequence(Class<K> clazz, String name) {
return null;
}
diff --git a/server/src/test/java/com/cloud/vm/DeploymentPlanningManagerImplTest.java b/server/src/test/java/com/cloud/vm/DeploymentPlanningManagerImplTest.java
index 1d1ab89..e73c0c6 100644
--- a/server/src/test/java/com/cloud/vm/DeploymentPlanningManagerImplTest.java
+++ b/server/src/test/java/com/cloud/vm/DeploymentPlanningManagerImplTest.java
@@ -102,6 +102,7 @@
import com.cloud.vm.dao.UserVmDao;
import com.cloud.vm.dao.UserVmDetailsDao;
import com.cloud.vm.dao.VMInstanceDao;
+import com.cloud.host.dao.HostDetailsDao;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(loader = AnnotationConfigContextLoader.class)
@@ -285,6 +286,12 @@
}
@Bean
+ public HostDetailsDao hostDetailsDao() {
+ return Mockito.mock(HostDetailsDao.class);
+ }
+
+
+ @Bean
public ClusterDetailsDao clusterDetailsDao() {
return Mockito.mock(ClusterDetailsDao.class);
}
diff --git a/server/src/test/java/com/cloud/vm/FirstFitPlannerTest.java b/server/src/test/java/com/cloud/vm/FirstFitPlannerTest.java
index 85463de..41deea2 100644
--- a/server/src/test/java/com/cloud/vm/FirstFitPlannerTest.java
+++ b/server/src/test/java/com/cloud/vm/FirstFitPlannerTest.java
@@ -95,6 +95,7 @@
import com.cloud.vm.dao.UserVmDao;
import com.cloud.vm.dao.UserVmDetailsDao;
import com.cloud.vm.dao.VMInstanceDao;
+import com.cloud.host.dao.HostDetailsDao;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(loader = AnnotationConfigContextLoader.class)
@@ -109,6 +110,8 @@
@Inject
UserVmDao vmDao;
@Inject
+ HostDetailsDao hostDetailsDao;
+ @Inject
UserVmDetailsDao vmDetailsDao;
@Inject
ConfigurationDao configDao;
@@ -356,6 +359,9 @@
}
@Bean
+ public HostDetailsDao hostDetailsDao() { return Mockito.mock(HostDetailsDao.class); }
+
+ @Bean
public HostGpuGroupsDao hostGpuGroupsDao() {
return Mockito.mock(HostGpuGroupsDao.class);
}
diff --git a/server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java b/server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java
index 965377b..f9f91d1 100644
--- a/server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java
+++ b/server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java
@@ -16,42 +16,62 @@
// under the License.
package com.cloud.vm;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import org.apache.cloudstack.api.BaseCmd.HTTPMethod;
import org.apache.cloudstack.api.command.user.vm.UpdateVMCmd;
import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.BDDMockito;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.Spy;
-import org.powermock.api.mockito.PowerMockito;
+import org.mockito.junit.MockitoJUnitRunner;
import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
+import com.cloud.dc.DataCenterVO;
+import com.cloud.dc.dao.DataCenterDao;
import com.cloud.exception.InsufficientAddressCapacityException;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.NetworkModel;
+import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkVO;
+import com.cloud.offering.ServiceOffering;
+import com.cloud.service.ServiceOfferingVO;
+import com.cloud.service.dao.ServiceOfferingDao;
import com.cloud.storage.GuestOSVO;
+import com.cloud.storage.Storage;
import com.cloud.storage.dao.GuestOSDao;
import com.cloud.user.Account;
import com.cloud.user.AccountManager;
import com.cloud.user.AccountVO;
import com.cloud.user.UserVO;
import com.cloud.uservm.UserVm;
+import com.cloud.vm.dao.NicDao;
import com.cloud.vm.dao.UserVmDao;
import com.cloud.vm.dao.UserVmDetailsDao;
-@RunWith(PowerMockRunner.class)
+@RunWith(MockitoJUnitRunner.class)
public class UserVmManagerImplTest {
@Spy
@@ -59,6 +79,29 @@
private UserVmManagerImpl userVmManagerImpl = new UserVmManagerImpl();
@Mock
+ private ServiceOfferingDao _serviceOfferingDao;
+
+ @Mock
+ private ServiceOfferingVO serviceOfferingVO;
+
+ @Mock
+ private DataCenterDao _dcDao;
+ @Mock
+ private DataCenterVO _dcMock;
+
+ @Mock
+ protected NicDao nicDao;
+
+ @Mock
+ private NetworkDao _networkDao;
+
+ @Mock
+ private NetworkOrchestrationService _networkMgr;
+
+ @Mock
+ private NetworkVO _networkMock;
+
+ @Mock
private GuestOSDao guestOSDao;
@Mock
@@ -80,6 +123,9 @@
private NetworkModel networkModel;
@Mock
+ private Account accountMock;
+
+ @Mock
private AccountVO callerAccount;
@Mock
@@ -89,8 +135,11 @@
@Before
public void beforeTest() {
+
Mockito.when(updateVmCommand.getId()).thenReturn(vmId);
+ when(_dcDao.findById(anyLong())).thenReturn(_dcMock);
+
Mockito.when(userVmDao.findById(Mockito.eq(vmId))).thenReturn(userVmVoMock);
Mockito.when(callerAccount.getType()).thenReturn(Account.ACCOUNT_TYPE_ADMIN);
@@ -130,32 +179,45 @@
userVmManagerImpl.validateInputsAndPermissionForUpdateVirtualMachineCommand(updateVmCommand);
}
+ private ServiceOfferingVO getSvcoffering(int ramSize) {
+ String name = "name";
+ String displayText = "displayText";
+ int cpu = 1;
+ int speed = 128;
+
+ boolean ha = false;
+ boolean useLocalStorage = false;
+
+ ServiceOfferingVO serviceOffering = new ServiceOfferingVO(name, cpu, ramSize, speed, null, null, ha, displayText, Storage.ProvisioningType.THIN, useLocalStorage, false, null, false, null,
+ false);
+ return serviceOffering;
+ }
+
@Test
@PrepareForTest(CallContext.class)
public void validateInputsAndPermissionForUpdateVirtualMachineCommandTest() {
Mockito.doNothing().when(userVmManagerImpl).validateGuestOsIdForUpdateVirtualMachineCommand(updateVmCommand);
- Account accountMock = Mockito.mock(Account.class);
CallContext callContextMock = Mockito.mock(CallContext.class);
- PowerMockito.mockStatic(CallContext.class);
- BDDMockito.given(CallContext.current()).willReturn(callContextMock);
- Mockito.when(callContextMock.getCallingAccount()).thenReturn(accountMock);
+ Mockito.lenient().doReturn(accountMock).when(callContextMock).getCallingAccount();
- Mockito.doNothing().when(accountManager).checkAccess(accountMock, null, true, userVmVoMock);
+ ServiceOffering offering = getSvcoffering(512);
+ Mockito.lenient().when(_serviceOfferingDao.findById(Mockito.anyLong(), Mockito.anyLong())).thenReturn((ServiceOfferingVO) offering);
+ Mockito.lenient().doNothing().when(accountManager).checkAccess(accountMock, null, true, userVmVoMock);
userVmManagerImpl.validateInputsAndPermissionForUpdateVirtualMachineCommand(updateVmCommand);
Mockito.verify(userVmManagerImpl).validateGuestOsIdForUpdateVirtualMachineCommand(updateVmCommand);
- Mockito.verify(accountManager).checkAccess(accountMock, null, true, userVmVoMock);
+ Mockito.verify(accountManager).checkAccess(callerAccount, null, true, userVmVoMock);
}
@Test
public void updateVirtualMachineTestDisplayChanged() throws ResourceUnavailableException, InsufficientCapacityException {
configureDoNothingForMethodsThatWeDoNotWantToTest();
-
+ ServiceOffering offering = getSvcoffering(512);
+ Mockito.when(_serviceOfferingDao.findById(Mockito.anyLong(), Mockito.anyLong())).thenReturn((ServiceOfferingVO) offering);
Mockito.when(userVmVoMock.isDisplay()).thenReturn(true);
Mockito.doNothing().when(userVmManagerImpl).updateDisplayVmFlag(false, vmId, userVmVoMock);
-
userVmManagerImpl.updateVirtualMachine(updateVmCommand);
verifyMethodsThatAreAlwaysExecuted();
@@ -166,10 +228,10 @@
@Test
public void updateVirtualMachineTestCleanUpTrue() throws ResourceUnavailableException, InsufficientCapacityException {
configureDoNothingForMethodsThatWeDoNotWantToTest();
-
+ ServiceOffering offering = getSvcoffering(512);
+ Mockito.when(_serviceOfferingDao.findById(Mockito.anyLong(), Mockito.anyLong())).thenReturn((ServiceOfferingVO) offering);
Mockito.when(updateVmCommand.isCleanupDetails()).thenReturn(true);
-
- Mockito.doNothing().when(userVmManagerImpl).updateDisplayVmFlag(false, vmId, userVmVoMock);
+ Mockito.lenient().doNothing().when(userVmManagerImpl).updateDisplayVmFlag(false, vmId, userVmVoMock);
Mockito.doNothing().when(userVmDetailVO).removeDetails(vmId);
userVmManagerImpl.updateVirtualMachine(updateVmCommand);
@@ -201,6 +263,17 @@
private void prepareAndExecuteMethodDealingWithDetails(boolean cleanUpDetails, boolean isDetailsEmpty) throws ResourceUnavailableException, InsufficientCapacityException {
configureDoNothingForMethodsThatWeDoNotWantToTest();
+ ServiceOffering offering = getSvcoffering(512);
+ Mockito.when(_serviceOfferingDao.findById(Mockito.anyLong(), Mockito.anyLong())).thenReturn((ServiceOfferingVO) offering);
+
+ List<NicVO> nics = new ArrayList<>();
+ NicVO nic1 = mock(NicVO.class);
+ NicVO nic2 = mock(NicVO.class);
+ nics.add(nic1);
+ nics.add(nic2);
+ when(this.nicDao.listByVmId(Mockito.anyLong())).thenReturn(nics);
+ when(_networkDao.findById(anyLong())).thenReturn(_networkMock);
+ lenient().doNothing().when(_networkMgr).saveExtraDhcpOptions(anyString(), anyLong(), anyMap());
HashMap<String, String> details = new HashMap<>();
if(!isDetailsEmpty) {
details.put("", "");
@@ -220,7 +293,7 @@
}
private void configureDoNothingForDetailsMethod() {
- Mockito.doNothing().when(userVmManagerImpl).updateDisplayVmFlag(false, vmId, userVmVoMock);
+ Mockito.lenient().doNothing().when(userVmManagerImpl).updateDisplayVmFlag(false, vmId, userVmVoMock);
Mockito.doNothing().when(userVmDetailVO).removeDetails(vmId);
Mockito.doNothing().when(userVmDao).saveDetails(userVmVoMock);
}
@@ -229,9 +302,11 @@
private void verifyMethodsThatAreAlwaysExecuted() throws ResourceUnavailableException, InsufficientCapacityException {
Mockito.verify(userVmManagerImpl).validateInputsAndPermissionForUpdateVirtualMachineCommand(updateVmCommand);
Mockito.verify(userVmManagerImpl).getSecurityGroupIdList(updateVmCommand);
- Mockito.verify(userVmManagerImpl).updateVirtualMachine(Mockito.anyLong(), Mockito.anyString(), Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyBoolean(), Mockito.anyLong(),
- Mockito.anyString(), Mockito.anyBoolean(), Mockito.any(HTTPMethod.class), Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyListOf(Long.class),
- Mockito.anyMap());
+
+ Mockito.verify(userVmManagerImpl).updateVirtualMachine(nullable(Long.class), nullable(String.class), nullable(String.class), nullable(Boolean.class),
+ nullable(Boolean.class), nullable(Long.class),
+ nullable(String.class), nullable(Boolean.class), nullable(HTTPMethod.class), nullable(String.class), nullable(String.class), nullable(String.class), nullable(List.class),
+ nullable(Map.class));
}
@@ -239,7 +314,7 @@
private void configureDoNothingForMethodsThatWeDoNotWantToTest() throws ResourceUnavailableException, InsufficientCapacityException {
Mockito.doNothing().when(userVmManagerImpl).validateInputsAndPermissionForUpdateVirtualMachineCommand(updateVmCommand);
Mockito.doReturn(new ArrayList<Long>()).when(userVmManagerImpl).getSecurityGroupIdList(updateVmCommand);
- Mockito.doReturn(Mockito.mock(UserVm.class)).when(userVmManagerImpl).updateVirtualMachine(Mockito.anyLong(), Mockito.anyString(), Mockito.anyString(), Mockito.anyBoolean(),
+ Mockito.lenient().doReturn(Mockito.mock(UserVm.class)).when(userVmManagerImpl).updateVirtualMachine(Mockito.anyLong(), Mockito.anyString(), Mockito.anyString(), Mockito.anyBoolean(),
Mockito.anyBoolean(), Mockito.anyLong(),
Mockito.anyString(), Mockito.anyBoolean(), Mockito.any(HTTPMethod.class), Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyListOf(Long.class),
Mockito.anyMap());
@@ -291,6 +366,18 @@
String returnedMacAddress = userVmManagerImpl.validateOrReplaceMacAddress(macAddress, 1l);
Mockito.verify(networkModel, Mockito.times(times)).getNextAvailableMacAddressInNetwork(Mockito.anyLong());
- Assert.assertEquals(expectedMacAddress, returnedMacAddress);
+ assertEquals(expectedMacAddress, returnedMacAddress);
+ }
+
+ @Test
+ public void testValidatekeyValuePair() throws Exception {
+ assertTrue(userVmManagerImpl.isValidKeyValuePair("is-a-template=true\nHVM-boot-policy=\nPV-bootloader=pygrub\nPV-args=hvc0"));
+ assertTrue(userVmManagerImpl.isValidKeyValuePair("is-a-template=true HVM-boot-policy= PV-bootloader=pygrub PV-args=hvc0"));
+ assertTrue(userVmManagerImpl.isValidKeyValuePair("nvp.vm-uuid=34b3d5ea-1c25-4bb0-9250-8dc3388bfa9b"));
+ assertFalse(userVmManagerImpl.isValidKeyValuePair("key"));
+ //key-1=value1, param:key-2=value2, my.config.v0=False"
+ assertTrue(userVmManagerImpl.isValidKeyValuePair("key-1=value1"));
+ assertTrue(userVmManagerImpl.isValidKeyValuePair("param:key-2=value2"));
+ assertTrue(userVmManagerImpl.isValidKeyValuePair("my.config.v0=False"));
}
}
diff --git a/server/src/test/java/com/cloud/vm/UserVmManagerTest.java b/server/src/test/java/com/cloud/vm/UserVmManagerTest.java
index a2d6b16..b8cc064 100644
--- a/server/src/test/java/com/cloud/vm/UserVmManagerTest.java
+++ b/server/src/test/java/com/cloud/vm/UserVmManagerTest.java
@@ -22,6 +22,7 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyFloat;
@@ -32,6 +33,7 @@
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -69,7 +71,7 @@
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.Spy;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import com.cloud.capacity.CapacityManager;
import com.cloud.configuration.ConfigurationManager;
@@ -233,11 +235,11 @@
doReturn(3L).when(_account).getId();
doReturn(8L).when(_vmMock).getAccountId();
when(_accountDao.findById(anyLong())).thenReturn(_accountMock);
- when(_userDao.findById(anyLong())).thenReturn(_userMock);
- doReturn(Account.State.enabled).when(_account).getState();
- when(_vmMock.getId()).thenReturn(314L);
- when(_vmInstance.getId()).thenReturn(1L);
- when(_vmInstance.getServiceOfferingId()).thenReturn(2L);
+ lenient().when(_userDao.findById(anyLong())).thenReturn(_userMock);
+ lenient().doReturn(Account.State.enabled).when(_account).getState();
+ lenient().when(_vmMock.getId()).thenReturn(314L);
+ lenient().when(_vmInstance.getId()).thenReturn(1L);
+ lenient().when(_vmInstance.getServiceOfferingId()).thenReturn(2L);
List<VMSnapshotVO> mockList = new ArrayList<>();
when(_vmSnapshotDao.findByVm(anyLong())).thenReturn(mockList);
@@ -296,8 +298,8 @@
@Test(expected = CloudRuntimeException.class)
public void testRestoreVMF1() throws ResourceAllocationException, InsufficientCapacityException, ResourceUnavailableException {
- when(_vmDao.findById(anyLong())).thenReturn(_vmMock);
- when(_templateDao.findById(anyLong())).thenReturn(_templateMock);
+ lenient().when(_vmDao.findById(anyLong())).thenReturn(_vmMock);
+ lenient().when(_templateDao.findById(anyLong())).thenReturn(_templateMock);
doReturn(VirtualMachine.State.Error).when(_vmMock).getState();
Account account = new AccountVO("testaccount", 1L, "networkdomain", (short)0, "uuid");
UserVO user = new UserVO(1, "testuser", "password", "firstname", "lastName", "email", "timezone", UUID.randomUUID().toString(), User.Source.UNKNOWN);
@@ -315,7 +317,7 @@
public void testRestoreVMF2() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException {
doReturn(VirtualMachine.State.Stopped).when(_vmMock).getState();
- when(_vmDao.findById(anyLong())).thenReturn(_vmMock);
+ lenient().when(_vmDao.findById(anyLong())).thenReturn(_vmMock);
when(_volsDao.findByInstanceAndType(314L, Volume.Type.ROOT)).thenReturn(_rootVols);
doReturn(false).when(_rootVols).isEmpty();
when(_rootVols.get(eq(0))).thenReturn(_volumeMock);
@@ -326,7 +328,7 @@
when(_volumeMock.getId()).thenReturn(3L);
doNothing().when(_volsDao).detachVolume(anyLong());
- when(_templateMock.getUuid()).thenReturn("e0552266-7060-11e2-bbaa-d55f5db67735");
+ lenient().when(_templateMock.getUuid()).thenReturn("e0552266-7060-11e2-bbaa-d55f5db67735");
Account account = new AccountVO("testaccount", 1L, "networkdomain", (short)0, "uuid");
UserVO user = new UserVO(1, "testuser", "password", "firstname", "lastName", "email", "timezone", UUID.randomUUID().toString(), User.Source.UNKNOWN);
@@ -362,7 +364,7 @@
when(_volumeMock.getId()).thenReturn(3L);
doNothing().when(_volsDao).detachVolume(anyLong());
- when(_templateMock.getUuid()).thenReturn("e0552266-7060-11e2-bbaa-d55f5db67735");
+ lenient().when(_templateMock.getUuid()).thenReturn("e0552266-7060-11e2-bbaa-d55f5db67735");
Account account = new AccountVO("testaccount", 1L, "networkdomain", (short)0, "uuid");
UserVO user = new UserVO(1, "testuser", "password", "firstname", "lastName", "email", "timezone", UUID.randomUUID().toString(), User.Source.UNKNOWN);
@@ -397,16 +399,16 @@
when(_storageMgr.allocateDuplicateVolume(_volumeMock, 14L)).thenReturn(_volumeMock);
when(_templateMock.getGuestOSId()).thenReturn(5L);
doNothing().when(_vmMock).setGuestOSId(anyLong());
- doNothing().when(_vmMock).setTemplateId(3L);
+ lenient().doNothing().when(_vmMock).setTemplateId(3L);
when(_vmDao.update(314L, _vmMock)).thenReturn(true);
- when(_storageMgr.allocateDuplicateVolume(_volumeMock, null)).thenReturn(_volumeMock);
+ lenient().when(_storageMgr.allocateDuplicateVolume(_volumeMock, null)).thenReturn(_volumeMock);
doNothing().when(_volsDao).attachVolume(anyLong(), anyLong(), anyLong());
when(_volumeMock.getId()).thenReturn(3L);
doNothing().when(_volsDao).detachVolume(anyLong());
List<VMSnapshotVO> mockList = new ArrayList<>();
when(_vmSnapshotDao.findByVm(anyLong())).thenReturn(mockList);
- when(_templateMock.getUuid()).thenReturn("b1a3626e-72e0-4697-8c7c-a110940cc55d");
+ lenient().when(_templateMock.getUuid()).thenReturn("b1a3626e-72e0-4697-8c7c-a110940cc55d");
Account account = new AccountVO("testaccount", 1L, "networkdomain", (short)0, "uuid");
UserVO user = new UserVO(1, "testuser", "password", "firstname", "lastName", "email", "timezone", UUID.randomUUID().toString(), User.Source.UNKNOWN);
@@ -443,7 +445,7 @@
doNothing().when(_vmMock).setIsoId(14L);
when(_templateMock.getGuestOSId()).thenReturn(5L);
doNothing().when(_vmMock).setGuestOSId(anyLong());
- doNothing().when(_vmMock).setTemplateId(3L);
+ lenient().doNothing().when(_vmMock).setTemplateId(3L);
when(_vmDao.update(314L, _vmMock)).thenReturn(true);
when(_storageMgr.allocateDuplicateVolume(_volumeMock, null)).thenReturn(_volumeMock);
doNothing().when(_volsDao).attachVolume(anyLong(), anyLong(), anyLong());
@@ -452,7 +454,7 @@
List<VMSnapshotVO> mockList = new ArrayList<>();
when(_vmSnapshotDao.findByVm(anyLong())).thenReturn(mockList);
- when(_templateMock.getUuid()).thenReturn("b1a3626e-72e0-4697-8c7c-a110940cc55d");
+ lenient().when(_templateMock.getUuid()).thenReturn("b1a3626e-72e0-4697-8c7c-a110940cc55d");
Account account = new AccountVO("testaccount", 1L, "networkdomain", (short)0, "uuid");
UserVO user = new UserVO(1, "testuser", "password", "firstname", "lastName", "email", "timezone", UUID.randomUUID().toString(), User.Source.UNKNOWN);
@@ -489,13 +491,13 @@
serviceOfferingIdField.setAccessible(true);
serviceOfferingIdField.set(cmd, 1L);
- when(_vmInstanceDao.findById(anyLong())).thenReturn(_vmInstance);
+ lenient().when(_vmInstanceDao.findById(anyLong())).thenReturn(_vmInstance);
// UserContext.current().setEventDetails("Vm Id: "+getId());
Account account = new AccountVO("testaccount", 1L, "networkdomain", (short)0, "uuid");
UserVO user = new UserVO(1, "testuser", "password", "firstname", "lastName", "email", "timezone", UUID.randomUUID().toString(), User.Source.UNKNOWN);
//AccountVO(String accountName, long domainId, String networkDomain, short type, int regionId)
- doReturn(VirtualMachine.State.Running).when(_vmInstance).getState();
+ lenient().doReturn(VirtualMachine.State.Running).when(_vmInstance).getState();
CallContext.register(user, account);
try {
@@ -521,18 +523,18 @@
serviceOfferingIdField.setAccessible(true);
serviceOfferingIdField.set(cmd, 1L);
- when(_vmInstanceDao.findById(anyLong())).thenReturn(_vmInstance);
- doReturn(Hypervisor.HypervisorType.XenServer).when(_vmInstance).getHypervisorType();
+ lenient().when(_vmInstanceDao.findById(anyLong())).thenReturn(_vmInstance);
+ lenient().doReturn(Hypervisor.HypervisorType.XenServer).when(_vmInstance).getHypervisorType();
- doReturn(VirtualMachine.State.Running).when(_vmInstance).getState();
+ lenient().doReturn(VirtualMachine.State.Running).when(_vmInstance).getState();
- doNothing().when(_accountMgr).checkAccess(_account, null, true, _templateMock);
+ lenient().doNothing().when(_accountMgr).checkAccess(_account, null, true, _templateMock);
- doNothing().when(_itMgr).checkIfCanUpgrade(_vmMock, _offeringVo);
+ lenient().doNothing().when(_itMgr).checkIfCanUpgrade(_vmMock, _offeringVo);
ServiceOffering so1 = getSvcoffering(512);
- when(_offeringDao.findById(anyLong())).thenReturn((ServiceOfferingVO)so1);
- when(_offeringDao.findByIdIncludingRemoved(anyLong(), anyLong())).thenReturn((ServiceOfferingVO)so1);
+ lenient().when(_offeringDao.findById(anyLong())).thenReturn((ServiceOfferingVO)so1);
+ lenient().when(_offeringDao.findByIdIncludingRemoved(anyLong(), anyLong())).thenReturn((ServiceOfferingVO)so1);
Account account = new AccountVO("testaccount", 1L, "networkdomain", (short)0, UUID.randomUUID().toString());
UserVO user = new UserVO(1, "testuser", "password", "firstname", "lastName", "email", "timezone", UUID.randomUUID().toString(), User.Source.UNKNOWN);
@@ -685,6 +687,7 @@
// Test Move VM b/w accounts where caller doesn't have access to the old or new account
@Test(expected = PermissionDeniedException.class)
public void testMoveVmToUser2() throws Exception {
+
AssignVMCmd cmd = new AssignVMCmd();
Class<?> _class = cmd.getClass();
@@ -704,8 +707,11 @@
Account caller = new AccountVO("testaccount", 1, "networkdomain", (short)1, UUID.randomUUID().toString());
UserVO user = new UserVO(1, "testuser", "password", "firstname", "lastName", "email", "timezone", UUID.randomUUID().toString(), User.Source.UNKNOWN);
- Account oldAccount = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
- Account newAccount = new AccountVO("testaccount", 1, "networkdomain", (short)1, UUID.randomUUID().toString());
+ AccountVO oldAccount = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
+ oldAccount.setId(1L);
+
+ AccountVO newAccount = new AccountVO("testaccount", 1, "networkdomain", (short)1, UUID.randomUUID().toString());
+ newAccount.setId(2L);
UserVmVO vm = new UserVmVO(10L, "test", "test", 1L, HypervisorType.Any, 1L, false, false, 1L, 1L, 1, 5L, "test", "test", 1L);
vm.setState(VirtualMachine.State.Stopped);
@@ -713,9 +719,9 @@
when(_accountService.getActiveAccountById(anyLong())).thenReturn(oldAccount);
- when(_accountMgr.finalizeOwner(any(Account.class), anyString(), anyLong(), anyLong())).thenReturn(newAccount);
+ when(_accountMgr.finalizeOwner(nullable(Account.class), nullable(String.class), nullable(Long.class), nullable(Long.class))).thenReturn(newAccount);
- doThrow(new PermissionDeniedException("Access check failed")).when(_accountMgr).checkAccess(any(Account.class), any(AccessType.class), any(Boolean.class), any(ControlledEntity.class));
+ doThrow(new PermissionDeniedException("Access check failed")).when(_accountMgr).checkAccess(nullable(Account.class), nullable(AccessType.class), nullable(Boolean.class), nullable(ControlledEntity.class));
CallContext.register(user, caller);
@@ -753,7 +759,7 @@
services.add(Service.Dhcp);
when(_networkModel.listNetworkOfferingServices(anyLong())).thenReturn(services);
when(_vmMock.getState()).thenReturn(State.Stopped);
- doNothing().when(_accountMgr).checkAccess(_account, null, true, _vmMock);
+ lenient().doNothing().when(_accountMgr).checkAccess(_account, null, true, _vmMock);
when(_accountDao.findByIdIncludingRemoved(anyLong())).thenReturn(_accountMock);
when(_networkMock.getState()).thenReturn(Network.State.Implemented);
@@ -800,8 +806,8 @@
List<Service> services = new ArrayList<Service>();
when(_networkModel.listNetworkOfferingServices(anyLong())).thenReturn(services);
- when(_vmMock.getState()).thenReturn(State.Running);
- doNothing().when(_accountMgr).checkAccess(_account, null, true, _vmMock);
+ lenient().when(_vmMock.getState()).thenReturn(State.Running);
+ lenient().doNothing().when(_accountMgr).checkAccess(_account, null, true, _vmMock);
when(_accountDao.findByIdIncludingRemoved(anyLong())).thenReturn(_accountMock);
when(_networkMock.getState()).thenReturn(Network.State.Implemented);
@@ -817,8 +823,8 @@
when(vlan.getVlanGateway()).thenReturn("10.10.10.1");
when(vlan.getVlanNetmask()).thenReturn("255.255.255.0");
- when(_ipAddrMgr.allocatePublicIpForGuestNic(Mockito.eq(_networkMock), anyLong(), Mockito.eq(_accountMock), anyString())).thenReturn("10.10.10.10");
- when(_ipAddressDao.findByIpAndSourceNetworkId(anyLong(), anyString())).thenReturn(null);
+ when(_ipAddrMgr.allocatePublicIpForGuestNic(Mockito.eq(_networkMock), nullable(Long.class), Mockito.eq(_accountMock), anyString())).thenReturn("10.10.10.10");
+ lenient().when(_ipAddressDao.findByIpAndSourceNetworkId(anyLong(), anyString())).thenReturn(null);
when(_nicDao.persist(any(NicVO.class))).thenReturn(nic);
when(_ipAddressDao.findByIpAndDcId(anyLong(), anyString())).thenReturn(newIp);
when(_vlanDao.findById(anyLong())).thenReturn(vlan);
@@ -897,7 +903,7 @@
services.add(Service.Dhcp);
when(_networkModel.listNetworkOfferingServices(anyLong())).thenReturn(services);
when(_vmMock.getState()).thenReturn(State.Stopped);
- doNothing().when(_accountMgr).checkAccess(_account, null, true, _vmMock);
+ lenient().doNothing().when(_accountMgr).checkAccess(_account, null, true, _vmMock);
when(_accountDao.findByIdIncludingRemoved(anyLong())).thenReturn(_accountMock);
when(_networkMock.getState()).thenReturn(Network.State.Implemented);
@@ -944,7 +950,7 @@
services.add(Service.Dhcp);
when(_networkModel.listNetworkOfferingServices(anyLong())).thenReturn(services);
when(_vmMock.getState()).thenReturn(State.Stopped);
- doNothing().when(_accountMgr).checkAccess(_account, null, true, _vmMock);
+ lenient().doNothing().when(_accountMgr).checkAccess(_account, null, true, _vmMock);
when(_accountDao.findByIdIncludingRemoved(anyLong())).thenReturn(_accountMock);
when(_networkMock.getState()).thenReturn(Network.State.Implemented);
@@ -953,7 +959,7 @@
when(_dcDao.findById(anyLong())).thenReturn(_dcMock);
when(_dcMock.getNetworkType()).thenReturn(NetworkType.Advanced);
- when(_ipAddrMgr.allocatePublicIpForGuestNic(Mockito.eq(_networkMock), anyLong(), Mockito.eq(_accountMock), anyString())).thenReturn(null);
+ lenient().when(_ipAddrMgr.allocatePublicIpForGuestNic(Mockito.eq(_networkMock), anyLong(), Mockito.eq(_accountMock), anyString())).thenReturn(null);
Account caller = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
UserVO user = new UserVO(1, "testuser", "password", "firstname", "lastName", "email", "timezone", UUID.randomUUID().toString(), User.Source.UNKNOWN);
@@ -981,14 +987,14 @@
@Test(expected = CloudRuntimeException.class)
public void testApplyUserDataInNetworkWithoutElement() throws Exception {
UserVm userVm = mock(UserVm.class);
- when(userVm.getId()).thenReturn(1L);
+ lenient().when(userVm.getId()).thenReturn(1L);
when(_nicMock.getNetworkId()).thenReturn(2L);
when(_networkMock.getNetworkOfferingId()).thenReturn(3L);
when(_networkDao.findById(2L)).thenReturn(_networkMock);
UserDataServiceProvider userDataServiceProvider = mock(UserDataServiceProvider.class);
- when(userDataServiceProvider.saveUserData(any(Network.class), any(NicProfile.class), any(VirtualMachineProfile.class))).thenReturn(true);
+ lenient().when(userDataServiceProvider.saveUserData(any(Network.class), any(NicProfile.class), any(VirtualMachineProfile.class))).thenReturn(true);
// Userdata support, but no implementing element
when(_networkModel.areServicesSupportedByNetworkOffering(3L, Service.UserData)).thenReturn(true);
@@ -998,7 +1004,7 @@
@Test
public void testApplyUserDataSuccessful() throws Exception {
UserVm userVm = mock(UserVm.class);
- when(userVm.getId()).thenReturn(1L);
+ lenient().when(userVm.getId()).thenReturn(1L);
when(_nicMock.getNetworkId()).thenReturn(2L);
when(_networkMock.getNetworkOfferingId()).thenReturn(3L);
diff --git a/server/src/test/java/com/cloud/vpc/MockNetworkManagerImpl.java b/server/src/test/java/com/cloud/vpc/MockNetworkManagerImpl.java
index e99c2a8..c962d90 100644
--- a/server/src/test/java/com/cloud/vpc/MockNetworkManagerImpl.java
+++ b/server/src/test/java/com/cloud/vpc/MockNetworkManagerImpl.java
@@ -160,7 +160,7 @@
* @see com.cloud.network.NetworkService#allocateIP(com.cloud.user.Account, long, java.lang.Long)
*/
@Override
- public IpAddress allocateIP(Account ipOwner, long zoneId, Long networkId, Boolean displayIp) throws ResourceAllocationException, InsufficientAddressCapacityException,
+ public IpAddress allocateIP(Account ipOwner, long zoneId, Long networkId, Boolean displayIp, String ipaddress) throws ResourceAllocationException, InsufficientAddressCapacityException,
ConcurrentOperationException {
// TODO Auto-generated method stub
return null;
@@ -213,11 +213,16 @@
return false;
}
+ @Override
+ public boolean restartNetwork(Long networkId, boolean cleanup, boolean makeRedundant, User user) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException {
+ return false;
+ }
+
/* (non-Javadoc)
* @see com.cloud.network.NetworkService#restartNetwork(com.cloud.api.commands.RestartNetworkCmd, boolean)
*/
@Override
- public boolean restartNetwork(RestartNetworkCmd cmd, boolean cleanup, boolean makeRedundant) throws ConcurrentOperationException, ResourceUnavailableException,
+ public boolean restartNetwork(RestartNetworkCmd cmd) throws ConcurrentOperationException, ResourceUnavailableException,
InsufficientCapacityException {
// TODO Auto-generated method stub
return false;
@@ -501,7 +506,7 @@
*/
@Override
public Network createPrivateNetwork(String networkName, String displayText, long physicalNetworkId, String vlan, String startIp, String endIP, String gateway,
- String netmask, long networkOwnerId, Long vpcId, Boolean sourceNat, Long networkOfferingId) throws ResourceAllocationException, ConcurrentOperationException,
+ String netmask, long networkOwnerId, Long vpcId, Boolean sourceNat, Long networkOfferingId, Boolean bypassVlanOverlapCheck) throws ResourceAllocationException, ConcurrentOperationException,
InsufficientCapacityException {
// TODO Auto-generated method stub
return null;
@@ -630,13 +635,18 @@
return false;
}
+ public Network createPrivateNetwork(final long networkOfferingId, final String name, final String displayText, final String gateway, final String cidr, final String vlanId, final boolean bypassVlanOverlapCheck, final Account owner, final PhysicalNetwork pNtwk, final Long vpcId) throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
/* (non-Javadoc)
* @see com.cloud.network.NetworkManager#createGuestNetwork(long, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, com.cloud.user.Account, java.lang.Long, com.cloud.network.PhysicalNetwork, long, org.apache.cloudstack.acl.ControlledEntity.ACLType, java.lang.Boolean, java.lang.Long)
*/
@Override
public Network createGuestNetwork(long networkOfferingId, String name, String displayText, String gateway, String cidr, String vlanId, boolean bypassVlanOverlapCheck, String networkDomain,
Account owner, Long domainId, PhysicalNetwork physicalNetwork, long zoneId, ACLType aclType, Boolean subdomainAccess, Long vpcId, String gatewayv6,
- String cidrv6, Boolean displayNetworkEnabled, String isolatedPvlan, String externalId) throws ConcurrentOperationException, InsufficientCapacityException,
+ String cidrv6, Boolean displayNetworkEnabled, String isolatedPvlan, Network.PVlanType isolatedPvlanType, String externalId) throws ConcurrentOperationException, InsufficientCapacityException,
ResourceAllocationException {
// TODO Auto-generated method stub
return null;
@@ -973,4 +983,9 @@
public AcquirePodIpCmdResponse allocatePodIp(Account account, String zoneId, String podId) throws ResourceAllocationException, ConcurrentOperationException {
return null;
}
+
+ @Override
+ public Pair<NicProfile, Integer> importNic(String macAddress, int deviceId, Network network, Boolean isDefaultNic, VirtualMachine vm, IpAddresses ipAddresses) {
+ return null;
+ }
}
diff --git a/server/src/test/java/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java b/server/src/test/java/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
index a85d039..45bf4c1 100644
--- a/server/src/test/java/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
+++ b/server/src/test/java/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
@@ -249,6 +249,11 @@
}
@Override
+ public boolean performRouterHealthChecks(long routerId) {
+ return false;
+ }
+
+ @Override
public boolean prepareAggregatedExecution(final Network network, final List<DomainRouterVO> routers) throws AgentUnavailableException {
return true; //To change body of implemented methods use File | Settings | File Templates.
}
@@ -269,4 +274,10 @@
// TODO Auto-generated method stub
return false;
}
+
+ @Override
+ public boolean startSite2SiteVpn(DomainRouterVO router) throws ResourceUnavailableException {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
\ No newline at end of file
diff --git a/server/src/test/java/com/cloud/vpc/NetworkACLManagerTest.java b/server/src/test/java/com/cloud/vpc/NetworkACLManagerTest.java
index ca1ddc6..b1d6455 100644
--- a/server/src/test/java/com/cloud/vpc/NetworkACLManagerTest.java
+++ b/server/src/test/java/com/cloud/vpc/NetworkACLManagerTest.java
@@ -15,6 +15,14 @@
package com.cloud.vpc;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -47,6 +55,7 @@
import com.cloud.network.Network;
import com.cloud.network.NetworkModel;
import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkServiceMapDao;
import com.cloud.network.dao.NetworkVO;
import com.cloud.network.element.NetworkACLServiceProvider;
import com.cloud.network.vpc.NetworkACLItem;
@@ -134,8 +143,8 @@
@SuppressWarnings("unchecked")
public void testApplyACL() throws Exception {
final NetworkVO network = Mockito.mock(NetworkVO.class);
- Mockito.when(_networkDao.findById(Matchers.anyLong())).thenReturn(network);
- Mockito.when(_networkModel.isProviderSupportServiceInNetwork(Matchers.anyLong(), Matchers.any(Network.Service.class), Matchers.any(Network.Provider.class))).thenReturn(true);
+ Mockito.when(_networkDao.findById(anyLong())).thenReturn(network);
+ Mockito.when(_networkModel.isProviderSupportServiceInNetwork(anyLong(), Matchers.any(Network.Service.class), Matchers.any(Network.Provider.class))).thenReturn(true);
Mockito.when(_networkAclElements.get(0).applyNetworkACLs(Matchers.any(Network.class), Matchers.anyList())).thenReturn(true);
assertTrue(_aclMgr.applyACLToNetwork(1L));
}
@@ -161,16 +170,20 @@
final NetworkVO network = Mockito.mock(NetworkVO.class);
final List<NetworkVO> networks = new ArrayList<NetworkVO>();
networks.add(network);
- Mockito.when(_networkDao.listByAclId(Matchers.anyLong())).thenReturn(networks);
- Mockito.when(_networkDao.findById(Matchers.anyLong())).thenReturn(network);
- Mockito.when(_networkModel.isProviderSupportServiceInNetwork(Matchers.anyLong(), Matchers.any(Network.Service.class), Matchers.any(Network.Provider.class))).thenReturn(true);
- Mockito.when(_networkAclElements.get(0).applyNetworkACLs(Matchers.any(Network.class), Matchers.anyList())).thenReturn(applyNetworkACLs);
+
+ NetworkServiceMapDao ntwkSrvcDao = mock(NetworkServiceMapDao.class);
+ when(ntwkSrvcDao.canProviderSupportServiceInNetwork(anyLong(), eq(Network.Service.NetworkACL), nullable(Network.Provider.class))).thenReturn(true);
+ Mockito.when(_networkDao.listByAclId(anyLong())).thenReturn(networks);
+ Mockito.when(_networkDao.findById(anyLong())).thenReturn(network);
+ Mockito.when(_networkModel.isProviderSupportServiceInNetwork(anyLong(), any(Network.Service.class), any(Network.Provider.class))).thenReturn(true);
+ Mockito.when(_networkAclElements.get(0).getProvider()).thenReturn(Mockito.mock(Network.Provider.class));
+ Mockito.when(_networkAclElements.get(0).applyNetworkACLs(any(Network.class), anyList())).thenReturn(applyNetworkACLs);
// Make sure it applies ACL to private gateway
final List<VpcGatewayVO> vpcGateways = new ArrayList<VpcGatewayVO>();
final VpcGatewayVO vpcGateway = Mockito.mock(VpcGatewayVO.class);
final PrivateGateway privateGateway = Mockito.mock(PrivateGateway.class);
- Mockito.when(_vpcSvc.getVpcPrivateGateway(Mockito.anyLong())).thenReturn(privateGateway);
+ Mockito.when(_vpcSvc.getVpcPrivateGateway(anyLong())).thenReturn(privateGateway);
vpcGateways.add(vpcGateway);
Mockito.when(_vpcGatewayDao.listByAclIdAndType(aclId, VpcGateway.Type.Private)).thenReturn(vpcGateways);
@@ -213,7 +226,7 @@
@Test
public void testRevokeACLItem() throws Exception {
- Mockito.when(_networkACLItemDao.findById(Matchers.anyLong())).thenReturn(aclItem);
+ Mockito.when(_networkACLItemDao.findById(anyLong())).thenReturn(aclItem);
assertTrue(_aclMgr.revokeNetworkACLItem(1L));
}
@@ -221,12 +234,12 @@
public void deleteNonEmptyACL() throws Exception {
final List<NetworkACLItemVO> aclItems = new ArrayList<NetworkACLItemVO>();
aclItems.add(aclItem);
- Mockito.when(_networkACLItemDao.listByACL(Matchers.anyLong())).thenReturn(aclItems);
+ Mockito.when(_networkACLItemDao.listByACL(anyLong())).thenReturn(aclItems);
Mockito.when(acl.getId()).thenReturn(3l);
- Mockito.when(_networkACLItemDao.findById(Matchers.anyLong())).thenReturn(aclItem);
+ Mockito.when(_networkACLItemDao.findById(anyLong())).thenReturn(aclItem);
Mockito.when(aclItem.getState()).thenReturn(State.Add);
Mockito.when(aclItem.getId()).thenReturn(3l);
- Mockito.when(_networkACLDao.remove(Matchers.anyLong())).thenReturn(true);
+ Mockito.when(_networkACLDao.remove(anyLong())).thenReturn(true);
final boolean result = _aclMgr.deleteNetworkACL(acl);
diff --git a/server/src/test/java/com/cloud/vpc/VpcApiUnitTest.java b/server/src/test/java/com/cloud/vpc/VpcApiUnitTest.java
index 7043f22..8899a04 100644
--- a/server/src/test/java/com/cloud/vpc/VpcApiUnitTest.java
+++ b/server/src/test/java/com/cloud/vpc/VpcApiUnitTest.java
@@ -21,11 +21,10 @@
import javax.inject.Inject;
-import junit.framework.TestCase;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import com.cloud.exception.InvalidParameterValueException;
@@ -36,8 +35,10 @@
import com.cloud.user.AccountVO;
import com.cloud.utils.component.ComponentContext;
+import junit.framework.TestCase;
+
@RunWith(SpringJUnit4ClassRunner.class)
-//@ContextConfiguration(locations = "classpath:/VpcTestContext.xml")
+@ContextConfiguration(locations = "classpath:/VpcTestContext.xml")
public class VpcApiUnitTest extends TestCase {
@Inject
VpcManagerImpl _vpcService = null;
diff --git a/server/src/test/java/com/cloud/vpc/dao/MockNetworkDaoImpl.java b/server/src/test/java/com/cloud/vpc/dao/MockNetworkDaoImpl.java
index 11f3f81..1a7c1f7 100644
--- a/server/src/test/java/com/cloud/vpc/dao/MockNetworkDaoImpl.java
+++ b/server/src/test/java/com/cloud/vpc/dao/MockNetworkDaoImpl.java
@@ -192,7 +192,7 @@
}
@Override
- public NetworkVO getPrivateNetwork(final String broadcastUri, final String cidr, final long accountId, final long zoneId, final Long netofferid) {
+ public NetworkVO getPrivateNetwork(final String broadcastUri, final String cidr, final long accountId, final long zoneId, final Long netofferid, final Long vpcId) {
return null;
}
@@ -235,4 +235,19 @@
public List<NetworkVO> listNetworkVO(List<Long> idset) {
return null;
}
-}
\ No newline at end of file
+
+ @Override
+ public NetworkVO findByVlan(String vlan) {
+ return null;
+ }
+
+ @Override
+ public List<NetworkVO> listByAccountIdNetworkName(final long accountId, final String name) {
+ return null;
+ }
+
+ @Override
+ public List<NetworkVO> listByPhysicalNetworkPvlan(long physicalNetworkId, String broadcastUri, Network.PVlanType pVlanType) {
+ return null;
+ }
+}
diff --git a/server/src/test/java/org/apache/cloudstack/acl/RoleManagerImplTest.java b/server/src/test/java/org/apache/cloudstack/acl/RoleManagerImplTest.java
index bc50f34..e7ce1ac 100644
--- a/server/src/test/java/org/apache/cloudstack/acl/RoleManagerImplTest.java
+++ b/server/src/test/java/org/apache/cloudstack/acl/RoleManagerImplTest.java
@@ -102,7 +102,7 @@
@Test
public void findRoleTestRootAdminAndNotRoleAdminType() {
- Mockito.doReturn(RoleType.DomainAdmin).when(roleVoMock).getRoleType();
+ Mockito.lenient().doReturn(RoleType.DomainAdmin).when(roleVoMock).getRoleType();
Mockito.doReturn(roleVoMock).when(roleDaoMock).findById(roleMockId);
Mockito.doReturn(true).when(accountManagerMock).isRootAdmin(accountMockId);
@@ -115,7 +115,7 @@
@Test
public void findRoleTestRootAdminAndRoleAdminType() {
- Mockito.doReturn(RoleType.Admin).when(roleVoMock).getRoleType();
+ Mockito.lenient().doReturn(RoleType.Admin).when(roleVoMock).getRoleType();
Mockito.doReturn(roleVoMock).when(roleDaoMock).findById(roleMockId);
Mockito.doReturn(true).when(accountManagerMock).isRootAdmin(accountMockId);
@@ -258,8 +258,8 @@
@Test
public void findRolesByTypeTestNonAdminRoleRootAdminUser() {
- Mockito.doReturn(accountMock).when(roleManagerImpl).getCurrentAccount();
- Mockito.doReturn(true).when(accountManagerMock).isRootAdmin(accountMockId);
+ Mockito.lenient().doReturn(accountMock).when(roleManagerImpl).getCurrentAccount();
+ Mockito.lenient().doReturn(true).when(accountManagerMock).isRootAdmin(accountMockId);
List<Role> roles = new ArrayList<>();
roles.add(Mockito.mock(Role.class));
diff --git a/server/src/test/java/org/apache/cloudstack/affinity/AffinityApiUnitTest.java b/server/src/test/java/org/apache/cloudstack/affinity/AffinityApiUnitTest.java
index 354054a..0d36648 100644
--- a/server/src/test/java/org/apache/cloudstack/affinity/AffinityApiUnitTest.java
+++ b/server/src/test/java/org/apache/cloudstack/affinity/AffinityApiUnitTest.java
@@ -17,9 +17,10 @@
package org.apache.cloudstack.affinity;
import static org.junit.Assert.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.when;
@@ -32,11 +33,13 @@
import javax.inject.Inject;
import javax.naming.ConfigurationException;
-import com.cloud.utils.db.EntityManager;
-import com.cloud.event.ActionEventUtils;
-import com.cloud.user.User;
+import org.apache.cloudstack.acl.ControlledEntity;
import org.apache.cloudstack.affinity.dao.AffinityGroupDao;
+import org.apache.cloudstack.affinity.dao.AffinityGroupDomainMapDao;
import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.framework.messagebus.MessageBus;
import org.apache.cloudstack.test.utils.SpringUtils;
import org.junit.After;
import org.junit.Before;
@@ -57,32 +60,29 @@
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.support.AnnotationConfigContextLoader;
-import org.apache.cloudstack.acl.ControlledEntity;
-import org.apache.cloudstack.affinity.dao.AffinityGroupDomainMapDao;
-import org.apache.cloudstack.context.CallContext;
-import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
-import org.apache.cloudstack.framework.messagebus.MessageBus;
-
import com.cloud.dc.dao.DedicatedResourceDao;
import com.cloud.domain.dao.DomainDao;
+import com.cloud.event.ActionEventUtils;
import com.cloud.event.EventVO;
import com.cloud.event.dao.EventDao;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ResourceInUseException;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.projects.dao.ProjectDao;
import com.cloud.user.Account;
import com.cloud.user.AccountManager;
import com.cloud.user.AccountService;
import com.cloud.user.AccountVO;
import com.cloud.user.DomainManager;
+import com.cloud.user.User;
import com.cloud.user.UserVO;
import com.cloud.user.dao.AccountDao;
import com.cloud.user.dao.UserDao;
import com.cloud.utils.component.ComponentContext;
+import com.cloud.utils.db.EntityManager;
import com.cloud.vm.UserVmVO;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.dao.UserVmDao;
-import com.cloud.projects.dao.ProjectDao;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(loader = AnnotationConfigContextLoader.class)
@@ -142,7 +142,7 @@
CallContext.register(user, acct);
- when(_acctMgr.finalizeOwner((Account)anyObject(), anyString(), anyLong(), anyLong())).thenReturn(acct);
+ when(_acctMgr.finalizeOwner(any(Account.class), anyString(), anyLong(), nullable(Long.class))).thenReturn(acct);
when(_processor.getType()).thenReturn("mock");
when(_accountDao.findByIdIncludingRemoved(0L)).thenReturn(acct);
diff --git a/server/src/test/java/org/apache/cloudstack/affinity/AffinityGroupServiceImplTest.java b/server/src/test/java/org/apache/cloudstack/affinity/AffinityGroupServiceImplTest.java
index 6f45b90..8aa4aa8 100644
--- a/server/src/test/java/org/apache/cloudstack/affinity/AffinityGroupServiceImplTest.java
+++ b/server/src/test/java/org/apache/cloudstack/affinity/AffinityGroupServiceImplTest.java
@@ -17,6 +17,8 @@
package org.apache.cloudstack.affinity;
import static org.junit.Assert.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.anyObject;
@@ -42,6 +44,7 @@
import org.apache.cloudstack.framework.messagebus.MessageBus;
import org.apache.cloudstack.test.utils.SpringUtils;
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -84,8 +87,6 @@
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.dao.UserVmDao;
-import org.junit.Assert;
-
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(loader = AnnotationConfigContextLoader.class)
public class AffinityGroupServiceImplTest {
@@ -152,6 +153,7 @@
when(_processor.getType()).thenReturn("mock");
when(_accountDao.findByIdIncludingRemoved(0L)).thenReturn(acct);
+
List<AffinityGroupProcessor> affinityProcessors = new ArrayList<AffinityGroupProcessor>();
affinityProcessors.add(_processor);
_affinityService.setAffinityGroupProcessors(affinityProcessors);
@@ -172,7 +174,7 @@
@Test
public void createAffinityGroupFromCmdTest() {
- when(_acctMgr.finalizeOwner((Account)anyObject(), anyString(), anyLong(), anyLong())).thenReturn(acct);
+ when(_acctMgr.finalizeOwner(any(Account.class), nullable(String.class), anyLong(), nullable(Long.class))).thenReturn(acct);
when(_groupDao.isNameInUse(anyLong(), anyLong(), eq(AFFINITY_GROUP_NAME))).thenReturn(false);
CreateAffinityGroupCmd mockCreateAffinityGroupCmd = Mockito.mock(CreateAffinityGroupCmd.class);
when(mockCreateAffinityGroupCmd.getProjectId()).thenReturn(PROJECT_ID);
@@ -185,7 +187,7 @@
@Test
public void createAffinityGroupTest() {
- when(_acctMgr.finalizeOwner((Account)anyObject(), anyString(), anyLong(), anyLong())).thenReturn(acct);
+ when(_acctMgr.finalizeOwner(any(Account.class), anyString(), anyLong(), nullable(Long.class))).thenReturn(acct);
when(_groupDao.isNameInUse(anyLong(), anyLong(), eq(AFFINITY_GROUP_NAME))).thenReturn(false);
AffinityGroup group = _affinityService.createAffinityGroup(ACCOUNT_NAME, null, DOMAIN_ID, AFFINITY_GROUP_NAME, "mock", "affinity group one");
assertNotNull("Affinity group 'group1' of type 'mock' failed to create ", group);
@@ -239,7 +241,7 @@
@Test(expected = InvalidParameterValueException.class)
public void uniqueAffinityNameTest() {
- when(_acctMgr.finalizeOwner((Account)anyObject(), anyString(), anyLong(), anyLong())).thenReturn(acct);
+ when(_acctMgr.finalizeOwner(any(Account.class), anyString(), anyLong(), nullable(Long.class))).thenReturn(acct);
when(_groupDao.isNameInUse(anyLong(), anyLong(), eq(AFFINITY_GROUP_NAME))).thenReturn(true);
_affinityService.createAffinityGroup(ACCOUNT_NAME, null, DOMAIN_ID, AFFINITY_GROUP_NAME, "mock", "affinity group two");
}
diff --git a/server/src/test/java/org/apache/cloudstack/ca/CABackgroundTaskTest.java b/server/src/test/java/org/apache/cloudstack/ca/CABackgroundTaskTest.java
index 564bbe3..063ff34 100644
--- a/server/src/test/java/org/apache/cloudstack/ca/CABackgroundTaskTest.java
+++ b/server/src/test/java/org/apache/cloudstack/ca/CABackgroundTaskTest.java
@@ -20,6 +20,9 @@
package org.apache.cloudstack.ca;
import static org.apache.cloudstack.ca.CAManager.AutomaticCertRenewal;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.nullable;
import java.lang.reflect.Field;
import java.security.KeyPair;
@@ -118,7 +121,7 @@
@Test
public void testAutoRenewalEnabledWithExceptionsOnProvisioning() throws Exception {
overrideDefaultConfigValue(AutomaticCertRenewal, "_defaultValue", "true");
- Mockito.when(caManager.provisionCertificate(Mockito.any(Host.class), Mockito.anyBoolean(), Mockito.anyString())).thenThrow(new CloudRuntimeException("some error"));
+ Mockito.when(caManager.provisionCertificate(any(Host.class), anyBoolean(), nullable(String.class))).thenThrow(new CloudRuntimeException("some error"));
host.setManagementServerId(ManagementServerNode.getManagementServerId());
certMap.put(hostIp, expiredCertificate);
Assert.assertTrue(certMap.size() == 1);
@@ -134,12 +137,12 @@
Assert.assertTrue(certMap.size() == 1);
// First round
task.runInContext();
- Mockito.verify(caManager, Mockito.times(0)).provisionCertificate(Mockito.any(Host.class), Mockito.anyBoolean(), Mockito.anyString());
+ Mockito.verify(caManager, Mockito.times(0)).provisionCertificate(Mockito.any(Host.class), anyBoolean(), Mockito.anyString());
Mockito.verify(caManager, Mockito.times(1)).sendAlert(Mockito.any(Host.class), Mockito.anyString(), Mockito.anyString());
Mockito.reset(caManager);
// Second round
task.runInContext();
- Mockito.verify(caManager, Mockito.times(0)).provisionCertificate(Mockito.any(Host.class), Mockito.anyBoolean(), Mockito.anyString());
+ Mockito.verify(caManager, Mockito.times(0)).provisionCertificate(Mockito.any(Host.class), anyBoolean(), Mockito.anyString());
Mockito.verify(caManager, Mockito.times(0)).sendAlert(Mockito.any(Host.class), Mockito.anyString(), Mockito.anyString());
}
diff --git a/server/src/test/java/org/apache/cloudstack/ca/CAManagerImplTest.java b/server/src/test/java/org/apache/cloudstack/ca/CAManagerImplTest.java
index 64cbf20..aff04dc 100644
--- a/server/src/test/java/org/apache/cloudstack/ca/CAManagerImplTest.java
+++ b/server/src/test/java/org/apache/cloudstack/ca/CAManagerImplTest.java
@@ -19,11 +19,19 @@
package org.apache.cloudstack.ca;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.nullable;
+
import java.lang.reflect.Field;
import java.math.BigInteger;
import java.security.KeyPair;
import java.security.cert.X509Certificate;
import java.util.Collections;
+import java.util.List;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.framework.ca.CAProvider;
@@ -36,10 +44,9 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import com.cloud.agent.AgentManager;
-import com.cloud.agent.api.Answer;
import com.cloud.certificate.CrlVO;
import com.cloud.certificate.dao.CrlDao;
import com.cloud.host.Host;
@@ -92,17 +99,17 @@
@Test
public void testIssueCertificate() throws Exception {
caManager.issueCertificate(null, Collections.singletonList("domain.example"), null, 1, null);
- Mockito.verify(caProvider, Mockito.times(1)).issueCertificate(Mockito.anyList(), Mockito.anyList(), Mockito.anyInt());
- Mockito.verify(caProvider, Mockito.times(0)).issueCertificate(Mockito.anyString(), Mockito.anyList(), Mockito.anyList(), Mockito.anyInt());
+ Mockito.verify(caProvider, Mockito.times(1)).issueCertificate(anyList(), nullable(List.class), anyInt());
+ Mockito.verify(caProvider, Mockito.times(0)).issueCertificate(anyString(), anyList(), anyList(), anyInt());
}
@Test
public void testRevokeCertificate() throws Exception {
final CrlVO crl = new CrlVO(CertUtils.generateRandomBigInt(), "some.domain", "some-uuid");
- Mockito.when(crlDao.revokeCertificate(Mockito.any(BigInteger.class), Mockito.anyString())).thenReturn(crl);
- Mockito.when(caProvider.revokeCertificate(Mockito.any(BigInteger.class), Mockito.anyString())).thenReturn(true);
+ Mockito.when(crlDao.revokeCertificate(Mockito.any(BigInteger.class), anyString())).thenReturn(crl);
+ Mockito.when(caProvider.revokeCertificate(Mockito.any(BigInteger.class), anyString())).thenReturn(true);
Assert.assertTrue(caManager.revokeCertificate(crl.getCertSerial(), crl.getCertCn(), null));
- Mockito.verify(caProvider, Mockito.times(1)).revokeCertificate(Mockito.any(BigInteger.class), Mockito.anyString());
+ Mockito.verify(caProvider, Mockito.times(1)).revokeCertificate(Mockito.any(BigInteger.class), anyString());
}
@Test
@@ -111,11 +118,13 @@
Mockito.when(host.getPrivateIpAddress()).thenReturn("1.2.3.4");
final KeyPair keyPair = CertUtils.generateRandomKeyPair(1024);
final X509Certificate certificate = CertUtils.generateV3Certificate(null, keyPair, keyPair.getPublic(), "CN=ca", "SHA256withRSA", 365, null, null);
- Mockito.when(caProvider.issueCertificate(Mockito.anyString(), Mockito.anyList(), Mockito.anyList(), Mockito.anyInt())).thenReturn(new Certificate(certificate, null, Collections.singletonList(certificate)));
- Mockito.when(agentManager.send(Mockito.anyLong(), Mockito.any(SetupKeyStoreCommand.class))).thenReturn(new SetupKeystoreAnswer("someCsr"));
+ Mockito.when(caProvider.issueCertificate(anyString(), anyList(), anyList(), anyInt())).thenReturn(new Certificate(certificate, null, Collections.singletonList(certificate)));
+ Mockito.when(agentManager.send(anyLong(), any(SetupCertificateCommand.class))).thenReturn(new SetupCertificateAnswer(true));
+ Mockito.when(agentManager.send(anyLong(), any(SetupKeyStoreCommand.class))).thenReturn(new SetupKeystoreAnswer("someCsr"));
Mockito.doNothing().when(agentManager).reconnect(Mockito.anyLong());
Assert.assertTrue(caManager.provisionCertificate(host, true, null));
- Mockito.verify(agentManager, Mockito.times(2)).send(Mockito.anyLong(), Mockito.any(Answer.class));
+ Mockito.verify(agentManager, Mockito.times(1)).send(Mockito.anyLong(), any(SetupKeyStoreCommand.class));
+ Mockito.verify(agentManager, Mockito.times(1)).send(Mockito.anyLong(), any(SetupCertificateCommand.class));
Mockito.verify(agentManager, Mockito.times(1)).reconnect(Mockito.anyLong());
}
}
\ No newline at end of file
diff --git a/server/src/test/java/org/apache/cloudstack/diagnostics/DiagnosticsFilesListFactoryTest.java b/server/src/test/java/org/apache/cloudstack/diagnostics/DiagnosticsFilesListFactoryTest.java
new file mode 100644
index 0000000..e0412db
--- /dev/null
+++ b/server/src/test/java/org/apache/cloudstack/diagnostics/DiagnosticsFilesListFactoryTest.java
@@ -0,0 +1,83 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.diagnostics;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import org.apache.cloudstack.diagnostics.fileprocessor.DiagnosticsFilesListFactory;
+import org.apache.cloudstack.diagnostics.fileprocessor.DomainRouterDiagnosticsFiles;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.VirtualMachine;
+
+@RunWith(MockitoJUnitRunner.class)
+public class DiagnosticsFilesListFactoryTest {
+
+ private DomainRouterDiagnosticsFiles proxyDiagnosticFiles;
+
+ @Mock
+ private VMInstanceVO vmInstance;
+
+ @InjectMocks
+ private DiagnosticsFilesListFactory listFactory = new DiagnosticsFilesListFactory();
+
+ @Before
+ public void setUp() throws Exception {
+ Mockito.when(vmInstance.getType()).thenReturn(VirtualMachine.Type.DomainRouter);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ Mockito.reset(vmInstance);
+ }
+
+ @Test
+ public void testgetDiagnosticsFilesListCpVmDataTypeList() {
+ List<String> dataTypeList = new ArrayList<>();
+ dataTypeList.add("/var/log/auth.log");
+ dataTypeList.add("/etc/dnsmasq.conf");
+ dataTypeList.add("iptables");
+ dataTypeList.add("ipaddr");
+
+ List<String> files = Objects.requireNonNull(DiagnosticsFilesListFactory.getDiagnosticsFilesList(dataTypeList, vmInstance)).generateFileList();
+
+ assertEquals(files, dataTypeList);
+ }
+
+ @Test
+ public void testDiagnosticsFileListDefaultsRouter() {
+ List<String> filesList = Objects.requireNonNull(DiagnosticsFilesListFactory.getDiagnosticsFilesList(null, vmInstance)).generateFileList();
+
+ ConfigKey configKey = proxyDiagnosticFiles.RouterDefaultSupportedFiles;
+ String[] defaultFileArray = configKey.defaultValue().split(",");
+
+ assertEquals(filesList.size(), defaultFileArray.length);
+ }
+}
\ No newline at end of file
diff --git a/server/src/test/java/org/apache/cloudstack/diagnostics/DiagnosticsServiceImplTest.java b/server/src/test/java/org/apache/cloudstack/diagnostics/DiagnosticsServiceImplTest.java
index d85c543..04a7e8a 100644
--- a/server/src/test/java/org/apache/cloudstack/diagnostics/DiagnosticsServiceImplTest.java
+++ b/server/src/test/java/org/apache/cloudstack/diagnostics/DiagnosticsServiceImplTest.java
@@ -18,15 +18,9 @@
//
package org.apache.cloudstack.diagnostics;
-import com.cloud.agent.AgentManager;
-import com.cloud.agent.api.routing.NetworkElementCommand;
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.utils.exception.CloudRuntimeException;
-import com.cloud.vm.VMInstanceVO;
-import com.cloud.vm.VirtualMachine;
-import com.cloud.vm.VirtualMachineManager;
-import com.cloud.vm.dao.VMInstanceDao;
-import junit.framework.TestCase;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.command.admin.diagnostics.RunDiagnosticsCmd;
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
@@ -39,8 +33,16 @@
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
-import java.util.HashMap;
-import java.util.Map;
+import com.cloud.agent.AgentManager;
+import com.cloud.agent.api.routing.NetworkElementCommand;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.VirtualMachineManager;
+import com.cloud.vm.dao.VMInstanceDao;
+
+import junit.framework.TestCase;
@RunWith(MockitoJUnitRunner.class)
public class DiagnosticsServiceImplTest extends TestCase {
@@ -50,40 +52,39 @@
@Mock
private VMInstanceDao instanceDao;
@Mock
- private RunDiagnosticsCmd diagnosticsCmd;
+ private RunDiagnosticsCmd runDiagnosticsCmd;
@Mock
private DiagnosticsCommand command;
@Mock
- private VMInstanceVO instanceVO;
+ private VMInstanceVO vmInstanceVO;
@Mock
private VirtualMachineManager vmManager;
@Mock
private NetworkOrchestrationService networkManager;
@InjectMocks
- private DiagnosticsServiceImpl diagnosticsService = new DiagnosticsServiceImpl();
+ private DiagnosticsServiceImpl serviceImpl = new DiagnosticsServiceImpl();
@Before
public void setUp() throws Exception {
- Mockito.when(diagnosticsCmd.getId()).thenReturn(1L);
- Mockito.when(diagnosticsCmd.getType()).thenReturn(DiagnosticsType.PING);
+ Mockito.when(runDiagnosticsCmd.getId()).thenReturn(1L);
+ Mockito.when(runDiagnosticsCmd.getType()).thenReturn(DiagnosticsType.PING);
Mockito.when(instanceDao.findByIdTypes(Mockito.anyLong(), Mockito.any(VirtualMachine.Type.class),
- Mockito.any(VirtualMachine.Type.class), Mockito.any(VirtualMachine.Type.class))).thenReturn(instanceVO);
-
+ Mockito.any(VirtualMachine.Type.class), Mockito.any(VirtualMachine.Type.class))).thenReturn(vmInstanceVO);
}
@After
public void tearDown() throws Exception {
- Mockito.reset(diagnosticsCmd);
+ Mockito.reset(runDiagnosticsCmd);
Mockito.reset(agentManager);
Mockito.reset(instanceDao);
- Mockito.reset(instanceVO);
+ Mockito.reset(vmInstanceVO);
Mockito.reset(command);
}
@Test
public void testRunDiagnosticsCommandTrue() throws Exception {
- Mockito.when(diagnosticsCmd.getAddress()).thenReturn("8.8.8.8");
+ Mockito.when(runDiagnosticsCmd.getAddress()).thenReturn("8.8.8.8");
Map<String, String> accessDetailsMap = new HashMap<>();
accessDetailsMap.put(NetworkElementCommand.ROUTER_IP, "169.20.175.10");
Mockito.when(networkManager.getSystemVMAccessDetails(Mockito.any(VMInstanceVO.class))).thenReturn(accessDetailsMap);
@@ -102,7 +103,7 @@
Mockito.when(agentManager.easySend(Mockito.anyLong(), Mockito.any(DiagnosticsCommand.class))).thenReturn(new DiagnosticsAnswer(command, true, details));
- Map<String, String> detailsMap = diagnosticsService.runDiagnosticsCommand(diagnosticsCmd);
+ Map<String, String> detailsMap = serviceImpl.runDiagnosticsCommand(runDiagnosticsCmd);
String stdout = "PING 8.8.8.8 (8.8.8.8) 56(84) bytes of data.\n" +
"64 bytes from 8.8.8.8: icmp_seq=1 ttl=125 time=7.88 ms\n" +
@@ -123,7 +124,7 @@
@Test
public void testRunDiagnosticsCommandFalse() throws Exception {
- Mockito.when(diagnosticsCmd.getAddress()).thenReturn("192.0.2.2");
+ Mockito.when(runDiagnosticsCmd.getAddress()).thenReturn("192.0.2.2");
Map<String, String> accessDetailsMap = new HashMap<>();
accessDetailsMap.put(NetworkElementCommand.ROUTER_IP, "169.20.175.10");
@@ -141,7 +142,7 @@
"4 packets transmitted, 0 packets received, 100% packet loss";
Mockito.when(agentManager.easySend(Mockito.anyLong(), Mockito.any(DiagnosticsCommand.class))).thenReturn(new DiagnosticsAnswer(command, true, details));
- Map<String, String> detailsMap = diagnosticsService.runDiagnosticsCommand(diagnosticsCmd);
+ Map<String, String> detailsMap = serviceImpl.runDiagnosticsCommand(runDiagnosticsCmd);
assertEquals(3, detailsMap.size());
assertEquals("Mismatch between actual and expected STDERR", "", detailsMap.get(ApiConstants.STDERR));
@@ -151,46 +152,47 @@
@Test(expected = InvalidParameterValueException.class)
public void testRunDiagnosticsThrowsInvalidParamException() throws Exception {
- Mockito.when(diagnosticsCmd.getAddress()).thenReturn("");
+ Mockito.when(runDiagnosticsCmd.getAddress()).thenReturn("");
Mockito.when(instanceDao.findByIdTypes(Mockito.anyLong(), Mockito.any(VirtualMachine.Type.class),
Mockito.any(VirtualMachine.Type.class), Mockito.any(VirtualMachine.Type.class))).thenReturn(null);
- diagnosticsService.runDiagnosticsCommand(diagnosticsCmd);
+ serviceImpl.runDiagnosticsCommand(runDiagnosticsCmd);
}
@Test(expected = CloudRuntimeException.class)
public void testVMControlIPisNull() throws Exception {
- Mockito.when(diagnosticsCmd.getAddress()).thenReturn("0.42.42.42");
+ Mockito.when(runDiagnosticsCmd.getAddress()).thenReturn("0.42.42.42");
Map<String, String> accessDetailsMap = new HashMap<>();
accessDetailsMap.put(NetworkElementCommand.ROUTER_IP, null);
Mockito.when(networkManager.getSystemVMAccessDetails(Mockito.any(VMInstanceVO.class))).thenReturn(accessDetailsMap);
- diagnosticsService.runDiagnosticsCommand(diagnosticsCmd);
+ serviceImpl.runDiagnosticsCommand(runDiagnosticsCmd);
}
@Test
public void testInvalidCharsInParams() throws Exception {
- assertFalse(diagnosticsService.hasValidChars("'\\''"));
- assertFalse(diagnosticsService.hasValidChars("-I eth0 &"));
- assertFalse(diagnosticsService.hasValidChars("-I eth0 ;"));
- assertFalse(diagnosticsService.hasValidChars(" &2 > "));
- assertFalse(diagnosticsService.hasValidChars(" &2 >> "));
- assertFalse(diagnosticsService.hasValidChars(" | "));
- assertFalse(diagnosticsService.hasValidChars("|"));
- assertFalse(diagnosticsService.hasValidChars(","));
+ assertFalse(serviceImpl.hasValidChars("'\\''"));
+ assertFalse(serviceImpl.hasValidChars("-I eth0 &"));
+ assertFalse(serviceImpl.hasValidChars("-I eth0 ;"));
+ assertFalse(serviceImpl.hasValidChars(" &2 > "));
+ assertFalse(serviceImpl.hasValidChars(" &2 >> "));
+ assertFalse(serviceImpl.hasValidChars(" | "));
+ assertFalse(serviceImpl.hasValidChars("|"));
+ assertFalse(serviceImpl.hasValidChars(","));
}
@Test
public void testValidCharsInParams() throws Exception {
- assertTrue(diagnosticsService.hasValidChars(""));
- assertTrue(diagnosticsService.hasValidChars("."));
- assertTrue(diagnosticsService.hasValidChars(" "));
- assertTrue(diagnosticsService.hasValidChars("-I eth0 www.google.com"));
- assertTrue(diagnosticsService.hasValidChars(" "));
- assertTrue(diagnosticsService.hasValidChars(" -I cloudbr0 --sport "));
- assertTrue(diagnosticsService.hasValidChars(" --back -m20 "));
- assertTrue(diagnosticsService.hasValidChars("-c 5 -4"));
- assertTrue(diagnosticsService.hasValidChars("-c 5 -4 -AbDfhqUV"));
+ assertTrue(serviceImpl.hasValidChars(""));
+ assertTrue(serviceImpl.hasValidChars("."));
+ assertTrue(serviceImpl.hasValidChars(" "));
+ assertTrue(serviceImpl.hasValidChars("-I eth0 www.google.com"));
+ assertTrue(serviceImpl.hasValidChars(" "));
+ assertTrue(serviceImpl.hasValidChars(" -I cloudbr0 --sport "));
+ assertTrue(serviceImpl.hasValidChars(" --back -m20 "));
+ assertTrue(serviceImpl.hasValidChars("-c 5 -4"));
+ assertTrue(serviceImpl.hasValidChars("-c 5 -4 -AbDfhqUV"));
}
+
}
\ No newline at end of file
diff --git a/server/src/test/java/org/apache/cloudstack/network/ssl/CertServiceTest.java b/server/src/test/java/org/apache/cloudstack/network/ssl/CertServiceTest.java
index 88b0b69..a8514f9 100644
--- a/server/src/test/java/org/apache/cloudstack/network/ssl/CertServiceTest.java
+++ b/server/src/test/java/org/apache/cloudstack/network/ssl/CertServiceTest.java
@@ -16,6 +16,32 @@
// under the License.
package org.apache.cloudstack.network.ssl;
+import static org.apache.commons.io.FileUtils.readFileToString;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.net.URLDecoder;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import org.apache.cloudstack.api.command.user.loadbalancer.DeleteSslCertCmd;
+import org.apache.cloudstack.api.command.user.loadbalancer.UploadSslCertCmd;
+import org.apache.cloudstack.context.CallContext;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Matchers;
+import org.mockito.Mockito;
+
import com.cloud.domain.DomainVO;
import com.cloud.domain.dao.DomainDao;
import com.cloud.network.dao.LoadBalancerCertMapDao;
@@ -31,28 +57,6 @@
import com.cloud.user.dao.AccountDao;
import com.cloud.utils.db.EntityManager;
import com.cloud.utils.db.TransactionLegacy;
-import org.apache.cloudstack.api.command.user.loadbalancer.DeleteSslCertCmd;
-import org.apache.cloudstack.api.command.user.loadbalancer.UploadSslCertCmd;
-import org.apache.cloudstack.context.CallContext;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Matchers;
-import org.mockito.Mockito;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.net.URLDecoder;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import static org.apache.commons.io.FileUtils.readFileToString;
-import static org.mockito.Mockito.when;
public class CertServiceTest {
@@ -108,17 +112,17 @@
//setting mock objects
certService._accountMgr = Mockito.mock(AccountManager.class);
final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
- when(certService._accountMgr.getAccount(Matchers.anyLong())).thenReturn(account);
+ when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
certService._domainDao = Mockito.mock(DomainDao.class);
final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
- when(certService._domainDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(domain);
+ when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
certService._sslCertDao = Mockito.mock(SslCertDao.class);
when(certService._sslCertDao.persist(Matchers.any(SslCertVO.class))).thenReturn(new SslCertVO());
certService._accountDao = Mockito.mock(AccountDao.class);
- when(certService._accountDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn((AccountVO)account);
+ when(certService._accountDao.findByIdIncludingRemoved(anyLong())).thenReturn((AccountVO)account);
//creating the command
final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
@@ -159,17 +163,17 @@
//setting mock objects
certService._accountMgr = Mockito.mock(AccountManager.class);
final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
- when(certService._accountMgr.getAccount(Matchers.anyLong())).thenReturn(account);
+ when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
certService._domainDao = Mockito.mock(DomainDao.class);
final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
- when(certService._domainDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(domain);
+ when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
certService._sslCertDao = Mockito.mock(SslCertDao.class);
when(certService._sslCertDao.persist(Matchers.any(SslCertVO.class))).thenReturn(new SslCertVO());
certService._accountDao = Mockito.mock(AccountDao.class);
- when(certService._accountDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn((AccountVO)account);
+ when(certService._accountDao.findByIdIncludingRemoved(anyLong())).thenReturn((AccountVO)account);
//creating the command
final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
@@ -209,17 +213,17 @@
//setting mock objects
certService._accountMgr = Mockito.mock(AccountManager.class);
final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
- when(certService._accountMgr.getAccount(Matchers.anyLong())).thenReturn(account);
+ when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
certService._domainDao = Mockito.mock(DomainDao.class);
final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
- when(certService._domainDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(domain);
+ when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
certService._sslCertDao = Mockito.mock(SslCertDao.class);
when(certService._sslCertDao.persist(Matchers.any(SslCertVO.class))).thenReturn(new SslCertVO());
certService._accountDao = Mockito.mock(AccountDao.class);
- when(certService._accountDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn((AccountVO)account);
+ when(certService._accountDao.findByIdIncludingRemoved(anyLong())).thenReturn((AccountVO)account);
//creating the command
UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
@@ -256,11 +260,11 @@
//setting mock objects
certService._accountMgr = Mockito.mock(AccountManager.class);
final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
- when(certService._accountMgr.getAccount(Matchers.anyLong())).thenReturn(account);
+ when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
certService._domainDao = Mockito.mock(DomainDao.class);
final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
- when(certService._domainDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(domain);
+ when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
certService._sslCertDao = Mockito.mock(SslCertDao.class);
when(certService._sslCertDao.persist(Matchers.any(SslCertVO.class))).thenReturn(new SslCertVO());
@@ -308,11 +312,11 @@
//setting mock objects
certService._accountMgr = Mockito.mock(AccountManager.class);
final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
- when(certService._accountMgr.getAccount(Matchers.anyLong())).thenReturn(account);
+ when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
certService._domainDao = Mockito.mock(DomainDao.class);
final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
- when(certService._domainDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(domain);
+ when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
certService._sslCertDao = Mockito.mock(SslCertDao.class);
when(certService._sslCertDao.persist(Matchers.any(SslCertVO.class))).thenReturn(new SslCertVO());
@@ -358,11 +362,11 @@
//setting mock objects
certService._accountMgr = Mockito.mock(AccountManager.class);
final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
- when(certService._accountMgr.getAccount(Matchers.anyLong())).thenReturn(account);
+ when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
certService._domainDao = Mockito.mock(DomainDao.class);
final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
- when(certService._domainDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(domain);
+ when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
certService._sslCertDao = Mockito.mock(SslCertDao.class);
when(certService._sslCertDao.persist(Matchers.any(SslCertVO.class))).thenReturn(new SslCertVO());
@@ -407,11 +411,11 @@
//setting mock objects
certService._accountMgr = Mockito.mock(AccountManager.class);
final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
- when(certService._accountMgr.getAccount(Matchers.anyLong())).thenReturn(account);
+ when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
certService._domainDao = Mockito.mock(DomainDao.class);
final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
- when(certService._domainDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(domain);
+ when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
certService._sslCertDao = Mockito.mock(SslCertDao.class);
when(certService._sslCertDao.persist(Matchers.any(SslCertVO.class))).thenReturn(new SslCertVO());
@@ -450,11 +454,11 @@
//setting mock objects
certService._accountMgr = Mockito.mock(AccountManager.class);
final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
- when(certService._accountMgr.getAccount(Matchers.anyLong())).thenReturn(account);
+ when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
certService._domainDao = Mockito.mock(DomainDao.class);
final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
- when(certService._domainDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(domain);
+ when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
certService._sslCertDao = Mockito.mock(SslCertDao.class);
when(certService._sslCertDao.persist(Matchers.any(SslCertVO.class))).thenReturn(new SslCertVO());
@@ -495,11 +499,11 @@
//setting mock objects
certService._accountMgr = Mockito.mock(AccountManager.class);
final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
- when(certService._accountMgr.getAccount(Matchers.anyLong())).thenReturn(account);
+ when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
certService._domainDao = Mockito.mock(DomainDao.class);
final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
- when(certService._domainDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(domain);
+ when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
certService._sslCertDao = Mockito.mock(SslCertDao.class);
when(certService._sslCertDao.persist(Matchers.any(SslCertVO.class))).thenReturn(new SslCertVO());
@@ -539,11 +543,11 @@
//setting mock objects
certService._accountMgr = Mockito.mock(AccountManager.class);
final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
- when(certService._accountMgr.getAccount(Matchers.anyLong())).thenReturn(account);
+ when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
certService._domainDao = Mockito.mock(DomainDao.class);
final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
- when(certService._domainDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(domain);
+ when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
certService._sslCertDao = Mockito.mock(SslCertDao.class);
when(certService._sslCertDao.persist(Matchers.any(SslCertVO.class))).thenReturn(new SslCertVO());
@@ -583,11 +587,11 @@
//setting mock objects
certService._accountMgr = Mockito.mock(AccountManager.class);
final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
- when(certService._accountMgr.getAccount(Matchers.anyLong())).thenReturn(account);
+ when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
certService._domainDao = Mockito.mock(DomainDao.class);
final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
- when(certService._domainDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(domain);
+ when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
certService._sslCertDao = Mockito.mock(SslCertDao.class);
when(certService._sslCertDao.persist(Matchers.any(SslCertVO.class))).thenReturn(new SslCertVO());
@@ -622,20 +626,20 @@
//setting mock objects
certService._accountMgr = Mockito.mock(AccountManager.class);
final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
- when(certService._accountMgr.getAccount(Matchers.anyLong())).thenReturn(account);
+ when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
certService._domainDao = Mockito.mock(DomainDao.class);
final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
- when(certService._domainDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(domain);
+ when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
certService._sslCertDao = Mockito.mock(SslCertDao.class);
- when(certService._sslCertDao.remove(Matchers.anyLong())).thenReturn(true);
- when(certService._sslCertDao.findById(Matchers.anyLong())).thenReturn(new SslCertVO());
+ when(certService._sslCertDao.remove(anyLong())).thenReturn(true);
+ when(certService._sslCertDao.findById(anyLong())).thenReturn(new SslCertVO());
// a rule holding the cert
certService._lbCertDao = Mockito.mock(LoadBalancerCertMapDao.class);
- when(certService._lbCertDao.listByCertId(Matchers.anyLong())).thenReturn(null);
+ when(certService._lbCertDao.listByCertId(anyLong())).thenReturn(null);
//creating the command
final DeleteSslCertCmd deleteCmd = new DeleteSslCertCmdExtn();
@@ -660,15 +664,15 @@
certService._accountMgr = Mockito.mock(AccountManager.class);
final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
- when(certService._accountMgr.getAccount(Matchers.anyLong())).thenReturn(account);
+ when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
certService._domainDao = Mockito.mock(DomainDao.class);
final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
- when(certService._domainDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(domain);
+ when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
certService._sslCertDao = Mockito.mock(SslCertDao.class);
- when(certService._sslCertDao.remove(Matchers.anyLong())).thenReturn(true);
- when(certService._sslCertDao.findById(Matchers.anyLong())).thenReturn(new SslCertVO());
+ when(certService._sslCertDao.remove(anyLong())).thenReturn(true);
+ when(certService._sslCertDao.findById(anyLong())).thenReturn(new SslCertVO());
// rule holding the cert
certService._lbCertDao = Mockito.mock(LoadBalancerCertMapDao.class);
@@ -677,10 +681,11 @@
lbMapList.add(new LoadBalancerCertMapVO());
certService._lbCertDao = Mockito.mock(LoadBalancerCertMapDao.class);
- when(certService._lbCertDao.listByCertId(Matchers.anyLong())).thenReturn(lbMapList);
+ when(certService._lbCertDao.listByCertId(anyLong())).thenReturn(lbMapList);
+
certService._entityMgr = Mockito.mock(EntityManager.class);
- when(certService._entityMgr.findById(Matchers.eq(LoadBalancerVO.class), Matchers.anyLong())).thenReturn(new LoadBalancerVO());
+ when(certService._entityMgr.findById(eq(LoadBalancerVO.class), nullable(Long.class))).thenReturn(new LoadBalancerVO());
//creating the command
final DeleteSslCertCmd deleteCmd = new DeleteSslCertCmdExtn();
@@ -708,19 +713,19 @@
certService._accountMgr = Mockito.mock(AccountManager.class);
final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
- when(certService._accountMgr.getAccount(Matchers.anyLong())).thenReturn(account);
+ when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
certService._domainDao = Mockito.mock(DomainDao.class);
final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain");
- when(certService._domainDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(domain);
+ when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
certService._sslCertDao = Mockito.mock(SslCertDao.class);
- when(certService._sslCertDao.remove(Matchers.anyLong())).thenReturn(true);
- when(certService._sslCertDao.findById(Matchers.anyLong())).thenReturn(null);
+ when(certService._sslCertDao.remove(anyLong())).thenReturn(true);
+ when(certService._sslCertDao.findById(anyLong())).thenReturn(null);
// no rule holding the cert
certService._lbCertDao = Mockito.mock(LoadBalancerCertMapDao.class);
- when(certService._lbCertDao.listByCertId(Matchers.anyLong())).thenReturn(null);
+ when(certService._lbCertDao.listByCertId(anyLong())).thenReturn(null);
//creating the command
final DeleteSslCertCmd deleteCmd = new DeleteSslCertCmdExtn();
diff --git a/server/src/test/java/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java b/server/src/test/java/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java
index 4f808cb..3c9f186 100644
--- a/server/src/test/java/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java
+++ b/server/src/test/java/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java
@@ -17,6 +17,10 @@
package org.apache.cloudstack.networkoffering;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.nullable;
+
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -24,9 +28,6 @@
import javax.inject.Inject;
-import com.cloud.network.dao.LoadBalancerVMMapDao;
-import junit.framework.TestCase;
-
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.framework.config.impl.ConfigurationVO;
@@ -35,7 +36,6 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Matchers;
import org.mockito.Mockito;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -48,6 +48,7 @@
import com.cloud.network.Network.Provider;
import com.cloud.network.Network.Service;
import com.cloud.network.Networks.TrafficType;
+import com.cloud.network.dao.LoadBalancerVMMapDao;
import com.cloud.network.vpc.VpcManager;
import com.cloud.offering.NetworkOffering.Availability;
import com.cloud.offerings.NetworkOfferingServiceMapVO;
@@ -60,6 +61,8 @@
import com.cloud.utils.component.ComponentContext;
import com.cloud.vm.dao.UserVmDetailsDao;
+import junit.framework.TestCase;
+
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = "classpath:/createNetworkOffering.xml")
public class CreateNetworkOfferingTest extends TestCase {
@@ -103,11 +106,11 @@
ComponentContext.initComponentsLifeCycle();
ConfigurationVO configVO = new ConfigurationVO("200", "200", "200", "200", "200", "200");
- Mockito.when(configDao.findByName(Matchers.anyString())).thenReturn(configVO);
+ Mockito.when(configDao.findByName(anyString())).thenReturn(configVO);
- Mockito.when(offDao.persist(Matchers.any(NetworkOfferingVO.class))).thenReturn(new NetworkOfferingVO());
- Mockito.when(offDao.persist(Matchers.any(NetworkOfferingVO.class), Matchers.anyMap())).thenReturn(new NetworkOfferingVO());
- Mockito.when(mapDao.persist(Matchers.any(NetworkOfferingServiceMapVO.class))).thenReturn(new NetworkOfferingServiceMapVO());
+ Mockito.when(offDao.persist(any(NetworkOfferingVO.class))).thenReturn(new NetworkOfferingVO());
+ Mockito.when(offDao.persist(any(NetworkOfferingVO.class), nullable(Map.class))).thenReturn(new NetworkOfferingVO());
+ Mockito.when(mapDao.persist(any(NetworkOfferingServiceMapVO.class))).thenReturn(new NetworkOfferingServiceMapVO());
Mockito.when(accountMgr.getSystemUser()).thenReturn(new UserVO(1));
Mockito.when(accountMgr.getSystemAccount()).thenReturn(new AccountVO(2));
diff --git a/server/src/test/java/org/apache/cloudstack/vm/VmImportManagerImplTest.java b/server/src/test/java/org/apache/cloudstack/vm/VmImportManagerImplTest.java
new file mode 100644
index 0000000..ad2bf08
--- /dev/null
+++ b/server/src/test/java/org/apache/cloudstack/vm/VmImportManagerImplTest.java
@@ -0,0 +1,353 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.vm;
+
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.when;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import org.apache.cloudstack.api.ResponseGenerator;
+import org.apache.cloudstack.api.ResponseObject;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.command.admin.vm.ImportUnmanagedInstanceCmd;
+import org.apache.cloudstack.api.command.admin.vm.ListUnmanagedInstancesCmd;
+import org.apache.cloudstack.api.response.UserVmResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
+import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService;
+import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import com.cloud.agent.AgentManager;
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.GetUnmanagedInstancesAnswer;
+import com.cloud.agent.api.GetUnmanagedInstancesCommand;
+import com.cloud.configuration.Resource;
+import com.cloud.dc.ClusterVO;
+import com.cloud.dc.DataCenter;
+import com.cloud.dc.DataCenterVO;
+import com.cloud.dc.dao.ClusterDao;
+import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.event.UsageEventUtils;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.PermissionDeniedException;
+import com.cloud.host.Host;
+import com.cloud.host.HostVO;
+import com.cloud.host.Status;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.network.Network;
+import com.cloud.network.NetworkModel;
+import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkVO;
+import com.cloud.offering.DiskOffering;
+import com.cloud.offering.ServiceOffering;
+import com.cloud.resource.ResourceManager;
+import com.cloud.service.ServiceOfferingVO;
+import com.cloud.service.dao.ServiceOfferingDao;
+import com.cloud.storage.DiskOfferingVO;
+import com.cloud.storage.StoragePool;
+import com.cloud.storage.VMTemplateStoragePoolVO;
+import com.cloud.storage.VMTemplateVO;
+import com.cloud.storage.Volume;
+import com.cloud.storage.VolumeApiService;
+import com.cloud.storage.VolumeVO;
+import com.cloud.storage.dao.DiskOfferingDao;
+import com.cloud.storage.dao.VMTemplateDao;
+import com.cloud.storage.dao.VMTemplatePoolDao;
+import com.cloud.storage.dao.VolumeDao;
+import com.cloud.template.VirtualMachineTemplate;
+import com.cloud.user.Account;
+import com.cloud.user.AccountService;
+import com.cloud.user.AccountVO;
+import com.cloud.user.ResourceLimitService;
+import com.cloud.user.User;
+import com.cloud.user.UserVO;
+import com.cloud.user.dao.UserDao;
+import com.cloud.uservm.UserVm;
+import com.cloud.utils.Pair;
+import com.cloud.vm.DiskProfile;
+import com.cloud.vm.NicProfile;
+import com.cloud.vm.UserVmManager;
+import com.cloud.vm.UserVmVO;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.dao.VMInstanceDao;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest(UsageEventUtils.class)
+public class VmImportManagerImplTest {
+
+ @InjectMocks
+ private VmImportService vmIngestionService = new VmImportManagerImpl();
+
+ @Mock
+ private UserVmManager userVmManager;
+ @Mock
+ private ClusterDao clusterDao;
+ @Mock
+ private ResourceManager resourceManager;
+ @Mock
+ private VMTemplatePoolDao templatePoolDao;
+ @Mock
+ private AgentManager agentManager;
+ @Mock
+ private AccountService accountService;
+ @Mock
+ private UserDao userDao;
+ @Mock
+ private DataCenterDao dataCenterDao;
+ @Mock
+ private VMTemplateDao templateDao;
+ @Mock
+ private VMInstanceDao vmDao;
+ @Mock
+ private ServiceOfferingDao serviceOfferingDao;
+ @Mock
+ private DiskOfferingDao diskOfferingDao;
+ @Mock
+ private NetworkDao networkDao;
+ @Mock
+ private NetworkOrchestrationService networkOrchestrationService;
+ @Mock
+ private VolumeOrchestrationService volumeManager;
+ @Mock
+ public ResponseGenerator responseGenerator;
+ @Mock
+ private VolumeDao volumeDao;
+ @Mock
+ private ResourceLimitService resourceLimitService;
+ @Mock
+ private PrimaryDataStoreDao primaryDataStoreDao;
+ @Mock
+ private VolumeApiService volumeApiService;
+ @Mock
+ private NetworkModel networkModel;
+ @Mock
+ private ConfigurationDao configurationDao;
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+
+ AccountVO account = new AccountVO("admin", 1L, "", Account.ACCOUNT_TYPE_ADMIN, "uuid");
+ UserVO user = new UserVO(1, "adminuser", "password", "firstname", "lastName", "email", "timezone", UUID.randomUUID().toString(), User.Source.UNKNOWN);
+ CallContext.register(user, account);
+
+ UnmanagedInstanceTO instance = new UnmanagedInstanceTO();
+ instance.setName("TestInstance");
+ instance.setCpuCores(2);
+ instance.setCpuCoresPerSocket(1);
+ instance.setCpuSpeed(1000);
+ instance.setMemory(1024);
+ instance.setOperatingSystem("CentOS 7");
+ List<UnmanagedInstanceTO.Disk> instanceDisks = new ArrayList<>();
+ UnmanagedInstanceTO.Disk instanceDisk = new UnmanagedInstanceTO.Disk();
+ instanceDisk.setDiskId("1000-1");
+ instanceDisk.setLabel("DiskLabel");
+ instanceDisk.setController("scsi");
+ instanceDisk.setImagePath("[b6ccf44a1fa13e29b3667b4954fa10ee] TestInstance/ROOT-1.vmdk");
+ instanceDisk.setCapacity(5242880L);
+ instanceDisk.setDatastoreName("Test");
+ instanceDisk.setDatastoreHost("Test");
+ instanceDisk.setDatastorePath("Test");
+ instanceDisk.setDatastoreType("NFS");
+ instanceDisks.add(instanceDisk);
+ instance.setDisks(instanceDisks);
+ List<UnmanagedInstanceTO.Nic> instanceNics = new ArrayList<>();
+ UnmanagedInstanceTO.Nic instanceNic = new UnmanagedInstanceTO.Nic();
+ instanceNic.setNicId("NIC 1");
+ instanceNic.setAdapterType("VirtualE1000E");
+ instanceNic.setMacAddress("02:00:2e:0f:00:02");
+ instanceNic.setVlan(1024);
+ instanceNics.add(instanceNic);
+ instance.setNics(instanceNics);
+ instance.setPowerState(UnmanagedInstanceTO.PowerState.PowerOn);
+
+ ClusterVO clusterVO = new ClusterVO(1L, 1L, "Cluster");
+ clusterVO.setHypervisorType(Hypervisor.HypervisorType.VMware.toString());
+ when(clusterDao.findById(Mockito.anyLong())).thenReturn(clusterVO);
+ when(configurationDao.getValue(Mockito.anyString())).thenReturn(null);
+ doNothing().when(resourceLimitService).checkResourceLimit(any(Account.class), any(Resource.ResourceType.class), anyLong());
+ List<HostVO> hosts = new ArrayList<>();
+ HostVO hostVO = Mockito.mock(HostVO.class);
+ when(hostVO.isInMaintenanceStates()).thenReturn(false);
+ hosts.add(hostVO);
+ when(resourceManager.listHostsInClusterByStatus(Mockito.anyLong(), Mockito.any(Status.class))).thenReturn(hosts);
+ List<VMTemplateStoragePoolVO> templates = new ArrayList<>();
+ when(templatePoolDao.listAll()).thenReturn(templates);
+ List<VolumeVO> volumes = new ArrayList<>();
+ when(volumeDao.findIncludingRemovedByZone(Mockito.anyLong())).thenReturn(volumes);
+ List<VMInstanceVO> vms = new ArrayList<>();
+ when(vmDao.listByHostId(Mockito.anyLong())).thenReturn(vms);
+ when(vmDao.listByLastHostIdAndStates(Mockito.anyLong())).thenReturn(vms);
+ GetUnmanagedInstancesCommand cmd = Mockito.mock(GetUnmanagedInstancesCommand.class);
+ HashMap<String, UnmanagedInstanceTO> map = new HashMap<>();
+ map.put(instance.getName(), instance);
+ Answer answer = new GetUnmanagedInstancesAnswer(cmd, "", map);
+ when(agentManager.easySend(Mockito.anyLong(), Mockito.any(GetUnmanagedInstancesCommand.class))).thenReturn(answer);
+ DataCenterVO zone = Mockito.mock(DataCenterVO.class);
+ when(zone.getId()).thenReturn(1L);
+ when(dataCenterDao.findById(Mockito.anyLong())).thenReturn(zone);
+ when(accountService.getActiveAccountById(Mockito.anyLong())).thenReturn(Mockito.mock(Account.class));
+ List<UserVO> users = new ArrayList<>();
+ users.add(Mockito.mock(UserVO.class));
+ when(userDao.listByAccount(Mockito.anyLong())).thenReturn(users);
+ VMTemplateVO template = Mockito.mock(VMTemplateVO.class);
+ when(template.getId()).thenReturn(1L);
+ when(template.getName()).thenReturn("Template");
+ when(templateDao.findById(Mockito.anyLong())).thenReturn(template);
+ when(templateDao.findByName(Mockito.anyString())).thenReturn(template);
+ ServiceOfferingVO serviceOffering = Mockito.mock(ServiceOfferingVO.class);
+ when(serviceOffering.getId()).thenReturn(1L);
+ when(serviceOffering.getTags()).thenReturn("");
+ when(serviceOffering.isDynamic()).thenReturn(false);
+ when(serviceOffering.getCpu()).thenReturn(instance.getCpuCores());
+ when(serviceOffering.getRamSize()).thenReturn(instance.getMemory());
+ when(serviceOffering.getSpeed()).thenReturn(instance.getCpuSpeed());
+ when(serviceOfferingDao.findById(Mockito.anyLong())).thenReturn(serviceOffering);
+ DiskOfferingVO diskOfferingVO = Mockito.mock(DiskOfferingVO.class);
+ when(diskOfferingVO.isCustomized()).thenReturn(false);
+ when(diskOfferingVO.getDiskSize()).thenReturn(Long.MAX_VALUE);
+ when(diskOfferingDao.findById(Mockito.anyLong())).thenReturn(diskOfferingVO);
+ UserVmVO userVm = Mockito.mock(UserVmVO.class);
+ when(userVm.getAccountId()).thenReturn(1L);
+ when(userVm.getDataCenterId()).thenReturn(1L);
+ when(userVm.getHostName()).thenReturn(instance.getName());
+ when(userVm.getTemplateId()).thenReturn(1L);
+ when(userVm.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.VMware);
+ when(userVm.getUuid()).thenReturn("abcd");
+ when(userVm.isDisplayVm()).thenReturn(true);
+ // Skip usage publishing and resource increment for test
+ when(userVm.getType()).thenReturn(VirtualMachine.Type.Instance);
+ userVm.setInstanceName(instance.getName());
+ userVm.setHostName(instance.getName());
+ StoragePoolVO poolVO = Mockito.mock(StoragePoolVO.class);
+ when(poolVO.getDataCenterId()).thenReturn(1L);
+ when(poolVO.getClusterId()).thenReturn(clusterVO.getId());
+ List<StoragePoolVO> pools = new ArrayList<>();
+ pools.add(poolVO);
+ when(primaryDataStoreDao.listPoolByHostPath(Mockito.anyString(), Mockito.anyString())).thenReturn(pools);
+ when(userVmManager.importVM(nullable(DataCenter.class), nullable(Host.class), nullable(VirtualMachineTemplate.class), nullable(String.class), nullable(String.class),
+ nullable(Account.class), nullable(String.class), nullable(Account.class), nullable(Boolean.class), nullable(String.class),
+ nullable(Long.class), nullable(Long.class), nullable(ServiceOffering.class), nullable(String.class),
+ nullable(String.class), nullable(Hypervisor.HypervisorType.class), nullable(Map.class), nullable(VirtualMachine.PowerState.class))).thenReturn(userVm);
+ when(volumeApiService.doesTargetStorageSupportDiskOffering(Mockito.any(StoragePool.class), Mockito.anyString())).thenReturn(true);
+ NetworkVO networkVO = Mockito.mock(NetworkVO.class);
+ when(networkVO.getGuestType()).thenReturn(Network.GuestType.L2);
+ when(networkVO.getBroadcastUri()).thenReturn(URI.create(String.format("vlan://%d", instanceNic.getVlan())));
+ when(networkVO.getDataCenterId()).thenReturn(1L);
+ when(networkDao.findById(Mockito.anyLong())).thenReturn(networkVO);
+ List<NetworkVO> networks = new ArrayList<>();
+ networks.add(networkVO);
+ when(networkDao.listByZone(Mockito.anyLong())).thenReturn(networks);
+ doNothing().when(networkModel).checkNetworkPermissions(Mockito.any(Account.class), Mockito.any(Network.class));
+ doNothing().when(networkModel).checkRequestedIpAddresses(Mockito.anyLong(), Mockito.any(Network.IpAddresses.class));
+ NicProfile profile = Mockito.mock(NicProfile.class);
+ Integer deviceId = 100;
+ Pair<NicProfile, Integer> pair = new Pair<NicProfile, Integer>(profile, deviceId);
+ when(networkOrchestrationService.importNic(nullable(String.class), nullable(Integer.class), nullable(Network.class), nullable(Boolean.class), nullable(VirtualMachine.class), nullable(Network.IpAddresses.class))).thenReturn(pair);
+ when(volumeManager.importVolume(Mockito.any(Volume.Type.class), Mockito.anyString(), Mockito.any(DiskOffering.class), Mockito.anyLong(),
+ Mockito.anyLong(), Mockito.anyLong(), Mockito.any(VirtualMachine.class), Mockito.any(VirtualMachineTemplate.class),
+ Mockito.any(Account.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyString(), Mockito.anyString())).thenReturn(Mockito.mock(DiskProfile.class));
+ when(volumeDao.findByInstance(Mockito.anyLong())).thenReturn(volumes);
+ List<UserVmResponse> userVmResponses = new ArrayList<>();
+ UserVmResponse userVmResponse = new UserVmResponse();
+ userVmResponse.setInstanceName(instance.getName());
+ userVmResponses.add(userVmResponse);
+ when(responseGenerator.createUserVmResponse(Mockito.any(ResponseObject.ResponseView.class), Mockito.anyString(), Mockito.any(UserVm.class))).thenReturn(userVmResponses);
+ }
+
+ @After
+ public void tearDown() {
+ CallContext.unregister();
+ }
+
+ @Test
+ public void listUnmanagedInstancesTest() {
+ ListUnmanagedInstancesCmd cmd = Mockito.mock(ListUnmanagedInstancesCmd.class);
+ vmIngestionService.listUnmanagedInstances(cmd);
+ }
+
+ @Test(expected = InvalidParameterValueException.class)
+ public void listUnmanagedInstancesInvalidHypervisorTest() {
+ ListUnmanagedInstancesCmd cmd = Mockito.mock(ListUnmanagedInstancesCmd.class);
+ ClusterVO cluster = new ClusterVO(1, 1, "Cluster");
+ cluster.setHypervisorType(Hypervisor.HypervisorType.KVM.toString());
+ when(clusterDao.findById(Mockito.anyLong())).thenReturn(cluster);
+ vmIngestionService.listUnmanagedInstances(cmd);
+ }
+
+ @Test(expected = PermissionDeniedException.class)
+ public void listUnmanagedInstancesInvalidCallerTest() {
+ CallContext.unregister();
+ AccountVO account = new AccountVO("user", 1L, "", Account.ACCOUNT_TYPE_NORMAL, "uuid");
+ UserVO user = new UserVO(1, "testuser", "password", "firstname", "lastName", "email", "timezone", UUID.randomUUID().toString(), User.Source.UNKNOWN);
+ CallContext.register(user, account);
+ ListUnmanagedInstancesCmd cmd = Mockito.mock(ListUnmanagedInstancesCmd.class);
+ vmIngestionService.listUnmanagedInstances(cmd);
+ }
+
+ @Test
+ public void importUnmanagedInstanceTest() {
+ ImportUnmanagedInstanceCmd importUnmanageInstanceCmd = Mockito.mock(ImportUnmanagedInstanceCmd.class);
+ when(importUnmanageInstanceCmd.getName()).thenReturn("TestInstance");
+ when(importUnmanageInstanceCmd.getAccountName()).thenReturn(null);
+ when(importUnmanageInstanceCmd.getDomainId()).thenReturn(null);
+ PowerMockito.mockStatic(UsageEventUtils.class);
+ vmIngestionService.importUnmanagedInstance(importUnmanageInstanceCmd);
+ }
+
+ @Test(expected = InvalidParameterValueException.class)
+ public void importUnmanagedInstanceInvalidHostnameTest() {
+ ImportUnmanagedInstanceCmd importUnmanageInstanceCmd = Mockito.mock(ImportUnmanagedInstanceCmd.class);
+ when(importUnmanageInstanceCmd.getName()).thenReturn("TestInstance");
+ when(importUnmanageInstanceCmd.getName()).thenReturn("some name");
+ when(importUnmanageInstanceCmd.getMigrateAllowed()).thenReturn(false);
+ vmIngestionService.importUnmanagedInstance(importUnmanageInstanceCmd);
+ }
+
+ @Test(expected = ServerApiException.class)
+ public void importUnmanagedInstanceMissingInstanceTest() {
+ ImportUnmanagedInstanceCmd importUnmanageInstanceCmd = Mockito.mock(ImportUnmanagedInstanceCmd.class);
+ when(importUnmanageInstanceCmd.getName()).thenReturn("SomeInstance");
+ when(importUnmanageInstanceCmd.getAccountName()).thenReturn(null);
+ when(importUnmanageInstanceCmd.getDomainId()).thenReturn(null);
+ vmIngestionService.importUnmanagedInstance(importUnmanageInstanceCmd);
+ }
+}
\ No newline at end of file
diff --git a/server/src/test/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionTest.java b/server/src/test/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionTest.java
index 6195387..6fa1759 100644
--- a/server/src/test/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionTest.java
+++ b/server/src/test/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionTest.java
@@ -25,6 +25,7 @@
import static org.mockito.Matchers.anyLong;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
@@ -285,7 +286,7 @@
@Test(expected = ResourceUnavailableException.class)
public void testCheckPreconditionsWrongState() throws ResourceUnavailableException {
// Prepare wrong traffic type to trigger error
- when(deployment.guestNetwork.getTrafficType()).thenReturn(TrafficType.Guest);
+ lenient().when(deployment.guestNetwork.getTrafficType()).thenReturn(TrafficType.Guest);
// Execute
driveTestCheckPreconditionsCorrectNwState(Network.State.Shutdown);
@@ -422,8 +423,8 @@
@Test
public void testPlanDeploymentRoutersNonBasic() {
// Prepare
- when(mockDataCenter.getNetworkType()).thenReturn(NetworkType.Advanced);
- when(mockDestination.getPod()).thenReturn(mockPod);
+ lenient().when(mockDataCenter.getNetworkType()).thenReturn(NetworkType.Advanced);
+ lenient().when(mockDestination.getPod()).thenReturn(mockPod);
// Execute
deployment.planDeploymentRouters();
@@ -651,7 +652,7 @@
public void testFindSourceNatIPNonPublicNw() throws InsufficientAddressCapacityException, ConcurrentOperationException {
// Prepare
final PublicIp sourceNatIp = mock(PublicIp.class);
- when(mockIpAddrMgr.assignSourceNatIpAddressToGuestNetwork(
+ lenient().when(mockIpAddrMgr.assignSourceNatIpAddressToGuestNetwork(
mockOwner, mockNw)).thenReturn(sourceNatIp);
deployment.isPublicNetwork = false;
@@ -705,7 +706,7 @@
// Prepare
deployment.routers = new ArrayList<>();
- when(mockNw.isRedundant()).thenReturn(true);
+ lenient().when(mockNw.isRedundant()).thenReturn(true);
//this.deployment.routers.add(routerVO1);
final RouterDeploymentDefinition deploymentUT = spy(deployment);
doReturn(2).when(deploymentUT).getNumberOfRoutersToDeploy();
@@ -714,7 +715,7 @@
final DomainRouterVO routerVO2 = mock(DomainRouterVO.class);
when(mockNetworkHelper.deployRouter(deploymentUT, false))
.thenReturn(routerVO1).thenReturn(routerVO2);
- when(networkDetailsDao.findById(anyLong())).thenReturn(null);
+ lenient().when(networkDetailsDao.findById(anyLong())).thenReturn(null);
// Execute
deploymentUT.deployAllVirtualRouters();
@@ -757,7 +758,7 @@
// Prepare
when(mockNetworkModel.isNetworkSystem(mockNw)).thenReturn(false);
when(mockNw.getGuestType()).thenReturn(Network.GuestType.Isolated);
- when(mockAccountMgr.getAccount(Account.ACCOUNT_ID_SYSTEM)).thenReturn(null);
+ lenient().when(mockAccountMgr.getAccount(Account.ACCOUNT_ID_SYSTEM)).thenReturn(null);
//Execute
deployment.setupAccountOwner();
// Assert
diff --git a/server/src/test/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionTestBase.java b/server/src/test/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionTestBase.java
index 626c2d7..04778b9 100644
--- a/server/src/test/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionTestBase.java
+++ b/server/src/test/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionTestBase.java
@@ -16,6 +16,7 @@
// under the License.
package org.cloud.network.router.deployment;
+import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.when;
import java.util.ArrayList;
@@ -23,11 +24,11 @@
import java.util.List;
import java.util.Map;
-import com.cloud.network.dao.NetworkDetailsDao;
+import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import com.cloud.dc.DataCenter;
import com.cloud.dc.HostPodVO;
@@ -37,6 +38,7 @@
import com.cloud.network.IpAddressManager;
import com.cloud.network.NetworkModel;
import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkDetailsDao;
import com.cloud.network.dao.NetworkVO;
import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
import com.cloud.network.dao.VirtualRouterProviderDao;
@@ -134,11 +136,17 @@
protected void initMocks() {
when(mockDestination.getDataCenter()).thenReturn(mockDataCenter);
- when(mockDataCenter.getId()).thenReturn(DATA_CENTER_ID);
- when(mockPod.getId()).thenReturn(POD_ID1);
- when(mockHostPodVO1.getId()).thenReturn(POD_ID1);
- when(mockHostPodVO2.getId()).thenReturn(POD_ID2);
- when(mockHostPodVO3.getId()).thenReturn(POD_ID3);
- when(mockNw.getId()).thenReturn(NW_ID_1);
+ lenient().when(mockDataCenter.getId()).thenReturn(DATA_CENTER_ID);
+ lenient().when(mockPod.getId()).thenReturn(POD_ID1);
+ lenient().when(mockHostPodVO1.getId()).thenReturn(POD_ID1);
+ lenient().when(mockHostPodVO2.getId()).thenReturn(POD_ID2);
+ lenient().when(mockHostPodVO3.getId()).thenReturn(POD_ID3);
+ lenient().when(mockNw.getId()).thenReturn(NW_ID_1);
}
+
+ @Test
+ public void mockTest() {
+ return;
+ }
+
}
diff --git a/server/src/test/java/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java b/server/src/test/java/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java
index e4ef9f5..68e147b 100644
--- a/server/src/test/java/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java
+++ b/server/src/test/java/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java
@@ -22,6 +22,7 @@
import static junit.framework.Assert.assertNull;
import static junit.framework.Assert.assertTrue;
import static org.mockito.Matchers.anyLong;
+import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -81,7 +82,7 @@
protected void initMocks() {
super.initMocks();
when(mockVpc.getId()).thenReturn(VPC_ID);
- when(mockVpc.getZoneId()).thenReturn(VPC_ID);
+ lenient().when(mockVpc.getZoneId()).thenReturn(VPC_ID);
when(mockVpc.getVpcOfferingId()).thenReturn(VPC_OFFERING_ID);
}
@@ -251,7 +252,7 @@
StorageUnavailableException, InsufficientCapacityException, ResourceUnavailableException {
// Prepare
final VpcRouterDeploymentDefinition vpcDeployment = (VpcRouterDeploymentDefinition) deployment;
- when(vpcDeployment.nwHelper.deployRouter(vpcDeployment, true)).thenReturn(router);
+ lenient().when(vpcDeployment.nwHelper.deployRouter(vpcDeployment, true)).thenReturn(router);
// Execute
vpcDeployment.deployAllVirtualRouters();
diff --git a/server/src/test/resources/SecurityGroupManagerTestContext.xml b/server/src/test/resources/SecurityGroupManagerTestContext.xml
index a4d0063..10ca3e2 100644
--- a/server/src/test/resources/SecurityGroupManagerTestContext.xml
+++ b/server/src/test/resources/SecurityGroupManagerTestContext.xml
@@ -9,19 +9,19 @@
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
- xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/tx
+ http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx/spring-tx.xsd
- http://www.springframework.org/schema/aop
+ http://www.springframework.org/schema/aop
http://www.springframework.org/schema/aop/spring-aop.xsd
- http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd">
-
- <context:annotation-config />
-
+
+ <context:annotation-config />
+
<!-- @DB support -->
<bean id="componentContext" class="com.cloud.utils.component.ComponentContext" />
<bean id="transactionContextBuilder" class="com.cloud.utils.db.TransactionContextBuilder" />
@@ -29,13 +29,29 @@
<property name="Interceptors">
<list>
<ref bean="transactionContextBuilder" />
- </list>
- </property>
- </bean>
-
- <bean id="TestConfiguration"
- class="com.cloud.network.security.SecurityGroupManagerTestConfiguration" />
- <bean class="org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor">
+ </list>
+ </property>
+ </bean>
+ <bean id="NetworkDao" class="com.cloud.network.dao.NetworkDaoImpl" />
+ <bean id="NetworkAccountDao" class="com.cloud.network.dao.NetworkAccountDaoImpl"/>
+ <bean id="NetworkDomainDao" class="com.cloud.network.dao.NetworkDomainDaoImpl" />
+ <bean id="NetworkOpDao" class="com.cloud.network.dao.NetworkOpDaoImpl"/>
+ <bean id="NetworkServiceMapDao" class="com.cloud.network.dao.NetworkServiceMapDaoImpl"/>
+ <bean id="NetworkOfferingDao" class="com.cloud.offerings.dao.NetworkOfferingDaoImpl"/>
+ <bean id="NetwrkOfferingDetailsDao" class="com.cloud.offerings.dao.NetworkOfferingDetailsDaoImpl"/>
+ <bean id="NetworkOfferingServiceMapDa" class="com.cloud.offerings.dao.NetworkOfferingServiceMapDaoImpl"/>
+ <bean id="UsageEventDetailsDao" class="com.cloud.event.dao.UsageEventDetailsDaoImpl"/>
+ <bean id="HostDaoImpl" class="com.cloud.gpu.dao.HostGpuGroupsDaoImpl"/>
+ <bean id="VgpuTypesDao" class="com.cloud.gpu.dao.VGPUTypesDaoImpl"/>
+ <bean id="MgmtServiceCOnf" class="com.cloud.configuration.ManagementServiceConfigurationImpl"/>
+ <bean id="ClusterDetailsDao" class="com.cloud.dc.ClusterDetailsDaoImpl"/>
+ <bean id="AccountGuestVlanMapDao" class="com.cloud.network.dao.AccountGuestVlanMapDaoImpl"/>
+ <bean id="NicSecIpDao" class="com.cloud.vm.dao.NicSecondaryIpDaoImpl"/>
+ <bean id="ManagedContext" class="org.apache.cloudstack.managed.context.impl.DefaultManagedContext"/>
+ <bean id="SecurityGroupJoinDaoImpl" class="com.cloud.api.query.dao.ResourceTagJoinDaoImpl"/>
+ <bean id="TestConfiguration"
+ class="com.cloud.network.security.SecurityGroupManagerTestConfiguration" />
+ <bean class="org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor">
<property name="requiredParameterValue" value="false" />
</bean>
</beans>
diff --git a/server/src/test/resources/SnapshotDaoTestContext.xml b/server/src/test/resources/SnapshotDaoTestContext.xml
index 448b309..479bd95 100644
--- a/server/src/test/resources/SnapshotDaoTestContext.xml
+++ b/server/src/test/resources/SnapshotDaoTestContext.xml
@@ -9,19 +9,19 @@
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
- xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/tx
+ http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx/spring-tx.xsd
- http://www.springframework.org/schema/aop
+ http://www.springframework.org/schema/aop
http://www.springframework.org/schema/aop/spring-aop.xsd
- http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd">
-
- <context:annotation-config />
-
+
+ <context:annotation-config />
+
<!-- @DB support -->
<bean id="componentContext" class="com.cloud.utils.component.ComponentContext" />
@@ -33,12 +33,16 @@
<ref bean="transactionContextBuilder" />
<ref bean="actionEventInterceptor" />
</list>
- </property>
- </bean>
-
- <bean id="TestConfiguration"
- class="com.cloud.snapshot.SnapshotDaoTestConfiguration" />
- <bean class="org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor" >
+ </property>
+ </bean>
+
+ <bean id="HostGpuGroupDao" class="com.cloud.gpu.dao.HostGpuGroupsDaoImpl"/>
+ <bean id="VGpuTypesDao" class="com.cloud.gpu.dao.VGPUTypesDaoImpl"/>
+ <bean id="MgmtServiceConf" class="com.cloud.configuration.ManagementServiceConfigurationImpl"/>
+ <bean id="ClusterDetailsDao" class="com.cloud.dc.ClusterDetailsDaoImpl"/>
+ <bean id="TestConfiguration"
+ class="com.cloud.snapshot.SnapshotDaoTestConfiguration" />
+ <bean class="org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor" >
<property name="requiredParameterValue" value="false" />
</bean>
</beans>
diff --git a/server/src/test/resources/VpcTestContext.xml b/server/src/test/resources/VpcTestContext.xml
index e124f72..c957573 100644
--- a/server/src/test/resources/VpcTestContext.xml
+++ b/server/src/test/resources/VpcTestContext.xml
@@ -9,23 +9,23 @@
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
- xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/tx
+ http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx/spring-tx.xsd
- http://www.springframework.org/schema/aop
+ http://www.springframework.org/schema/aop
http://www.springframework.org/schema/aop/spring-aop.xsd
- http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd">
-
- <context:annotation-config />
-
- <!-- @DB support -->
- <bean id="componentContext" class="com.cloud.utils.component.ComponentContext" />
-
- <bean id="transactionContextBuilder" class="com.cloud.utils.db.TransactionContextBuilder" />
+
+ <context:annotation-config />
+
+ <!-- @DB support -->
+ <bean id="componentContext" class="com.cloud.utils.component.ComponentContext" />
+
+ <bean id="transactionContextBuilder" class="com.cloud.utils.db.TransactionContextBuilder" />
<bean id="actionEventInterceptor" class="com.cloud.event.ActionEventInterceptor" />
<bean id="instantiatePostProcessor" class="com.cloud.utils.component.ComponentInstantiationPostProcessor">
<property name="Interceptors">
diff --git a/server/src/test/resources/createNetworkOffering.xml b/server/src/test/resources/createNetworkOffering.xml
index 32596fc..8dee0e8 100644
--- a/server/src/test/resources/createNetworkOffering.xml
+++ b/server/src/test/resources/createNetworkOffering.xml
@@ -58,5 +58,6 @@
<bean id="DiskOfferingDetailsDaoImpl" class="org.apache.cloudstack.resourcedetail.dao.DiskOfferingDetailsDaoImpl" />
<bean id="networkOfferingJoinDaoImpl" class="com.cloud.api.query.dao.NetworkOfferingJoinDaoImpl" />
<bean id="networkOfferingDetailsDaoImpl" class="com.cloud.offerings.dao.NetworkOfferingDetailsDaoImpl" />
+ <bean id="vMTemplateZoneDaoImpl" class="com.cloud.storage.dao.VMTemplateZoneDaoImpl" />
<bean id="indirectAgentLBImpl" class="org.apache.cloudstack.agent.lb.IndirectAgentLBServiceImpl" />
</beans>
diff --git a/services/console-proxy/pom.xml b/services/console-proxy/pom.xml
index a3222cb..c789931 100644
--- a/services/console-proxy/pom.xml
+++ b/services/console-proxy/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-services</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
diff --git a/services/console-proxy/rdpconsole/pom.xml b/services/console-proxy/rdpconsole/pom.xml
index f562b82..b5dbcca 100644
--- a/services/console-proxy/rdpconsole/pom.xml
+++ b/services/console-proxy/rdpconsole/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-service-console-proxy</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
@@ -48,6 +48,11 @@
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.security</groupId>
+ <artifactId>xml-security-impl</artifactId>
+ <version>1.0</version>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/services/console-proxy/server/pom.xml b/services/console-proxy/server/pom.xml
index a3c8f6c..8de3862 100644
--- a/services/console-proxy/server/pom.xml
+++ b/services/console-proxy/server/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-service-console-proxy</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxy.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxy.java
index f0c3c4e..2161de2 100644
--- a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxy.java
+++ b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxy.java
@@ -35,7 +35,6 @@
import com.cloud.consoleproxy.util.Logger;
import com.cloud.utils.PropertiesUtil;
-import com.cloud.utils.ReflectUtil;
import com.google.gson.Gson;
import com.sun.net.httpserver.HttpServer;
@@ -74,7 +73,7 @@
static String encryptorPassword = "Dummy";
private static void configLog4j() {
- final ClassLoader loader = ReflectUtil.getClassLoaderForName("conf");
+ final ClassLoader loader = Thread.currentThread().getContextClassLoader();
URL configUrl = loader.getResource("/conf/log4j-cloud.xml");
if (configUrl == null)
configUrl = ClassLoader.getSystemResource("log4j-cloud.xml");
@@ -249,7 +248,7 @@
ConsoleProxy.ksBits = ksBits;
ConsoleProxy.ksPassword = ksPassword;
try {
- final ClassLoader loader = ReflectUtil.getClassLoaderForName("agent");
+ final ClassLoader loader = Thread.currentThread().getContextClassLoader();
Class<?> contextClazz = loader.loadClass("com.cloud.agent.resource.consoleproxy.ConsoleProxyResource");
authMethod = contextClazz.getDeclaredMethod("authenticateConsoleAccess", String.class, String.class, String.class, String.class, String.class, Boolean.class);
reportMethod = contextClazz.getDeclaredMethod("reportLoadInfo", String.class);
diff --git a/services/pom.xml b/services/pom.xml
index 3d8ec62..5bfefbf 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
diff --git a/services/secondary-storage/controller/pom.xml b/services/secondary-storage/controller/pom.xml
index 02d009b..2bffd56 100644
--- a/services/secondary-storage/controller/pom.xml
+++ b/services/secondary-storage/controller/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-service-secondary-storage</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
index 8b2ed40..a1a3873b 100644
--- a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
+++ b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
@@ -828,8 +828,7 @@
return false;
}
- DataStore store = templateMgr.getImageStore(dataCenterId, template.getId());
- if (store == null) {
+ if (!template.isDirectDownload() && templateMgr.getImageStore(dataCenterId, template.getId()) == null) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("No secondary storage available in zone " + dataCenterId + ", wait until it is ready to launch secondary storage vm");
}
diff --git a/services/secondary-storage/pom.xml b/services/secondary-storage/pom.xml
index 2f5b10e..c4c028a 100644
--- a/services/secondary-storage/pom.xml
+++ b/services/secondary-storage/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-services</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
diff --git a/services/secondary-storage/server/pom.xml b/services/secondary-storage/server/pom.xml
index ee67c04..cebeb33 100644
--- a/services/secondary-storage/server/pom.xml
+++ b/services/secondary-storage/server/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-service-secondary-storage</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
@@ -60,7 +60,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
- <version>4.0.33.Final</version>
+ <version>4.0.56.Final</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
index 3dc6775..ab98a81 100644
--- a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
+++ b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
@@ -67,7 +67,7 @@
import org.apache.cloudstack.storage.configdrive.ConfigDriveBuilder;
import org.apache.cloudstack.storage.template.DownloadManager;
import org.apache.cloudstack.storage.template.DownloadManagerImpl;
-import org.apache.cloudstack.storage.template.DownloadManagerImpl.ZfsPathParser;
+import org.apache.cloudstack.storage.NfsMountManagerImpl.PathParser;
import org.apache.cloudstack.storage.template.UploadEntity;
import org.apache.cloudstack.storage.template.UploadManager;
import org.apache.cloudstack.storage.template.UploadManagerImpl;
@@ -2905,7 +2905,7 @@
script = new Script(!_inSystemVM, "mount", _timeout, s_logger);
List<String> res = new ArrayList<String>();
- ZfsPathParser parser = new ZfsPathParser(localRootPath);
+ PathParser parser = new PathParser(localRootPath);
script.execute(parser);
res.addAll(parser.getPaths());
for (String s : res) {
@@ -3201,15 +3201,15 @@
UploadEntity.ResourceType resourceType = uploadEntity.getResourceType();
String fileSavedTempLocation = uploadEntity.getInstallPathPrefix() + "/" + filename;
-
- String uploadedFileExtension = FilenameUtils.getExtension(filename);
- String userSelectedFormat = uploadEntity.getFormat().toString();
- if (uploadedFileExtension.equals("zip") || uploadedFileExtension.equals("bz2") || uploadedFileExtension.equals("gz")) {
- userSelectedFormat += "." + uploadedFileExtension;
+ String dummyFileName = "dummy." + uploadEntity.getFormat().getFileExtension();
+ if (ImageStoreUtil.isCompressedExtension(filename)) {
+ String uploadedFileExtension = FilenameUtils.getExtension(filename);
+ dummyFileName += "." + uploadedFileExtension;
}
- String formatError = ImageStoreUtil.checkTemplateFormat(fileSavedTempLocation, userSelectedFormat);
+
+ String formatError = ImageStoreUtil.checkTemplateFormat(fileSavedTempLocation, dummyFileName);
if (StringUtils.isNotBlank(formatError)) {
- String errorString = "File type mismatch between uploaded file and selected format. Selected file format: " + userSelectedFormat + ". Received: " + formatError;
+ String errorString = "File type mismatch between uploaded file and selected format. Selected file format: " + uploadEntity.getFormat() + ". Received: " + formatError;
s_logger.error(errorString);
return errorString;
}
diff --git a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/DownloadManagerImpl.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/DownloadManagerImpl.java
index f6de4c3..4149cd1 100644
--- a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/DownloadManagerImpl.java
+++ b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/DownloadManagerImpl.java
@@ -16,7 +16,6 @@
// under the License.
package org.apache.cloudstack.storage.template;
-import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -60,6 +59,7 @@
import org.apache.cloudstack.storage.command.DownloadCommand.ResourceType;
import org.apache.cloudstack.storage.command.DownloadProgressCommand;
import org.apache.cloudstack.storage.command.DownloadProgressCommand.RequestType;
+import org.apache.cloudstack.storage.NfsMountManagerImpl.PathParser;
import org.apache.cloudstack.storage.resource.NfsSecondaryStorageResource;
import org.apache.cloudstack.storage.resource.SecondaryStorageResource;
import org.apache.commons.collections.CollectionUtils;
@@ -82,7 +82,6 @@
import com.cloud.utils.StringUtils;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.exception.CloudRuntimeException;
-import com.cloud.utils.script.OutputInterpreter;
import com.cloud.utils.script.Script;
import com.cloud.utils.storage.QCOW2Utils;
import org.apache.cloudstack.utils.security.ChecksumValue;
@@ -850,8 +849,12 @@
Script script = new Script(listVolScr, LOGGER);
script.add("-r", rootdir);
- ZfsPathParser zpp = new ZfsPathParser(rootdir);
+ PathParser zpp = new PathParser(rootdir);
script.execute(zpp);
+ if (script.getExitValue() != 0) {
+ LOGGER.error("Error while executing script " + script.toString());
+ throw new CloudRuntimeException("Error while executing script " + script.toString());
+ }
result.addAll(zpp.getPaths());
LOGGER.info("found " + zpp.getPaths().size() + " volumes" + zpp.getPaths());
return result;
@@ -862,8 +865,12 @@
Script script = new Script(listTmpltScr, LOGGER);
script.add("-r", rootdir);
- ZfsPathParser zpp = new ZfsPathParser(rootdir);
+ PathParser zpp = new PathParser(rootdir);
script.execute(zpp);
+ if (script.getExitValue() != 0) {
+ LOGGER.error("Error while executing script " + script.toString());
+ throw new CloudRuntimeException("Error while executing script " + script.toString());
+ }
result.addAll(zpp.getPaths());
LOGGER.info("found " + zpp.getPaths().size() + " templates" + zpp.getPaths());
return result;
@@ -961,33 +968,6 @@
return result;
}
- public static class ZfsPathParser extends OutputInterpreter {
- String _parent;
- List<String> paths = new ArrayList<String>();
-
- public ZfsPathParser(String parent) {
- _parent = parent;
- }
-
- @Override
- public String interpret(BufferedReader reader) throws IOException {
- String line = null;
- while ((line = reader.readLine()) != null) {
- paths.add(line);
- }
- return null;
- }
-
- public List<String> getPaths() {
- return paths;
- }
-
- @Override
- public boolean drain() {
- return true;
- }
- }
-
public DownloadManagerImpl() {
}
diff --git a/services/secondary-storage/server/src/test/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResourceTest.java b/services/secondary-storage/server/src/test/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResourceTest.java
index 44d762f..5ca17b0 100644
--- a/services/secondary-storage/server/src/test/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResourceTest.java
+++ b/services/secondary-storage/server/src/test/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResourceTest.java
@@ -18,7 +18,15 @@
*/
package org.apache.cloudstack.storage.resource;
-import com.cloud.test.TestAppender;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.spy;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.StringWriter;
+
import org.apache.cloudstack.storage.command.DeleteCommand;
import org.apache.cloudstack.storage.to.TemplateObjectTO;
import org.apache.log4j.Level;
@@ -28,19 +36,14 @@
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.StringWriter;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.spy;
+import com.cloud.test.TestAppender;
@RunWith(PowerMockRunner.class)
+@PowerMockIgnore({ "javax.xml.*", "org.xml.*"})
public class NfsSecondaryStorageResourceTest {
private NfsSecondaryStorageResource resource;
diff --git a/setup/bindir/cloud-setup-databases.in b/setup/bindir/cloud-setup-databases.in
index 0e66cfa..15a8176 100755
--- a/setup/bindir/cloud-setup-databases.in
+++ b/setup/bindir/cloud-setup-databases.in
@@ -67,7 +67,7 @@
dbDotProperties = {}
dbDotPropertiesIndex = 0
encryptionKeyFile = '@MSCONF@/key'
- encryptionJarPath = '@COMMONLIBDIR@/lib/jasypt-1.9.2.jar'
+ encryptionJarPath = '@COMMONLIBDIR@/lib/jasypt-1.9.3.jar'
success = False
magicString = 'This_is_a_magic_string_i_think_no_one_will_duplicate'
tmpMysqlFile = os.path.join(os.path.expanduser('~/'), 'cloudstackmysql.tmp.sql')
diff --git a/setup/bindir/cloud-setup-encryption.in b/setup/bindir/cloud-setup-encryption.in
index 0c9b650..54447f7 100755
--- a/setup/bindir/cloud-setup-encryption.in
+++ b/setup/bindir/cloud-setup-encryption.in
@@ -63,7 +63,7 @@
dbDotProperties = {}
dbDotPropertiesIndex = 0
encryptionKeyFile = '@MSCONF@/key'
- encryptionJarPath = '@COMMONLIBDIR@/lib/jasypt-1.9.2.jar'
+ encryptionJarPath = '@COMMONLIBDIR@/lib/jasypt-1.9.3.jar'
success = False
magicString = 'This_is_a_magic_string_i_think_no_one_will_duplicate'
diff --git a/setup/dev/advanced.cfg b/setup/dev/advanced.cfg
index d458b01..a36371a 100644
--- a/setup/dev/advanced.cfg
+++ b/setup/dev/advanced.cfg
@@ -128,7 +128,7 @@
},
{
"url": "nfs://10.147.28.6:/export/home/sandbox/primary3",
- "name": "PS2"
+ "name": "PS3"
}
]
}
diff --git a/setup/dev/advdualzone.cfg b/setup/dev/advdualzone.cfg
new file mode 100644
index 0000000..b11675d
--- /dev/null
+++ b/setup/dev/advdualzone.cfg
@@ -0,0 +1,377 @@
+# 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.
+{
+ "zones": [
+ {
+ "name": "zim1",
+ "guestcidraddress": "10.100.1.0/24",
+ "dns1": "10.147.100.6",
+ "physical_networks": [
+ {
+ "broadcastdomainrange": "Zone",
+ "vlan": "1100-1200",
+ "name": "z1-pnet",
+ "traffictypes": [
+ {
+ "typ": "Guest"
+ },
+ {
+ "typ": "Management"
+ },
+ {
+ "typ": "Public"
+ }
+ ],
+ "providers": [
+ {
+ "broadcastdomainrange": "ZONE",
+ "name": "VirtualRouter"
+ },
+ {
+ "broadcastdomainrange": "ZONE",
+ "name": "VpcVirtualRouter"
+ },
+ {
+ "broadcastdomainrange": "ZONE",
+ "name": "InternalLbVm"
+ }
+ ],
+ "isolationmethods": [
+ "VLAN"
+ ]
+ }
+ ],
+ "vmwaredc": {
+ "username": "",
+ "vcenter": "",
+ "password": "",
+ "name": ""
+ },
+ "ipranges": [
+ {
+ "startip": "192.168.100.2",
+ "endip": "192.168.100.200",
+ "netmask": "255.255.255.0",
+ "vlan": "50",
+ "gateway": "192.168.100.1"
+ }
+ ],
+ "networktype": "Advanced",
+ "pods": [
+ {
+ "endip": "172.16.100.200",
+ "name": "Z1P1",
+ "startip": "172.16.100.2",
+ "netmask": "255.255.255.0",
+ "clusters": [
+ {
+ "clustername": "Z1P1C1",
+ "hypervisor": "simulator",
+ "hosts": [
+ {
+ "username": "root",
+ "url": "http://sim1/c1/h1",
+ "password": "password"
+ },
+ {
+ "username": "root",
+ "url": "http://sim1/c1/h2",
+ "password": "password"
+ }
+ ],
+ "clustertype": "CloudManaged",
+ "primaryStorages": [
+ {
+ "url": "nfs://10.147.100.6:/export/home/sandbox/z1p1",
+ "name": "Z1PS1"
+ },
+ {
+ "url": "nfs://10.147.100.6:/export/home/sandbox/z1p2",
+ "name": "Z1PS2"
+ }
+ ]
+ },
+ {
+ "clustername": "Z1P1C2",
+ "hypervisor": "simulator",
+ "hosts": [
+ {
+ "username": "root",
+ "url": "http://sim1/c2/h1",
+ "password": "password"
+ },
+ {
+ "username": "root",
+ "url": "http://sim1/c2/h2",
+ "password": "password"
+ }
+ ],
+ "clustertype": "CloudManaged",
+ "primaryStorages": [
+ {
+ "url": "nfs://10.147.100.6:/export/home/sandbox/z1p3",
+ "name": "Z1PS3"
+ },
+ {
+ "url": "nfs://10.147.100.6:/export/home/sandbox/z1p4",
+ "name": "Z1PS4"
+ }
+ ]
+ }
+ ],
+ "gateway": "172.16.100.1"
+ }
+ ],
+ "internaldns1": "10.147.100.6",
+ "secondaryStorages": [
+ {
+ "url": "nfs://10.147.100.6:/export/home/sandbox/z1secondary",
+ "provider" : "NFS"
+ }
+ ]
+ },
+ {
+ "name": "zim2",
+ "guestcidraddress": "10.200.1.0/24",
+ "dns1": "10.147.200.6",
+ "physical_networks": [
+ {
+ "broadcastdomainrange": "Zone",
+ "vlan": "2100-2200",
+ "name": "z2-pnet",
+ "traffictypes": [
+ {
+ "typ": "Guest"
+ },
+ {
+ "typ": "Management"
+ },
+ {
+ "typ": "Public"
+ }
+ ],
+ "providers": [
+ {
+ "broadcastdomainrange": "ZONE",
+ "name": "VirtualRouter"
+ },
+ {
+ "broadcastdomainrange": "ZONE",
+ "name": "VpcVirtualRouter"
+ },
+ {
+ "broadcastdomainrange": "ZONE",
+ "name": "InternalLbVm"
+ }
+ ],
+ "isolationmethods": [
+ "VLAN"
+ ]
+ }
+ ],
+ "vmwaredc": {
+ "username": "",
+ "vcenter": "",
+ "password": "",
+ "name": ""
+ },
+ "ipranges": [
+ {
+ "startip": "192.168.200.2",
+ "endip": "192.168.200.200",
+ "netmask": "255.255.255.0",
+ "vlan": "50",
+ "gateway": "192.168.200.1"
+ }
+ ],
+ "networktype": "Advanced",
+ "pods": [
+ {
+ "endip": "172.16.200.200",
+ "name": "Z2P1",
+ "startip": "172.16.200.2",
+ "netmask": "255.255.255.0",
+ "clusters": [
+ {
+ "clustername": "Z2P1C1",
+ "hypervisor": "simulator",
+ "hosts": [
+ {
+ "username": "root",
+ "url": "http://sim2/c1/h1",
+ "password": "password"
+ },
+ {
+ "username": "root",
+ "url": "http://sim2/c1/h2",
+ "password": "password"
+ }
+ ],
+ "clustertype": "CloudManaged",
+ "primaryStorages": [
+ {
+ "url": "nfs://10.147.200.6:/export/home/sandbox/z2p1",
+ "name": "Z2PS1"
+ },
+ {
+ "url": "nfs://10.147.200.6:/export/home/sandbox/z2p2",
+ "name": "Z2PS2"
+ }
+ ]
+ },
+ {
+ "clustername": "Z2P2C1",
+ "hypervisor": "simulator",
+ "hosts": [
+ {
+ "username": "root",
+ "url": "http://sim2/c1/h1",
+ "password": "password"
+ },
+ {
+ "username": "root",
+ "url": "http://sim2/c1/h2",
+ "password": "password"
+ }
+ ],
+ "clustertype": "CloudManaged",
+ "primaryStorages": [
+ {
+ "url": "nfs://10.147.200.6:/export/home/sandbox/z2p3",
+ "name": "Z2PS3"
+ },
+ {
+ "url": "nfs://10.147.200.6:/export/home/sandbox/z2p4",
+ "name": "Z2PS4"
+ }
+ ]
+ }
+ ],
+ "gateway": "172.16.200.1"
+ }
+ ],
+ "internaldns1": "10.147.200.6",
+ "secondaryStorages": [
+ {
+ "url": "nfs://10.147.200.6:/export/home/sandbox/z2secondary",
+ "provider" : "NFS"
+ }
+ ]
+ }
+ ],
+ "dbSvr": {
+ "dbSvr": "localhost",
+ "passwd": "cloud",
+ "db": "cloud",
+ "port": 3306,
+ "user": "cloud"
+ },
+ "logger":
+ {
+ "LogFolderPath": "/tmp"
+ },
+ "globalConfig": [
+ {
+ "name": "network.gc.wait",
+ "value": "20"
+ },
+ {
+ "name": "storage.cleanup.interval",
+ "value": "40"
+ },
+ {
+ "name": "vm.op.wait.interval",
+ "value": "5"
+ },
+ {
+ "name": "default.page.size",
+ "value": "500"
+ },
+ {
+ "name": "network.gc.interval",
+ "value": "20"
+ },
+ {
+ "name": "instance.name",
+ "value": "QA"
+ },
+ {
+ "name": "workers",
+ "value": "10"
+ },
+ {
+ "name": "account.cleanup.interval",
+ "value": "20"
+ },
+ {
+ "name": "guest.domain.suffix",
+ "value": "sandbox.simulator"
+ },
+ {
+ "name": "expunge.delay",
+ "value": "20"
+ },
+ {
+ "name": "vm.allocation.algorithm",
+ "value": "random"
+ },
+ {
+ "name": "expunge.interval",
+ "value": "20"
+ },
+ {
+ "name": "expunge.workers",
+ "value": "3"
+ },
+ {
+ "name": "check.pod.cidrs",
+ "value": "true"
+ },
+ {
+ "name": "secstorage.allowed.internal.sites",
+ "value": "10.147.0.0/16"
+ },
+ {
+ "name": "direct.agent.load.size",
+ "value": "1000"
+ },
+ {
+ "name": "enable.dynamic.scale.vm",
+ "value": "true"
+ },
+ {
+ "name": "ping.interval",
+ "value": "10"
+ },
+ {
+ "name": "ping.timeout",
+ "value": "2.0"
+ }
+ ],
+ "mgtSvr": [
+ {
+ "mgtSvrIp": "localhost",
+ "passwd": "password",
+ "user": "root",
+ "port": 8096,
+ "hypervisor": "simulator",
+ "useHttps": "False",
+ "certCAPath": "NA",
+ "certPath": "NA"
+ }
+ ]
+}
diff --git a/setup/dev/dualsim.cfg b/setup/dev/dualsim.cfg
new file mode 100644
index 0000000..b11675d
--- /dev/null
+++ b/setup/dev/dualsim.cfg
@@ -0,0 +1,377 @@
+# 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.
+{
+ "zones": [
+ {
+ "name": "zim1",
+ "guestcidraddress": "10.100.1.0/24",
+ "dns1": "10.147.100.6",
+ "physical_networks": [
+ {
+ "broadcastdomainrange": "Zone",
+ "vlan": "1100-1200",
+ "name": "z1-pnet",
+ "traffictypes": [
+ {
+ "typ": "Guest"
+ },
+ {
+ "typ": "Management"
+ },
+ {
+ "typ": "Public"
+ }
+ ],
+ "providers": [
+ {
+ "broadcastdomainrange": "ZONE",
+ "name": "VirtualRouter"
+ },
+ {
+ "broadcastdomainrange": "ZONE",
+ "name": "VpcVirtualRouter"
+ },
+ {
+ "broadcastdomainrange": "ZONE",
+ "name": "InternalLbVm"
+ }
+ ],
+ "isolationmethods": [
+ "VLAN"
+ ]
+ }
+ ],
+ "vmwaredc": {
+ "username": "",
+ "vcenter": "",
+ "password": "",
+ "name": ""
+ },
+ "ipranges": [
+ {
+ "startip": "192.168.100.2",
+ "endip": "192.168.100.200",
+ "netmask": "255.255.255.0",
+ "vlan": "50",
+ "gateway": "192.168.100.1"
+ }
+ ],
+ "networktype": "Advanced",
+ "pods": [
+ {
+ "endip": "172.16.100.200",
+ "name": "Z1P1",
+ "startip": "172.16.100.2",
+ "netmask": "255.255.255.0",
+ "clusters": [
+ {
+ "clustername": "Z1P1C1",
+ "hypervisor": "simulator",
+ "hosts": [
+ {
+ "username": "root",
+ "url": "http://sim1/c1/h1",
+ "password": "password"
+ },
+ {
+ "username": "root",
+ "url": "http://sim1/c1/h2",
+ "password": "password"
+ }
+ ],
+ "clustertype": "CloudManaged",
+ "primaryStorages": [
+ {
+ "url": "nfs://10.147.100.6:/export/home/sandbox/z1p1",
+ "name": "Z1PS1"
+ },
+ {
+ "url": "nfs://10.147.100.6:/export/home/sandbox/z1p2",
+ "name": "Z1PS2"
+ }
+ ]
+ },
+ {
+ "clustername": "Z1P1C2",
+ "hypervisor": "simulator",
+ "hosts": [
+ {
+ "username": "root",
+ "url": "http://sim1/c2/h1",
+ "password": "password"
+ },
+ {
+ "username": "root",
+ "url": "http://sim1/c2/h2",
+ "password": "password"
+ }
+ ],
+ "clustertype": "CloudManaged",
+ "primaryStorages": [
+ {
+ "url": "nfs://10.147.100.6:/export/home/sandbox/z1p3",
+ "name": "Z1PS3"
+ },
+ {
+ "url": "nfs://10.147.100.6:/export/home/sandbox/z1p4",
+ "name": "Z1PS4"
+ }
+ ]
+ }
+ ],
+ "gateway": "172.16.100.1"
+ }
+ ],
+ "internaldns1": "10.147.100.6",
+ "secondaryStorages": [
+ {
+ "url": "nfs://10.147.100.6:/export/home/sandbox/z1secondary",
+ "provider" : "NFS"
+ }
+ ]
+ },
+ {
+ "name": "zim2",
+ "guestcidraddress": "10.200.1.0/24",
+ "dns1": "10.147.200.6",
+ "physical_networks": [
+ {
+ "broadcastdomainrange": "Zone",
+ "vlan": "2100-2200",
+ "name": "z2-pnet",
+ "traffictypes": [
+ {
+ "typ": "Guest"
+ },
+ {
+ "typ": "Management"
+ },
+ {
+ "typ": "Public"
+ }
+ ],
+ "providers": [
+ {
+ "broadcastdomainrange": "ZONE",
+ "name": "VirtualRouter"
+ },
+ {
+ "broadcastdomainrange": "ZONE",
+ "name": "VpcVirtualRouter"
+ },
+ {
+ "broadcastdomainrange": "ZONE",
+ "name": "InternalLbVm"
+ }
+ ],
+ "isolationmethods": [
+ "VLAN"
+ ]
+ }
+ ],
+ "vmwaredc": {
+ "username": "",
+ "vcenter": "",
+ "password": "",
+ "name": ""
+ },
+ "ipranges": [
+ {
+ "startip": "192.168.200.2",
+ "endip": "192.168.200.200",
+ "netmask": "255.255.255.0",
+ "vlan": "50",
+ "gateway": "192.168.200.1"
+ }
+ ],
+ "networktype": "Advanced",
+ "pods": [
+ {
+ "endip": "172.16.200.200",
+ "name": "Z2P1",
+ "startip": "172.16.200.2",
+ "netmask": "255.255.255.0",
+ "clusters": [
+ {
+ "clustername": "Z2P1C1",
+ "hypervisor": "simulator",
+ "hosts": [
+ {
+ "username": "root",
+ "url": "http://sim2/c1/h1",
+ "password": "password"
+ },
+ {
+ "username": "root",
+ "url": "http://sim2/c1/h2",
+ "password": "password"
+ }
+ ],
+ "clustertype": "CloudManaged",
+ "primaryStorages": [
+ {
+ "url": "nfs://10.147.200.6:/export/home/sandbox/z2p1",
+ "name": "Z2PS1"
+ },
+ {
+ "url": "nfs://10.147.200.6:/export/home/sandbox/z2p2",
+ "name": "Z2PS2"
+ }
+ ]
+ },
+ {
+ "clustername": "Z2P2C1",
+ "hypervisor": "simulator",
+ "hosts": [
+ {
+ "username": "root",
+ "url": "http://sim2/c1/h1",
+ "password": "password"
+ },
+ {
+ "username": "root",
+ "url": "http://sim2/c1/h2",
+ "password": "password"
+ }
+ ],
+ "clustertype": "CloudManaged",
+ "primaryStorages": [
+ {
+ "url": "nfs://10.147.200.6:/export/home/sandbox/z2p3",
+ "name": "Z2PS3"
+ },
+ {
+ "url": "nfs://10.147.200.6:/export/home/sandbox/z2p4",
+ "name": "Z2PS4"
+ }
+ ]
+ }
+ ],
+ "gateway": "172.16.200.1"
+ }
+ ],
+ "internaldns1": "10.147.200.6",
+ "secondaryStorages": [
+ {
+ "url": "nfs://10.147.200.6:/export/home/sandbox/z2secondary",
+ "provider" : "NFS"
+ }
+ ]
+ }
+ ],
+ "dbSvr": {
+ "dbSvr": "localhost",
+ "passwd": "cloud",
+ "db": "cloud",
+ "port": 3306,
+ "user": "cloud"
+ },
+ "logger":
+ {
+ "LogFolderPath": "/tmp"
+ },
+ "globalConfig": [
+ {
+ "name": "network.gc.wait",
+ "value": "20"
+ },
+ {
+ "name": "storage.cleanup.interval",
+ "value": "40"
+ },
+ {
+ "name": "vm.op.wait.interval",
+ "value": "5"
+ },
+ {
+ "name": "default.page.size",
+ "value": "500"
+ },
+ {
+ "name": "network.gc.interval",
+ "value": "20"
+ },
+ {
+ "name": "instance.name",
+ "value": "QA"
+ },
+ {
+ "name": "workers",
+ "value": "10"
+ },
+ {
+ "name": "account.cleanup.interval",
+ "value": "20"
+ },
+ {
+ "name": "guest.domain.suffix",
+ "value": "sandbox.simulator"
+ },
+ {
+ "name": "expunge.delay",
+ "value": "20"
+ },
+ {
+ "name": "vm.allocation.algorithm",
+ "value": "random"
+ },
+ {
+ "name": "expunge.interval",
+ "value": "20"
+ },
+ {
+ "name": "expunge.workers",
+ "value": "3"
+ },
+ {
+ "name": "check.pod.cidrs",
+ "value": "true"
+ },
+ {
+ "name": "secstorage.allowed.internal.sites",
+ "value": "10.147.0.0/16"
+ },
+ {
+ "name": "direct.agent.load.size",
+ "value": "1000"
+ },
+ {
+ "name": "enable.dynamic.scale.vm",
+ "value": "true"
+ },
+ {
+ "name": "ping.interval",
+ "value": "10"
+ },
+ {
+ "name": "ping.timeout",
+ "value": "2.0"
+ }
+ ],
+ "mgtSvr": [
+ {
+ "mgtSvrIp": "localhost",
+ "passwd": "password",
+ "user": "root",
+ "port": 8096,
+ "hypervisor": "simulator",
+ "useHttps": "False",
+ "certCAPath": "NA",
+ "certPath": "NA"
+ }
+ ]
+}
diff --git a/packaging/centos63/cloudstack-sccs b/systemvm/debian/etc/logrotate.d/monitor
similarity index 84%
copy from packaging/centos63/cloudstack-sccs
copy to systemvm/debian/etc/logrotate.d/monitor
index e05d372..769f8d5 100644
--- a/packaging/centos63/cloudstack-sccs
+++ b/systemvm/debian/etc/logrotate.d/monitor
@@ -1,5 +1,3 @@
-#!/bin/sh
-
# 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
@@ -16,5 +14,11 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-
-cat /usr/share/cloudstack-common/scripts/gitrev.txt
+/var/log/monitor.log {
+ rotate 5
+ maxsize 10M
+ missingok
+ notifempty
+ compress
+ copytruncate
+}
diff --git a/packaging/centos63/cloudstack-sccs b/systemvm/debian/etc/logrotate.d/routerServiceMonitor
similarity index 83%
copy from packaging/centos63/cloudstack-sccs
copy to systemvm/debian/etc/logrotate.d/routerServiceMonitor
index e05d372..7202441 100644
--- a/packaging/centos63/cloudstack-sccs
+++ b/systemvm/debian/etc/logrotate.d/routerServiceMonitor
@@ -1,5 +1,3 @@
-#!/bin/sh
-
# 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
@@ -16,5 +14,11 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-
-cat /usr/share/cloudstack-common/scripts/gitrev.txt
+/var/log/routerServiceMonitor.log {
+ rotate 5
+ maxsize 10M
+ missingok
+ notifempty
+ compress
+ copytruncate
+}
diff --git a/systemvm/debian/lib/systemd/system/baremetal-vr.service b/systemvm/debian/etc/systemd/system/baremetal-vr.service
similarity index 100%
rename from systemvm/debian/lib/systemd/system/baremetal-vr.service
rename to systemvm/debian/etc/systemd/system/baremetal-vr.service
diff --git a/systemvm/debian/lib/systemd/system/cloud.service b/systemvm/debian/etc/systemd/system/cloud.service
similarity index 100%
rename from systemvm/debian/lib/systemd/system/cloud.service
rename to systemvm/debian/etc/systemd/system/cloud.service
diff --git a/systemvm/debian/lib/systemd/system/hyperv-daemons.hv-fcopy-daemon.service b/systemvm/debian/etc/systemd/system/hyperv-daemons.hv-fcopy-daemon.service
similarity index 100%
rename from systemvm/debian/lib/systemd/system/hyperv-daemons.hv-fcopy-daemon.service
rename to systemvm/debian/etc/systemd/system/hyperv-daemons.hv-fcopy-daemon.service
diff --git a/systemvm/debian/lib/systemd/system/hyperv-daemons.hv-kvp-daemon.service b/systemvm/debian/etc/systemd/system/hyperv-daemons.hv-kvp-daemon.service
similarity index 100%
rename from systemvm/debian/lib/systemd/system/hyperv-daemons.hv-kvp-daemon.service
rename to systemvm/debian/etc/systemd/system/hyperv-daemons.hv-kvp-daemon.service
diff --git a/systemvm/debian/lib/systemd/system/hyperv-daemons.hv-vss-daemon.service b/systemvm/debian/etc/systemd/system/hyperv-daemons.hv-vss-daemon.service
similarity index 100%
rename from systemvm/debian/lib/systemd/system/hyperv-daemons.hv-vss-daemon.service
rename to systemvm/debian/etc/systemd/system/hyperv-daemons.hv-vss-daemon.service
diff --git a/systemvm/debian/lib/systemd/system/open-vm-tools.service b/systemvm/debian/etc/systemd/system/open-vm-tools.service
similarity index 100%
rename from systemvm/debian/lib/systemd/system/open-vm-tools.service
rename to systemvm/debian/etc/systemd/system/open-vm-tools.service
diff --git a/systemvm/debian/lib/systemd/system/xe-daemon.service b/systemvm/debian/etc/systemd/system/xe-daemon.service
similarity index 100%
rename from systemvm/debian/lib/systemd/system/xe-daemon.service
rename to systemvm/debian/etc/systemd/system/xe-daemon.service
diff --git a/packaging/centos63/cloudstack-sccs b/systemvm/debian/opt/cloud/bin/cleanup.sh
old mode 100644
new mode 100755
similarity index 79%
copy from packaging/centos63/cloudstack-sccs
copy to systemvm/debian/opt/cloud/bin/cleanup.sh
index e05d372..d14877b
--- a/packaging/centos63/cloudstack-sccs
+++ b/systemvm/debian/opt/cloud/bin/cleanup.sh
@@ -1,5 +1,4 @@
-#!/bin/sh
-
+#!/bin/bash
# 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
@@ -17,4 +16,13 @@
# specific language governing permissions and limitations
# under the License.
-cat /usr/share/cloudstack-common/scripts/gitrev.txt
+#rm -rf $@ && echo $?
+
+zip_file=$1
+if [ -e "$zip_file" ];
+then
+ rm -rf "$zip_file"
+ echo "Deleting diagnostics zip file $zip_file"
+else
+ echo "File $zip_file not found in vm "
+fi
diff --git a/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py b/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py
index 7586372..c2c00d5 100755
--- a/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py
+++ b/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py
@@ -188,11 +188,11 @@
lease))
else:
tag = entry['ipv4_address'].replace(".", "_")
- self.cloud.add("%s,set:%s,%s,%s,%sh" % (entry['mac_address'],
- tag,
- entry['ipv4_address'],
- entry['host_name'],
- lease))
+ self.cloud.add("%s,set:%s,%s,%s,%s" % (entry['mac_address'],
+ tag,
+ entry['ipv4_address'],
+ entry['host_name'],
+ lease))
self.dhcp_opts.add("%s,%s" % (tag, 3))
self.dhcp_opts.add("%s,%s" % (tag, 6))
self.dhcp_opts.add("%s,%s" % (tag, 15))
diff --git a/systemvm/debian/opt/cloud/bin/cs/CsMonitor.py b/systemvm/debian/opt/cloud/bin/cs/CsMonitor.py
index 6b19423..5a0ff5b 100755
--- a/systemvm/debian/opt/cloud/bin/cs/CsMonitor.py
+++ b/systemvm/debian/opt/cloud/bin/cs/CsMonitor.py
@@ -17,27 +17,67 @@
import logging
from cs.CsDatabag import CsDataBag
from CsFile import CsFile
+import json
MON_CONFIG = "/etc/monitor.conf"
+HC_CONFIG = "/root/health_checks_data.json"
class CsMonitor(CsDataBag):
- """ Manage dhcp entries """
+ """ Manage Monitor script schedule and health checks for router """
- def process(self):
- if "config" not in self.dbag:
- return
- procs = [x.strip() for x in self.dbag['config'].split(',')]
- file = CsFile(MON_CONFIG)
- for proc in procs:
- bits = [x for x in proc.split(':')]
- if len(bits) < 5:
- continue
- for i in range(0, 4):
- file.add(bits[i], -1)
- file.commit()
+ def get_basic_check_interval(self):
+ return self.dbag["health_checks_basic_run_interval"] if "health_checks_basic_run_interval" in self.dbag else 3
+
+ def get_advanced_check_interval(self):
+ return self.dbag["health_checks_advanced_run_interval"] if "health_checks_advanced_run_interval" in self.dbag else 0
+
+ def setupMonitorConfigFile(self):
+ if "config" in self.dbag:
+ procs = [x.strip() for x in self.dbag['config'].split(',')]
+ file = CsFile(MON_CONFIG)
+ for proc in procs:
+ bits = [x for x in proc.split(':')]
+ if len(bits) < 5:
+ continue
+ for i in range(0, 4):
+ file.add(bits[i], -1)
+ file.commit()
+
+ def setupHealthCheckCronJobs(self):
+ cron_rep_basic = self.get_basic_check_interval()
+ cron_rep_advanced = self.get_advanced_check_interval()
cron = CsFile("/etc/cron.d/process")
+ cron.deleteLine("root /usr/bin/python /root/monitorServices.py")
cron.add("SHELL=/bin/bash", 0)
cron.add("PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin", 1)
- cron.add("*/3 * * * * root /usr/bin/python /root/monitorServices.py", -1)
+ if cron_rep_basic > 0:
+ cron.add("*/" + str(cron_rep_basic) + " * * * * root /usr/bin/python /root/monitorServices.py basic", -1)
+ if cron_rep_advanced > 0:
+ cron.add("*/" + str(cron_rep_advanced) + " * * * * root /usr/bin/python /root/monitorServices.py advanced", -1)
cron.commit()
+
+ def setupHealthChecksConfigFile(self):
+ hc_data = {}
+ hc_data["health_checks_basic_run_interval"] = self.get_basic_check_interval()
+ hc_data["health_checks_advanced_run_interval"] = self.get_advanced_check_interval()
+ hc_data["health_checks_enabled"] = self.dbag["health_checks_enabled"] if "health_checks_enabled" in self.dbag else False
+
+ if "excluded_health_checks" in self.dbag:
+ excluded_checks = self.dbag["excluded_health_checks"]
+ hc_data["excluded_health_checks"] = [ch.strip() for ch in excluded_checks.split(",")] if len(excluded_checks) > 0 else []
+ else:
+ hc_data["excluded_health_checks"] = []
+
+ if "health_checks_config" in self.dbag:
+ hc_data["health_checks_config"] = self.dbag["health_checks_config"]
+ else:
+ hc_data["health_checks_config"] = {}
+
+ with open(HC_CONFIG, 'w') as f:
+ json.dump(hc_data, f, ensure_ascii=False, indent=4)
+
+ def process(self):
+ self.setupMonitorConfigFile()
+ self.setupHealthChecksConfigFile()
+ self.setupHealthCheckCronJobs()
diff --git a/systemvm/debian/opt/cloud/bin/cs_monitorservice.py b/systemvm/debian/opt/cloud/bin/cs_monitorservice.py
index 75a7c95..55c89df 100755
--- a/systemvm/debian/opt/cloud/bin/cs_monitorservice.py
+++ b/systemvm/debian/opt/cloud/bin/cs_monitorservice.py
@@ -22,4 +22,15 @@
if "config" in data:
dbag['config'] = data["config"]
+ if "health_checks_enabled" in data:
+ dbag["health_checks_enabled"] = data["health_checks_enabled"]
+ if "health_checks_basic_run_interval" in data:
+ dbag["health_checks_basic_run_interval"] = data["health_checks_basic_run_interval"]
+ if "health_checks_advanced_run_interval" in data:
+ dbag["health_checks_advanced_run_interval"] = data["health_checks_advanced_run_interval"]
+ if "excluded_health_checks" in data:
+ dbag["excluded_health_checks"] = data["excluded_health_checks"]
+ if "health_checks_config" in data:
+ dbag["health_checks_config"] = data["health_checks_config"]
+
return dbag
diff --git a/systemvm/debian/opt/cloud/bin/getRouterAlerts.sh b/systemvm/debian/opt/cloud/bin/getRouterAlerts.sh
old mode 100644
new mode 100755
diff --git a/systemvm/debian/opt/cloud/bin/getRouterMonitorResults.sh b/systemvm/debian/opt/cloud/bin/getRouterMonitorResults.sh
new file mode 100755
index 0000000..bdc709d
--- /dev/null
+++ b/systemvm/debian/opt/cloud/bin/getRouterMonitorResults.sh
@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+# 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.
+
+# getRouterMonitorResults.sh --- Send the monitor results to Management Server
+
+if [ "$1" == "true" ]
+then
+ python /root/monitorServices.py > /dev/null
+fi
+
+printf "FAILING CHECKS:\n"
+
+if [ -f /root/basic_failing_health_checks ]
+then
+ echo `cat /root/basic_failing_health_checks`
+fi
+
+if [ -f /root/advanced_failing_health_checks ]
+then
+ echo `cat /root/advanced_failing_health_checks`
+fi
+
+printf "MONITOR RESULTS:\n"
+
+echo "{\"basic\":"
+if [ -f /root/basic_monitor_results.json ]
+then
+ echo `cat /root/basic_monitor_results.json`
+else
+ echo "{}"
+fi
+echo ",\"advanced\":"
+if [ -f /root/advanced_monitor_results.json ]
+then
+ echo `cat /root/advanced_monitor_results.json`
+else
+ echo "{}"
+fi
+
+echo "}"
diff --git a/systemvm/debian/opt/cloud/bin/get_diagnostics_files.py b/systemvm/debian/opt/cloud/bin/get_diagnostics_files.py
new file mode 100755
index 0000000..b95dfb5
--- /dev/null
+++ b/systemvm/debian/opt/cloud/bin/get_diagnostics_files.py
@@ -0,0 +1,143 @@
+#!/usr/bin/env 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.
+
+import logging
+import os
+import re
+import shlex
+import subprocess as sp
+import sys
+import time
+import zipfile
+
+
+# Create zip archive and append files for retrieval
+def zip_files(files):
+ fList = files
+ compression = zipfile.ZIP_DEFLATED
+ time_str = time.strftime("%Y%m%d-%H%M%S")
+ zf_name = '/root/diagnostics_files_' + time_str + '.zip'
+ zf = zipfile.ZipFile(zf_name, 'w', compression)
+
+ '''
+ Initialize 3 empty arrays to collect found files, non-existent files
+ and last one to collect temp files to be cleaned up when script exits
+ '''
+ files_found_list = []
+ files_not_found_list = []
+ files_from_shell_commands = []
+
+ try:
+ for f in fList:
+ f = f.strip()
+
+ if f in ('iptables', 'ipaddr', 'iprule', 'iproute'):
+ f = execute_shell_script(f)
+ files_from_shell_commands.append(f)
+
+ if len(f) > 3 and f.startswith('[') and f.endswith(']'):
+ f = execute_shell_script(f[1:-1])
+ files_from_shell_commands.append(f)
+
+ if os.path.isfile(f):
+ try:
+ zf.write(f, f[f.rfind('/') + 1:])
+ except OSError or RuntimeError as e:
+ files_not_found_list.append(f)
+ else:
+ files_found_list.append(f)
+ finally:
+ cleanup(files_from_shell_commands)
+ generate_retrieved_files_txt(zf, files_found_list, files_not_found_list)
+ zf.close()
+ print zf_name
+
+
+def get_cmd(script):
+ if script is None or len(script) == 0:
+ return None
+
+ cmd = None
+ if script == 'iptables':
+ cmd = 'iptables-save'
+ elif script == 'ipaddr':
+ cmd = 'ip address'
+ elif script == 'iprule':
+ cmd = 'ip rule list'
+ elif script == 'iproute':
+ cmd = 'ip route show table all'
+ else:
+ cmd = '/opt/cloud/bin/' + script
+ if not os.path.isfile(cmd.split(' ')[0]):
+ cmd = None
+
+ return cmd
+
+
+def execute_shell_script(script):
+ script = script.strip()
+ outputfile = script + '.log'
+
+ with open(outputfile, 'wb', 0) as f:
+ try:
+ cmd = get_cmd(script)
+ if cmd is None:
+ f.write('Unable to generate command for ' + script + ', perhaps missing file')
+ else:
+ p = sp.Popen(cmd, shell=True, stdout=sp.PIPE, stderr=sp.PIPE)
+ stdout, stderr = p.communicate()
+ return_code = p.returncode
+ if return_code is 0:
+ f.write(stdout)
+ else:
+ f.write(stderr)
+ except OSError as ex:
+ delete_tmp_file_cmd = 'rm -f %s' % outputfile
+ sp.check_call(shlex.split(delete_tmp_file_cmd))
+ finally:
+ f.close()
+ return outputfile
+
+
+def cleanup(file_list):
+ files = ' '.join(file_list)
+ cmd = 'rm -f %s' % files
+ try:
+ p = sp.Popen(shlex.split(cmd), stderr=sp.PIPE, stdout=sp.PIPE)
+ p.communicate()
+ except OSError as e:
+ logging.debug("Failed to execute bash command")
+
+
+def generate_retrieved_files_txt(zip_file, files_found, files_not_found):
+ output_file = 'fileinfo.txt'
+ try:
+ with open(output_file, 'wb', 0) as man:
+ for i in files_found:
+ man.write(i + '\n')
+ for j in files_not_found:
+ man.write(j + 'File Not Found!!\n')
+ zip_file.write(output_file, output_file)
+ finally:
+ cleanup_cmd = "rm -f %s" % output_file
+ sp.check_call(shlex.split(cleanup_cmd))
+
+
+if __name__ == '__main__':
+ fileList = sys.argv[1:]
+ zip_files(fileList)
diff --git a/systemvm/debian/opt/cloud/bin/merge.py b/systemvm/debian/opt/cloud/bin/merge.py
index 54d86c5..b988b7a 100755
--- a/systemvm/debian/opt/cloud/bin/merge.py
+++ b/systemvm/debian/opt/cloud/bin/merge.py
@@ -301,6 +301,7 @@
if self.keep:
self.__moveFile(filename, self.configCache + "/processed")
else:
+ logging.debug("Processed file deleted: %s and not kept in /processed", filename)
os.remove(filename)
updateDataBag(self)
diff --git a/systemvm/debian/opt/cloud/bin/update_config.py b/systemvm/debian/opt/cloud/bin/update_config.py
index 77008af..c9121eb 100755
--- a/systemvm/debian/opt/cloud/bin/update_config.py
+++ b/systemvm/debian/opt/cloud/bin/update_config.py
@@ -29,7 +29,8 @@
logging.basicConfig(filename='/var/log/cloud.log', level=logging.INFO, format='%(asctime)s %(filename)s %(funcName)s:%(lineno)d %(message)s')
# first commandline argument should be the file to process
-if (len(sys.argv) != 2):
+argc = len(sys.argv)
+if argc != 2 and argc != 3:
logging.error("Invalid usage, args passed: %s" % sys.argv)
sys.exit(1)
@@ -49,6 +50,9 @@
def process_file():
logging.info("Processing JSON file %s" % sys.argv[1])
qf = QueueFile()
+ if len(sys.argv) > 2 and sys.argv[2].lower() == "false":
+ qf.keep = False
+
qf.setFile(sys.argv[1])
qf.load(None)
# These can be safely deferred, dramatically speeding up loading times
diff --git a/packaging/centos63/cloudstack-sccs b/systemvm/debian/root/health_checks/__init__.py
similarity index 82%
copy from packaging/centos63/cloudstack-sccs
copy to systemvm/debian/root/health_checks/__init__.py
index e05d372..3dcbe82 100644
--- a/packaging/centos63/cloudstack-sccs
+++ b/systemvm/debian/root/health_checks/__init__.py
@@ -1,5 +1,4 @@
-#!/bin/sh
-
+#!/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
@@ -17,4 +16,5 @@
# specific language governing permissions and limitations
# under the License.
-cat /usr/share/cloudstack-common/scripts/gitrev.txt
+# Needed to expose utility as package outside for monitorServices.py.
+# This directory should only contain executables for health checks.
diff --git a/systemvm/debian/root/health_checks/cpu_usage_check.py b/systemvm/debian/root/health_checks/cpu_usage_check.py
new file mode 100644
index 0000000..5e6a2fe
--- /dev/null
+++ b/systemvm/debian/root/health_checks/cpu_usage_check.py
@@ -0,0 +1,56 @@
+#!/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 subprocess import *
+from utility import getHealthChecksData
+
+
+def main():
+ entries = getHealthChecksData("systemThresholds")
+ data = {}
+ if entries is not None and len(entries) == 1:
+ data = entries[0]
+
+ if "maxCpuUsage" not in data:
+ print "Missing maxCpuUsage in health_checks_data systemThresholds, skipping"
+ exit(0)
+
+ maxCpuUsage = float(data["maxCpuUsage"])
+ cmd = "top -b -n2 -p 1 | fgrep \"Cpu(s)\" | tail -1 | " \
+ "awk -F 'id,' " \
+ "'{ split($1, vs, \",\"); idle=vs[length(vs)]; " \
+ "sub(\"%\", \"\", idle); printf \"%.2f\", 100 - idle }'"
+ pout = Popen(cmd, shell=True, stdout=PIPE)
+ if pout.wait() == 0:
+ currentUsage = float(pout.communicate()[0].strip())
+ if currentUsage > maxCpuUsage:
+ print "CPU Usage " + str(currentUsage) + \
+ "% has crossed threshold of " + str(maxCpuUsage) + "%"
+ exit(1)
+ print "CPU Usage within limits with current at " \
+ + str(currentUsage) + "%"
+ exit(0)
+ else:
+ print "Failed to retrieve cpu usage using " + cmd
+ exit(1)
+
+
+if __name__ == "__main__":
+ if len(sys.argv) == 2 and sys.argv[1] == "basic":
+ main()
diff --git a/systemvm/debian/root/health_checks/dhcp_check.py b/systemvm/debian/root/health_checks/dhcp_check.py
new file mode 100755
index 0000000..be7a840
--- /dev/null
+++ b/systemvm/debian/root/health_checks/dhcp_check.py
@@ -0,0 +1,69 @@
+#!/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 utility import getHealthChecksData
+
+
+def main():
+ vMs = getHealthChecksData("virtualMachines")
+
+ if vMs is None or len(vMs) == 0:
+ print "No VMs running data available, skipping"
+ exit(0)
+
+ with open('/etc/dhcphosts.txt', 'r') as hostsFile:
+ allHosts = hostsFile.readlines()
+ hostsFile.close()
+
+ failedCheck = False
+ failureMessage = "Missing elements in dhcphosts.txt - \n"
+ for vM in vMs:
+ entry = vM["macAddress"] + " " + vM["ip"] + " " + vM["vmName"]
+ foundEntry = False
+ for host in allHosts:
+ host = host.strip().split(',')
+ if len(host) < 4:
+ continue
+
+ if host[0].strip() == vM["macAddress"] and host[1].strip() == vM["ip"]\
+ and host[2].strip() == vM["vmName"]:
+ foundEntry = True
+ break
+
+ nonDefaultSet = "set:" + vM["ip"].replace(".", "_")
+ if host[0].strip() == vM["macAddress"] and host[1].strip() == nonDefaultSet \
+ and host[2].strip() == vM["ip"] and host[3].strip() == vM["vmName"]:
+ foundEntry = True
+ break
+
+ if not foundEntry:
+ failedCheck = True
+ failureMessage = failureMessage + entry + ", "
+
+ if failedCheck:
+ print failureMessage[:-2]
+ exit(1)
+ else:
+ print "All " + str(len(vMs)) + " VMs are present in dhcphosts.txt"
+ exit(0)
+
+
+if __name__ == "__main__":
+ if len(sys.argv) == 2 and sys.argv[1] == "advanced":
+ main()
diff --git a/systemvm/debian/root/health_checks/disk_space_check.py b/systemvm/debian/root/health_checks/disk_space_check.py
new file mode 100644
index 0000000..af8cb3d
--- /dev/null
+++ b/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"
+ exit(1)
+ else:
+ print "Sufficient free space is " + str(freeSpace/1024) + " MB"
+ exit(0)
+
+
+if __name__ == "__main__":
+ if len(sys.argv) == 2 and sys.argv[1] == "basic":
+ main()
diff --git a/systemvm/debian/root/health_checks/dns_check.py b/systemvm/debian/root/health_checks/dns_check.py
new file mode 100644
index 0000000..c177888
--- /dev/null
+++ b/systemvm/debian/root/health_checks/dns_check.py
@@ -0,0 +1,59 @@
+#!/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 utility import getHealthChecksData
+
+
+def main():
+ vMs = getHealthChecksData("virtualMachines")
+
+ if vMs is None or len(vMs) == 0:
+ print "No VMs running data available, skipping"
+ exit(0)
+
+ with open('/etc/hosts', 'r') as hostsFile:
+ allHosts = hostsFile.readlines()
+ hostsFile.close()
+
+ failedCheck = False
+ failureMessage = "Missing entries for VMs in /etc/hosts -\n"
+ for vM in vMs:
+ foundEntry = False
+ for host in allHosts:
+ components = host.split('\t')
+ if len(components) == 2 and components[0].strip() == vM["ip"] \
+ and components[1].strip() == vM["vmName"]:
+ foundEntry = True
+ break
+
+ if not foundEntry:
+ failedCheck = True
+ failureMessage = failureMessage + vM["ip"] + " " + vM["vmName"] + ", "
+
+ if failedCheck:
+ print failureMessage[:-2]
+ exit(1)
+ else:
+ print "All " + str(len(vMs)) + " VMs are present in /etc/hosts"
+ exit(0)
+
+
+if __name__ == "__main__":
+ if len(sys.argv) == 2 and sys.argv[1] == "advanced":
+ main()
diff --git a/systemvm/debian/root/health_checks/gateways_check.py b/systemvm/debian/root/health_checks/gateways_check.py
new file mode 100644
index 0000000..29ce884
--- /dev/null
+++ b/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"
+ pout = Popen(pingCmd, shell=True, stdout=PIPE)
+ if pout.wait() == 0:
+ reachableGw = True
+ break
+
+ if not reachableGw:
+ unreachableGateWays.append(gw)
+
+ if len(unreachableGateWays) == 0:
+ print "All " + str(len(gws)) + " gateways are reachable via ping"
+ exit(0)
+ else:
+ print "Unreachable gateways found-"
+ print unreachableGateWays
+ exit(1)
+
+
+if __name__ == "__main__":
+ if len(sys.argv) == 2 and sys.argv[1] == "basic":
+ main()
diff --git a/systemvm/debian/root/health_checks/haproxy_check.py b/systemvm/debian/root/health_checks/haproxy_check.py
new file mode 100644
index 0000000..56e0ce7
--- /dev/null
+++ b/systemvm/debian/root/health_checks/haproxy_check.py
@@ -0,0 +1,134 @@
+#!/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 utility import getHealthChecksData, formatPort
+
+
+def checkMaxconn(haproxyData, haCfgSections):
+ if "maxconn" in haproxyData and "maxconn" in haCfgSections["global"]:
+ if haproxyData["maxconn"] != haCfgSections["global"]["maxconn"][0].strip():
+ print "global maxconn mismatch occured"
+ return False
+
+ return True
+
+
+def checkLoadBalance(haproxyData, haCfgSections):
+ correct = True
+ for lbSec in haproxyData:
+ srcServer = lbSec["sourceIp"].replace('.', '_') + "-" + \
+ formatPort(lbSec["sourcePortStart"],
+ lbSec["sourcePortEnd"])
+ secName = "listen " + srcServer
+
+ if secName not in haCfgSections:
+ print "Missing section for load balancing " + secName + "\n"
+ correct = False
+ else:
+ cfgSection = haCfgSections[secName]
+ if "server" in cfgSection:
+ if lbSec["algorithm"] != cfgSection["balance"][0]:
+ print "Incorrect balance method for " + secName + \
+ "Expected : " + lbSec["algorithm"] + \
+ " but found " + cfgSection["balance"][0] + "\n"
+ correct = False
+
+ bindStr = lbSec["sourceIp"] + ":" + formatPort(lbSec["sourcePortStart"], lbSec["sourcePortEnd"])
+ if cfgSection["bind"][0] != bindStr:
+ print "Incorrect bind string found. Expected " + bindStr + " but found " + cfgSection["bind"][0] + "."
+ correct = False
+
+ if (lbSec["sourcePortStart"] == "80" and lbSec["sourcePortEnd"] == "80" and lbSec["keepAliveEnabled"] == "false") \
+ or (lbSec["stickiness"].find("AppCookie") != -1 or lbSec["stickiness"].find("LbCookie") != -1):
+ if not ("mode" in cfgSection and cfgSection["mode"][0] == "http"):
+ print "Expected HTTP mode but not found"
+ correct = False
+
+ expectedServerIps = lbSec["vmIps"].split(" ")
+ for expectedServerIp in expectedServerIps:
+ pattern = expectedServerIp + ":" + \
+ formatPort(lbSec["destPortStart"],
+ lbSec["destPortEnd"])
+ foundPattern = False
+ for server in cfgSection["server"]:
+ s = server.split()
+ if s[0].strip().find(srcServer + "_") == 0 and s[1].strip() == pattern:
+ foundPattern = True
+ break
+
+ if not foundPattern:
+ correct = False
+ print "Missing load balancing for " + pattern + ". "
+
+ return correct
+
+
+def main():
+ '''
+ Checks for max con and each load balancing rule - source ip, ports and destination
+ ips and ports. Also checks for http mode. Does not check for stickiness policies.
+ '''
+ haproxyData = getHealthChecksData("haproxyData")
+ if haproxyData is None or len(haproxyData) == 0:
+ print "No data provided to check, skipping"
+ exit(0)
+
+ with open("/etc/haproxy/haproxy.cfg", 'r') as haCfgFile:
+ haCfgLines = haCfgFile.readlines()
+ haCfgFile.close()
+
+ if len(haCfgLines) == 0:
+ print "Unable to read config file /etc/haproxy/haproxy.cfg"
+ exit(1)
+
+ haCfgSections = {}
+ currSection = None
+ currSectionDict = {}
+ for line in haCfgLines:
+ line = line.strip()
+ if len(line) == 0:
+ if currSection is not None and len(currSectionDict) > 0:
+ haCfgSections[currSection] = currSectionDict
+
+ currSection = None
+ currSectionDict = {}
+ continue
+
+ if currSection is None:
+ currSection = line
+ else:
+ lineSec = line.split(' ', 1)
+ if lineSec[0] not in currSectionDict:
+ currSectionDict[lineSec[0]] = []
+
+ currSectionDict[lineSec[0]].append(lineSec[1] if len(lineSec) > 1 else '')
+
+ checkMaxConn = checkMaxconn(haproxyData[0], haCfgSections)
+ checkLbRules = checkLoadBalance(haproxyData, haCfgSections)
+
+ if checkMaxConn and checkLbRules:
+ print "All checks pass"
+ exit(0)
+ else:
+ exit(1)
+
+
+if __name__ == "__main__":
+ if len(sys.argv) == 2 and sys.argv[1] == "advanced":
+ main()
diff --git a/systemvm/debian/root/health_checks/iptables_check.py b/systemvm/debian/root/health_checks/iptables_check.py
new file mode 100644
index 0000000..d80f05b
--- /dev/null
+++ b/systemvm/debian/root/health_checks/iptables_check.py
@@ -0,0 +1,80 @@
+#!/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, formatPort
+
+
+def main():
+ portForwards = getHealthChecksData("portForwarding")
+ if portForwards is None or len(portForwards) == 0:
+ print "No portforwarding rules provided to check, skipping"
+ exit(0)
+
+ failedCheck = False
+ failureMessage = "Missing port forwarding rules in Iptables-\n "
+ for portForward in portForwards:
+ entriesExpected = []
+ destIp = portForward["destIp"]
+ srcIpText = "-d " + portForward["sourceIp"]
+ srcPortText = "--dport " + formatPort(portForward["sourcePortStart"], portForward["sourcePortEnd"], ":")
+ dstText = destIp + ":" + formatPort(portForward["destPortStart"], portForward["destPortEnd"], "-")
+ for algo in [["PREROUTING", "--to-destination"],
+ ["OUTPUT", "--to-destination"]]:
+ entriesExpected.append([algo[0], srcIpText, srcPortText, algo[1] + " " + dstText])
+
+ fetchIpTableEntriesCmd = "iptables-save | grep " + destIp
+ pout = Popen(fetchIpTableEntriesCmd, shell=True, stdout=PIPE)
+ if pout.wait() != 0:
+ failedCheck = True
+ failureMessage = failureMessage + "Unable to execute iptables-save command " \
+ "for fetching rules by " + fetchIpTableEntriesCmd + "\n"
+ continue
+
+ ipTablesMatchingEntries = pout.communicate()[0].strip().split('\n')
+ for pfEntryListExpected in entriesExpected:
+ foundPfEntryList = False
+ for ipTableEntry in ipTablesMatchingEntries:
+ # Check if all expected parts of pfEntryList
+ # is present in this ipTableEntry
+ foundAll = True
+ for expectedEntry in pfEntryListExpected:
+ if ipTableEntry.find(expectedEntry) == -1:
+ foundAll = False
+ break
+
+ if foundAll:
+ foundPfEntryList = True
+ break
+
+ if not foundPfEntryList:
+ failedCheck = True
+ failureMessage = failureMessage + str(pfEntryListExpected) + "\n"
+
+ if failedCheck:
+ print failureMessage
+ exit(1)
+ else:
+ print "Found all entries (count " + str(len(portForwards)) + ") in iptables"
+ exit(0)
+
+
+if __name__ == "__main__":
+ if len(sys.argv) == 2 and sys.argv[1] == "advanced":
+ main()
diff --git a/systemvm/debian/root/health_checks/memory_usage_check.py b/systemvm/debian/root/health_checks/memory_usage_check.py
new file mode 100644
index 0000000..97ca0c5
--- /dev/null
+++ b/systemvm/debian/root/health_checks/memory_usage_check.py
@@ -0,0 +1,55 @@
+#!/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 subprocess import *
+from utility import getHealthChecksData
+
+
+def main():
+ entries = getHealthChecksData("systemThresholds")
+ data = {}
+ if entries is not None and len(entries) == 1:
+ data = entries[0]
+
+ if "maxMemoryUsage" not in data:
+ print "Missing maxMemoryUsage in health_checks_data " + \
+ "systemThresholds, skipping"
+ exit(0)
+
+ maxMemoryUsage = float(data["maxMemoryUsage"])
+ cmd = "free | awk 'FNR == 2 { print $3 * 100 / $2 }'"
+ pout = Popen(cmd, shell=True, stdout=PIPE)
+
+ if pout.wait() == 0:
+ currentUsage = float(pout.communicate()[0].strip())
+ if currentUsage > maxMemoryUsage:
+ print "Memory Usage " + str(currentUsage) + \
+ "% has crossed threshold of " + str(maxMemoryUsage) + "%"
+ exit(1)
+ print "Memory Usage within limits with current at " + \
+ str(currentUsage) + "%"
+ exit(0)
+ else:
+ print "Failed to retrieve memory usage using " + cmd
+ exit(1)
+
+
+if __name__ == "__main__":
+ if len(sys.argv) == 2 and sys.argv[1] == "basic":
+ main()
diff --git a/systemvm/debian/root/health_checks/router_version_check.py b/systemvm/debian/root/health_checks/router_version_check.py
new file mode 100644
index 0000000..2173e09
--- /dev/null
+++ b/systemvm/debian/root/health_checks/router_version_check.py
@@ -0,0 +1,83 @@
+#!/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 getFirstLine(file=None):
+ if file is not None and path.isfile(file):
+ ret = None
+ with open(file, 'r') as oFile:
+ lines = oFile.readlines()
+ if len(lines) > 0:
+ ret = lines[0].strip()
+ oFile.close()
+
+ return ret
+ else:
+ return None
+
+
+def main():
+ entries = getHealthChecksData("routerVersion")
+ data = {}
+ if entries is not None and len(entries) == 1:
+ data = entries[0]
+
+ if len(data) == 0:
+ print "Missing routerVersion in health_checks_data, skipping"
+ exit(0)
+
+ templateVersionMatches = True
+ scriptVersionMatches = True
+
+ if "templateVersion" in data:
+ expected = data["templateVersion"].strip()
+ releaseFile = "/etc/cloudstack-release"
+ found = getFirstLine(releaseFile)
+ if found is None:
+ print "Release version not yet setup at " + releaseFile +\
+ ", skipping."
+ elif expected != found:
+ print "Template Version mismatch. Expected: " + \
+ expected + ", found: " + found
+ templateVersionMatches = False
+
+ if "scriptsVersion" in data:
+ expected = data["scriptsVersion"].strip()
+ sigFile = "/var/cache/cloud/cloud-scripts-signature"
+ found = getFirstLine(sigFile)
+ if found is None:
+ print "Scripts signature is not yet setup at " + sigFile +\
+ ", skipping"
+ if expected != found:
+ print "Scripts Version mismatch. Expected: " + \
+ expected + ", found: " + found
+ scriptVersionMatches = False
+
+ if templateVersionMatches and scriptVersionMatches:
+ print "Template and scripts version match successful"
+ exit(0)
+ else:
+ exit(1)
+
+
+if __name__ == "__main__":
+ if len(sys.argv) == 2 and sys.argv[1] == "basic":
+ main()
diff --git a/packaging/centos63/cloudstack-sccs b/systemvm/debian/root/health_checks/utility/__init__.py
similarity index 90%
rename from packaging/centos63/cloudstack-sccs
rename to systemvm/debian/root/health_checks/utility/__init__.py
index e05d372..22ac3ff 100644
--- a/packaging/centos63/cloudstack-sccs
+++ b/systemvm/debian/root/health_checks/utility/__init__.py
@@ -1,5 +1,4 @@
-#!/bin/sh
-
+#!/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
@@ -17,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
-cat /usr/share/cloudstack-common/scripts/gitrev.txt
+from sharedFunctions import getHealthChecksData, formatPort
diff --git a/systemvm/debian/root/health_checks/utility/sharedFunctions.py b/systemvm/debian/root/health_checks/utility/sharedFunctions.py
new file mode 100644
index 0000000..20ef640
--- /dev/null
+++ b/systemvm/debian/root/health_checks/utility/sharedFunctions.py
@@ -0,0 +1,54 @@
+# 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.
+
+import json
+
+
+def getHealthChecksData(additionalDataKey=None):
+ with open('/root/health_checks_data.json', 'r') as hc_data_file:
+ hc_data = json.load(hc_data_file)
+
+ # If no specific key is requested return all the data as JSON
+ if additionalDataKey is None:
+ return hc_data
+
+ if additionalDataKey not in hc_data["health_checks_config"]:
+ return None
+
+ data = hc_data["health_checks_config"][additionalDataKey].strip().split(";")
+ addData = []
+ for line in data:
+ line = line.strip()
+ if len(line) == 0:
+ continue
+ entries = line.split(',')
+ d = {}
+ for entry in entries:
+ entry = entry.strip()
+ if len(entry) == 0:
+ continue
+ keyVal = entry.split("=")
+ if len(keyVal) == 2:
+ d[keyVal[0].strip()] = keyVal[1].strip()
+ if len(d) > 0:
+ addData.append(d)
+
+ return addData
+
+
+def formatPort(portStart, portEnd, delim="-"):
+ return portStart if portStart == portEnd else portStart + delim + portEnd
diff --git a/systemvm/debian/root/monitorServices.py b/systemvm/debian/root/monitorServices.py
index 75d1004..909e419 100755
--- a/systemvm/debian/root/monitorServices.py
+++ b/systemvm/debian/root/monitorServices.py
@@ -16,16 +16,15 @@
# specific language governing permissions and limitations
# under the License.
-
-
-
-
from ConfigParser import SafeConfigParser
from subprocess import *
-from os import path
+from datetime import datetime
import time
import os
import logging
+import json
+from os import sys, path
+from health_checks.utility import getHealthChecksData
class StatusCodes:
SUCCESS = 0
@@ -42,15 +41,15 @@
NOTIF = 'NOTIF'
class Config:
- MONIT_AFTER_MINS = 30
SLEEP_SEC = 1
RETRY_ITERATIONS = 10
RETRY_FOR_RESTART = 5
MONITOR_LOG = '/var/log/monitor.log'
- UNMONIT_PS_FILE = '/etc/unmonit_psList.txt'
+ HEALTH_CHECKS_DIR = 'health_checks'
+ MONITOR_RESULT_FILE_SUFFIX = 'monitor_results.json'
+ FAILING_CHECKS_FILE = 'failing_health_checks'
-
-def getConfig( config_file_path = "/etc/monitor.conf" ):
+def getServicesConfig( config_file_path = "/etc/monitor.conf" ):
"""
Reads the process configuration from the config file.
Config file contains the processes to be monitored.
@@ -66,7 +65,7 @@
for name, value in parser.items(section):
process_dict[section][name] = value
-# printd (" %s = %r" % (name, value))
+ printd (" %s = %r" % (name, value))
return process_dict
@@ -77,12 +76,12 @@
#for debug
#print msg
- return 0
- f= open(Config.MONITOR_LOG,'r+')
+ f= open(Config.MONITOR_LOG, 'w' if not path.isfile(Config.MONITOR_LOG) else 'r+')
f.seek(0, 2)
f.write(str(msg)+"\n")
f.close()
+ print str(msg)
def raisealert(severity, msg, process_name=None):
""" Writes the alert message"""
@@ -97,6 +96,7 @@
logging.info(log)
msg = 'logger -t monit '+ log
pout = Popen(msg, shell=True, stdout=PIPE)
+ print "[Alert] " + msg
def isPidMatchPidFile(pidfile, pids):
@@ -126,7 +126,7 @@
fd.close()
return StatusCodes.FAILED
- printd("file content "+str(inp))
+ printd("file content of pidfile " + pidfile + " = " + str(inp).strip())
printd(pids)
tocheck_pid = inp.strip()
for item in pids:
@@ -152,7 +152,7 @@
#check there is only one pid or not
if exitStatus == 0:
- pids = temp_out.split(' ')
+ pids = temp_out.strip().split(' ')
printd("pid(s) of process %s are %s " %(process_name, pids))
#there is more than one process so match the pid file
@@ -181,11 +181,10 @@
return False
-
-
def checkProcessStatus( process ):
"""
Check the process running status, if not running tries to restart
+ Returns the process status and if it was restarted
"""
process_name = process.get('processname')
service_name = process.get('servicename')
@@ -197,13 +196,13 @@
cmd=''
if process_name is None:
printd ("\n Invalid Process Name")
- return StatusCodes.INVALID_INP
+ return StatusCodes.INVALID_INP, False
status, pids = checkProcessRunningStatus(process_name, pidfile)
if status == True:
printd("The process is running ....")
- return StatusCodes.RUNNING
+ return StatusCodes.RUNNING, False
else:
printd("Process %s is not running trying to recover" %process_name)
#Retry the process state for few seconds
@@ -243,138 +242,151 @@
raisealert(Log.ALERT,process_name,msg)
printd("Restart failed after number of retries")
- return StatusCodes.STOPPED
+ return StatusCodes.STOPPED, False
- return StatusCodes.RUNNING
+ return StatusCodes.RUNNING, True
def monitProcess( processes_info ):
"""
Monitors the processes which got from the config file
"""
+ checkStartTime = time.time()
+ service_status = {}
+ failing_services = []
if len( processes_info ) == 0:
- printd("Invalid Input")
- return StatusCodes.INVALID_INP
+ printd("No config items provided - means a redundant VR or a VPC Router")
+ return service_status, failing_services
- dict_unmonit={}
- umonit_update={}
- unMonitPs=False
-
- if not path.isfile(Config.UNMONIT_PS_FILE):
- printd('Unmonit File not exist')
- else:
- #load the dictionary with unmonit process list
- dict_unmonit = loadPsFromUnMonitFile()
+ print "[Process Info] " + json.dumps(processes_info)
#time for noting process down time
csec = repr(time.time()).split('.')[0]
for process,properties in processes_info.items():
- #skip the process it its time stamp less than Config.MONIT_AFTER_MINS
- printd ("checking the service %s \n" %process)
-
- if not is_emtpy(dict_unmonit):
- if dict_unmonit.has_key(process):
- ts = dict_unmonit[process]
-
- if checkPsTimeStampForMonitor (csec, ts, properties) == False:
- unMonitPs = True
- continue
-
- if checkProcessStatus( properties) != StatusCodes.RUNNING:
+ printd ("---------------------------\nchecking the service %s\n---------------------------- " %process)
+ serviceName = process + ".service"
+ processStatus, wasRestarted = checkProcessStatus(properties)
+ if processStatus != StatusCodes.RUNNING:
printd( "\n Service %s is not Running"%process)
- #add this process into unmonit list
- printd ("updating the service for unmonit %s\n" %process)
- umonit_update[process]=csec
+ checkEndTime = time.time()
+ service_status[serviceName] = {
+ "success": "false",
+ "lastUpdate": str(int(checkStartTime * 1000)),
+ "lastRunDuration": str((checkEndTime - checkStartTime) * 1000),
+ "message": "service down at last check " + str(csec)
+ }
+ failing_services.append(serviceName)
+ else:
+ checkEndTime = time.time()
+ service_status[serviceName] = {
+ "success": "true",
+ "lastUpdate": str(int(checkStartTime * 1000)),
+ "lastRunDuration": str((checkEndTime - checkStartTime) * 1000),
+ "message": "service is running" + (", was restarted" if wasRestarted else "")
+ }
- #if dict is not empty write to file else delete it
- if not is_emtpy(umonit_update):
- writePsListToUnmonitFile(umonit_update)
+ return service_status, failing_services
+
+
+def execute(script, checkType = "basic"):
+ checkStartTime = time.time()
+ cmd = "./" + script + " " + checkType
+ printd ("Executing health check script command: " + cmd)
+
+ pout = Popen(cmd, shell=True, stdout=PIPE)
+ exitStatus = pout.wait()
+ output = pout.communicate()[0].strip()
+ checkEndTime = time.time()
+
+ if exitStatus == 0:
+ if len(output) > 0:
+ printd("Successful execution of " + script)
+ return {
+ "success": "true",
+ "lastUpdate": str(int(checkStartTime * 1000)),
+ "lastRunDuration": str((checkEndTime - checkStartTime) * 1000),
+ "message": output
+ }
+ return {} #Skip script if no output is received
else:
- if is_emtpy(umonit_update) and unMonitPs == False:
- #delete file it is there
- removeFile(Config.UNMONIT_PS_FILE)
+ printd("Script execution failed " + script)
+ return {
+ "success": "false",
+ "lastUpdate": str(int(checkStartTime * 1000)),
+ "lastRunDuration": str((checkEndTime - checkStartTime) * 1000),
+ "message": output
+ }
-
-def checkPsTimeStampForMonitor(csec,ts, process):
- printd("Time difference=%s" %str(int(csec) - int(ts)))
- tmin = (int(csec) - int(ts) )/60
-
- if ( int(csec) - int(ts) )/60 < Config.MONIT_AFTER_MINS:
- raisealert(Log.ALERT, "The %s get monitor after %s minutes " %(process, Config.MONIT_AFTER_MINS))
- printd('process will be monitored after %s min' %(str(int(Config.MONIT_AFTER_MINS) - tmin)))
- return False
-
- return True
-
-def removeFile(fileName):
- if path.isfile(fileName):
- printd("Removing the file %s" %fileName)
- os.remove(fileName)
-
-def loadPsFromUnMonitFile():
-
- dict_unmonit = {}
-
- try:
- fd = open(Config.UNMONIT_PS_FILE)
- except:
- printd("Failed to open file %s " %(Config.UNMONIT_PS_FILE))
- return StatusCodes.FAILED
-
- ps = fd.read()
-
- if not ps:
- printd("File %s content is empty " %Config.UNMONIT_PS_FILE)
- return StatusCodes.FAILED
-
- printd(ps)
- plist = ps.split(',')
- plist.remove('')
- for i in plist:
- dict_unmonit[i.split(':')[0]] = i.split(':')[1]
-
- fd.close()
-
- return dict_unmonit
-
-
-def writePsListToUnmonitFile(umonit_update):
- printd("Write updated unmonit list to file")
- line=''
- for i in umonit_update:
- line+=str(i)+":"+str(umonit_update[i])+','
- printd(line)
- try:
- fd=open(Config.UNMONIT_PS_FILE,'w')
- except:
- printd("Failed to open file %s " %Config.UNMONIT_PS_FILE)
- return StatusCodes.FAILED
-
- fd.write(line)
- fd.close()
-
-
-def is_emtpy(struct):
- """
- Checks wether the given struct is empty or not
- """
- if struct:
- return False
- else:
- return True
-
-def main():
+def main(checkType = "basic"):
+ startTime = time.time()
'''
- Step1 : Get Config
+ Step1 : Get Services Config
'''
printd("monitoring started")
- temp_dict = getConfig()
+ configDict = getServicesConfig()
'''
- Step2: Monitor and Raise Alert
+ Step2: Monitor services and Raise Alerts
'''
- monitProcess( temp_dict )
+ monitResult = {}
+ failingChecks = []
+ if checkType == "basic":
+ monitResult, failingChecks = monitProcess(configDict)
+
+ '''
+ Step3: Run health check scripts as needed
+ '''
+ hc_data = getHealthChecksData()
+
+ if hc_data is not None and "health_checks_enabled" in hc_data and hc_data['health_checks_enabled']:
+ hc_exclude = hc_data["excluded_health_checks"] if "excluded_health_checks" in hc_data else []
+ for f in os.listdir(Config.HEALTH_CHECKS_DIR):
+ if f in hc_exclude:
+ continue
+ fpath = path.join(Config.HEALTH_CHECKS_DIR, f)
+ if path.isfile(fpath) and os.access(fpath, os.X_OK):
+ ret = execute(fpath, checkType)
+ if len(ret) == 0:
+ continue
+ if "success" in ret and ret["success"].lower() == "false":
+ failingChecks.append(f)
+ monitResult[f] = ret
+
+ '''
+ Step4: Write results to the json file for admins/management server to read
+ '''
+
+ endTime = time.time()
+ monitResult["lastRun"] = {
+ "start": str(datetime.fromtimestamp(startTime)),
+ "end": str(datetime.fromtimestamp(endTime)),
+ "duration": str(endTime - startTime)
+ }
+
+ with open(checkType + "_" + Config.MONITOR_RESULT_FILE_SUFFIX, 'w') as f:
+ json.dump(monitResult, f, ensure_ascii=False)
+
+ failChecksFile = checkType + "_" + Config.FAILING_CHECKS_FILE
+ if len(failingChecks) > 0:
+ fcs = ""
+ for fc in failingChecks:
+ fcs = fcs + fc + ","
+ fcs = fcs[0:-1]
+ with open(failChecksFile, 'w') as f:
+ f.write(fcs)
+ elif path.isfile(failChecksFile):
+ os.remove(failChecksFile)
if __name__ == "__main__":
- main()
+ checkType = "basic"
+ if len(sys.argv) == 2:
+ if sys.argv[1] == "advanced":
+ main("advanced")
+ elif sys.argv[1] == "basic":
+ main("basic")
+ else:
+ printd("Error: Unknown type of test: " + sys.argv)
+ else:
+ main("basic")
+ main("advanced")
diff --git a/systemvm/pom.xml b/systemvm/pom.xml
index b7bad59..36a52dc 100644
--- a/systemvm/pom.xml
+++ b/systemvm/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<properties>
diff --git a/test/integration/component/test_acquire_specified_public_ip.py b/test/integration/component/test_acquire_specified_public_ip.py
new file mode 100644
index 0000000..01a4470
--- /dev/null
+++ b/test/integration/component/test_acquire_specified_public_ip.py
@@ -0,0 +1,486 @@
+# 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.
+
+"""
+Tests of acquiring a specified public IP for isolated network or vpc
+"""
+
+# Import Local Modules
+from nose.plugins.attrib import attr
+from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackAPI import createVlanIpRange
+from marvin.lib.utils import (validateList,
+ cleanup_resources)
+from marvin.lib.base import (Account,
+ Domain,
+ Configurations,
+ VirtualMachine,
+ ServiceOffering,
+ VpcOffering,
+ Zone,
+ Network,
+ VPC,
+ PublicIPAddress,
+ PublicIpRange)
+from marvin.lib.common import (get_domain,
+ get_zone,
+ get_free_vlan,
+ get_template)
+import logging
+import random
+
+class TestAcquireSpecifiedPublicIp(cloudstackTestCase):
+ @classmethod
+ def setUpClass(cls):
+ cls.testClient = super(
+ TestAcquireSpecifiedPublicIp,
+ cls).getClsTestClient()
+ cls.apiclient = cls.testClient.getApiClient()
+ cls.services = cls.testClient.getParsedTestDataConfig()
+
+ zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests())
+ cls.zone = Zone(zone.__dict__)
+ cls.template = get_template(cls.apiclient, cls.zone.id)
+ cls._cleanup = []
+
+ if str(cls.zone.securitygroupsenabled) == "True":
+ sys.exit(1)
+
+ cls.logger = logging.getLogger("TestAcquireSpecifiedPublicIp")
+ cls.stream_handler = logging.StreamHandler()
+ cls.logger.setLevel(logging.DEBUG)
+ cls.logger.addHandler(cls.stream_handler)
+
+ # Get Zone, Domain and templates
+ cls.domain = get_domain(cls.apiclient)
+
+ # Create new domain1
+ cls.domain1 = Domain.create(
+ cls.apiclient,
+ services=cls.services["acl"]["domain1"],
+ parentdomainid=cls.domain.id)
+
+ # Create account1
+ cls.account1 = Account.create(
+ cls.apiclient,
+ cls.services["acl"]["accountD1"],
+ domainid=cls.domain1.id
+ )
+
+ # Create domain2
+ cls.domain2 = Domain.create(
+ cls.apiclient,
+ services=cls.services["acl"]["domain2"],
+ parentdomainid=cls.domain.id)
+
+ # Create account2
+ cls.account2 = Account.create(
+ cls.apiclient,
+ cls.services["acl"]["accountD2"],
+ domainid=cls.domain2.id
+ )
+
+ cls.services["publiciprange"]["zoneid"] = cls.zone.id
+ cls.services["publiciprange"]["forvirtualnetwork"] = "true"
+
+ # Create public ip range 1
+ cls.services["publiciprange"]["vlan"] = get_free_vlan(
+ cls.apiclient,
+ cls.zone.id)[1]
+ random_subnet_number = random.randrange(10,20)
+ cls.services["publiciprange"]["gateway"] = "172.16." + \
+ str(random_subnet_number) + ".1"
+ cls.services["publiciprange"]["startip"] = "172.16." + \
+ str(random_subnet_number) + ".2"
+ cls.services["publiciprange"]["endip"] = "172.16." + \
+ str(random_subnet_number) + ".10"
+ cls.services["publiciprange"]["netmask"] = "255.255.255.0"
+ cls.public_ip_range1 = PublicIpRange.create(
+ cls.apiclient,
+ cls.services["publiciprange"]
+ )
+ PublicIpRange.dedicate(
+ cls.apiclient,
+ cls.public_ip_range1.vlan.id,
+ domainid=cls.account1.domainid
+ )
+
+ # Create public ip range 2
+ cls.services["publiciprange"]["vlan"] = get_free_vlan(
+ cls.apiclient,
+ cls.zone.id)[1]
+ cls.services["publiciprange"]["gateway"] = "172.16." + \
+ str(random_subnet_number + 1) + ".1"
+ cls.services["publiciprange"]["startip"] = "172.16." + \
+ str(random_subnet_number + 1) + ".2"
+ cls.services["publiciprange"]["endip"] = "172.16." + \
+ str(random_subnet_number + 1) + ".10"
+ cls.services["publiciprange"]["netmask"] = "255.255.255.0"
+ cls.public_ip_range2 = PublicIpRange.create(
+ cls.apiclient,
+ cls.services["publiciprange"]
+ )
+ PublicIpRange.dedicate(
+ cls.apiclient,
+ cls.public_ip_range2.vlan.id,
+ account=cls.account1.name,
+ domainid=cls.account1.domainid
+ )
+
+ # Create public ip range 3
+ cls.services["publiciprange"]["vlan"] = get_free_vlan(
+ cls.apiclient,
+ cls.zone.id)[1]
+ cls.services["publiciprange"]["gateway"] = "172.16." + \
+ str(random_subnet_number + 2) + ".1"
+ cls.services["publiciprange"]["startip"] = "172.16." + \
+ str(random_subnet_number + 2) + ".2"
+ cls.services["publiciprange"]["endip"] = "172.16." + \
+ str(random_subnet_number + 2) + ".10"
+ cls.services["publiciprange"]["netmask"] = "255.255.255.0"
+ cls.public_ip_range3 = PublicIpRange.create(
+ cls.apiclient,
+ cls.services["publiciprange"]
+ )
+ PublicIpRange.dedicate(
+ cls.apiclient,
+ cls.public_ip_range3.vlan.id,
+ domainid=cls.account2.domainid
+ )
+
+ # Create public ip range 4
+ cls.services["publiciprange"]["vlan"] = get_free_vlan(
+ cls.apiclient,
+ cls.zone.id)[1]
+ cls.services["publiciprange"]["gateway"] = "172.16." + \
+ str(random_subnet_number + 3) + ".1"
+ cls.services["publiciprange"]["startip"] = "172.16." + \
+ str(random_subnet_number + 3) + ".2"
+ cls.services["publiciprange"]["endip"] = "172.16." + \
+ str(random_subnet_number + 3) + ".10"
+ cls.services["publiciprange"]["netmask"] = "255.255.255.0"
+ cls.public_ip_range4 = PublicIpRange.create(
+ cls.apiclient,
+ cls.services["publiciprange"]
+ )
+ PublicIpRange.dedicate(
+ cls.apiclient,
+ cls.public_ip_range4.vlan.id,
+ account=cls.account2.name,
+ domainid=cls.account2.domainid
+ )
+
+ # Create public ip range 5
+ cls.services["publiciprange"]["vlan"] = get_free_vlan(
+ cls.apiclient,
+ cls.zone.id)[1]
+ cls.services["publiciprange"]["gateway"] = "172.16." + \
+ str(random_subnet_number + 4) + ".1"
+ cls.services["publiciprange"]["startip"] = "172.16." + \
+ str(random_subnet_number + 4) + ".2"
+ cls.services["publiciprange"]["endip"] = "172.16." + \
+ str(random_subnet_number + 4) + ".10"
+ cls.services["publiciprange"]["netmask"] = "255.255.255.0"
+ cls.public_ip_range5 = PublicIpRange.create(
+ cls.apiclient,
+ cls.services["publiciprange"]
+ )
+
+ cls._cleanup.append(cls.account1)
+ cls._cleanup.append(cls.domain1)
+ cls._cleanup.append(cls.account2)
+ cls._cleanup.append(cls.domain2)
+ cls._cleanup.append(cls.public_ip_range1)
+ cls._cleanup.append(cls.public_ip_range2)
+ cls._cleanup.append(cls.public_ip_range3)
+ cls._cleanup.append(cls.public_ip_range4)
+ cls._cleanup.append(cls.public_ip_range5)
+
+ @classmethod
+ def tearDownClass(cls):
+ try:
+ cleanup_resources(cls.apiclient, cls._cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ def setUp(cls):
+ cls.apiclient = cls.testClient.getApiClient()
+ cls.cleanup = []
+ return
+
+ def tearDown(cls):
+ try:
+ cleanup_resources(cls.apiclient, cls.cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ @attr(tags=["advanced"], required_hardware="false")
+ def test_01_acquire_public_ip_in_isolated_network(self):
+ # Validate the following
+ # 1. create a vm . it will create a network as well.
+ # 2. assign a specified IP from subnet which is dedicated to domain1, it should succeed
+ # 3. assign a specified IP from subnet which is dedicated to domain1/account1, it should succeed
+ # 4. assign a specified IP from subnet which is dedicated to domain2, it should fail
+ # 5. assign a specified IP from subnet which is dedicated to domain2/account2, it should fail
+ # 6. update account setting use.system.public.ips to false, assign a specified IP from subnet which is public, it should fail
+ # 7. update account setting use.system.public.ips to true, assign a specified IP from subnet which is public, it should succeed
+
+ self.service_offering = ServiceOffering.create(
+ self.apiclient,
+ self.services["service_offering"]
+ )
+ self.cleanup.append(self.service_offering)
+
+ self.virtual_machine = VirtualMachine.create(
+ self.apiclient,
+ self.services["small"],
+ templateid=self.template.id,
+ accountid=self.account1.name,
+ domainid=self.account1.domainid,
+ serviceofferingid=self.service_offering.id,
+ zoneid=self.zone.id
+ )
+
+ networks = Network.list(
+ self.apiclient,
+ account=self.account1.name,
+ domainid=self.account1.domainid,
+ listall=True
+ )
+ self.assertEqual(
+ isinstance(networks, list),
+ True,
+ "List networks should return a valid response for created network"
+ )
+ network = networks[0]
+
+ # Associate IP in range dedicated to domain1
+ ip_address_1 = self.get_free_ipaddress(self.public_ip_range1.vlan.id)
+ ipaddress = PublicIPAddress.create(
+ self.apiclient,
+ zoneid=self.zone.id,
+ networkid=network.id,
+ ipaddress=ip_address_1
+ )
+ self.assertIsNotNone(
+ ipaddress,
+ "Failed to Associate IP Address"
+ )
+ self.cleanup.append(ipaddress)
+ self.assertEqual(ipaddress.ipaddress.ipaddress, ip_address_1, "Associated IP is not same as specified")
+
+ # Associate IP in range dedicated to domain1/account1
+ ip_address_2 = self.get_free_ipaddress(self.public_ip_range2.vlan.id)
+ ipaddress = PublicIPAddress.create(
+ self.apiclient,
+ zoneid=self.zone.id,
+ networkid=network.id,
+ ipaddress=ip_address_2
+ )
+ self.assertIsNotNone(
+ ipaddress,
+ "Failed to Associate IP Address"
+ )
+ self.cleanup.append(ipaddress)
+ self.assertEqual(ipaddress.ipaddress.ipaddress, ip_address_2, "Associated IP is not same as specified")
+
+ # Associate IP in range dedicated to domain2
+ ip_address_3 = self.get_free_ipaddress(self.public_ip_range3.vlan.id)
+ with self.assertRaises(Exception):
+ ipaddress = PublicIPAddress.create(
+ self.apiclient,
+ zoneid=self.zone.id,
+ networkid=network.id,
+ ipaddress=ip_address_3
+ )
+
+ # Associate IP in range dedicated to domain2/account2
+ ip_address_4 = self.get_free_ipaddress(self.public_ip_range4.vlan.id)
+ with self.assertRaises(Exception):
+ ipaddress = PublicIPAddress.create(
+ self.apiclient,
+ zoneid=self.zone.id,
+ networkid=network.id,
+ ipaddress=ip_address_4
+ )
+
+ # Associate IP in public IP pool
+ Configurations.update(
+ self.apiclient,
+ name="use.system.public.ips",
+ value="false",
+ accountid=self.account1.id
+ )
+
+ ip_address_5 = self.get_free_ipaddress(self.public_ip_range5.vlan.id)
+ with self.assertRaises(Exception):
+ ipaddress = PublicIPAddress.create(
+ self.apiclient,
+ zoneid=self.zone.id,
+ networkid=network.id,
+ ipaddress=ip_address_5
+ )
+
+ Configurations.update(
+ self.apiclient,
+ name="use.system.public.ips",
+ value="true",
+ accountid=self.account1.id
+ )
+ ipaddress = PublicIPAddress.create(
+ self.apiclient,
+ zoneid=self.zone.id,
+ networkid=network.id,
+ ipaddress=ip_address_5
+ )
+ self.assertIsNotNone(
+ ipaddress,
+ "Failed to Associate IP Address"
+ )
+ self.cleanup.append(ipaddress)
+ self.assertEqual(ipaddress.ipaddress.ipaddress, ip_address_5, "Associated IP is not same as specified")
+
+ self.cleanup.append(self.virtual_machine)
+ self.cleanup.append(self.service_offering)
+
+ return
+
+ @attr(tags=["advanced"], required_hardware="false")
+ def test_02_acquire_public_ip_in_vpc(self):
+ # Validate the following
+ # 1. create a VPC with default offering.
+ # 2. assign a specified IP from subnet which is dedicated to domain1, it should succeed
+ # 3. assign a specified IP from subnet which is dedicated to domain1/account1, it should succeed
+ # 4. assign a specified IP from subnet which is dedicated to domain2, it should fail
+ # 5. assign a specified IP from subnet which is dedicated to domain2/account2, it should fail
+ # 6. update account setting use.system.public.ips to false, assign a specified IP from subnet which is public, it should fail
+ # 7. update account setting use.system.public.ips to true, assign a specified IP from subnet which is public, it should succeed
+
+ vpcOffering = VpcOffering.list(self.apiclient, name="Default VPC offering")
+ vpc = VPC.create(
+ apiclient=self.apiclient,
+ services=self.services["vpc"],
+ vpcofferingid=vpcOffering[0].id,
+ zoneid=self.zone.id,
+ account=self.account1.name,
+ domainid=self.account1.domainid
+ )
+
+ # Associate IP in range dedicated to domain1
+ ip_address_1 = self.get_free_ipaddress(self.public_ip_range1.vlan.id)
+ ipaddress = PublicIPAddress.create(
+ self.apiclient,
+ zoneid=self.zone.id,
+ vpcid=vpc.id,
+ ipaddress=ip_address_1
+ )
+ self.assertIsNotNone(
+ ipaddress,
+ "Failed to Associate IP Address"
+ )
+ self.cleanup.append(ipaddress)
+ self.assertEqual(ipaddress.ipaddress.ipaddress, ip_address_1, "Associated IP is not same as specified")
+
+ # Associate IP in range dedicated to domain1/account1
+ ip_address_2 = self.get_free_ipaddress(self.public_ip_range2.vlan.id)
+ ipaddress = PublicIPAddress.create(
+ self.apiclient,
+ zoneid=self.zone.id,
+ vpcid=vpc.id,
+ ipaddress=ip_address_2
+ )
+ self.assertIsNotNone(
+ ipaddress,
+ "Failed to Associate IP Address"
+ )
+ self.cleanup.append(ipaddress)
+ self.assertEqual(ipaddress.ipaddress.ipaddress, ip_address_2, "Associated IP is not same as specified")
+
+ # Associate IP in range dedicated to domain2
+ ip_address_3 = self.get_free_ipaddress(self.public_ip_range3.vlan.id)
+ with self.assertRaises(Exception):
+ ipaddress = PublicIPAddress.create(
+ self.apiclient,
+ zoneid=self.zone.id,
+ vpcid=vpc.id,
+ ipaddress=ip_address_3
+ )
+
+ # Associate IP in range dedicated to domain2/account2
+ ip_address_4 = self.get_free_ipaddress(self.public_ip_range4.vlan.id)
+ with self.assertRaises(Exception):
+ ipaddress = PublicIPAddress.create(
+ self.apiclient,
+ zoneid=self.zone.id,
+ vpcid=vpc.id,
+ ipaddress=ip_address_4
+ )
+
+ # Associate IP in public IP pool
+ Configurations.update(
+ self.apiclient,
+ name="use.system.public.ips",
+ value="false",
+ accountid=self.account1.id
+ )
+
+ ip_address_5 = self.get_free_ipaddress(self.public_ip_range5.vlan.id)
+ with self.assertRaises(Exception):
+ ipaddress = PublicIPAddress.create(
+ self.apiclient,
+ zoneid=self.zone.id,
+ vpcid=vpc.id,
+ ipaddress=ip_address_5
+ )
+
+ Configurations.update(
+ self.apiclient,
+ name="use.system.public.ips",
+ value="true",
+ accountid=self.account1.id
+ )
+ ipaddress = PublicIPAddress.create(
+ self.apiclient,
+ zoneid=self.zone.id,
+ vpcid=vpc.id,
+ ipaddress=ip_address_5
+ )
+ self.assertIsNotNone(
+ ipaddress,
+ "Failed to Associate IP Address"
+ )
+ self.cleanup.append(ipaddress)
+ self.assertEqual(ipaddress.ipaddress.ipaddress, ip_address_5, "Associated IP is not same as specified")
+
+ self.cleanup.append(vpc)
+ return
+
+ def get_free_ipaddress(self, vlanId):
+ ipaddresses = PublicIPAddress.list(
+ self.apiclient,
+ vlanid=vlanId,
+ state='Free'
+ )
+ self.assertEqual(
+ isinstance(ipaddresses, list),
+ True,
+ "List ipaddresses should return a valid response for Free ipaddresses"
+ )
+ random.shuffle(ipaddresses)
+ return ipaddresses[0].ipaddress
diff --git a/test/integration/component/test_multiple_nic_support.py b/test/integration/component/test_multiple_nic_support.py
new file mode 100644
index 0000000..cf3a233
--- /dev/null
+++ b/test/integration/component/test_multiple_nic_support.py
@@ -0,0 +1,629 @@
+# 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.
+""" tests for supporting multiple NIC's in advanced zone with security groups in cloudstack 4.14.0.0
+
+"""
+# Import Local Modules
+from nose.plugins.attrib import attr
+from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.sshClient import SshClient
+from marvin.lib.utils import (validateList,
+ cleanup_resources,
+ get_host_credentials,
+ get_process_status,
+ execute_command_in_host,
+ random_gen)
+from marvin.lib.base import (PhysicalNetwork,
+ Account,
+ Host,
+ TrafficType,
+ Domain,
+ Network,
+ NetworkOffering,
+ VirtualMachine,
+ ServiceOffering,
+ Zone,
+ NIC,
+ SecurityGroup)
+from marvin.lib.common import (get_domain,
+ get_zone,
+ get_template,
+ list_virtual_machines,
+ list_routers,
+ list_hosts,
+ get_free_vlan)
+from marvin.codes import (PASS, FAILED)
+import logging
+import random
+import time
+
+class TestMulipleNicSupport(cloudstackTestCase):
+ @classmethod
+ def setUpClass(cls):
+ cls.testClient = super(
+ TestMulipleNicSupport,
+ cls).getClsTestClient()
+ cls.apiclient = cls.testClient.getApiClient()
+ cls.testdata = cls.testClient.getParsedTestDataConfig()
+ cls.services = cls.testClient.getParsedTestDataConfig()
+ zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests())
+ cls.zone = Zone(zone.__dict__)
+ cls._cleanup = []
+
+ if str(cls.zone.securitygroupsenabled) != "True":
+ sys.exit(1)
+
+ cls.logger = logging.getLogger("TestMulipleNicSupport")
+ cls.stream_handler = logging.StreamHandler()
+ cls.logger.setLevel(logging.DEBUG)
+ cls.logger.addHandler(cls.stream_handler)
+
+ # Get Domain and templates
+ cls.domain = get_domain(cls.apiclient)
+ cls.services['mode'] = cls.zone.networktype
+
+ cls.template = get_template(cls.apiclient, cls.zone.id, hypervisor="KVM")
+ if cls.template == FAILED:
+ sys.exit(1)
+
+ # Create new domain, account, network and VM
+ cls.user_domain = Domain.create(
+ cls.apiclient,
+ services=cls.testdata["acl"]["domain2"],
+ parentdomainid=cls.domain.id)
+
+ # Create account
+ cls.account1 = Account.create(
+ cls.apiclient,
+ cls.testdata["acl"]["accountD2"],
+ admin=True,
+ domainid=cls.user_domain.id
+ )
+
+ # Create small service offering
+ cls.service_offering = ServiceOffering.create(
+ cls.apiclient,
+ cls.testdata["service_offerings"]["small"]
+ )
+
+ cls._cleanup.append(cls.service_offering)
+ cls.services["network"]["zoneid"] = cls.zone.id
+ cls.network_offering = NetworkOffering.create(
+ cls.apiclient,
+ cls.services["network_offering"],
+ )
+ # Enable Network offering
+ cls.network_offering.update(cls.apiclient, state='Enabled')
+
+ cls._cleanup.append(cls.network_offering)
+ cls.testdata["virtual_machine"]["zoneid"] = cls.zone.id
+ cls.testdata["virtual_machine"]["template"] = cls.template.id
+
+ if cls.zone.securitygroupsenabled:
+ # Enable networking for reaching to VM thorugh SSH
+ security_group = SecurityGroup.create(
+ cls.apiclient,
+ cls.testdata["security_group"],
+ account=cls.account1.name,
+ domainid=cls.account1.domainid
+ )
+
+ # Authorize Security group to SSH to VM
+ ingress_rule = security_group.authorize(
+ cls.apiclient,
+ cls.testdata["ingress_rule"],
+ account=cls.account1.name,
+ domainid=cls.account1.domainid
+ )
+
+ # Authorize Security group to SSH to VM
+ ingress_rule2 = security_group.authorize(
+ cls.apiclient,
+ cls.testdata["ingress_rule_ICMP"],
+ account=cls.account1.name,
+ domainid=cls.account1.domainid
+ )
+
+ cls.testdata["shared_network_offering_sg"]["specifyVlan"] = 'True'
+ cls.testdata["shared_network_offering_sg"]["specifyIpRanges"] = 'True'
+ cls.shared_network_offering = NetworkOffering.create(
+ cls.apiclient,
+ cls.testdata["shared_network_offering_sg"],
+ conservemode=False
+ )
+
+ NetworkOffering.update(
+ cls.shared_network_offering,
+ cls.apiclient,
+ id=cls.shared_network_offering.id,
+ state="enabled"
+ )
+
+ physical_network, vlan = get_free_vlan(cls.apiclient, cls.zone.id)
+ cls.testdata["shared_network_sg"]["physicalnetworkid"] = physical_network.id
+
+ random_subnet_number = random.randrange(90, 99)
+ cls.testdata["shared_network_sg"]["name"] = "Shared-Network-SG-Test-vlan" + str(random_subnet_number)
+ cls.testdata["shared_network_sg"]["displaytext"] = "Shared-Network-SG-Test-vlan" + str(random_subnet_number)
+ cls.testdata["shared_network_sg"]["vlan"] = "vlan://" + str(random_subnet_number)
+ cls.testdata["shared_network_sg"]["startip"] = "192.168." + str(random_subnet_number) + ".240"
+ cls.testdata["shared_network_sg"]["endip"] = "192.168." + str(random_subnet_number) + ".250"
+ cls.testdata["shared_network_sg"]["gateway"] = "192.168." + str(random_subnet_number) + ".254"
+ cls.network1 = Network.create(
+ cls.apiclient,
+ cls.testdata["shared_network_sg"],
+ networkofferingid=cls.shared_network_offering.id,
+ zoneid=cls.zone.id,
+ accountid=cls.account1.name,
+ domainid=cls.account1.domainid
+ )
+
+ random_subnet_number = random.randrange(100, 110)
+ cls.testdata["shared_network_sg"]["name"] = "Shared-Network-SG-Test-vlan" + str(random_subnet_number)
+ cls.testdata["shared_network_sg"]["displaytext"] = "Shared-Network-SG-Test-vlan" + str(random_subnet_number)
+ cls.testdata["shared_network_sg"]["vlan"] = "vlan://" + str(random_subnet_number)
+ cls.testdata["shared_network_sg"]["startip"] = "192.168." + str(random_subnet_number) + ".240"
+ cls.testdata["shared_network_sg"]["endip"] = "192.168." + str(random_subnet_number) + ".250"
+ cls.testdata["shared_network_sg"]["gateway"] = "192.168." + str(random_subnet_number) + ".254"
+ cls.network2 = Network.create(
+ cls.apiclient,
+ cls.testdata["shared_network_sg"],
+ networkofferingid=cls.shared_network_offering.id,
+ zoneid=cls.zone.id,
+ accountid=cls.account1.name,
+ domainid=cls.account1.domainid
+ )
+
+ random_subnet_number = random.randrange(111, 120)
+ cls.testdata["shared_network_sg"]["name"] = "Shared-Network-SG-Test-vlan" + str(random_subnet_number)
+ cls.testdata["shared_network_sg"]["displaytext"] = "Shared-Network-SG-Test-vlan" + str(random_subnet_number)
+ cls.testdata["shared_network_sg"]["vlan"] = "vlan://" + str(random_subnet_number)
+ cls.testdata["shared_network_sg"]["startip"] = "192.168." + str(random_subnet_number) + ".240"
+ cls.testdata["shared_network_sg"]["endip"] = "192.168." + str(random_subnet_number) + ".250"
+ cls.testdata["shared_network_sg"]["gateway"] = "192.168." + str(random_subnet_number) + ".254"
+ cls.network3 = Network.create(
+ cls.apiclient,
+ cls.testdata["shared_network_sg"],
+ networkofferingid=cls.shared_network_offering.id,
+ zoneid=cls.zone.id,
+ accountid=cls.account1.name,
+ domainid=cls.account1.domainid
+ )
+
+ try:
+ cls.virtual_machine1 = VirtualMachine.create(
+ cls.apiclient,
+ cls.testdata["virtual_machine"],
+ accountid=cls.account1.name,
+ domainid=cls.account1.domainid,
+ serviceofferingid=cls.service_offering.id,
+ templateid=cls.template.id,
+ securitygroupids=[security_group.id],
+ networkids=cls.network1.id
+ )
+ for nic in cls.virtual_machine1.nic:
+ if nic.isdefault:
+ cls.virtual_machine1.ssh_ip = nic.ipaddress
+ cls.virtual_machine1.default_network_id = nic.networkid
+ break
+ except Exception as e:
+ cls.fail("Exception while deploying virtual machine: %s" % e)
+
+ try:
+ cls.virtual_machine2 = VirtualMachine.create(
+ cls.apiclient,
+ cls.testdata["virtual_machine"],
+ accountid=cls.account1.name,
+ domainid=cls.account1.domainid,
+ serviceofferingid=cls.service_offering.id,
+ templateid=cls.template.id,
+ securitygroupids=[security_group.id],
+ networkids=[str(cls.network1.id), str(cls.network2.id)]
+ )
+ for nic in cls.virtual_machine2.nic:
+ if nic.isdefault:
+ cls.virtual_machine2.ssh_ip = nic.ipaddress
+ cls.virtual_machine2.default_network_id = nic.networkid
+ break
+ except Exception as e:
+ cls.fail("Exception while deploying virtual machine: %s" % e)
+
+ cls._cleanup.append(cls.virtual_machine1)
+ cls._cleanup.append(cls.virtual_machine2)
+ cls._cleanup.append(cls.network1)
+ cls._cleanup.append(cls.network2)
+ cls._cleanup.append(cls.network3)
+ cls._cleanup.append(cls.shared_network_offering)
+ if cls.zone.securitygroupsenabled:
+ cls._cleanup.append(security_group)
+ cls._cleanup.append(cls.account1)
+ cls._cleanup.append(cls.user_domain)
+
+ @classmethod
+ def tearDownClass(self):
+ try:
+ cleanup_resources(self.apiclient, self._cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ def setUp(self):
+ self.apiclient = self.testClient.getApiClient()
+ self.cleanup = []
+ return
+
+ def tearDown(self):
+ try:
+ cleanup_resources(self.apiclient, self.cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ def verify_network_rules(self, vm_id):
+ virtual_machine = VirtualMachine.list(
+ self.apiclient,
+ id=vm_id
+ )
+ vm = virtual_machine[0]
+ hosts = list_hosts(
+ self.apiclient,
+ id=vm.hostid
+ )
+ host = hosts[0]
+ if host.hypervisor.lower() not in "kvm":
+ return
+ host.user, host.password = get_host_credentials(self.config, host.ipaddress)
+ for nic in vm.nic:
+ secips = ""
+ if len(nic.secondaryip) > 0:
+ for secip in nic.secondaryip:
+ secips += secip.ipaddress + ";"
+ command="/usr/share/cloudstack-common/scripts/vm/network/security_group.py verify_network_rules --vmname %s --vmip %s --vmmac %s --nicsecips '%s'" % (vm.instancename, nic.ipaddress, nic.macaddress, secips)
+ self.logger.debug("Executing command '%s' in host %s" % (command, host.ipaddress))
+ result=execute_command_in_host(host.ipaddress, 22,
+ host.user,
+ host.password,
+ command)
+ if len(result) > 0:
+ self.fail("The iptables/ebtables rules for nic %s on vm %s on host %s are not correct" %(nic.ipaddress, vm.instancename, host.name))
+
+ @attr(tags=["adeancedsg"], required_hardware="false")
+ def test_01_create_vm_with_multiple_nics(self):
+ """Create Vm with multiple NIC's
+
+ Steps:
+ # 1. Create more than 1 isolated or shared network
+ # 2. Create a vm and select more than 1 network while deploying
+ # 3. Vm is deployed successfully with 1 nic from each network
+ # 4. All the vm's should be pingable
+ :return:
+ """
+ virtual_machine = VirtualMachine.list(
+ self.apiclient,
+ id=self.virtual_machine2.id
+ )
+ self.assertEqual(
+ len(virtual_machine), 1,
+ "Virtual Machine create with 2 NIC's failed")
+
+ nicIdInVm = virtual_machine[0].nic[0]
+ self.assertIsNotNone(nicIdInVm, "NIC 1 not found in Virtual Machine")
+
+ nicIdInVm = virtual_machine[0].nic[1]
+ self.assertIsNotNone(nicIdInVm, "NIC 2 not found in Virtual Machine")
+
+ self.verify_network_rules(self.virtual_machine2.id)
+
+ @attr(tags=["advancedsg"], required_hardware="false")
+ def test_02_add_nic_to_vm(self):
+ """Create VM with single NIC and then add additional NIC
+
+ Steps:
+ # 1. Create a VM by selecting one default NIC
+ # 2. Create few more isolated or shared networks
+ # 3. Add extra NIC's to the vm from the newly created networks
+ # 4. The deployed VM should have extra nic's added in the above
+ # step without any fail
+ # 5. The IP's of the extra NIC's should be pingable
+ :return:
+ """
+ self.virtual_machine1.add_nic(self.apiclient, self.network2.id)
+
+ virtual_machine = VirtualMachine.list(
+ self.apiclient,
+ id=self.virtual_machine1.id
+ )
+
+ nicIdInVm = virtual_machine[0].nic[1]
+ self.assertIsNotNone(nicIdInVm, "Second NIC not found")
+
+ self.verify_network_rules(self.virtual_machine1.id)
+
+ @attr(tags=["advancedsg"], required_hardware="false")
+ def test_03_add_ip_to_default_nic(self):
+ """ Add secondary IP's to the VM
+
+ Steps:
+ # 1. Create a VM with more than 1 NIC
+ # 2) Navigate to Instances->NIC->Edit Secondary IP's
+ # ->Aquire new Secondary IP"
+ # 3) Add as many secondary Ip as possible to the VM
+ # 4) Configure the secondary IP's by referring to "Configure
+ # the secondary IP's" in the "Action Item" section
+ :return:
+ """
+ ipaddress = NIC.addIp(
+ self.apiclient,
+ id=self.virtual_machine2.nic[0].id
+ )
+
+ self.assertIsNotNone(
+ ipaddress,
+ "Unable to add secondary IP to the default NIC")
+
+ self.verify_network_rules(self.virtual_machine2.id)
+
+ @attr(tags=["advancedsg"], required_hardware="false")
+ def test_04_add_ip_to_remaining_nics(self):
+ """ Add secondary IP's to remaining NIC's
+
+ Steps:
+ # 1) Create a VM with more than 1 NIC
+ # 2)Navigate to Instances-NIC's->Edit Secondary IP's
+ # ->Acquire new Secondary IP
+ # 3) Add secondary IP to all the NIC's of the VM
+ # 4) Confiugre the secondary IP's by referring to "Configure the
+ # secondary IP's" in the "Action Item" section
+ :return:
+ """
+
+ self.virtual_machine1.add_nic(self.apiclient, self.network3.id)
+
+ vms = VirtualMachine.list(
+ self.apiclient,
+ id=self.virtual_machine1.id
+ )
+
+ self.assertIsNotNone(
+ vms[0].nic[2],
+ "Third NIC is not added successfully to the VM")
+
+ vms1_nic1_id = vms[0].nic[1]['id']
+ vms1_nic2_id = vms[0].nic[2]['id']
+
+ ipaddress21 = NIC.addIp(
+ self.apiclient,
+ id=vms1_nic1_id
+ )
+
+ ipaddress22 = NIC.addIp(
+ self.apiclient,
+ id=vms1_nic1_id
+ )
+
+ self.assertIsNotNone(
+ ipaddress21,
+ "Unable to add first secondary IP to the second nic")
+ self.assertIsNotNone(
+ ipaddress22,
+ "Unable to add second secondary IP to second NIC")
+
+ ipaddress31 = NIC.addIp(
+ self.apiclient,
+ id=vms1_nic2_id
+ )
+
+ ipaddress32 = NIC.addIp(
+ self.apiclient,
+ id=vms1_nic2_id
+ )
+
+ self.assertIsNotNone(
+ ipaddress31,
+ "Unable to add first secondary IP to third NIC")
+ self.assertIsNotNone(
+ ipaddress32,
+ "Unable to add second secondary IP to third NIC")
+
+ self.verify_network_rules(self.virtual_machine1.id)
+
+ @attr(tags=["advancedsg"], required_hardware="false")
+ def test_05_stop_start_vm_with_multiple_nic(self):
+ """ Stop and Start a VM with Multple NIC
+
+ Steps:
+ # 1) Create a Vm with multiple NIC's
+ # 2) Configure secondary IP's on the VM
+ # 3) Try to stop/start the VM
+ # 4) Ping the IP's of the vm
+ # 5) Remove Secondary IP from one of the NIC
+ :return:
+ """
+ ipaddress1 = NIC.addIp(
+ self.apiclient,
+ id=self.virtual_machine2.nic[0].id
+ )
+
+ ipaddress2 = NIC.addIp(
+ self.apiclient,
+ id=self.virtual_machine2.nic[1].id
+ )
+ # Stop the VM with multiple NIC's
+ self.virtual_machine2.stop(self.apiclient)
+
+ virtual_machine = VirtualMachine.list(
+ self.apiclient,
+ id=self.virtual_machine2.id
+ )
+
+ self.assertEqual(
+ virtual_machine[0]['state'], 'Stopped',
+ "Could not stop the VM with multiple NIC's")
+
+ if virtual_machine[0]['state'] == 'Stopped':
+ # If stopped then try to start the VM
+ self.virtual_machine2.start(self.apiclient)
+ virtual_machine = VirtualMachine.list(
+ self.apiclient,
+ id=self.virtual_machine2.id
+ )
+ self.assertEqual(
+ virtual_machine[0]['state'], 'Running',
+ "Could not start the VM with multiple NIC's")
+
+ self.verify_network_rules(self.virtual_machine2.id)
+
+ @attr(tags=["advancedsg"], required_hardware="false")
+ def test_06_migrate_vm_with_multiple_nic(self):
+ """ Migrate a VM with Multple NIC
+
+ Steps:
+ # 1) Create a Vm with multiple NIC's
+ # 2) Configure secondary IP's on the VM
+ # 3) Try to stop/start the VM
+ # 4) Ping the IP's of the vm
+ :return:
+ """
+ # Skipping adding Secondary IP to NIC since its already
+ # done in the previous test cases
+
+ virtual_machine = VirtualMachine.list(
+ self.apiclient,
+ id=self.virtual_machine1.id
+ )
+ old_host_id = virtual_machine[0]['hostid']
+
+ try:
+ hosts = Host.list(
+ self.apiclient,
+ virtualmachineid=self.virtual_machine1.id,
+ listall=True)
+ self.assertEqual(
+ validateList(hosts)[0],
+ PASS,
+ "hosts list validation failed")
+
+ # Get a host which is not already assigned to VM
+ for host in hosts:
+ if host.id == old_host_id:
+ continue
+ else:
+ host_id = host.id
+ break
+
+ self.virtual_machine1.migrate(self.apiclient, host_id)
+ except Exception as e:
+ self.fail("Exception occured: %s" % e)
+
+ # List the vm again
+ virtual_machine = VirtualMachine.list(
+ self.apiclient,
+ id=self.virtual_machine1.id)
+
+ new_host_id = virtual_machine[0]['hostid']
+
+ self.assertNotEqual(
+ old_host_id, new_host_id,
+ "Migration of VM to new host failed"
+ )
+
+ self.verify_network_rules(self.virtual_machine1.id)
+
+ @attr(tags=["advancedsg"], required_hardware="false")
+ def test_07_remove_secondary_ip_from_nic(self):
+ """ Remove secondary IP from any NIC
+ Steps:
+ # 1) Navigate to Instances
+ # 2) Select any vm
+ # 3) NIC's ->Edit secondary IP's->Release IP
+ # 4) The secondary IP should be successfully removed
+ """
+ virtual_machine = VirtualMachine.list(
+ self.apiclient,
+ id=self.virtual_machine2.id)
+
+ # Check which NIC is having secondary IP
+ secondary_ips = virtual_machine[0].nic[1].secondaryip
+
+ for secondary_ip in secondary_ips:
+ NIC.removeIp(self.apiclient, ipaddressid=secondary_ip['id'])
+
+ virtual_machine = VirtualMachine.list(
+ self.apiclient,
+ id=self.virtual_machine2.id
+ )
+
+ self.assertFalse(
+ virtual_machine[0].nic[1].secondaryip,
+ 'Failed to remove secondary IP')
+
+ self.verify_network_rules(self.virtual_machine2.id)
+
+ @attr(tags=["advancedsg"], required_hardware="false")
+ def test_08_remove_nic_from_vm(self):
+ """ Remove NIC from VM
+ Steps:
+ # 1) Navigate to Instances->select any vm->NIC's->NIC 2
+ # ->Click on "X" button to remove the second NIC
+ # 2) Remove other NIC's as well from the VM
+ # 3) All the NIC's should be successfully removed from the VM
+ :return:
+ """
+ virtual_machine = VirtualMachine.list(
+ self.apiclient,
+ id=self.virtual_machine2.id)
+
+ for nic in virtual_machine[0].nic:
+ if nic.isdefault:
+ continue
+ self.virtual_machine2.remove_nic(self.apiclient, nic.id)
+
+ virtual_machine = VirtualMachine.list(
+ self.apiclient,
+ id=self.virtual_machine2.id)
+
+ self.assertEqual(
+ len(virtual_machine[0].nic), 1,
+ "Failed to remove all the nics from the virtual machine")
+
+ self.verify_network_rules(self.virtual_machine2.id)
+
+ @attr(tags=["advancedsg"], required_hardware="false")
+ def test_09_reboot_vm_with_multiple_nic(self):
+ """ Reboot a VM with Multple NIC
+
+ Steps:
+ # 1) Create a Vm with multiple NIC's
+ # 2) Configure secondary IP's on the VM
+ # 3) Try to reboot the VM
+ # 4) Ping the IP's of the vm
+ :return:
+ """
+ # Skipping adding Secondary IP to NIC since its already
+ # done in the previous test cases
+
+ virtual_machine = VirtualMachine.list(
+ self.apiclient,
+ id=self.virtual_machine1.id
+ )
+ try:
+ self.virtual_machine1.reboot(self.apiclient)
+ except Exception as e:
+ self.fail("Exception occured: %s" % e)
+
+ self.verify_network_rules(self.virtual_machine1.id)
+
diff --git a/test/integration/component/test_protocol_number_security_group.py b/test/integration/component/test_protocol_number_security_group.py
new file mode 100644
index 0000000..6029675
--- /dev/null
+++ b/test/integration/component/test_protocol_number_security_group.py
@@ -0,0 +1,460 @@
+# 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.
+
+"""
+Tests protocol number support for security groups
+"""
+
+# Import Local Modules
+from nose.plugins.attrib import attr
+from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackAPI import authorizeSecurityGroupIngress, revokeSecurityGroupIngress, authorizeSecurityGroupEgress, revokeSecurityGroupEgress
+from marvin.sshClient import SshClient
+from marvin.lib.utils import (validateList,
+ cleanup_resources,
+ get_host_credentials)
+from marvin.lib.base import (Account,
+ Host,
+ Domain,
+ VirtualMachine,
+ ServiceOffering,
+ Zone,
+ SecurityGroup)
+from marvin.lib.common import (get_domain,
+ get_zone,
+ get_template,
+ list_hosts)
+import logging
+
+class TestProtocolNumberSecurityGroup(cloudstackTestCase):
+ @classmethod
+ def setUpClass(cls):
+ cls.testClient = super(
+ TestProtocolNumberSecurityGroup,
+ cls).getClsTestClient()
+ cls.apiclient = cls.testClient.getApiClient()
+ cls.testdata = cls.testClient.getParsedTestDataConfig()
+ cls.services = cls.testClient.getParsedTestDataConfig()
+
+ zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests())
+ cls.zone = Zone(zone.__dict__)
+ cls.template = get_template(cls.apiclient, cls.zone.id)
+ cls._cleanup = []
+
+ if str(cls.zone.securitygroupsenabled) != "True":
+ sys.exit(1)
+
+ cls.logger = logging.getLogger("TestProtocolNumberSecurityGroup")
+ cls.stream_handler = logging.StreamHandler()
+ cls.logger.setLevel(logging.DEBUG)
+ cls.logger.addHandler(cls.stream_handler)
+
+ # Get Zone, Domain and templates
+ cls.domain = get_domain(cls.apiclient)
+ testClient = super(TestProtocolNumberSecurityGroup, cls).getClsTestClient()
+ cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
+ cls.services['mode'] = cls.zone.networktype
+
+ # Create new domain, account, network and VM
+ cls.user_domain = Domain.create(
+ cls.apiclient,
+ services=cls.testdata["acl"]["domain2"],
+ parentdomainid=cls.domain.id)
+
+ # Create account
+ cls.account = Account.create(
+ cls.apiclient,
+ cls.testdata["acl"]["accountD2"],
+ admin=True,
+ domainid=cls.user_domain.id
+ )
+
+ cls.service_offering = ServiceOffering.create(
+ cls.apiclient,
+ cls.testdata["service_offering"]
+ )
+
+ cls.testdata["domainid"] = cls.domain.id
+ cls.testdata["virtual_machine_userdata"]["zoneid"] = cls.zone.id
+ cls.testdata["virtual_machine_userdata"]["template"] = cls.template.id
+
+ cls._cleanup.append(cls.service_offering)
+ cls._cleanup.append(cls.account)
+ cls._cleanup.append(cls.user_domain)
+
+ @classmethod
+ def tearDownClass(self):
+ try:
+ cleanup_resources(self.apiclient, self._cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ def setUp(self):
+ self.apiclient = self.testClient.getApiClient()
+ self.cleanup = []
+ return
+
+ def tearDown(self):
+ try:
+ cleanup_resources(self.apiclient, self.cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ @attr(tags=["advancedsg"], required_hardware="false")
+ def test_01_add_valid_protocol_number(self):
+ # Validate the following
+ #
+ # 1. Create a security group
+ # 2. Try to add a new ingress rule by specifying a protocol number
+ # 3. New rule should be added successfully
+ # 4. Try to add a new egress rule by specifying a protocol number
+ # 5. New rule should be added successfully
+
+ self.security_group = SecurityGroup.create(
+ self.apiclient,
+ self.testdata["security_group"],
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
+ self.debug("Created security group with ID: %s" % self.security_group.id)
+
+ # Add ingress rule
+ self.createIngressRule("111")
+
+ # Add egress rule
+ self.createEgressRule("111")
+
+ # verify number of ingress rules and egress rules
+ self.verify_security_group_rules(self.security_group.id, 1, 1)
+
+ @attr(tags=["advancedsg"], required_hardware="false")
+ def test_02_add_invalid_protocol_number(self):
+ # Validate the following
+ #
+ # 1. Create a security group
+ # 2. Try to add a new ingress rule by specifying an invalid (> 255) protocol number
+ # 3. Exception should be thrown successfully
+ # 4. Try to add a new egreess rule by specifying an invalid (> 255) protocol number
+ # 5. Exception should be thrown successfully
+
+ self.security_group = SecurityGroup.create(
+ self.apiclient,
+ self.testdata["security_group"],
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
+ self.debug("Created security group with ID: %s" % self.security_group.id)
+
+ # Create ingress rule with invalid protocol number. Exception should be thrown
+ with self.assertRaises(Exception):
+ self.createIngressRule("555")
+
+ # Create egress rule with invalid protocol number. Exception should be thrown
+ with self.assertRaises(Exception):
+ self.createEgressRule("555")
+
+ @attr(tags=["advancedsg"], required_hardware="false")
+ def test_03_add_duplicate_protocol_number(self):
+ # Validate the following
+ #
+ # 1. Create a security group
+ # 2. Try to add a new ingress rule by specifying a protocol number
+ # 3. Try to add one more ingress rule by specifying the same protocol number
+ # 4. Exception should be thrown successfully
+ # 5. Try to add a new egress rule by specifying a protocol number
+ # 6. Try to add one more egress rule by specifying the same protocol number
+ # 7. Exception should be thrown successfully
+
+ self.security_group = SecurityGroup.create(
+ self.apiclient,
+ self.testdata["security_group"],
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
+ self.debug("Created security group with ID: %s" % self.security_group.id)
+
+ # Add ingress rule
+ self.createIngressRule("111")
+ # verify number of ingress rules and egress rules
+ self.verify_security_group_rules(self.security_group.id, 1, 0)
+
+ # Try to add another ingress with same protocol number. Exception is thrown
+ with self.assertRaises(Exception):
+ self.createIngressRule("111")
+
+ # Add egress rule
+ self.createEgressRule("111")
+ # verify number of ingress rules and egress rules
+ self.verify_security_group_rules(self.security_group.id, 1, 1)
+
+ # Try to add another ingress with same protocol number. Exception is thrown
+ with self.assertRaises(Exception):
+ self.createEgressRule("111")
+
+ @attr(tags=["advancedsg"], required_hardware="false")
+ def test_04_add_duplicate_protocol_number(self):
+ # Validate the following
+ #
+ # 1. Create a security group
+ # 2. Try to add a new ingress rule by using "all" as the protocol string
+ # 3. Try to add one more ingress rule by specifying the same protocol
+ # 4. Exception should be thrown successfully
+ # 5. Try to add a new egress rule by using "all" as the protocol string
+ # 6. Try to add one more egress rule by specifying the same protocol
+ # 7. Exception should be thrown successfully
+
+ self.security_group = SecurityGroup.create(
+ self.apiclient,
+ self.testdata["security_group"],
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
+ self.debug("Created security group with ID: %s" % self.security_group.id)
+
+ # Add ingress rule
+ self.createIngressRule("111")
+ # verify number of ingress rules and egress rules
+ self.verify_security_group_rules(self.security_group.id, 1, 0)
+
+ # Try to add another ingress with same protocol number. Exception is thrown
+ with self.assertRaises(Exception):
+ self.createIngressRule("111")
+
+ # Add egress rule
+ self.createEgressRule("111")
+ # verify number of ingress rules and egress rules
+ self.verify_security_group_rules(self.security_group.id, 1, 1)
+
+ # Try to add another ingress with same protocol number. Exception is thrown
+ with self.assertRaises(Exception):
+ self.createEgressRule("111")
+
+ @attr(tags=["advancedsg"], required_hardware="false")
+ def test_05_invalid_protocol_string(self):
+ # Validate the following
+ #
+ # 1. Create a security group
+ # 2. Try to add ingress rule with invalid protocol name
+ # 3. Exception should be thrown
+ # 4. Try to add egressrule with invalid protocol name
+ # 5. Exception should be thrown
+
+ security_group = SecurityGroup.create(
+ self.apiclient,
+ self.testdata["security_group"],
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
+ self.debug("Created security group with ID: %s" % security_group.id)
+
+ with self.assertRaises(Exception):
+ self.createIngressRule("randomprotocol")
+
+ with self.assertRaises(Exception):
+ self.createEgressRule("randomprotocol")
+
+ @attr(tags=["advancedsg"])
+ def test_06_create_virtual_machine(self):
+ # Validate the following
+ #
+ # 1. Create a security group
+ # 2. Create a virtual machine
+ # 3. Try to add a new ingress rule
+ # 4. Check if ingress rule is applied successfully on host
+ # 5. Throw exception if it's not applied
+ # 6. Try to add a new egress rule
+ # 7. Check if egress rule is applied successfully on host
+ # 8. Throw exception if it's not applied
+
+ self.security_group = SecurityGroup.create(
+ self.apiclient,
+ self.testdata["security_group"],
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
+
+ self.virtual_machine = VirtualMachine.create(
+ self.apiclient,
+ self.testdata["virtual_machine_userdata"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ serviceofferingid=self.service_offering.id,
+ securitygroupids=[self.security_group.id]
+ )
+
+ # Get the virtual machine
+ virtial_machine = VirtualMachine.list(
+ self.apiclient,
+ id=self.virtual_machine.id
+ )
+
+ vm = virtial_machine[0]
+
+ # get the host on which the vm is running
+ hosts = list_hosts(
+ self.apiclient,
+ id=vm.hostid
+ )
+
+ host = hosts[0]
+ if host.hypervisor.lower() not in "kvm":
+ return
+
+ host.user, host.passwd = get_host_credentials(self.config, host.ipaddress)
+
+ # Add ingress rule
+ self.createIngressRule("tcp", "1.1.1.1/32")
+ # verify number of ingress rules and egress rules
+ self.verify_security_group_rules(self.security_group.id, 1, 0)
+ # Check if the ingress rule if applied successfully on host
+ rule = "-A %s -s 1.1.1.1/32 -p tcp -m tcp --dport 1:65535 -m state --state NEW -j ACCEPT" % vm.instancename
+ self.verify_rule_on_host(host.ipaddress, host.user, host.passwd, rule)
+
+ # Add ingress rule
+ self.createIngressRule("udp", "2.2.2.2/32")
+ # verify number of ingress rules and egress rules
+ self.verify_security_group_rules(self.security_group.id, 2, 0)
+ # Check if the ingress rule if applied successfully on host
+ rule = "-A %s -s 2.2.2.2/32 -p udp -m udp --dport 1:65535 -m state --state NEW -j ACCEPT" % vm.instancename
+ self.verify_rule_on_host(host.ipaddress, host.user, host.passwd, rule)
+
+ # Add ingress rule
+ self.createIngressRule("icmp", "3.3.3.3/32")
+ # verify number of ingress rules and egress rules
+ self.verify_security_group_rules(self.security_group.id, 3, 0)
+ # Check if the ingress rule if applied successfully on host
+ rule = "-A %s -s 3.3.3.3/32 -p icmp -m icmp --icmp-type any -j ACCEPT" % vm.instancename
+ self.verify_rule_on_host(host.ipaddress, host.user, host.passwd, rule)
+
+ # Add ingress rule
+ self.createIngressRule("all", "4.4.4.4/32")
+ # verify number of ingress rules and egress rules
+ self.verify_security_group_rules(self.security_group.id, 4, 0)
+ # Check if the ingress rule if applied successfully on host
+ rule = "-A %s -s 4.4.4.4/32 -m state --state NEW -j ACCEPT" % vm.instancename
+ self.verify_rule_on_host(host.ipaddress, host.user, host.passwd, rule)
+
+ # Add ingress rule
+ self.createIngressRule("47", "5.5.5.5/32")
+ # verify number of ingress rules and egress rules
+ self.verify_security_group_rules(self.security_group.id, 5, 0)
+ # Check if the ingress rule if applied successfully on host
+ rule = "-A %s -s 5.5.5.5/32 -p gre -j ACCEPT" % vm.instancename
+ self.verify_rule_on_host(host.ipaddress, host.user, host.passwd, rule)
+
+ # Add egress rule
+ self.createEgressRule("tcp", "11.11.11.11/32")
+ # verify number of ingress rules and egress rules
+ self.verify_security_group_rules(self.security_group.id, 5, 1)
+ # Check if the egress rule if applied successfully on host
+ rule = "-A %s-eg -d 11.11.11.11/32 -p tcp -m tcp --dport 1:65535 -m state --state NEW -j RETURN" % vm.instancename
+ self.verify_rule_on_host(host.ipaddress, host.user, host.passwd, rule)
+
+ # Add egress rule
+ self.createEgressRule("udp", "12.12.12.12/32")
+ # verify number of ingress rules and egress rules
+ self.verify_security_group_rules(self.security_group.id, 5, 2)
+ # Check if the egress rule if applied successfully on host
+ rule = "-A %s-eg -d 12.12.12.12/32 -p udp -m udp --dport 1:65535 -m state --state NEW -j RETURN" % vm.instancename
+ self.verify_rule_on_host(host.ipaddress, host.user, host.passwd, rule)
+
+ # Add egress rule
+ self.createEgressRule("icmp", "13.13.13.13/32")
+ # verify number of ingress rules and egress rules
+ self.verify_security_group_rules(self.security_group.id, 5, 3)
+ # Check if the egress rule if applied successfully on host
+ rule = "-A %s-eg -d 13.13.13.13/32 -p icmp -m icmp --icmp-type any -j RETURN" % vm.instancename
+ self.verify_rule_on_host(host.ipaddress, host.user, host.passwd, rule)
+
+ # Add egress rule
+ self.createEgressRule("all", "14.14.14.14/32")
+ # verify number of ingress rules and egress rules
+ self.verify_security_group_rules(self.security_group.id, 5, 4)
+ # Check if the egress rule if applied successfully on host
+ rule = "-A %s-eg -d 14.14.14.14/32 -m state --state NEW -j RETURN" % vm.instancename
+ self.verify_rule_on_host(host.ipaddress, host.user, host.passwd, rule)
+
+ # Add egress rule
+ self.createEgressRule("47", "15.15.15.15/32")
+ # verify number of ingress rules and egress rules
+ self.verify_security_group_rules(self.security_group.id, 5, 5)
+ # Check if the egress rule if applied successfully on host
+ rule = "-A %s-eg -d 15.15.15.15/32 -p gre -j RETURN" % vm.instancename
+ self.verify_rule_on_host(host.ipaddress, host.user, host.passwd, rule)
+
+ def createIngressRule(self, protocol, cidrlist=None):
+ cmd = authorizeSecurityGroupIngress.authorizeSecurityGroupIngressCmd()
+ cmd.account=self.account.name
+ cmd.domainid=self.account.domainid
+ cmd.securitygroupid=self.security_group.id
+ cmd.cidrlist="99.99.99.99/32"
+ if cidrlist:
+ cmd.cidrlist=cidrlist
+ cmd.protocol=protocol
+ if protocol == "tcp" or protocol == "udp":
+ cmd.startport = 1
+ cmd.endport = 65535
+ elif protocol == "icmp":
+ cmd.icmptype = -1
+ cmd.icmpcode = -1
+ self.apiclient.authorizeSecurityGroupIngress(cmd)
+ cmd = None
+
+ def createEgressRule(self, protocol, cidrlist=None):
+ cmd = authorizeSecurityGroupEgress.authorizeSecurityGroupEgressCmd()
+ cmd.account=self.account.name
+ cmd.domainid=self.account.domainid
+ cmd.securitygroupid=self.security_group.id
+ cmd.cidrlist="88.88.88.88/32"
+ if cidrlist:
+ cmd.cidrlist=cidrlist
+ cmd.protocol=protocol
+ if protocol == "tcp" or protocol == "udp":
+ cmd.startport = 1
+ cmd.endport = 65535
+ elif protocol == "icmp":
+ cmd.icmptype = -1
+ cmd.icmpcode = -1
+ self.apiclient.authorizeSecurityGroupEgress(cmd)
+ cmd = None
+
+ def verify_security_group_rules(self, securitygroupid, numIngress, numEgress):
+ security_groups = SecurityGroup.list(
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid,
+ id=securitygroupid
+ )
+ ingressrule = security_groups[0].ingressrule
+ if len(ingressrule) != numIngress:
+ raise Exception("Failed to verify ingress rule for security group %s" % security_groups[0].name)
+ egressrule = security_groups[0].egressrule
+ if len(egressrule) != numEgress:
+ raise Exception("Failed to verify egress rule for security group %s" % security_groups[0].name)
+
+ def verify_rule_on_host(self, ipaddress, user, password, rule):
+ self.logger.debug("Verifying rule '%s' in host %s" % (rule, ipaddress))
+ try:
+ ssh = SshClient(ipaddress, 22, user, password)
+ result = ssh.execute("iptables-save |grep \"\\%s\"" % rule)
+ if len(result) == 0 or result[0] != rule:
+ raise Exception("Unable to apply security group rule")
+ except KeyError:
+ self.skipTest(
+ "Provide a marvin config file with host credentials to run %s" % self._testMethodName)
diff --git a/test/integration/component/test_resource_count_running_vms.py b/test/integration/component/test_resource_count_running_vms.py
new file mode 100644
index 0000000..2c6e972
--- /dev/null
+++ b/test/integration/component/test_resource_count_running_vms.py
@@ -0,0 +1,927 @@
+# 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.
+""" tests for Resource count of only running vms in cloudstack 4.14.0.0
+
+"""
+# Import Local Modules
+from nose.plugins.attrib import attr
+from marvin.cloudstackTestCase import cloudstackTestCase
+from marvin.lib.utils import (validateList,
+ cleanup_resources)
+from marvin.lib.base import (Account,
+ Domain,
+ Configurations,
+ Network,
+ NetworkOffering,
+ VirtualMachine,
+ Resources,
+ ServiceOffering,
+ Zone)
+from marvin.lib.common import (get_domain,
+ get_zone,
+ get_template,
+ matchResourceCount,
+ isAccountResourceCountEqualToExpectedCount)
+from marvin.codes import (PASS, FAILED, RESOURCE_CPU, RESOURCE_MEMORY)
+import logging
+import random
+import time
+
+class TestResourceCountRunningVMs(cloudstackTestCase):
+ @classmethod
+ def setUpClass(cls):
+ cls.testClient = super(
+ TestResourceCountRunningVMs,
+ cls).getClsTestClient()
+ cls.apiclient = cls.testClient.getApiClient()
+ cls.services = cls.testClient.getParsedTestDataConfig()
+ zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests())
+ cls.zone = Zone(zone.__dict__)
+ cls._cleanup = []
+
+ cls.logger = logging.getLogger("TestResourceCountRunningVMs")
+ cls.stream_handler = logging.StreamHandler()
+ cls.logger.setLevel(logging.DEBUG)
+ cls.logger.addHandler(cls.stream_handler)
+
+ # Get Domain and templates
+ cls.domain = get_domain(cls.apiclient)
+
+ cls.template = get_template(cls.apiclient, cls.zone.id, hypervisor="KVM")
+ if cls.template == FAILED:
+ sys.exit(1)
+ cls.templatesize = (cls.template.size / (1024 ** 3))
+
+ cls.services['mode'] = cls.zone.networktype
+ # Create Account
+ cls.account = Account.create(
+ cls.apiclient,
+ cls.services["account"],
+ admin=True,
+ domainid=cls.domain.id
+ )
+ accounts = Account.list(cls.apiclient, id=cls.account.id)
+ cls.expectedCpu = int(accounts[0].cputotal)
+ cls.expectedMemory = int(accounts[0].memorytotal)
+
+ if cls.zone.securitygroupsenabled:
+ cls.services["shared_network_offering"]["specifyVlan"] = 'True'
+ cls.services["shared_network_offering"]["specifyIpRanges"] = 'True'
+
+ cls.network_offering = NetworkOffering.create(
+ cls.apiclient,
+ cls.services["shared_network_offering"]
+ )
+ cls.network_offering.update(cls.apiclient, state='Enabled')
+
+ cls.account_network = Network.create(
+ cls.apiclient,
+ cls.services["network2"],
+ networkofferingid=cls.network_offering.id,
+ zoneid=cls.zone.id,
+ accountid=cls.account.name,
+ domainid=cls.account.domainid
+ )
+ else:
+ cls.network_offering = NetworkOffering.create(
+ cls.apiclient,
+ cls.services["isolated_network_offering"],
+ )
+ # Enable Network offering
+ cls.network_offering.update(cls.apiclient, state='Enabled')
+
+ # Create account network
+ cls.services["network"]["zoneid"] = cls.zone.id
+ cls.services["network"]["networkoffering"] = cls.network_offering.id
+ cls.account_network = Network.create(
+ cls.apiclient,
+ cls.services["network"],
+ cls.account.name,
+ cls.account.domainid
+ )
+
+ cls._cleanup.append(cls.account);
+ cls._cleanup.append(cls.network_offering)
+
+ @classmethod
+ def tearDownClass(self):
+ try:
+ cleanup_resources(self.apiclient, self._cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ def setUp(self):
+ self.apiclient = self.testClient.getApiClient()
+ self.cleanup = []
+ return
+
+ def tearDown(self):
+ try:
+ cleanup_resources(self.apiclient, self.cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ def verify_resource_count_cpu_memory(self, expectedCpu, expectedMemory, account=None):
+ if account is None:
+ account = self.account
+ response = matchResourceCount(
+ self.apiclient, expectedCpu,
+ RESOURCE_CPU,
+ accountid=account.id)
+ self.assertEqual(response[0], PASS, response[1])
+
+ response = matchResourceCount(
+ self.apiclient, expectedMemory,
+ RESOURCE_MEMORY,
+ accountid=account.id)
+ self.assertEqual(response[0], PASS, response[1])
+
+ result = isAccountResourceCountEqualToExpectedCount(
+ self.apiclient, account.domainid, account.name,
+ expectedCpu, RESOURCE_CPU)
+ self.assertFalse(result[0], result[1])
+ self.assertTrue(result[2], "Resource count of cpu does not match")
+
+ result = isAccountResourceCountEqualToExpectedCount(
+ self.apiclient, account.domainid, account.name,
+ expectedMemory, RESOURCE_MEMORY)
+ self.assertFalse(result[0], result[1])
+ self.assertTrue(result[2], "Resource count of memory does not match")
+
+ def update_account_resource_limitation(self, maxCpu, maxMemory):
+ Resources.updateLimit(self.apiclient,
+ resourcetype=RESOURCE_CPU,
+ max=maxCpu,
+ domainid=self.account.domainid,
+ account=self.account.name)
+
+ Resources.updateLimit(self.apiclient,
+ resourcetype=RESOURCE_MEMORY,
+ max=maxMemory,
+ domainid=self.account.domainid,
+ account=self.account.name)
+
+ @attr(tags=["advanced", "advancedsg"], required_hardware="false")
+ def test_01_resource_count_vm_with_normal_offering_in_all_states(self):
+ """Create VM with normal offering. Take resources of vm in all states into calculation of resource count.
+
+ Steps:
+ # 1. update resource.count.running.vms.only to false
+ # 2. create normal service offering
+ # 3. deploy vm, resource count of cpu/ram increases
+ # 4. stop vm, resource count of cpu/ram is not changed
+ # 5. update vm with displayvm=false, resource count decreases
+ # 6. update vm with displayvm=true, resource count increases
+ # 7. start vm, resource count of cpu/ram is not changed
+ # 8. reboot vm, resource count of cpu/ram is not changed
+ # 9. destroy vm, resource count of cpu/ram decreases
+ # 10. expunge vm, resource count of cpu/ram is not changed
+ """
+
+ Configurations.update(self.apiclient,
+ name="resource.count.running.vms.only",
+ value="false" )
+
+ # Create small service offering
+ self.service_offering = ServiceOffering.create(
+ self.apiclient,
+ self.services["service_offerings"]["small"]
+ )
+ self.cleanup.append(self.service_offering)
+
+ # deploy vm
+ try:
+ virtual_machine_1 = VirtualMachine.create(
+ self.apiclient,
+ self.services["virtual_machine"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ serviceofferingid=self.service_offering.id,
+ templateid=self.template.id,
+ zoneid=self.zone.id,
+ mode=self.zone.networktype
+ )
+ except Exception as e:
+ self.fail("Exception while deploying virtual machine: %s" % e)
+
+ self.expectedCpu = self.expectedCpu + virtual_machine_1.cpunumber
+ self.expectedMemory = self.expectedMemory + virtual_machine_1.memory
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # stop vm
+ virtual_machine_1.stop(self.apiclient)
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # update vm with displayvm=false
+ virtual_machine_1.update(self.apiclient, displayvm=False)
+ self.expectedCpu = self.expectedCpu - virtual_machine_1.cpunumber
+ self.expectedMemory = self.expectedMemory - virtual_machine_1.memory
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # update vm with displayvm=false
+ virtual_machine_1.update(self.apiclient, displayvm=True)
+ self.expectedCpu = self.expectedCpu + virtual_machine_1.cpunumber
+ self.expectedMemory = self.expectedMemory + virtual_machine_1.memory
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # start vm
+ virtual_machine_1.start(self.apiclient)
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # reboot vm
+ virtual_machine_1.reboot(self.apiclient)
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # destroy vm
+ virtual_machine_1.delete(self.apiclient, expunge=False)
+ self.expectedCpu = self.expectedCpu - virtual_machine_1.cpunumber
+ self.expectedMemory = self.expectedMemory - virtual_machine_1.memory
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # expunge vm
+ virtual_machine_1.expunge(self.apiclient)
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ @attr(tags=["advanced", "advancedsg"], required_hardware="false")
+ def test_02_resource_count_vm_with_dynamic_offering_in_all_states(self):
+ """Create VM with dynamic service offering. Take resources of vm in all states into calculation of resource count.
+
+ Steps:
+ # 1. update resource.count.running.vms.only to false
+ # 2. create dynamic service offering
+ # 3. deploy vm, resource count of cpu/ram increases
+ # 4. stop vm, resource count of cpu/ram is not changed
+ # 5. update vm with displayvm=false, resource count decreases
+ # 6. update vm with displayvm=true, resource count increases
+ # 7. start vm, resource count of cpu/ram is not changed
+ # 8. reboot vm, resource count of cpu/ram is not changed
+ # 9. destroy vm, resource count of cpu/ram decreases
+ # 10. expunge vm, resource count of cpu/ram is not changed
+ """
+ Configurations.update(self.apiclient,
+ name="resource.count.running.vms.only",
+ value="false" )
+
+ # Create dynamic service offering
+ self.services["service_offering"]["cpunumber"] = ""
+ self.services["service_offering"]["cpuspeed"] = ""
+ self.services["service_offering"]["memory"] = ""
+
+ self.service_offering = ServiceOffering.create(
+ self.apiclient,
+ self.services["service_offering"])
+ self.cleanup.append(self.service_offering)
+
+ # deploy vm
+ try:
+ virtual_machine_2 = VirtualMachine.create(
+ self.apiclient,
+ self.services["virtual_machine"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ serviceofferingid=self.service_offering.id,
+ customcpunumber=1,
+ customcpuspeed=100,
+ custommemory=256,
+ templateid=self.template.id,
+ zoneid=self.zone.id,
+ mode=self.zone.networktype
+ )
+ except Exception as e:
+ self.fail("Exception while deploying virtual machine: %s" % e)
+
+ self.expectedCpu = self.expectedCpu + virtual_machine_2.cpunumber
+ self.expectedMemory = self.expectedMemory + virtual_machine_2.memory
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # stop vm
+ virtual_machine_2.stop(self.apiclient)
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # update vm with displayvm=false
+ virtual_machine_2.update(self.apiclient, displayvm=False)
+ self.expectedCpu = self.expectedCpu - virtual_machine_2.cpunumber
+ self.expectedMemory = self.expectedMemory - virtual_machine_2.memory
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # update vm with displayvm=false
+ virtual_machine_2.update(self.apiclient, displayvm=True)
+ self.expectedCpu = self.expectedCpu + virtual_machine_2.cpunumber
+ self.expectedMemory = self.expectedMemory + virtual_machine_2.memory
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # start vm
+ virtual_machine_2.start(self.apiclient)
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # reboot vm
+ virtual_machine_2.reboot(self.apiclient)
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # destroy vm
+ virtual_machine_2.delete(self.apiclient, expunge=False)
+ self.expectedCpu = self.expectedCpu - virtual_machine_2.cpunumber
+ self.expectedMemory = self.expectedMemory - virtual_machine_2.memory
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # expunge vm
+ virtual_machine_2.expunge(self.apiclient)
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ @attr(tags=["advanced", "advancedsg"], required_hardware="false")
+ def test_03_resource_count_vm_with_normal_offering_in_running_state(self):
+ """Create VM with normal service offering. Take resources of vm in running state into calculation of resource count.
+
+ Steps:
+ # 1. update resource.count.running.vms.only to true
+ # 2. create normal service offering
+ # 3. deploy vm, resource count of cpu/ram increases
+ # 4. stop vm, resource count of cpu/ram decreases
+ # 5. start vm, resource count of cpu/ram increases
+ # 6. reboot vm, resource count of cpu/ram is not changed
+ # 7. destroy vm, resource count of cpu/ram decreases
+ # 8. recover vm, resource count of cpu/ram is not changed
+ # 9. update vm with displayvm=false, resource count of cpu/ram is not changed
+ # 10. destroy vm with expunge = true, resource count of cpu/ram is not changed
+ """
+ Configurations.update(self.apiclient,
+ name="resource.count.running.vms.only",
+ value="true" )
+
+ # Create service offering
+ self.service_offering = ServiceOffering.create(
+ self.apiclient,
+ self.services["service_offerings"]["small"]
+ )
+ self.cleanup.append(self.service_offering)
+
+ # deploy vm
+ try:
+ virtual_machine_3 = VirtualMachine.create(
+ self.apiclient,
+ self.services["virtual_machine"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ serviceofferingid=self.service_offering.id,
+ templateid=self.template.id,
+ zoneid=self.zone.id,
+ mode=self.zone.networktype
+ )
+ except Exception as e:
+ self.fail("Exception while deploying virtual machine: %s" % e)
+
+ self.expectedCpu = self.expectedCpu + virtual_machine_3.cpunumber
+ self.expectedMemory = self.expectedMemory + virtual_machine_3.memory
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # stop vm
+ virtual_machine_3.stop(self.apiclient)
+ self.expectedCpu = self.expectedCpu - virtual_machine_3.cpunumber
+ self.expectedMemory = self.expectedMemory - virtual_machine_3.memory
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # start vm
+ virtual_machine_3.start(self.apiclient)
+ self.expectedCpu = self.expectedCpu + virtual_machine_3.cpunumber
+ self.expectedMemory = self.expectedMemory + virtual_machine_3.memory
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # reboot vm
+ virtual_machine_3.reboot(self.apiclient)
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # destroy vm
+ virtual_machine_3.delete(self.apiclient, expunge=False)
+ self.expectedCpu = self.expectedCpu - virtual_machine_3.cpunumber
+ self.expectedMemory = self.expectedMemory - virtual_machine_3.memory
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # recover vm
+ virtual_machine_3.recover(self.apiclient)
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # update vm with displayvm=false
+ virtual_machine_3.update(self.apiclient, displayvm=False)
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # expunge vm
+ virtual_machine_3.delete(self.apiclient, expunge=True)
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ @attr(tags=["advanced", "advancedsg"], required_hardware="false")
+ def test_04_resource_count_vm_with_dynamic_offering_in_running_state(self):
+ """Create VM with dynamic service offering. Take resources of vm in running state into calculation of resource count.
+
+ Steps:
+ # 1. update resource.count.running.vms.only to true
+ # 2. create dynamic service offering
+ # 3. deploy vm, resource count of cpu/ram increases
+ # 4. stop vm, resource count of cpu/ram decreases
+ # 5. start vm, resource count of cpu/ram increases
+ # 6. reboot vm, resource count of cpu/ram is not changed
+ # 7. destroy vm, resource count of cpu/ram decreases
+ # 8. recover vm, resource count of cpu/ram is not changed
+ # 9. update vm with displayvm=false, resource count of cpu/ram is not changed
+ # 10. destroy vm with expunge = true, resource count of cpu/ram is not changed
+ """
+ Configurations.update(self.apiclient,
+ name="resource.count.running.vms.only",
+ value="true" )
+
+ # Create dynamic service offering
+ self.services["service_offering"]["cpunumber"] = ""
+ self.services["service_offering"]["cpuspeed"] = ""
+ self.services["service_offering"]["memory"] = ""
+
+ self.service_offering = ServiceOffering.create(
+ self.apiclient,
+ self.services["service_offering"])
+ self.cleanup.append(self.service_offering)
+
+ # deploy vm
+ try:
+ virtual_machine_4 = VirtualMachine.create(
+ self.apiclient,
+ self.services["virtual_machine"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ serviceofferingid=self.service_offering.id,
+ customcpunumber=1,
+ customcpuspeed=100,
+ custommemory=256,
+ templateid=self.template.id,
+ zoneid=self.zone.id,
+ mode=self.zone.networktype
+ )
+ except Exception as e:
+ self.fail("Exception while deploying virtual machine: %s" % e)
+
+ self.expectedCpu = self.expectedCpu + virtual_machine_4.cpunumber
+ self.expectedMemory = self.expectedMemory + virtual_machine_4.memory
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # stop vm
+ virtual_machine_4.stop(self.apiclient)
+ self.expectedCpu = self.expectedCpu - virtual_machine_4.cpunumber
+ self.expectedMemory = self.expectedMemory - virtual_machine_4.memory
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # start vm
+ virtual_machine_4.start(self.apiclient)
+ self.expectedCpu = self.expectedCpu + virtual_machine_4.cpunumber
+ self.expectedMemory = self.expectedMemory + virtual_machine_4.memory
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # reboot vm
+ virtual_machine_4.reboot(self.apiclient)
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # destroy vm
+ virtual_machine_4.delete(self.apiclient, expunge=False)
+ self.expectedCpu = self.expectedCpu - virtual_machine_4.cpunumber
+ self.expectedMemory = self.expectedMemory - virtual_machine_4.memory
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # recover vm
+ virtual_machine_4.recover(self.apiclient)
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # update vm with displayvm=false
+ virtual_machine_4.update(self.apiclient, displayvm=False)
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # expunge vm
+ virtual_machine_4.delete(self.apiclient, expunge=True)
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ @attr(tags=["advanced", "advancedsg"], required_hardware="false")
+ def test_05_resource_count_vm_with_dynamic_offering_in_running_state_failed_cases(self):
+ """Create VM with dynamic service offering. Take resources of vm in running state into calculation of resource count. Test failed cases
+
+ Steps:
+ # 1. update resource.count.running.vms.only to true
+ # 2. create dynamic service offering
+ # 3. update account cpu/ram limitation to current value
+ # 4. deploy vm (startvm=false), resource count of cpu/ram is not changed
+ # 5. start vm, it should fail
+ # 6. increase cpu limitation, start vm, it should fail
+ # 7. increase memory limitation, start vm, it should succeed. resource count of cpu/ram increases
+ # 8. restore vm, it should succeed. resource count of cpu/ram is not changed
+ # 9. destroy vm, resource count of cpu/ram decreases
+ # 10. expunge vm, resource count of cpu/ram is not changed
+ """
+ Configurations.update(self.apiclient,
+ name="resource.count.running.vms.only",
+ value="true" )
+
+ # Create dynamic service offering
+ self.services["service_offering"]["cpunumber"] = ""
+ self.services["service_offering"]["cpuspeed"] = ""
+ self.services["service_offering"]["memory"] = ""
+
+ self.service_offering = ServiceOffering.create(
+ self.apiclient,
+ self.services["service_offering"])
+ self.cleanup.append(self.service_offering)
+
+ # update resource limitation
+ self.update_account_resource_limitation(self.expectedCpu, self.expectedMemory)
+
+ # deploy vm (startvm=false)
+ try:
+ virtual_machine_5 = VirtualMachine.create(
+ self.apiclient,
+ self.services["virtual_machine"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ serviceofferingid=self.service_offering.id,
+ customcpunumber=1,
+ customcpuspeed=100,
+ custommemory=256,
+ templateid=self.template.id,
+ zoneid=self.zone.id,
+ startvm=False,
+ mode=self.zone.networktype
+ )
+ except Exception as e:
+ self.fail("Exception while deploying virtual machine: %s" % e)
+
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # start vm
+ try:
+ virtual_machine_5.start(self.apiclient)
+ self.fail("Start VM should fail as there is not enough cpu")
+ except Exception:
+ self.debug("Start VM failed as expected")
+
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # increase cpu limitation, and start vm
+ self.update_account_resource_limitation(self.expectedCpu + virtual_machine_5.cpunumber, self.expectedMemory)
+ try:
+ virtual_machine_5.start(self.apiclient)
+ self.fail("Start VM should fail as there is not enough memory")
+ except Exception:
+ self.debug("Start VM failed as expected")
+
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # increase memory limitation, and start vm
+ self.update_account_resource_limitation(self.expectedCpu + virtual_machine_5.cpunumber, self.expectedMemory + virtual_machine_5.memory)
+ try:
+ virtual_machine_5.start(self.apiclient)
+ self.debug("Start VM succeed as expected")
+ except Exception:
+ self.fail("Start VM should succeed as there is enough cpu and memory")
+
+ self.expectedCpu = self.expectedCpu + virtual_machine_5.cpunumber
+ self.expectedMemory = self.expectedMemory + virtual_machine_5.memory
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # restore running vm
+ virtual_machine_5.restore(self.apiclient)
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # expunge vm
+ virtual_machine_5.delete(self.apiclient, expunge=True)
+ self.expectedCpu = self.expectedCpu - virtual_machine_5.cpunumber
+ self.expectedMemory = self.expectedMemory - virtual_machine_5.memory
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ @attr(tags=["advanced", "advancedsg"], required_hardware="false")
+ def test_06_resource_count_vm_with_dynamic_offering_in_all_states_failed_cases(self):
+ """Create VM with dynamic service offering. Take resources of vm in all states into calculation of resource count. Test failed cases
+
+ Steps:
+ # 1. update resource.count.running.vms.only to false
+ # 2. create dynamic service offering
+ # 3. update account cpu/ram limitation to current value
+ # 4. deploy vm (startvm=false), it should fail
+ # 5. increase cpu limitation, deploy vm, it should fail
+ # 6. increase memory limitation, deploy vm, it should succeed. resource count of cpu/ram increases
+ # 7. start vm, resource count of cpu/ram is not changed
+ # 8. restore vm, it should succeed. resource count of cpu/ram is not changed
+ # 9. destroy vm, resource count of cpu/ram decreases
+ # 10. expunge vm, resource count of cpu/ram is not changed
+ """
+ Configurations.update(self.apiclient,
+ name="resource.count.running.vms.only",
+ value="false" )
+
+ # Create dynamic service offering
+ self.services["service_offering"]["cpunumber"] = ""
+ self.services["service_offering"]["cpuspeed"] = ""
+ self.services["service_offering"]["memory"] = ""
+
+ self.service_offering = ServiceOffering.create(
+ self.apiclient,
+ self.services["service_offering"])
+ self.cleanup.append(self.service_offering)
+
+ # update resource limitation
+ self.update_account_resource_limitation(self.expectedCpu, self.expectedMemory)
+
+ # deploy vm (startvm=false)
+ try:
+ virtual_machine_6 = VirtualMachine.create(
+ self.apiclient,
+ self.services["virtual_machine"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ serviceofferingid=self.service_offering.id,
+ customcpunumber=1,
+ customcpuspeed=100,
+ custommemory=256,
+ templateid=self.template.id,
+ zoneid=self.zone.id,
+ startvm=False,
+ mode=self.zone.networktype
+ )
+ self.fail("Deploy VM should fail as there is not enough cpu")
+ except Exception as e:
+ self.debug("Deploy VM failed as expected")
+
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # increase cpu limitation, and deploy vm
+ self.update_account_resource_limitation(self.expectedCpu + 1, self.expectedMemory)
+ try:
+ virtual_machine_6 = VirtualMachine.create(
+ self.apiclient,
+ self.services["virtual_machine"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ serviceofferingid=self.service_offering.id,
+ customcpunumber=1,
+ customcpuspeed=100,
+ custommemory=256,
+ templateid=self.template.id,
+ zoneid=self.zone.id,
+ startvm=False,
+ mode=self.zone.networktype
+ )
+ self.fail("Deploy VM should fail as there is not enough memory")
+ except Exception as e:
+ self.debug("Deploy VM failed as expected")
+
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # increase memory limitation, and deploy vm
+ self.update_account_resource_limitation(self.expectedCpu + 1, self.expectedMemory + 256)
+ try:
+ virtual_machine_6 = VirtualMachine.create(
+ self.apiclient,
+ self.services["virtual_machine"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ serviceofferingid=self.service_offering.id,
+ customcpunumber=1,
+ customcpuspeed=100,
+ custommemory=256,
+ templateid=self.template.id,
+ zoneid=self.zone.id,
+ startvm=False,
+ mode=self.zone.networktype
+ )
+ self.debug("Deploy VM succeed as expected")
+ except Exception:
+ self.fail("Deploy VM should succeed as there is enough cpu and memory")
+
+ self.expectedCpu = self.expectedCpu + virtual_machine_6.cpunumber
+ self.expectedMemory = self.expectedMemory + virtual_machine_6.memory
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # start vm
+ virtual_machine_6.start(self.apiclient)
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # restore running vm
+ virtual_machine_6.restore(self.apiclient)
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # expunge vm
+ virtual_machine_6.delete(self.apiclient, expunge=True)
+ self.expectedCpu = self.expectedCpu - virtual_machine_6.cpunumber
+ self.expectedMemory = self.expectedMemory - virtual_machine_6.memory
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ @attr(tags=["advanced", "advancedsg"], required_hardware="false")
+ def test_07_resource_count_vm_in_running_state_and_move_and_upgrade(self):
+ """Create VM with dynamic service offering. Take resources of vm in running state into calculation. Move vm to another account and upgrade it.
+
+ Steps:
+ # 1. update resource.count.running.vms.only to true
+ # 2. create dynamic service offering
+ # 3. deploy vm, resource count of cpu/ram increases
+ # 4. stop vm, resource count of cpu/ram decreases
+ # 5. create another account
+ # 6. move vm to new account. resource count of cpu/ram of current account is not changed. resource count of cpu/ram of new account is not changed.
+ # 7. create another service offering.
+ # 8. upgrade vm. resource count of cpu/ram of new account is not changed.
+ # 9. start vm, resource count of cpu/ram of new account increases with cpu/ram of new service offering.
+ # 10. destroy vm, resource count of cpu/ram decreases
+ # 11. expunge vm, resource count of cpu/ram is not changed
+ """
+ Configurations.update(self.apiclient,
+ name="resource.count.running.vms.only",
+ value="true" )
+
+ # Create dynamic service offering
+ self.services["service_offering"]["cpunumber"] = ""
+ self.services["service_offering"]["cpuspeed"] = ""
+ self.services["service_offering"]["memory"] = ""
+
+ self.service_offering = ServiceOffering.create(
+ self.apiclient,
+ self.services["service_offering"])
+ self.cleanup.append(self.service_offering)
+
+ # deploy vm
+ try:
+ virtual_machine_7 = VirtualMachine.create(
+ self.apiclient,
+ self.services["virtual_machine"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ serviceofferingid=self.service_offering.id,
+ customcpunumber=1,
+ customcpuspeed=100,
+ custommemory=256,
+ templateid=self.template.id,
+ zoneid=self.zone.id
+ )
+ except Exception as e:
+ self.fail("Exception while deploying virtual machine: %s" % e)
+
+ self.expectedCpu = self.expectedCpu + virtual_machine_7.cpunumber
+ self.expectedMemory = self.expectedMemory + virtual_machine_7.memory
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # stop vm
+ virtual_machine_7.stop(self.apiclient)
+ self.expectedCpu = self.expectedCpu - virtual_machine_7.cpunumber
+ self.expectedMemory = self.expectedMemory - virtual_machine_7.memory
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # create another account
+ self.account2 = Account.create(
+ self.apiclient,
+ self.services["account2"],
+ admin=True,
+ domainid=self.domain.id
+ )
+ accounts = Account.list(self.apiclient, id=self.account2.id)
+ self.account2Cpu = int(accounts[0].cputotal)
+ self.account2Memory = int(accounts[0].memorytotal)
+
+ # move vm to new account. resource count of cpu/ram of current account is not changed. resource count of cpu/ram of new account is not changed.
+ oldcpunumber = virtual_machine_7.cpunumber
+ oldmemory = virtual_machine_7.memory
+ virtual_machine_7.assign_virtual_machine(self.apiclient, self.account2.name, self.account2.domainid)
+
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+ self.verify_resource_count_cpu_memory(self.account2Cpu, self.account2Memory, account=self.account2);
+
+ # create another service offering
+ self.service_offering_big = ServiceOffering.create(
+ self.apiclient,
+ self.services["service_offerings"]["big"]
+ )
+ self.cleanup.append(self.service_offering_big)
+
+ # upgrade vm
+ virtual_machine_7.change_service_offering(self.apiclient, self.service_offering_big.id)
+ self.verify_resource_count_cpu_memory(self.account2Cpu, self.account2Memory, account=self.account2);
+
+ # start vm, resource count of cpu/ram of new account increases with cpu/ram of new service offering.
+ virtual_machine_7.start(self.apiclient)
+ self.account2Cpu = self.account2Cpu + self.service_offering_big.cpunumber
+ self.account2Memory = self.account2Memory + self.service_offering_big.memory
+ self.verify_resource_count_cpu_memory(self.account2Cpu, self.account2Memory, account=self.account2);
+
+ # expunge vm
+ virtual_machine_7.delete(self.apiclient, expunge=True)
+ self.account2Cpu = self.account2Cpu - self.service_offering_big.cpunumber
+ self.account2Memory = self.account2Memory - self.service_offering_big.memory
+ self.verify_resource_count_cpu_memory(self.account2Cpu, self.account2Memory, account=self.account2);
+
+ @attr(tags=["advanced", "advancedsg"], required_hardware="false")
+ def test_08_resource_count_vm_in_all_states_and_move_and_upgrade(self):
+ """Create VM with dynamic service offering. Take resources of vm in all states into calculation. Move vm to another account and upgrade it.
+
+ Steps:
+ # 1. update resource.count.running.vms.only to true
+ # 2. create dynamic service offering
+ # 3. deploy vm, resource count of cpu/ram increases
+ # 4. stop vm, resource count of cpu/ram is not changed
+ # 5. create another account
+ # 6. move vm to new account. resource count of cpu/ram of current account decreases. resource count of cpu/ram of new account increases.
+ # 7. create another service offering.
+ # 8. upgrade vm. resource count of cpu/ram of new account is changed.
+ # 9. start vm, resource count of cpu/ram is not changed
+ # 10. destroy vm, resource count of cpu/ram decreases
+ # 11. expunge vm, resource count of cpu/ram is not changed
+ """
+ Configurations.update(self.apiclient,
+ name="resource.count.running.vms.only",
+ value="false" )
+
+ # Create dynamic service offering
+ self.services["service_offering"]["cpunumber"] = ""
+ self.services["service_offering"]["cpuspeed"] = ""
+ self.services["service_offering"]["memory"] = ""
+
+ self.service_offering = ServiceOffering.create(
+ self.apiclient,
+ self.services["service_offering"])
+ self.cleanup.append(self.service_offering)
+
+ # deploy vm
+ try:
+ virtual_machine_8 = VirtualMachine.create(
+ self.apiclient,
+ self.services["virtual_machine"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ serviceofferingid=self.service_offering.id,
+ customcpunumber=1,
+ customcpuspeed=100,
+ custommemory=256,
+ templateid=self.template.id,
+ zoneid=self.zone.id
+ )
+ except Exception as e:
+ self.fail("Exception while deploying virtual machine: %s" % e)
+
+ self.expectedCpu = self.expectedCpu + virtual_machine_8.cpunumber
+ self.expectedMemory = self.expectedMemory + virtual_machine_8.memory
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # stop vm
+ virtual_machine_8.stop(self.apiclient)
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ # create another account
+ self.account2 = Account.create(
+ self.apiclient,
+ self.services["account2"],
+ admin=True,
+ domainid=self.domain.id
+ )
+ self.cleanup.append(self.account2)
+ accounts = Account.list(self.apiclient, id=self.account2.id)
+ self.account2Cpu = int(accounts[0].cputotal)
+ self.account2Memory = int(accounts[0].memorytotal)
+
+ # move vm to new account. resource count of cpu/ram of current account decreases. resource count of cpu/ram of new account increases.
+ oldcpunumber = virtual_machine_8.cpunumber
+ oldmemory = virtual_machine_8.memory
+ virtual_machine_8.assign_virtual_machine(self.apiclient, self.account2.name, self.account2.domainid)
+
+ self.expectedCpu = self.expectedCpu - virtual_machine_8.cpunumber
+ self.expectedMemory = self.expectedMemory - virtual_machine_8.memory
+ self.verify_resource_count_cpu_memory(self.expectedCpu, self.expectedMemory);
+
+ self.account2Cpu = self.account2Cpu + virtual_machine_8.cpunumber
+ self.account2Memory = self.account2Memory + virtual_machine_8.memory
+ self.verify_resource_count_cpu_memory(self.account2Cpu, self.account2Memory, account=self.account2);
+
+ # create another service offering
+ self.service_offering_big = ServiceOffering.create(
+ self.apiclient,
+ self.services["service_offerings"]["big"]
+ )
+ self.cleanup.append(self.service_offering_big)
+
+ # upgrade vm
+ virtual_machine_8.change_service_offering(self.apiclient, self.service_offering_big.id)
+ self.account2Cpu = self.account2Cpu + self.service_offering_big.cpunumber - oldcpunumber
+ self.account2Memory = self.account2Memory + self.service_offering_big.memory - oldmemory
+ self.verify_resource_count_cpu_memory(self.account2Cpu, self.account2Memory, account=self.account2);
+
+ # start vm
+ virtual_machine_8.start(self.apiclient)
+ self.verify_resource_count_cpu_memory(self.account2Cpu, self.account2Memory, account=self.account2);
+
+ # expunge vm
+ virtual_machine_8.delete(self.apiclient, expunge=True)
+ self.account2Cpu = self.account2Cpu - self.service_offering_big.cpunumber
+ self.account2Memory = self.account2Memory - self.service_offering_big.memory
+ self.verify_resource_count_cpu_memory(self.account2Cpu, self.account2Memory, account=self.account2);
diff --git a/test/integration/component/test_routers.py b/test/integration/component/test_routers.py
index 45e2853..196d054 100644
--- a/test/integration/component/test_routers.py
+++ b/test/integration/component/test_routers.py
@@ -21,7 +21,8 @@
from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.cloudstackAPI import (stopVirtualMachine,
stopRouter,
- startRouter)
+ startRouter,
+ getRouterHealthCheckResults)
from marvin.lib.utils import (cleanup_resources,
get_process_status)
from marvin.lib.base import (ServiceOffering,
@@ -594,6 +595,75 @@
return
+ @attr(tags=["advanced"], required_hardware="true")
+ def test_04_RouterHealthChecksResults(self):
+ """Test advanced zone router list contains health check records
+ """
+
+ routers = list_routers(
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid,
+ fetchhealthcheckresults=True
+ )
+
+ self.assertEqual(isinstance(routers, list), True,
+ "Check for list routers response return valid data"
+ )
+ self.assertNotEqual(
+ len(routers), 0,
+ "Check list router response"
+ )
+
+ router = routers[0]
+ self.info("Router ID: %s & Router state: %s" % (
+ router.id, router.state
+ ))
+
+ self.assertEqual(isinstance(router.healthcheckresults, list), True,
+ "Router response should contain it's health check result as list"
+ )
+
+ cmd = getRouterHealthCheckResults.getRouterHealthCheckResultsCmd()
+ cmd.routerid = router.id
+ cmd.performfreshchecks = True # Perform fresh checks as a newly created router may not have results
+ healthData = self.api_client.getRouterHealthCheckResults(cmd)
+ self.info("Router ID: %s & Router state: %s" % (
+ router.id, router.state
+ ))
+
+ self.assertEqual(router.id, healthData.routerid,
+ "Router response should contain it's health check result so id should match"
+ )
+ self.assertEqual(isinstance(healthData.healthchecks, list), True,
+ "Router response should contain it's health check result as list"
+ )
+
+ self.verifyCheckTypes(healthData.healthchecks)
+ self.verifyCheckNames(healthData.healthchecks)
+
+ def verifyCheckTypes(self, healthChecks):
+ for checkType in ["basic", "advanced"]:
+ foundType = False
+ for check in healthChecks:
+ if check.checktype == checkType:
+ foundType = True
+ break
+ self.assertTrue(foundType,
+ "Router should contain health check results info for type: " + checkType
+ )
+
+ def verifyCheckNames(self, healthChecks):
+ for checkName in ["dns_check.py", "dhcp_check.py", "haproxy_check.py", "disk_space_check.py", "iptables_check.py", "gateways_check.py", "router_version_check.py"]:
+ foundCheck = False
+ for check in healthChecks:
+ if check.checkname == checkName:
+ foundCheck = True
+ break
+ self.assertTrue(foundCheck,
+ "Router should contain health check results info for check name: " + checkName
+ )
+
class TestRouterStopCreatePF(cloudstackTestCase):
diff --git a/test/integration/component/test_volume_destroy_recover.py b/test/integration/component/test_volume_destroy_recover.py
new file mode 100644
index 0000000..c9e11c0
--- /dev/null
+++ b/test/integration/component/test_volume_destroy_recover.py
@@ -0,0 +1,507 @@
+# 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.
+""" tests for Volume improvement (Destroy/Recover) in cloudstack 4.14.0.0
+
+"""
+# Import Local Modules
+from nose.plugins.attrib import attr
+from marvin.cloudstackTestCase import cloudstackTestCase
+from marvin.cloudstackAPI import (deleteVolume, extractVolume, recoverVolume)
+from marvin.lib.utils import (validateList,
+ cleanup_resources)
+from marvin.lib.base import (Resources,
+ Volume,
+ Account,
+ Domain,
+ Network,
+ NetworkOffering,
+ VirtualMachine,
+ ServiceOffering,
+ DiskOffering,
+ Zone)
+from marvin.lib.common import (get_domain,
+ get_zone,
+ get_template,
+ matchResourceCount,
+ isAccountResourceCountEqualToExpectedCount)
+from marvin.codes import (PASS, FAILED, RESOURCE_PRIMARY_STORAGE, RESOURCE_VOLUME)
+import logging
+import random
+import time
+
+class TestVolumeDestroyRecover(cloudstackTestCase):
+ @classmethod
+ def setUpClass(cls):
+ cls.testClient = super(
+ TestVolumeDestroyRecover,
+ cls).getClsTestClient()
+ cls.apiclient = cls.testClient.getApiClient()
+ cls.services = cls.testClient.getParsedTestDataConfig()
+ zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests())
+ cls.zone = Zone(zone.__dict__)
+ cls._cleanup = []
+
+ cls.logger = logging.getLogger("TestVolumeDestroyRecover")
+ cls.stream_handler = logging.StreamHandler()
+ cls.logger.setLevel(logging.DEBUG)
+ cls.logger.addHandler(cls.stream_handler)
+
+ # Get Domain and templates
+ cls.domain = get_domain(cls.apiclient)
+
+ cls.template = get_template(cls.apiclient, cls.zone.id, hypervisor="KVM")
+ if cls.template == FAILED:
+ sys.exit(1)
+ cls.templatesize = (cls.template.size / (1024 ** 3))
+
+ cls.services['mode'] = cls.zone.networktype
+ # Create Account
+ cls.account = Account.create(
+ cls.apiclient,
+ cls.services["account"],
+ admin=True,
+ domainid=cls.domain.id
+ )
+ accounts = Account.list(cls.apiclient, id=cls.account.id)
+ cls.expectedCount = int(accounts[0].primarystoragetotal)
+ cls.volumeTotal = int(accounts[0].volumetotal)
+
+ if cls.zone.securitygroupsenabled:
+ cls.services["shared_network_offering"]["specifyVlan"] = 'True'
+ cls.services["shared_network_offering"]["specifyIpRanges"] = 'True'
+
+ cls.network_offering = NetworkOffering.create(
+ cls.apiclient,
+ cls.services["shared_network_offering"]
+ )
+ cls.network_offering.update(cls.apiclient, state='Enabled')
+
+ cls.account_network = Network.create(
+ cls.apiclient,
+ cls.services["network2"],
+ networkofferingid=cls.network_offering.id,
+ zoneid=cls.zone.id,
+ accountid=cls.account.name,
+ domainid=cls.account.domainid
+ )
+ else:
+ cls.network_offering = NetworkOffering.create(
+ cls.apiclient,
+ cls.services["isolated_network_offering"],
+ )
+ # Enable Network offering
+ cls.network_offering.update(cls.apiclient, state='Enabled')
+
+ # Create account network
+ cls.services["network"]["zoneid"] = cls.zone.id
+ cls.services["network"]["networkoffering"] = cls.network_offering.id
+ cls.account_network = Network.create(
+ cls.apiclient,
+ cls.services["network"],
+ cls.account.name,
+ cls.account.domainid
+ )
+
+ # Create small service offering
+ cls.service_offering = ServiceOffering.create(
+ cls.apiclient,
+ cls.services["service_offerings"]["small"]
+ )
+
+ # Create disk offering
+ cls.disk_offering = DiskOffering.create(
+ cls.apiclient,
+ cls.services["disk_offering"],
+ )
+
+ cls._cleanup.append(cls.disk_offering)
+ cls._cleanup.append(cls.service_offering)
+ cls._cleanup.append(cls.account);
+ cls._cleanup.append(cls.network_offering)
+
+ @classmethod
+ def tearDownClass(self):
+ try:
+ cleanup_resources(self.apiclient, self._cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ def setUp(self):
+ self.apiclient = self.testClient.getApiClient()
+ self.cleanup = []
+ return
+
+ def tearDown(self):
+ try:
+ cleanup_resources(self.apiclient, self.cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ def verify_resource_count_primary_storage(self, expectedCount, volumeTotal):
+ response = matchResourceCount(
+ self.apiclient, expectedCount,
+ RESOURCE_PRIMARY_STORAGE,
+ accountid=self.account.id)
+ self.assertEqual(response[0], PASS, response[1])
+
+ result = isAccountResourceCountEqualToExpectedCount(
+ self.apiclient, self.account.domainid, self.account.name,
+ expectedCount, RESOURCE_PRIMARY_STORAGE)
+ self.assertFalse(result[0], result[1])
+ self.assertTrue(result[2], "Resource count of primary storage does not match")
+
+ response = matchResourceCount(
+ self.apiclient, volumeTotal,
+ RESOURCE_VOLUME,
+ accountid=self.account.id)
+ self.assertEqual(response[0], PASS, response[1])
+
+ result = isAccountResourceCountEqualToExpectedCount(
+ self.apiclient, self.account.domainid, self.account.name,
+ volumeTotal, RESOURCE_VOLUME)
+ self.assertFalse(result[0], result[1])
+ self.assertTrue(result[2], "Resource count of volume does not match")
+
+ @attr(tags=["advanced", "advancedsg"], required_hardware="false")
+ def test_01_create_vm_with_data_disk(self):
+ """Create VM with DATA disk, then destroy it (expunge=False) and expunge it
+
+ Steps:
+ # 1. create vm with root disk and data disk
+ # 2. destroy vm, resource count of primary storage is not changed
+ # 3. expunge vm, resource count of primary storage decreased with size of root disk.
+ # 4. delete volume (data disk), resource count of primary storage decreased with size of data disk
+ """
+
+ try:
+ virtual_machine_1 = VirtualMachine.create(
+ self.apiclient,
+ self.services["virtual_machine"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ serviceofferingid=self.service_offering.id,
+ diskofferingid=self.disk_offering.id,
+ templateid=self.template.id,
+ zoneid=self.zone.id
+ )
+ except Exception as e:
+ self.fail("Exception while deploying virtual machine: %s" % e)
+
+ self.expectedCount = self.expectedCount + self.templatesize + self.disk_offering.disksize
+ self.volumeTotal = self.volumeTotal + 2
+ self.verify_resource_count_primary_storage(self.expectedCount, self.volumeTotal);
+
+ root_volumes_list = Volume.list(
+ self.apiclient,
+ virtualmachineid=virtual_machine_1.id,
+ type='ROOT',
+ listall=True
+ )
+ status = validateList(root_volumes_list)
+ self.assertEqual(status[0], PASS, "ROOT Volume List Validation Failed")
+ root_volume_id = root_volumes_list[0].id
+
+ data_volumes_list = Volume.list(
+ self.apiclient,
+ virtualmachineid=virtual_machine_1.id,
+ type='DATADISK',
+ listall=True
+ )
+ status = validateList(data_volumes_list)
+ self.assertEqual(status[0], PASS, "DATADISK Volume List Validation Failed")
+ data_volume_id = data_volumes_list[0].id
+
+ # destroy vm
+ virtual_machine_1.delete(self.apiclient, expunge=False)
+ self.verify_resource_count_primary_storage(self.expectedCount, self.volumeTotal)
+
+ # expunge vm
+ virtual_machine_1.expunge(self.apiclient)
+ self.expectedCount = self.expectedCount - self.templatesize
+ self.volumeTotal = self.volumeTotal - 1
+ self.verify_resource_count_primary_storage(self.expectedCount, self.volumeTotal)
+
+ # delete datadisk
+ cmd = deleteVolume.deleteVolumeCmd()
+ cmd.id = data_volume_id
+ self.apiclient.deleteVolume(cmd)
+ self.expectedCount = self.expectedCount - self.disk_offering.disksize
+ self.volumeTotal = self.volumeTotal - 1
+ self.verify_resource_count_primary_storage(self.expectedCount, self.volumeTotal)
+
+ @attr(tags=["advanced", "advancedsg"], required_hardware="false")
+ def test_02_destroy_allocated_volume(self):
+ """Create volume, destroy it when expunge=false and expunge=true
+
+ Steps:
+ # 1. create volume, resource count increases.
+ # 2. destroy volume (expunge = false), Exception happened. resource count no changes
+ # 3. destroy volume (expunge = True), resource count of primary storage decreased with size of volume.
+ """
+
+ # Create volume
+ volume = Volume.create(
+ self.apiclient, self.services["volume"],
+ zoneid=self.zone.id, account=self.account.name,
+ domainid=self.account.domainid, diskofferingid=self.disk_offering.id
+ )
+ self.expectedCount = self.expectedCount + self.disk_offering.disksize
+ self.volumeTotal = self.volumeTotal + 1
+ self.verify_resource_count_primary_storage(self.expectedCount, self.volumeTotal);
+
+ # Destroy volume (expunge=False)
+ with self.assertRaises(Exception):
+ volume.destroy(self.apiclient)
+
+ # Destroy volume (expunge=True)
+ volume.destroy(self.apiclient, expunge=True)
+
+ self.expectedCount = self.expectedCount - self.disk_offering.disksize
+ self.volumeTotal = self.volumeTotal - 1
+ self.verify_resource_count_primary_storage(self.expectedCount, self.volumeTotal);
+
+ @attr(tags=["advanced", "advancedsg"], required_hardware="false")
+ def test_03_destroy_detached_volume(self):
+ """Create volume, attach/detach it, then destroy it when expunge=false and expunge=true
+
+ Steps:
+ # 1. create vm without data disk, resource count increases.
+ # 2. create volume, resource count increases.
+ # 3. attach volume to a vm. resource count no changes.
+ # 4. detach volume from a vm. resource count no changes.
+ # 5. destroy volume (expunge = false), volume is Destroy. resource count decreased with size of volume.
+ # 6. destroy volume (expunge = true), volume is not found. resource count no changes.
+ # 7. destroy vm (expunge=True). resource count decreased with size of root disk
+ """
+ # Create vm
+ try:
+ virtual_machine_2 = VirtualMachine.create(
+ self.apiclient,
+ self.services["virtual_machine"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ serviceofferingid=self.service_offering.id,
+ templateid=self.template.id,
+ zoneid=self.zone.id
+ )
+ except Exception as e:
+ self.fail("Exception while deploying virtual machine: %s" % e)
+
+ self.expectedCount = self.expectedCount + self.templatesize
+ self.volumeTotal = self.volumeTotal + 1
+ self.verify_resource_count_primary_storage(self.expectedCount, self.volumeTotal);
+
+ # Create volume
+ volume = Volume.create(
+ self.apiclient, self.services["volume"],
+ zoneid=self.zone.id, account=self.account.name,
+ domainid=self.account.domainid, diskofferingid=self.disk_offering.id
+ )
+ self.expectedCount = self.expectedCount + self.disk_offering.disksize
+ self.volumeTotal = self.volumeTotal + 1
+ self.verify_resource_count_primary_storage(self.expectedCount, self.volumeTotal);
+
+ # Attach volume to vm
+ virtual_machine_2.attach_volume(self.apiclient, volume)
+ self.verify_resource_count_primary_storage(self.expectedCount, self.volumeTotal);
+
+ # Detach volume from vm
+ virtual_machine_2.detach_volume(self.apiclient, volume)
+ self.verify_resource_count_primary_storage(self.expectedCount, self.volumeTotal);
+
+ # Destroy volume (expunge=False)
+ volume.destroy(self.apiclient)
+ self.expectedCount = self.expectedCount - self.disk_offering.disksize
+ self.volumeTotal = self.volumeTotal - 1
+ self.verify_resource_count_primary_storage(self.expectedCount, self.volumeTotal);
+
+ # Destroy volume (expunge=True)
+ volume.destroy(self.apiclient, expunge=True)
+ self.verify_resource_count_primary_storage(self.expectedCount, self.volumeTotal);
+
+ # Destroy VM (expunge=True)
+ virtual_machine_2.delete(self.apiclient, expunge=True)
+ self.expectedCount = self.expectedCount - self.templatesize
+ self.volumeTotal = self.volumeTotal - 1
+ self.verify_resource_count_primary_storage(self.expectedCount, self.volumeTotal);
+
+ @attr(tags=["advanced", "advancedsg"], required_hardware="false")
+ def test_04_recover_root_volume_after_restorevm(self):
+ """Restore VM, recover/delete old root disk
+
+ Steps:
+ # 1. create vm without data disk, resource count increases.
+ # 2. restore vm. resource count no changes.
+ # 3. check old root disk , should be Destroy state
+ # 4. recover old root disk. resource count increases.
+ # 5. delete old root disk . resource count decreases.
+ # 6. destroy vm (expunge=True). resource count decreased with size of root disk
+ """
+
+ # Create vm
+ try:
+ virtual_machine_3 = VirtualMachine.create(
+ self.apiclient,
+ self.services["virtual_machine"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ serviceofferingid=self.service_offering.id,
+ templateid=self.template.id,
+ zoneid=self.zone.id
+ )
+ except Exception as e:
+ self.fail("Exception while deploying virtual machine: %s" % e)
+
+ self.expectedCount = self.expectedCount + self.templatesize
+ self.volumeTotal = self.volumeTotal + 1
+ self.verify_resource_count_primary_storage(self.expectedCount, self.volumeTotal);
+
+ # Get id of root disk
+ root_volumes_list = Volume.list(
+ self.apiclient,
+ virtualmachineid=virtual_machine_3.id,
+ type='ROOT',
+ listall=True
+ )
+ status = validateList(root_volumes_list)
+ self.assertEqual(status[0], PASS, "ROOT Volume List Validation Failed")
+ root_volume_id = root_volumes_list[0].id
+
+ # restore vm
+ virtual_machine_3.restore(self.apiclient)
+ self.verify_resource_count_primary_storage(self.expectedCount, self.volumeTotal);
+
+ # check old root disk state
+ root_volumes_list = Volume.list(
+ self.apiclient,
+ id=root_volume_id,
+ listall=True
+ )
+ status = validateList(root_volumes_list)
+ self.assertEqual(status[0], PASS, "ROOT Volume List Validation Failed")
+ root_volume = root_volumes_list[0]
+ self.assertEqual(root_volume['state'], 'Destroy', "ROOT volume should be Destroy after restorevm")
+
+ # recover old root disk
+ cmd = recoverVolume.recoverVolumeCmd()
+ cmd.id = root_volume.id
+ self.apiclient.recoverVolume(cmd)
+ self.expectedCount = self.expectedCount + self.templatesize
+ self.volumeTotal = self.volumeTotal + 1
+ self.verify_resource_count_primary_storage(self.expectedCount, self.volumeTotal);
+
+ # delete old root disk
+ cmd = deleteVolume.deleteVolumeCmd()
+ cmd.id = root_volume.id
+ self.apiclient.deleteVolume(cmd)
+ self.expectedCount = self.expectedCount - self.templatesize
+ self.volumeTotal = self.volumeTotal - 1
+ self.verify_resource_count_primary_storage(self.expectedCount, self.volumeTotal)
+
+ # Destroy VM (expunge=True)
+ virtual_machine_3.delete(self.apiclient, expunge=True)
+ self.expectedCount = self.expectedCount - self.templatesize
+ self.volumeTotal = self.volumeTotal - 1
+ self.verify_resource_count_primary_storage(self.expectedCount, self.volumeTotal);
+
+ @attr(tags=["advanced", "advancedsg"], required_hardware="false")
+ def test_05_extract_root_volume_and_destroy_vm(self):
+ """Create VM, extract root volume, then destroy vm and volume
+
+ Steps:
+ # 1. create vm without data disk, resource count increases.
+ # 2. stop vm
+ # 3. extract root volume
+ # 4. expunge vm, root volume in Expunged state. resource count decreased with size of root disk.
+ # 5. destroy volume (expunge = false), Exception happened. resource count no changes
+ # 6. destroy volume (expunge = true). volume is not found. resource count no changes.
+ """
+
+ # Create vm
+ try:
+ virtual_machine_4 = VirtualMachine.create(
+ self.apiclient,
+ self.services["virtual_machine"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ serviceofferingid=self.service_offering.id,
+ templateid=self.template.id,
+ zoneid=self.zone.id
+ )
+ except Exception as e:
+ self.fail("Exception while deploying virtual machine: %s" % e)
+
+ self.expectedCount = self.expectedCount + self.templatesize
+ self.volumeTotal = self.volumeTotal + 1
+ self.verify_resource_count_primary_storage(self.expectedCount, self.volumeTotal);
+
+ # Get id of root disk
+ root_volumes_list = Volume.list(
+ self.apiclient,
+ virtualmachineid=virtual_machine_4.id,
+ type='ROOT',
+ listall=True
+ )
+ status = validateList(root_volumes_list)
+ self.assertEqual(status[0], PASS, "ROOT Volume List Validation Failed")
+ root_volume_id = root_volumes_list[0].id
+
+ # Stop vm
+ virtual_machine_4.stop(self.apiclient)
+
+ # extract root volume
+ cmd = extractVolume.extractVolumeCmd()
+ cmd.id = root_volume_id
+ cmd.mode = "HTTP_DOWNLOAD"
+ cmd.zoneid = self.zone.id
+ self.apiclient.extractVolume(cmd)
+
+ # Destroy VM (expunge=True)
+ virtual_machine_4.delete(self.apiclient, expunge=True)
+ self.expectedCount = self.expectedCount - self.templatesize
+ self.volumeTotal = self.volumeTotal - 1
+ self.verify_resource_count_primary_storage(self.expectedCount, self.volumeTotal);
+
+ # check root disk state
+ root_volumes_list = Volume.list(
+ self.apiclient,
+ id=root_volume_id,
+ listall=True
+ )
+ status = validateList(root_volumes_list)
+ self.assertEqual(status[0], PASS, "ROOT Volume List Validation Failed")
+ root_volume = root_volumes_list[0]
+ self.assertEqual(root_volume['state'], 'Expunged', "ROOT volume should be Destroy after restorevm")
+
+ # delete root disk
+ cmd = deleteVolume.deleteVolumeCmd()
+ cmd.id = root_volume.id
+ self.apiclient.deleteVolume(cmd)
+ self.verify_resource_count_primary_storage(self.expectedCount, self.volumeTotal)
+
+ @attr(tags=["advanced", "advancedsg"], required_hardware="false")
+ def test_06_delete_network(self):
+ """Delete account network, resource count should not be changed
+
+ Steps:
+ # 1. Delete account network
+ # 2. resource count should not be changed
+ """
+ self.account_network.delete(self.apiclient)
+ self.verify_resource_count_primary_storage(self.expectedCount, self.volumeTotal)
diff --git a/test/integration/plugins/ldap/ldap_test_data.py b/test/integration/plugins/ldap/ldap_test_data.py
new file mode 100644
index 0000000..bfb89d5
--- /dev/null
+++ b/test/integration/plugins/ldap/ldap_test_data.py
@@ -0,0 +1,189 @@
+# 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.
+
+class LdapTestData:
+ #constants
+ configuration = "ldap_configuration"
+ syncAccounts = "accountsToSync"
+ parentDomain = "LDAP"
+ manualDomain = "manual"
+ importDomain = "import"
+ syncDomain = "sync"
+ name = "name"
+ id = "id"
+ notAvailable = "N/A"
+ groups = "groups"
+ group = "group"
+ seniorAccount = "seniors"
+ juniorAccount = "juniors"
+
+ ldap_ip_address = "localhost"
+ ldap_port = 389
+ hostname = "hostname"
+ port = "port"
+ dn = "dn"
+ ou = "ou"
+ cn = "cn"
+ member = "uniqueMember"
+ basedn = "basedn"
+ basednConfig = "ldap.basedn"
+ ldapPw = "ldapPassword"
+ ldapPwConfig = "ldap.bind.password"
+ principal = "ldapUsername"
+ principalConfig = "ldap.bind.principal"
+ users = "users"
+ objectClass = "objectClass"
+ sn = "sn"
+ givenName = "givenName"
+ uid = "uid"
+ domains = "domains"
+ type = "accounttype"
+ password = "userPassword"
+ mail = "email"
+ groupPrinciple = "ldap.search.group.principle"
+
+ basednValue = "dc=echt,dc=net"
+ people_dn = "ou=people,"+basednValue
+ groups_dn = "ou=groups,"+basednValue
+ admins = "ou=admins,"+groups_dn
+ juniors = "ou=juniors,"+groups_dn
+ seniors = "ou=seniors,"+groups_dn
+ userObject = "userObject"
+ usernameAttribute = "usernameAttribute"
+ memberAttribute = "memberAttribute"
+ mailAttribute = "emailAttribute"
+
+ def __init__(self):
+ self.testdata = {
+ LdapTestData.configuration: {
+ LdapTestData.mailAttribute: "mail",
+ LdapTestData.userObject: "person",
+ LdapTestData.usernameAttribute: LdapTestData.uid,
+ LdapTestData.memberAttribute: LdapTestData.member,
+ # global values for use in all domains
+ LdapTestData.hostname: LdapTestData.ldap_ip_address,
+ LdapTestData.port: LdapTestData.ldap_port,
+ LdapTestData.basedn: LdapTestData.basednValue,
+ LdapTestData.ldapPw: "secret",
+ LdapTestData.principal: "cn=willie,"+LdapTestData.basednValue,
+ },
+ LdapTestData.groups: [
+ {
+ LdapTestData.dn : LdapTestData.people_dn,
+ LdapTestData.objectClass: ["organizationalUnit", "top"],
+ LdapTestData.ou : "People"
+ },
+ {
+ LdapTestData.dn : LdapTestData.groups_dn,
+ LdapTestData.objectClass: ["organizationalUnit", "top"],
+ LdapTestData.ou : "Groups"
+ },
+ {
+ LdapTestData.dn : LdapTestData.seniors,
+ LdapTestData.objectClass: ["groupOfUniqueNames", "top"],
+ LdapTestData.ou : "seniors",
+ LdapTestData.cn : "seniors",
+ LdapTestData.member : ["uid=bobby,ou=people,"+LdapTestData.basednValue, "uid=rohit,ou=people,"+LdapTestData.basednValue]
+ },
+ {
+ LdapTestData.dn : LdapTestData.juniors,
+ LdapTestData.objectClass : ["groupOfUniqueNames", "top"],
+ LdapTestData.ou : "juniors",
+ LdapTestData.cn : "juniors",
+ LdapTestData.member : ["uid=dahn,ou=people,"+LdapTestData.basednValue, "uid=paul,ou=people,"+LdapTestData.basednValue]
+ }
+ ],
+ LdapTestData.users: [
+ {
+ LdapTestData.dn : "uid=bobby,ou=people,"+LdapTestData.basednValue,
+ LdapTestData.objectClass : ["inetOrgPerson", "top", "person"],
+ LdapTestData.cn : "bobby",
+ LdapTestData.sn: "Stoyanov",
+ LdapTestData.givenName : "Boris",
+ LdapTestData.uid : "bobby",
+ LdapTestData.mail: "bobby@echt.net"
+ },
+ {
+ LdapTestData.dn : "uid=dahn,ou=people,"+LdapTestData.basednValue,
+ LdapTestData.objectClass : ["inetOrgPerson", "top", "person"],
+ LdapTestData.cn : "dahn",
+ LdapTestData.sn: "Hoogland",
+ LdapTestData.givenName : "Daan",
+ LdapTestData.uid : "dahn",
+ LdapTestData.mail: "dahn@echt.net"
+ },
+ {
+ LdapTestData.dn : "uid=paul,ou=people,"+LdapTestData.basednValue,
+ LdapTestData.objectClass : ["inetOrgPerson", "top", "person"],
+ LdapTestData.cn : "Paul",
+ LdapTestData.sn: "Angus",
+ LdapTestData.givenName : "Paul",
+ LdapTestData.uid : "paul",
+ LdapTestData.mail: "paul@echt.net"
+ },
+ {
+ LdapTestData.dn : "uid=rohit,ou=people,"+LdapTestData.basednValue,
+ LdapTestData.objectClass : ["inetOrgPerson", "top", "person"],
+ LdapTestData.cn : "rhtyd",
+ LdapTestData.sn: "Yadav",
+ LdapTestData.givenName : "Rohit",
+ LdapTestData.uid : "rohit",
+ LdapTestData.mail: "rhtyd@echt.net"
+ },
+ # extra test user (just in case)
+ # {
+ # LdapTestData.dn : "uid=noone,ou=people,"+LdapTestData.basednValue,
+ # LdapTestData.objectClass : ["inetOrgPerson", "person"],
+ # LdapTestData.cn : "noone",
+ # LdapTestData.sn: "a User",
+ # LdapTestData.givenName : "Not",
+ # LdapTestData.uid : "noone",
+ # LdapTestData.mail: "noone@echt.net",
+ # LdapTestData.password: 'password'
+ # },
+ ],
+ LdapTestData.domains : [
+ {
+ LdapTestData.name : LdapTestData.parentDomain,
+ LdapTestData.id : LdapTestData.notAvailable
+ },
+ {
+ LdapTestData.name : LdapTestData.manualDomain,
+ LdapTestData.id : LdapTestData.notAvailable
+ },
+ {
+ LdapTestData.name : LdapTestData.importDomain,
+ LdapTestData.id : LdapTestData.notAvailable
+ },
+ {
+ LdapTestData.name : LdapTestData.syncDomain,
+ LdapTestData.id : LdapTestData.notAvailable
+ },
+ ],
+ LdapTestData.syncAccounts : [
+ {
+ LdapTestData.name : LdapTestData.juniorAccount,
+ LdapTestData.type : 0,
+ LdapTestData.group : LdapTestData.juniors
+ },
+ {
+ LdapTestData.name : LdapTestData.seniorAccount,
+ LdapTestData.type : 2,
+ LdapTestData.group : LdapTestData.seniors
+ }
+ ],
+ }
\ No newline at end of file
diff --git a/test/integration/plugins/ldap/test_ldap.py b/test/integration/plugins/ldap/test_ldap.py
new file mode 100644
index 0000000..b017957
--- /dev/null
+++ b/test/integration/plugins/ldap/test_ldap.py
@@ -0,0 +1,476 @@
+# 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.
+
+#Import Local Modules
+from .ldap_test_data import LdapTestData
+from marvin.cloudstackTestCase import cloudstackTestCase
+from marvin.lib.utils import (cleanup_resources)
+from marvin.lib.base import (listLdapUsers,
+ ldapCreateAccount,
+ importLdapUsers,
+ User,
+ Domain,
+ Account,
+ addLdapConfiguration,
+ deleteLdapConfiguration,
+ linkAccountToLdap,
+ linkDomainToLdap,
+ updateConfiguration)
+from marvin.lib.common import (get_domain,
+ get_zone)
+from nose.plugins.attrib import attr
+
+# for login validation
+import requests
+
+import logging
+
+class TestLDAP(cloudstackTestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ '''
+ needs to
+ - create the applicable ldap accounts in the directory server
+ - create three domains:
+ -- LDAP/manual
+ -- LDAP/import
+ -- LDAP/sync
+ '''
+ cls.logger = logging.getLogger(__name__)
+ stream_handler = logging.StreamHandler()
+ logger_formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s')
+ stream_handler.setFormatter(logger_formatter)
+ cls.logger.setLevel(logging.DEBUG)
+ cls.logger.addHandler(stream_handler)
+
+ cls.logger.info("Setting up Class")
+ testClient = super(TestLDAP, cls).getClsTestClient()
+ cls.apiclient = testClient.getApiClient()
+
+ try:
+ # Setup test data
+ cls.testdata = LdapTestData()
+ if cls.config.TestData and cls.config.TestData.Path:
+ cls.logger.debug("reading extra config from '" + cls.config.TestData.Path + "'")
+ cls.testdata.update(cls.config.TestData.Path)
+ cls.logger.debug(cls.testdata)
+
+ cls.services = testClient.getParsedTestDataConfig()
+ cls.services["configurableData"]["ldap_configuration"] = cls.testdata.testdata["ldap_configuration"]
+ cls.logger.debug(cls.services["configurableData"]["ldap_configuration"])
+
+ # Get Zone, Domain
+ cls.domain = get_domain(cls.apiclient)
+ cls.logger.debug("standard domain: %s" % cls.domain.id)
+ cls.zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests())
+
+ cls._cleanup = []
+
+ # Build the test env
+ cls.create_domains(cls.testdata)
+ cls.configure_ldap_for_domains(cls.testdata)
+
+ cls.test_user = [
+ cls.testdata.testdata[LdapTestData.users][0][LdapTestData.uid],
+ cls.testdata.testdata[LdapTestData.users][1][LdapTestData.uid],
+ cls.testdata.testdata[LdapTestData.users][2][LdapTestData.uid]
+ ]
+ except Exception as e:
+ cls.logger.debug("Exception in setUpClass(cls): %s" % e)
+ cls.tearDownClass()
+ raise Exception("setup failed due to %s", e)
+
+ return
+
+ @classmethod
+ def tearDownClass(cls):
+ cls.logger.info("Tearing Down Class")
+ try:
+ cleanup_resources(cls.apiclient, reversed(cls._cleanup))
+ cls.remove_ldap_configuration_for_domains()
+ cls.logger.debug("done cleaning up resources in tearDownClass(cls) %s")
+ except Exception as e:
+ cls.logger.debug("Exception in tearDownClass(cls): %s" % e)
+
+ def setUp(self):
+ self.cleanup = []
+
+ self.server_details = self.config.__dict__["mgtSvr"][0].__dict__
+ self.server_url = "http://%s:8080/client/api" % self.server_details['mgtSvrIp']
+
+ return
+
+ def tearDown(self):
+ try:
+ cleanup_resources(self.apiclient, self.cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ @attr(tags=["smoke", "advanced"], required_hardware="false")
+ def test_01_manual(self):
+ '''
+ test if an account can be imported
+
+ prerequisite
+ a ldap host is configured
+ a domain is linked to cloudstack
+ '''
+ cmd = listLdapUsers.listLdapUsersCmd()
+ cmd.domainid = self.manualDomain.id
+ cmd.userfilter = "LocalDomain"
+ response = self.apiclient.listLdapUsers(cmd)
+ self.logger.info("users found for linked domain %s" % response)
+ self.assertEqual(len(response), len(self.testdata.testdata[LdapTestData.users]), "unexpected number (%d) of ldap users" % len(self.testdata.testdata[LdapTestData.users]))
+
+ cmd = ldapCreateAccount.ldapCreateAccountCmd()
+ cmd.domainid = self.manualDomain.id
+ cmd.accounttype = 0
+ cmd.username = self.test_user[1]
+ create_response = self.apiclient.ldapCreateAccount(cmd)
+
+ # cleanup
+ # last results id should be the account
+ list_response = Account.list(self.apiclient, id=create_response.id)
+ account_created = Account(list_response[0].__dict__)
+ self.cleanup.append(account_created)
+
+ self.assertEqual(len(create_response.user), 1, "only one user %s should be present" % self.test_user[1])
+
+ self.assertEqual(len(list_response),
+ 1,
+ "only one account (for user %s) should be present" % self.test_user[1])
+
+ return
+
+ @attr(tags=["smoke", "advanced"], required_hardware="false")
+ def test_02_import(self):
+ '''
+ test if components are synced
+
+ prerequisite
+ a ldap host is configured
+ a domain is linked to cloudstack
+ '''
+ domainid = self.importDomain.id
+
+ cmd = importLdapUsers.importLdapUsersCmd()
+ cmd.domainid = domainid
+ cmd.accounttype = 0
+ import_response = self.apiclient.importLdapUsers(cmd)
+
+ # this is needed purely for cleanup:
+ # cleanup
+ list_response = Account.list(self.apiclient, domainid=domainid)
+ for account in list_response:
+ account_created = Account(account.__dict__)
+ self.logger.debug("account to clean: %s (id: %s)" % (account_created.name, account_created.id))
+ self.cleanup.append(account_created)
+
+ self.assertEqual(len(import_response), len(self.testdata.testdata[LdapTestData.users]), "unexpected number of ldap users")
+
+ self.assertEqual(len(list_response), len(self.testdata.testdata[LdapTestData.users]), "only one account (for user %s) should be present" % self.test_user[1])
+
+ return
+
+ @attr(tags=["smoke", "advanced"], required_hardware="false")
+ def test_03_sync(self):
+ '''
+ test if components are synced
+
+ prerequisite
+ a ldap host is configured
+ a domain is linked to cloudstack
+ some accounts in that domain are linked to groups in ldap
+ '''
+ domainid = self.syncDomain.id
+ username = self.test_user[1]
+
+ # validate the user doesn't exist
+ response = User.list(self.apiclient,domainid=domainid,username=username)
+ self.assertEqual(response, None, "user should not exist yet")
+
+ self.logon_test_user(username)
+
+ # now validate the user exists in domain
+ response = User.list(self.apiclient,domainid=domainid,username=username)
+ for user in response:
+ user_created = User(user.__dict__)
+ self.logger.debug("user to clean: %s (id: %s)" % (user_created.username, user_created.id))
+ self.cleanup.append(user_created)
+
+ # now verify the creation of the user
+ self.assertEqual(len(response), 1, "user should exist by now")
+
+ return
+
+ @attr(tags=["smoke", "advanced"], required_hardware="false")
+ def test_04_filtered_list_of_users(self):
+ '''
+ test if we can get a filtered list of ldap users
+
+ prerequisite
+ a ldap host is configured
+ a couple of ldapdomains are linked to cloudstack domains
+ some accounts in those domain are linked to groups in ldap
+ some ldap accounts are linked and present with the same uid
+ some ldap accounts are not yet linked but present at other locations in cloudstack
+
+ NOTE 1: if this test is run last only the explicitely imported test user from test_03_sync
+ is in the system. The accounts from test_01_manual and test_02_import should have been cleared
+ by the test tearDown(). We can not depend on test_03_sync having run so the test must avoid
+ depending on it either being available or not.
+
+ NOTE 2: this test will not work if the ldap users UIDs are already present in the ACS instance
+ against which is being tested
+ '''
+ cmd = listLdapUsers.listLdapUsersCmd()
+ cmd.userfilter = "NoFilter"
+ cmd.domainid = self.manualDomain.id
+ response = self.apiclient.listLdapUsers(cmd)
+ self.logger.debug(cmd.userfilter + " : " + str(response))
+ self.assertEqual(len(response), len(self.testdata.testdata[LdapTestData.users]), "unexpected number of ldap users")
+
+ # create a non ldap user with the uid of cls.test_user[0] in parentDomain
+ # create a manual import of a cls.test_user[1] in manualDomain
+ # log on with test_user[2] in an syncDomain
+
+ # we can now test all four filtertypes in syncDomain and inspect the respective outcomes for validity
+
+ self.logon_test_user(self.test_user[2])
+
+ cmd.userfilter = "LocalDomain"
+ cmd.domainid = self.syncDomain.id
+ response = self.apiclient.listLdapUsers(cmd)
+ self.logger.debug(cmd.userfilter + " : " + str(response))
+ self.assertEqual(len(response),
+ len(self.testdata.testdata[LdapTestData.users]) - 1,
+ "unexpected number of ldap users")
+
+ @attr(tags=["smoke", "advanced"], required_hardware="false")
+ def test_05_relink_account_and_reuse_user(self):
+ '''
+ test if an account and thus a user can be removed and re-added
+
+ test if components still are synced
+
+ prerequisite
+ a ldap host is configured
+ a domain is linked to cloudstack
+ some accounts in that domain are linked to groups in ldap
+ '''
+ domainid = self.syncDomain.id
+ username = self.test_user[1]
+
+ # validate the user doesn't exist
+ response = User.list(self.apiclient,domainid=domainid,username=username)
+ self.assertEqual(response, None, "user should not exist yet")
+
+ self.logon_test_user(username)
+
+ # now validate the user exists in domain
+ response = User.list(self.apiclient,domainid=domainid,username=username)
+ # for user in response:
+ # user_created = User(user.__dict__)
+ # self.debug("user to clean: %s (id: %s)" % (user_created.username, user_created.id))
+ # # we don't cleanup to test if re-adding fails
+ # self.cleanup.append(user_created)
+
+ # now verify the creation of the user
+ self.assertEqual(len(response), 1, "user should exist by now")
+
+ # delete the account - quick implementation: user[1] happens to be a junior
+ self.junior_account.delete(self.apiclient)
+
+ # add the account with the same ldap group
+ self.bind_account_to_ldap(
+ account=self.testdata.testdata[LdapTestData.syncAccounts][0]["name"],
+ ldapdomain=self.testdata.testdata[LdapTestData.syncAccounts][0]["group"],
+ accounttype=self.testdata.testdata[LdapTestData.syncAccounts][0]["accounttype"])
+
+ # logon the user - should succeed - reported to fail
+ self.logon_test_user(username)
+
+ # now verify the creation of the user
+ response = User.list(self.apiclient,domainid=domainid,username=username)
+ for user in response:
+ user_created = User(user.__dict__)
+ self.debug("user to clean: %s (id: %s)" % (user_created.username, user_created.id))
+ # we don't cleanup to test if re-adding fails
+ # self.cleanup.append(user_created)
+ self.assertEqual(len(response), 1, "user should exist again")
+ return
+
+
+ def logon_test_user(self, username, domain = None):
+ # login of dahn should create a user in account juniors
+ args = {}
+ args["command"] = 'login'
+ args["username"] = username
+ args["password"] = 'password'
+ if domain == None:
+ args["domain"] = "/" + self.parentDomain.name + "/" + self.syncDomain.name
+ else:
+ args["domain"] = domain
+ args["response"] = "json"
+ session = requests.Session()
+ try:
+ resp = session.post(self.server_url, params=args, verify=False)
+ except requests.exceptions.ConnectionError as e:
+ self.fail("Failed to attempt login request to mgmt server")
+
+
+ @classmethod
+ def create_domains(cls, td):
+ # create a parent domain
+ cls.parentDomain = cls.create_domain(td.testdata["domains"][0], parent_domain=cls.domain.id)
+ cls.manualDomain = cls.create_domain(td.testdata["domains"][1], parent_domain=cls.parentDomain.id)
+ cls.importDomain = cls.create_domain(td.testdata["domains"][2], parent_domain=cls.parentDomain.id)
+ cls.syncDomain = cls.create_domain(td.testdata["domains"][3], parent_domain=cls.parentDomain.id)
+
+ @classmethod
+ def create_domain(cls, domain_to_create, parent_domain = None):
+ cls.logger.debug("Creating domain: %s under %s" % (domain_to_create[LdapTestData.name], parent_domain))
+ if parent_domain:
+ domain_to_create["parentdomainid"] = parent_domain
+ tmpDomain = Domain.create(cls.apiclient, domain_to_create)
+ cls.logger.debug("Created domain %s with id %s " % (tmpDomain.name, tmpDomain.id))
+ cls._cleanup.append(tmpDomain)
+ return tmpDomain
+
+ @classmethod
+ def configure_ldap_for_domains(cls, td) :
+ cmd = addLdapConfiguration.addLdapConfigurationCmd()
+ cmd.hostname = td.testdata[LdapTestData.configuration][LdapTestData.hostname]
+ cmd.port = td.testdata[LdapTestData.configuration][LdapTestData.port]
+
+ cls.logger.debug("configuring ldap server for domain %s" % LdapTestData.manualDomain)
+ cmd.domainid = cls.manualDomain.id
+ response = cls.apiclient.addLdapConfiguration(cmd)
+ cls.manualLdap = response
+
+ cls.logger.debug("configuring ldap server for domain %s" % LdapTestData.importDomain)
+ cmd.domainid = cls.importDomain.id
+ response = cls.apiclient.addLdapConfiguration(cmd)
+ cls.importLdap = response
+
+ cls.logger.debug("configuring ldap server for domain %s" % LdapTestData.syncDomain)
+ cmd.domainid = cls.syncDomain.id
+ response = cls.apiclient.addLdapConfiguration(cmd)
+ cls.syncLdap = response
+
+ cls.set_ldap_settings_on_domain(domainid=cls.manualDomain.id)
+ cls.bind_domain_to_ldap(domainid=cls.manualDomain.id, ldapdomain=cls.testdata.admins)
+
+ cls.set_ldap_settings_on_domain(domainid=cls.importDomain.id)
+ cls.bind_domain_to_ldap(domainid=cls.importDomain.id, ldapdomain=cls.testdata.admins,
+ accounttype=2, type="Group") # just to be testing different types
+
+ cls.set_ldap_settings_on_domain(domainid=cls.syncDomain.id)
+ cls.create_sync_accounts()
+
+ @classmethod
+ def remove_ldap_configuration_for_domains(cls) :
+ cls.logger.debug("deleting configurations for ldap server")
+ cmd = deleteLdapConfiguration.deleteLdapConfigurationCmd()
+
+ cmd.hostname = cls.manualLdap.hostname
+ cmd.port = cls.manualLdap.port
+ cmd.domainid = cls.manualLdap.domainid
+ response = cls.apiclient.deleteLdapConfiguration(cmd)
+ cls.logger.debug("configuration deleted for %s" % response)
+
+ cmd.hostname = cls.importLdap.hostname
+ cmd.port = cls.importLdap.port
+ cmd.domainid = cls.importLdap.domainid
+ response = cls.apiclient.deleteLdapConfiguration(cmd)
+ cls.logger.debug("configuration deleted for %s" % response)
+
+ cmd.hostname = cls.syncLdap.hostname
+ cmd.port = cls.syncLdap.port
+ cmd.domainid = cls.syncLdap.domainid
+ cls.logger.debug("deleting configuration %s" % cmd)
+ response = cls.apiclient.deleteLdapConfiguration(cmd)
+ cls.logger.debug("configuration deleted for %s" % response)
+
+
+ @classmethod
+ def create_sync_accounts(cls):
+ cls.logger.debug("creating account: %s" % LdapTestData.seniors)
+ cls.senior_account = cls.bind_account_to_ldap(
+ account=cls.testdata.testdata[LdapTestData.syncAccounts][1]["name"],
+ ldapdomain=cls.testdata.testdata[LdapTestData.syncAccounts][1]["group"],
+ accounttype=cls.testdata.testdata[LdapTestData.syncAccounts][1]["accounttype"])
+ cls.junior_account = cls.bind_account_to_ldap(
+ account=cls.testdata.testdata[LdapTestData.syncAccounts][0]["name"],
+ ldapdomain=cls.testdata.testdata[LdapTestData.syncAccounts][0]["group"],
+ accounttype=cls.testdata.testdata[LdapTestData.syncAccounts][0]["accounttype"])
+
+ @classmethod
+ def bind_account_to_ldap(cls, account, ldapdomain, type="Group", accounttype=0):
+ cmd = linkAccountToLdap.linkAccountToLdapCmd()
+
+ cmd.domainid = cls.syncDomain.id
+ cmd.account = account
+ cmd.ldapdomain = ldapdomain
+ cmd.type = type
+ cmd.accounttype = accounttype
+
+ response = cls.apiclient.linkAccountToLdap(cmd)
+ cls.logger.info("account linked to ladp %s" % response)
+
+ # this is needed purely for cleanup:
+ response = Account.list(cls.apiclient, id=response.accountid)
+ account_created = Account(response[0].__dict__)
+ cls._cleanup.append(account_created)
+ return account_created
+
+ @classmethod
+ def bind_domain_to_ldap(cls, domainid, ldapdomain, type="OU", accounttype=0):
+ cmd = linkDomainToLdap.linkDomainToLdapCmd()
+ cmd.domainid = domainid
+ cmd.type = type
+ cmd.accounttype = accounttype
+ cmd.ldapdomain = ldapdomain
+ response = cls.apiclient.linkDomainToLdap(cmd)
+ cls.logger.info("domain linked to ladp %s" % response)
+
+ @classmethod
+ def set_ldap_settings_on_domain(cls, domainid):
+ cmd = updateConfiguration.updateConfigurationCmd()
+ cmd.domainid = domainid
+ cmd.name = LdapTestData.basednConfig
+ cmd.value = cls.testdata.testdata[LdapTestData.configuration][LdapTestData.basedn]
+ response = cls.apiclient.updateConfiguration(cmd)
+ cls.logger.debug("set the basedn: %s" % response)
+ cmd.name = LdapTestData.ldapPwConfig
+ cmd.value = cls.testdata.testdata[LdapTestData.configuration][LdapTestData.ldapPw]
+ response = cls.apiclient.updateConfiguration(cmd)
+ cls.logger.debug("set the pw: %s" % response)
+ cmd.name = LdapTestData.principalConfig
+ cmd.value = cls.testdata.testdata[LdapTestData.configuration][LdapTestData.principal]
+ response = cls.apiclient.updateConfiguration(cmd)
+ cls.logger.debug("set the id: %s" % response)
+ if cls.testdata.testdata[LdapTestData.configuration].has_key(LdapTestData.groupPrinciple) :
+ cmd.name = LdapTestData.groupPrinciple
+ cmd.value = cls.testdata.testdata[LdapTestData.configuration][LdapTestData.groupPrinciple]
+ response = cls.apiclient.updateConfiguration(cmd)
+ cls.logger.debug("set the id: %s" % response)
+
+
+## python ldap utility functions
diff --git a/test/integration/plugins/test_quota.py b/test/integration/plugins/test_quota.py
index 1ae6790..afafc23 100644
--- a/test/integration/plugins/test_quota.py
+++ b/test/integration/plugins/test_quota.py
@@ -54,6 +54,14 @@
]
return
+ @classmethod
+ def tearDownClass(cls):
+ try:
+ cleanup_resources(cls.apiclient, cls._cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
def setUp(self):
self.apiclient = self.testClient.getApiClient()
self.hypervisor = self.testClient.getHypervisorInfo()
diff --git a/test/integration/smoke/test_accounts.py b/test/integration/smoke/test_accounts.py
index 6169bf5..43aa6bd 100644
--- a/test/integration/smoke/test_accounts.py
+++ b/test/integration/smoke/test_accounts.py
@@ -155,7 +155,7 @@
def tearDownClass(cls):
try:
# Cleanup resources used
- cleanup_resources(cls.api_client, cls._cleanup)
+ cleanup_resources(cls.api_client, reversed(cls._cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -169,7 +169,7 @@
def tearDown(self):
try:
# Clean up, terminate the created accounts, domains etc
- cleanup_resources(self.apiclient, self.cleanup)
+ cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -280,12 +280,13 @@
ts = str(time.time())
network_domain = 'mycloud.com'
- account = Account.create(self.apiclient, self.services['account'])
- self.cleanup.append(account)
-
+ # role will be in cleanup list first so it won't be deleted before the account it is on.
role = Role.create(self.apiclient, self.services['role'])
self.cleanup.append(role)
+ account = Account.create(self.apiclient, self.services['account'])
+ self.cleanup.append(account)
+
account.update(self.apiclient, newname=account.name + ts)
account.update(self.apiclient, roleid=role.id)
account.update(self.apiclient, networkdomain=network_domain)
@@ -353,7 +354,7 @@
def tearDownClass(cls):
try:
# Cleanup resources used
- cleanup_resources(cls.api_client, cls._cleanup)
+ cleanup_resources(cls.api_client, reversed(cls._cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -367,7 +368,7 @@
def tearDown(self):
try:
# Clean up, terminate the created instance, users etc
- cleanup_resources(self.apiclient, self.cleanup)
+ cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -494,28 +495,27 @@
cls.services = Services().services
cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
+ cls._cleanup = []
# Create an account, domain etc
cls.domain = Domain.create(
cls.api_client,
cls.services["domain"],
)
+ cls._cleanup.append(cls.domain)
cls.account = Account.create(
cls.api_client,
cls.services["account"],
admin=True,
domainid=cls.domain.id
)
- cls._cleanup = [
- cls.account,
- cls.domain
- ]
+ cls._cleanup.append(cls.account)
return
@classmethod
def tearDownClass(cls):
try:
# Cleanup resources used
- cleanup_resources(cls.api_client, cls._cleanup)
+ cleanup_resources(cls.api_client, reversed(cls._cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -529,7 +529,7 @@
def tearDown(self):
try:
# Clean up, terminate the created accounts
- cleanup_resources(self.apiclient, self.cleanup)
+ cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -601,20 +601,25 @@
).getClsTestClient().getApiClient()
cls.services = Services().services
+ cls._cleanup = []
+
# Create Domains, accounts etc
cls.domain_1 = Domain.create(
cls.api_client,
cls.services["domain"]
)
+ cls._cleanup.append(cls.domain_1)
cls.domain_2 = Domain.create(
cls.api_client,
cls.services["domain"]
)
+ cls._cleanup.append(cls.domain_2)
cls.service_offering = ServiceOffering.create(
cls.api_client,
cls.services["service_offering"],
domainid=cls.domain_1.id
)
+ cls._cleanup.append(cls.service_offering)
# Create account for doamin_1
cls.account_1 = Account.create(
cls.api_client,
@@ -622,6 +627,7 @@
admin=True,
domainid=cls.domain_1.id
)
+ cls._cleanup.append(cls.account_1)
# Create an account for domain_2
cls.account_2 = Account.create(
@@ -630,21 +636,15 @@
admin=True,
domainid=cls.domain_2.id
)
+ cls._cleanup.append(cls.account_2)
- cls._cleanup = [
- cls.account_1,
- cls.account_2,
- cls.service_offering,
- cls.domain_1,
- cls.domain_2,
- ]
return
@classmethod
def tearDownClass(cls):
try:
# Cleanup resources used
- cleanup_resources(cls.api_client, cls._cleanup)
+ cleanup_resources(cls.api_client, reversed(cls._cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -658,7 +658,7 @@
def tearDown(self):
try:
# Clean up, terminate the created domains, accounts
- cleanup_resources(self.apiclient, self.cleanup)
+ cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -725,21 +725,26 @@
).getClsTestClient().getApiClient()
cls.services = Services().services
+ cls._cleanup = []
+
# Create domain, service offerings etc
cls.domain_1 = Domain.create(
cls.api_client,
cls.services["domain"]
)
+ cls._cleanup.append(cls.domain_1)
cls.domain_2 = Domain.create(
cls.api_client,
cls.services["domain"],
parentdomainid=cls.domain_1.id
)
+ cls._cleanup.append(cls.domain_2)
cls.service_offering = ServiceOffering.create(
cls.api_client,
cls.services["service_offering"],
domainid=cls.domain_1.id
)
+ cls._cleanup.append(cls.service_offering)
# Create account for doamin_1
cls.account_1 = Account.create(
cls.api_client,
@@ -747,7 +752,7 @@
admin=True,
domainid=cls.domain_1.id
)
-
+ cls._cleanup.append(cls.account_1)
# Create an account for domain_2
cls.account_2 = Account.create(
cls.api_client,
@@ -755,14 +760,7 @@
admin=True,
domainid=cls.domain_2.id
)
-
- cls._cleanup = [
- cls.account_2,
- cls.domain_2,
- cls.service_offering,
- cls.account_1,
- cls.domain_1,
- ]
+ cls._cleanup.append(cls.account_2)
return
@@ -770,7 +768,7 @@
def tearDownClass(cls):
try:
# Cleanup resources used
- cleanup_resources(cls.api_client, cls._cleanup)
+ cleanup_resources(cls.api_client, reversed(cls._cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -784,7 +782,7 @@
def tearDown(self):
try:
# Clean up, terminate the created instance, volumes and snapshots
- cleanup_resources(self.apiclient, self.cleanup)
+ cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -852,16 +850,20 @@
cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
+ cls._cleanup = []
+
# Create domains, accounts and template
cls.domain_1 = Domain.create(
cls.api_client,
cls.services["domain"]
)
+ cls._cleanup.append(cls.domain_1)
cls.domain_2 = Domain.create(
cls.api_client,
cls.services["domain"],
parentdomainid=cls.domain_1.id
)
+ cls._cleanup.append(cls.domain_2)
# Create account for doamin_1
cls.account_1 = Account.create(
@@ -870,6 +872,7 @@
admin=True,
domainid=cls.domain_1.id
)
+ cls._cleanup.append(cls.account_1)
# Create an account for domain_2
cls.account_2 = Account.create(
@@ -878,13 +881,7 @@
admin=True,
domainid=cls.domain_2.id
)
-
- cls._cleanup = [
- cls.account_2,
- cls.domain_2,
- cls.account_1,
- cls.domain_1,
- ]
+ cls._cleanup.append(cls.account_2)
builtin_info = get_builtin_template_info(cls.api_client, cls.zone.id)
cls.services["template"]["url"] = builtin_info[0]
@@ -900,6 +897,7 @@
domainid=cls.domain_1.id,
hypervisor=cls.hypervisor
)
+ cls._cleanup.append(cls.template)
# Wait for template to download
cls.template.download(cls.api_client)
@@ -912,7 +910,7 @@
def tearDownClass(cls):
try:
# Cleanup resources used
- cleanup_resources(cls.api_client, cls._cleanup)
+ cleanup_resources(cls.api_client, reversed(cls._cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -926,7 +924,7 @@
def tearDown(self):
try:
# Clean up, terminate the created instance, volumes and snapshots
- cleanup_resources(self.apiclient, self.cleanup)
+ cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -1005,11 +1003,14 @@
cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.hypervisor = cls.testClient.getHypervisorInfo()
cls.services['mode'] = cls.zone.networktype
+ cls._cleanup = []
+
cls.sub_domain = Domain.create(
cls.api_client,
cls.services["domain"],
parentdomainid=cls.domain.id
)
+ cls._cleanup.append(cls.sub_domain)
# Create account for doamin_1
cls.account_1 = Account.create(
@@ -1018,6 +1019,7 @@
admin=True,
domainid=cls.domain.id
)
+ cls._cleanup.append(cls.account_1)
# Create an account for domain_2
cls.account_2 = Account.create(
@@ -1026,19 +1028,15 @@
admin=True,
domainid=cls.sub_domain.id
)
+ cls._cleanup.append(cls.account_2)
cls.service_offering = ServiceOffering.create(
cls.api_client,
cls.services["service_offering"],
domainid=cls.domain.id
)
+ cls._cleanup.append(cls.service_offering)
- cls._cleanup = [
- cls.account_2,
- cls.account_1,
- cls.sub_domain,
- cls.service_offering
- ]
cls.template = get_test_template(
cls.api_client,
cls.zone.id,
@@ -1068,7 +1066,7 @@
def tearDownClass(cls):
try:
# Clean up, terminate the created resources
- cleanup_resources(cls.api_client, cls._cleanup)
+ cleanup_resources(cls.api_client, reversed(cls._cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -1082,7 +1080,7 @@
def tearDown(self):
try:
# Clean up, terminate the created resources
- cleanup_resources(self.apiclient, self.cleanup)
+ cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -1164,7 +1162,7 @@
def tearDownClass(cls):
try:
# Cleanup resources used
- cleanup_resources(cls.api_client, cls._cleanup)
+ cleanup_resources(cls.api_client, reversed(cls._cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -1178,7 +1176,7 @@
def tearDown(self):
try:
# Clean up, terminate the created network offerings
- cleanup_resources(self.apiclient, self.cleanup)
+ cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -1463,7 +1461,7 @@
def tearDownClass(cls):
try:
# Cleanup resources used
- cleanup_resources(cls.api_client, cls._cleanup)
+ cleanup_resources(cls.api_client, reversed(cls._cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -1477,7 +1475,7 @@
def tearDown(self):
try:
# Clean up, terminate the created network offerings
- cleanup_resources(self.apiclient, self.cleanup)
+ cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -1558,7 +1556,7 @@
self.services["domain"],
parentdomainid=self.domain.id
)
-
+ self.cleanup.append(domain)
self.debug("Domain: %s is created successfully." % domain.name)
self.debug("Validating the created domain")
@@ -1574,11 +1572,8 @@
self.services["domain"],
parentdomainid=domain.id
)
-
- self.debug("Sub-Domain: %s is created successfully." % subDomain.name)
-
self.cleanup.append(subDomain)
- self.cleanup.append(domain)
+ self.debug("Sub-Domain: %s is created successfully." % subDomain.name)
self.debug("Validating the created sub-domain")
list_sub_domain = Domain.list(self.api_client, id=subDomain.id)
@@ -1631,6 +1626,7 @@
self.services["domain"],
parentdomainid=self.domain.id
)
+ self.cleanup.append(domain)
self.debug("Domain: %s is created succesfully." % domain.name)
self.debug(
"Checking if the created domain is listed in list domains API")
@@ -1690,40 +1686,39 @@
cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
+ cls._cleanup = []
# Create an account, domain etc
cls.domain = Domain.create(
cls.api_client,
cls.services["domain"],
)
+ cls._cleanup.append(cls.domain)
cls.account = Account.create(
cls.api_client,
cls.services["account"],
admin=False,
domainid=cls.domain.id
)
+ cls._cleanup.append(cls.account)
cls.domain_2 = Domain.create(
cls.api_client,
cls.services["domain"],
)
+ cls._cleanup.append(cls.domain_2)
cls.account_2 = Account.create(
cls.api_client,
cls.services["account"],
admin=False,
domainid=cls.domain_2.id
)
- cls._cleanup = [
- cls.account,
- cls.domain,
- cls.account_2,
- cls.domain_2
- ]
+ cls._cleanup.append(cls.account_2)
return
@classmethod
def tearDownClass(cls):
try:
# Cleanup resources used
- cleanup_resources(cls.api_client, cls._cleanup)
+ cleanup_resources(cls.api_client, reversed(cls._cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -1737,7 +1732,7 @@
def tearDown(self):
try:
# Clean up, terminate the created network offerings
- cleanup_resources(self.apiclient, self.cleanup)
+ cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -1875,7 +1870,7 @@
def tearDownClass(cls):
try:
# Clean up, terminate the created resources
- cleanup_resources(cls.api_client, cls._cleanup)
+ cleanup_resources(cls.api_client, reversed(cls._cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
@@ -1890,7 +1885,7 @@
def tearDown(self):
try:
# Clean up, terminate the created resources
- cleanup_resources(self.apiclient, self.cleanup)
+ cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -2043,8 +2038,10 @@
"Length of response from listLbRules should not be 0"
)
except Exception as e:
- self.clenaup.append(self.account_1)
+ self.cleanup.append(self.domain)
+ self.cleanup.append(self.account_1)
self.cleanup.append(self.account_2)
+ self.cleanup.append(self.service_offering)
self.fail(e)
self.debug("Deleting domain with force option")
@@ -2102,6 +2099,8 @@
self.services["domain"],
parentdomainid=self.domain.id
)
+ # in this test delete domain *should* fail so we need to housekeep:
+ self.cleanup.append(domain)
self.debug("Domain: %s is created successfully." % domain.name)
self.debug(
"Checking if the created domain is listed in list domains API")
@@ -2250,7 +2249,7 @@
def tearDownClass(cls):
try:
# Clean up, terminate the created resources
- cleanup_resources(cls.api_client, cls._cleanup)
+ cleanup_resources(cls.api_client, reversed(cls._cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
@@ -2287,7 +2286,7 @@
def tearDown(self):
try:
# Clean up, terminate the created resources
- cleanup_resources(self.apiclient, self.cleanup)
+ cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -2337,7 +2336,6 @@
else:
self.fail("It should not be allowed to move users across accounts in different domains, failing")
- account_different_domain.delete(self.api_client)
return
@attr(tags=["domains", "advanced", "advancedns", "simulator","dvs"], required_hardware="false")
diff --git a/test/integration/smoke/test_backup_recovery_dummy.py b/test/integration/smoke/test_backup_recovery_dummy.py
new file mode 100644
index 0000000..79f375c
--- /dev/null
+++ b/test/integration/smoke/test_backup_recovery_dummy.py
@@ -0,0 +1,152 @@
+#!/usr/bin/env 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 marvin.cloudstackTestCase import cloudstackTestCase
+from marvin.lib.utils import (cleanup_resources)
+from marvin.lib.base import (Account, ServiceOffering, VirtualMachine, BackupOffering, Configurations, Backup)
+from marvin.lib.common import (get_domain, get_zone, get_template)
+from nose.plugins.attrib import attr
+from marvin.codes import FAILED
+
+class TestDummyBackupAndRecovery(cloudstackTestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ # Setup
+
+ cls.testClient = super(TestDummyBackupAndRecovery, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+ cls.services = cls.testClient.getParsedTestDataConfig()
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.services["mode"] = cls.zone.networktype
+ cls.hypervisor = cls.testClient.getHypervisorInfo()
+ cls.domain = get_domain(cls.api_client)
+ cls.template = get_template(cls.api_client, cls.zone.id, cls.services["ostype"])
+ if cls.template == FAILED:
+ assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
+ cls.services["small"]["zoneid"] = cls.zone.id
+ cls.services["small"]["template"] = cls.template.id
+ cls.account = Account.create(cls.api_client, cls.services["account"], domainid=cls.domain.id)
+ cls.offering = ServiceOffering.create(cls.api_client,cls.services["service_offerings"]["small"])
+ cls.vm = VirtualMachine.create(cls.api_client, cls.services["small"], accountid=cls.account.name,
+ domainid=cls.account.domainid, serviceofferingid=cls.offering.id,
+ mode=cls.services["mode"])
+ cls._cleanup = [cls.offering, cls.account]
+
+ # Check backup configuration values, set them to enable the dummy provider
+
+ backup_enabled_cfg = Configurations.list(cls.api_client, name='backup.framework.enabled', zoneid=cls.zone.id)
+ backup_provider_cfg = Configurations.list(cls.api_client, name='backup.framework.provider.plugin', zoneid=cls.zone.id)
+ cls.backup_enabled = backup_enabled_cfg[0].value
+ cls.backup_provider = backup_provider_cfg[0].value
+
+ if cls.backup_enabled == "false":
+ Configurations.update(cls.api_client, 'backup.framework.enabled', value='true', zoneid=cls.zone.id)
+ if cls.backup_provider != "dummy":
+ Configurations.update(cls.api_client, 'backup.framework.provider.plugin', value='dummy', zoneid=cls.zone.id)
+
+ # Import a dummy backup offering to use on tests
+
+ cls.provider_offerings = BackupOffering.listExternal(cls.api_client, cls.zone.id)
+ cls.debug("Importing backup offering %s - %s" % (cls.provider_offerings[0].externalid, cls.provider_offerings[0].name))
+ cls.offering = BackupOffering.importExisting(cls.api_client, cls.zone.id, cls.provider_offerings[0].externalid,
+ cls.provider_offerings[0].name, cls.provider_offerings[0].description)
+ cls._cleanup.append(cls.offering)
+
+ @classmethod
+ def tearDownClass(cls):
+ try:
+ # Cleanup resources used
+ cleanup_resources(cls.api_client, cls._cleanup)
+
+ # Restore original backup framework values values
+ if cls.backup_enabled == "false":
+ Configurations.update(cls.api_client, 'backup.framework.enabled', value=cls.backup_enabled, zoneid=cls.zone.id)
+ if cls.backup_provider != "dummy":
+ Configurations.update(cls.api_client, 'backup.framework.provider.plugin', value=cls.backup_provider, zoneid=cls.zone.id)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+
+ def setUp(self):
+ self.apiclient = self.testClient.getApiClient()
+ self.dbclient = self.testClient.getDbConnection()
+ self.cleanup = []
+
+ def tearDown(self):
+ try:
+ cleanup_resources(self.apiclient, self.cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+
+ @attr(tags=["advanced", "backup"], required_hardware="false")
+ def test_import_backup_offering(self):
+ """
+ Import provider backup offering from Dummy Backup and Recovery Provider
+ """
+
+ # Import backup offering
+ provider_offering = self.provider_offerings[1]
+ self.debug("Importing backup offering %s - %s" % (provider_offering.externalid, provider_offering.name))
+ offering = BackupOffering.importExisting(self.apiclient, self.zone.id, provider_offering.externalid,
+ provider_offering.name, provider_offering.description)
+
+ # Verify offering is listed
+ imported_offering = BackupOffering.listByZone(self.apiclient, self.zone.id)
+ self.assertIsInstance(imported_offering, list, "List Backup Offerings should return a valid response")
+ self.assertNotEqual(len(imported_offering), 0, "Check if the list API returns a non-empty response")
+ matching_offerings = [x for x in imported_offering if x.id == offering.id]
+ self.assertNotEqual(len(matching_offerings), 0, "Check if there is a matching offering")
+
+ # Delete backup offering
+ self.debug("Deleting backup offering %s" % offering.id)
+ offering.delete(self.apiclient)
+
+ # Verify offering is not listed
+ imported_offering = BackupOffering.listByZone(self.apiclient, self.zone.id)
+ self.assertIsInstance(imported_offering, list, "List Backup Offerings should return a valid response")
+ matching_offerings = [x for x in imported_offering if x.id == offering.id]
+ self.assertEqual(len(matching_offerings), 0, "Check there is not a matching offering")
+
+ @attr(tags=["advanced", "backup"], required_hardware="false")
+ def test_vm_backup_lifecycle(self):
+ """
+ Test VM backup lifecycle
+ """
+
+ # Verify there are no backups for the VM
+ backups = Backup.list(self.apiclient, self.vm.id)
+ self.assertEqual(backups, None, "There should not exist any backup for the VM")
+
+ # Assign VM to offering and create ad-hoc backup
+ self.offering.assignOffering(self.apiclient, self.vm.id)
+ Backup.create(self.apiclient, self.vm.id)
+
+ # Verify backup is created for the VM
+ backups = Backup.list(self.apiclient, self.vm.id)
+ self.assertEqual(len(backups), 1, "There should exist only one backup for the VM")
+ backup = backups[0]
+
+ # Delete backup
+ Backup.delete(self.apiclient, backup.id)
+
+ # Verify backup is deleted
+ backups = Backup.list(self.apiclient, self.vm.id)
+ self.assertEqual(backups, None, "There should not exist any backup for the VM")
+
+ # Remove VM from offering
+ self.offering.removeOffering(self.apiclient, self.vm.id)
diff --git a/test/integration/smoke/test_create_network.py b/test/integration/smoke/test_create_network.py
new file mode 100644
index 0000000..7fe7cbb
--- /dev/null
+++ b/test/integration/smoke/test_create_network.py
@@ -0,0 +1,291 @@
+# 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.
+
+# Import Local Modules
+from nose.plugins.attrib import attr
+from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.sshClient import SshClient
+from marvin.lib.utils import (cleanup_resources,
+ random_gen)
+from marvin.lib.base import (Account,
+ Configurations,
+ Domain,
+ Network,
+ NetworkOffering,
+ PhysicalNetwork,
+ ServiceOffering,
+ Zone)
+from marvin.lib.common import (get_domain,
+ get_zone,
+ get_free_vlan)
+import logging
+import random
+
+class TestNetworkManagement(cloudstackTestCase):
+ @classmethod
+ def setUpClass(cls):
+ cls.testClient = super(
+ TestNetworkManagement,
+ cls).getClsTestClient()
+ cls.apiclient = cls.testClient.getApiClient()
+ cls.dbclient = cls.testClient.getDbConnection()
+ cls.testdata = cls.testClient.getParsedTestDataConfig()
+ cls.services = cls.testClient.getParsedTestDataConfig()
+ zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests())
+ cls.zone = Zone(zone.__dict__)
+ cls._cleanup = []
+
+ cls.logger = logging.getLogger("TestNetworkManagement")
+ cls.stream_handler = logging.StreamHandler()
+ cls.logger.setLevel(logging.DEBUG)
+ cls.logger.addHandler(cls.stream_handler)
+
+ # Get Zone, Domain and templates
+ cls.domain = get_domain(cls.apiclient)
+ testClient = super(TestNetworkManagement, cls).getClsTestClient()
+ cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
+ cls.services['mode'] = cls.zone.networktype
+ # Create new domain, account, network and VM
+ cls.user_domain = Domain.create(
+ cls.apiclient,
+ services=cls.testdata["acl"]["domain2"],
+ parentdomainid=cls.domain.id)
+
+ # Create account
+ cls.account = Account.create(
+ cls.apiclient,
+ cls.testdata["acl"]["accountD2"],
+ admin=True,
+ domainid=cls.user_domain.id
+ )
+
+ # Create small service offering
+ cls.service_offering = ServiceOffering.create(
+ cls.apiclient,
+ cls.testdata["service_offerings"]["small"]
+ )
+
+ cls._cleanup.append(cls.service_offering)
+ cls._cleanup.append(cls.account)
+ cls._cleanup.append(cls.user_domain)
+
+ @classmethod
+ def tearDownClass(self):
+ try:
+ cleanup_resources(self.apiclient, self._cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ def setUp(self):
+ self.apiclient = self.testClient.getApiClient()
+ self.cleanup = []
+ return
+
+ def tearDown(self):
+ try:
+ cleanup_resources(self.apiclient, self.cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ @attr(tags=["adeancedsg"], required_hardware="false")
+ def test_01_create_network_without_start_end_ip(self):
+ """Create Shared network without start and end ip
+
+ Steps:
+ # 1. Update the global setting allow.empty.start.end.ipaddress to true
+ # 2. Create a shared network without specifying start or end ip
+ # 3. This should create the network
+ # 4. Now Update the global setting allow.empty.start.end.ipaddress to false
+ # 5. Create a shared network without specifying start or end ip
+ # 6. Exception should be thrown since start and end ip are not specified
+ :return:
+ """
+ # Create network offering
+ self.network_offering = NetworkOffering.create(
+ self.apiclient,
+ self.testdata["network_offering_shared"]
+ )
+
+ NetworkOffering.update(
+ self.network_offering,
+ self.apiclient,
+ id=self.network_offering.id,
+ state="enabled"
+ )
+
+ physical_network, vlan = get_free_vlan(self.apiclient, self.zone.id)
+ self.testdata["shared_network_sg"]["physicalnetworkid"] = physical_network.id
+
+ random_subnet_number = random.randrange(100, 199)
+ self.testdata["shared_network_sg"]["specifyVlan"] = 'True'
+ self.testdata["shared_network_sg"]["specifyIpRanges"] = 'True'
+ self.testdata["shared_network_sg"]["name"] = "Shared-Network-SG-Test-vlan" + str(random_subnet_number)
+ self.testdata["shared_network_sg"]["displaytext"] = "Shared-Network-SG-Test-vlan" + str(random_subnet_number)
+ self.testdata["shared_network_sg"]["vlan"] = "vlan://" + str(random_subnet_number)
+ self.testdata["shared_network_sg"]["startip"] = None
+ self.testdata["shared_network_sg"]["endip"] = None
+ self.testdata["shared_network_sg"]["gateway"] = "192.168." + str(random_subnet_number) + ".254"
+ self.testdata["shared_network_sg"]["netmask"] = "255.255.255.0"
+ self.testdata["shared_network_sg"]["acltype"] = "account"
+
+ # Update the global setting to true
+ Configurations.update(self.apiclient,
+ name="allow.empty.start.end.ipaddress",
+ value="true"
+ )
+
+ # Create network
+ network = Network.create(
+ self.apiclient,
+ self.testdata["shared_network_sg"],
+ networkofferingid=self.network_offering.id,
+ zoneid=self.zone.id,
+ accountid=self.account.name,
+ domainid=self.account.domainid
+ )
+
+ self.logger.info("network id is %s" % network.id)
+ self.cleanup.append(network)
+
+ # Update the global setting to false
+ Configurations.update(self.apiclient,
+ name="allow.empty.start.end.ipaddress",
+ value="false"
+ )
+
+ # Exception should be thrown
+ with self.assertRaises(Exception):
+ self.testdata["shared_network_sg"]["vlan"] = "vlan://" + str(random_subnet_number)
+ network2 = Network.create(
+ self.apiclient,
+ self.testdata["shared_network_sg"],
+ networkofferingid=self.network_offering.id,
+ zoneid=self.zone.id,
+ accountid=self.account.name,
+ domainid=self.account.domainid
+ )
+
+ # Restore the setting to default value which is true
+ Configurations.update(self.apiclient,
+ name="allow.empty.start.end.ipaddress",
+ value="true"
+ )
+
+ self.cleanup.append(self.network_offering)
+
+ @attr(tags=["adeancedsg"], required_hardware="false")
+ def test_02_create_network_with_same_name(self):
+ """Create Shared network with same name in same account
+
+ Steps:
+ # 1. Update the global setting allow.duplicate.networkname to true
+ # 2. Create a shared network in an account
+ # 3. Try to create another shared network with same name in the same account
+ # 4. No exception should be thrown as multiple networks with same name can be created
+ # 5. Now update the global setting allow.duplicate.networkname to false
+ # 6. Try to create another shared network with same name in the same account
+ # 7. Exception should be thrown as network with same name cant be created in the same account
+ :return:
+ """
+ # Update the global setting to true
+ Configurations.update(self.apiclient,
+ name="allow.duplicate.networkname",
+ value="true"
+ )
+
+ # Create network offering
+ self.network_offering = NetworkOffering.create(
+ self.apiclient,
+ self.testdata["network_offering_shared"]
+ )
+
+ NetworkOffering.update(
+ self.network_offering,
+ self.apiclient,
+ id=self.network_offering.id,
+ state="enabled"
+ )
+
+ physical_network, vlan = get_free_vlan(self.apiclient, self.zone.id)
+ self.testdata["shared_network_sg"]["physicalnetworkid"] = physical_network.id
+
+ random_subnet_number = random.randrange(100, 199)
+ self.testdata["shared_network_sg"]["specifyVlan"] = 'True'
+ self.testdata["shared_network_sg"]["specifyIpRanges"] = 'True'
+ self.testdata["shared_network_sg"]["name"] = "Shared-Network-SG-Test-vlan-1"
+ self.testdata["shared_network_sg"]["displaytext"] = "Shared-Network-SG-Test-vlan-1"
+ self.testdata["shared_network_sg"]["vlan"] = "vlan://" + str(random_subnet_number)
+ self.testdata["shared_network_sg"]["startip"] = "192.168." + str(random_subnet_number) + ".1"
+ self.testdata["shared_network_sg"]["endip"] = "192.168." + str(random_subnet_number) + ".10"
+ self.testdata["shared_network_sg"]["gateway"] = "192.168." + str(random_subnet_number) + ".254"
+ self.testdata["shared_network_sg"]["netmask"] = "255.255.255.0"
+ self.testdata["shared_network_sg"]["acltype"] = "account"
+
+ # Create the first network
+ network3 = Network.create(
+ self.apiclient,
+ self.testdata["shared_network_sg"],
+ networkofferingid=self.network_offering.id,
+ zoneid=self.zone.id,
+ accountid=self.account.name,
+ domainid=self.account.domainid
+ )
+ self.cleanup.append(network3)
+
+ # Create the second network with same name. No exception should be thrown
+ random_subnet_number = random.randrange(100, 199)
+ self.testdata["shared_network_sg"]["vlan"] = "vlan://" + str(random_subnet_number)
+ network4 = Network.create(
+ self.apiclient,
+ self.testdata["shared_network_sg"],
+ networkofferingid=self.network_offering.id,
+ zoneid=self.zone.id,
+ accountid=self.account.name,
+ domainid=self.account.domainid
+ )
+
+ self.cleanup.append(network4)
+
+ # Update the global setting to true
+ Configurations.update(self.apiclient,
+ name="allow.duplicate.networkname",
+ value="false"
+ )
+
+ # Exception should be thrown while creating another network with same name
+ with self.assertRaises(Exception):
+ random_subnet_number = random.randrange(100, 199)
+ self.testdata["shared_network_sg"]["vlan"] = "vlan://" + str(random_subnet_number)
+ network5 = Network.create(
+ self.apiclient,
+ self.testdata["shared_network_sg"],
+ networkofferingid=self.network_offering.id,
+ zoneid=self.zone.id,
+ accountid=self.account.name,
+ domainid=self.account.domainid
+ )
+
+ # Update the global setting to original value
+ Configurations.update(self.apiclient,
+ name="allow.duplicate.networkname",
+ value="true"
+ )
+
+ self.cleanup.append(self.network_offering)
+
diff --git a/test/integration/smoke/test_deploy_vm_extra_config_data.py b/test/integration/smoke/test_deploy_vm_extra_config_data.py
new file mode 100644
index 0000000..63e0040
--- /dev/null
+++ b/test/integration/smoke/test_deploy_vm_extra_config_data.py
@@ -0,0 +1,542 @@
+# 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.
+""" BVT tests for Virtual Machine additional configuration
+"""
+# Import System modules
+import urllib
+import xml.etree.ElementTree as ET
+
+from lxml import etree
+from marvin.cloudstackAPI import (updateVirtualMachine,
+ deployVirtualMachine,
+ destroyVirtualMachine,
+ stopVirtualMachine,
+ startVirtualMachine,
+ updateConfiguration,
+ listVirtualMachines)
+# Import Local Modules
+from marvin.cloudstackTestCase import cloudstackTestCase
+from marvin.lib.base import (Account,
+ ServiceOffering,
+ )
+from marvin.lib.common import (get_domain,
+ get_zone,
+ get_template,
+ list_hosts)
+from marvin.lib.utils import *
+from nose.plugins.attrib import attr
+
+class TestAddConfigtoDeployVM(cloudstackTestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ testClient = super(TestAddConfigtoDeployVM, cls).getClsTestClient()
+ cls.apiclient = testClient.getApiClient()
+ cls.services = testClient.getParsedTestDataConfig()
+
+ # Get Zone, Domain and templates
+ cls.domain = get_domain(cls.apiclient)
+ cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
+ cls.hypervisor = testClient.getHypervisorInfo()
+ cls.services['mode'] = cls.zone.networktype
+ cls.hostConfig = cls.config.__dict__["zones"][0].__dict__["pods"][0].__dict__["clusters"][0].__dict__["hosts"][
+ 0].__dict__
+
+ # Set Zones and disk offerings
+ cls.services["small"]["zoneid"] = cls.zone.id
+
+ cls.services["iso1"]["zoneid"] = cls.zone.id
+
+ cls.services["virtual_machine"]["zoneid"] = cls.zone.id
+
+ # Create an account, network, and IP addresses
+ cls.account = Account.create(
+ cls.apiclient,
+ cls.services["account"],
+ domainid=cls.domain.id
+ )
+ cls.service_offering = ServiceOffering.create(
+ cls.apiclient,
+ cls.services["service_offerings"]["small"]
+ )
+
+ cls.cleanup = [
+ cls.account,
+ cls.service_offering
+ ]
+
+ @classmethod
+ def tearDownClass(cls):
+ try:
+ cls.apiclient = super(TestAddConfigtoDeployVM, cls).getClsTestClient().getApiClient()
+ # Clean up, terminate the created templates
+ cleanup_resources(cls.apiclient, cls.cleanup)
+
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+
+ def setUp(self):
+ self.apiclient = self.testClient.getApiClient()
+ self.hypervisor = self.testClient.getHypervisorInfo()
+ self.dbclient = self.testClient.getDbConnection()
+
+ """
+ Set EnableAdditionalData to true
+ """
+ updateConfigurationCmd = updateConfiguration.updateConfigurationCmd()
+ updateConfigurationCmd.name = "enable.additional.vm.configuration"
+ updateConfigurationCmd.value = "true"
+ updateConfigurationCmd.scopename = "account"
+ updateConfigurationResponse = self.apiclient.updateConfiguration(updateConfigurationCmd)
+ self.debug("updated the parameter %s with value %s" % (
+ updateConfigurationResponse.name, updateConfigurationResponse.value))
+
+ # Ste Global Config value
+ def add_global_config(self, name, value):
+ self.apiclient = self.testClient.getApiClient()
+ self.hypervisor = self.testClient.getHypervisorInfo()
+ self.dbclient = self.testClient.getDbConnection()
+
+ cmd = updateConfiguration.updateConfigurationCmd()
+ cmd.name = name
+ cmd.value = value
+ return self.apiclient.updateConfiguration(cmd)
+
+ # Compare XML Element objects
+ def elements_equal(self, e1, e2):
+ if e1.tag != e2.tag:
+ return False
+ if e1.attrib != e2.attrib:
+ return False
+ if len(e1) != len(e2):
+ return False
+ return all(self.elements_equal(c1, c2) for c1, c2 in zip(e1, e2))
+
+ def destroy_vm(self, vm_id):
+ cmd = destroyVirtualMachine.destroyVirtualMachineCmd()
+ cmd.expunge = True
+ cmd.id = vm_id
+ return self.apiclient.destroyVirtualMachine(cmd)
+
+ def deploy_vm(self, hypervisor, extra_config=None):
+ cmd = deployVirtualMachine.deployVirtualMachineCmd()
+ if extra_config is not None:
+ cmd.extraconfig = extra_config
+
+ template = get_template(
+ self.apiclient,
+ self.zone.id,
+ hypervisor=hypervisor
+ )
+ cmd.zoneid = self.zone.id
+ cmd.templateid = template.id
+ cmd.serviceofferingid = self.service_offering.id
+ return self.apiclient.deployVirtualMachine(cmd)
+
+ def list_vm(self):
+ cmd = listVirtualMachines.listVirtualMachinesCmd()
+ cmd.hypervisor = self.hypervisor
+ return self.apiclient.listVirtualMachines(cmd)[0]
+
+ def update_vm(self, id, extra_config):
+ cmd = updateVirtualMachine.updateVirtualMachineCmd()
+ cmd.id = id
+ cmd.extraconfig = extra_config
+ return self.apiclient.updateVirtualMachine(cmd)
+
+ def stop_vm(self, id):
+ cmd = stopVirtualMachine.stopVirtualMachineCmd()
+ cmd.id = id
+ return self.apiclient.stopVirtualMachine(cmd)
+
+ def start_vm(self, id):
+ cmd = startVirtualMachine.startVirtualMachineCmd()
+ cmd.id = id
+ return self.apiclient.startVirtualMachine(cmd)
+
+ # Parse extraconfig for config with that returned by xe vm-param-get ...
+ def get_xen_param_values(self, config):
+ equal_sign_index = config.index("=")
+ cmd_option = config[:equal_sign_index]
+ cmd_value = config[equal_sign_index + 1:]
+ return cmd_option, cmd_value
+
+ # Format vm config such that it equals the one from vmx file
+ def prepare_vmware_config(self, config):
+ equal_sign_index = config.index("=")
+ cmd_option = config[:equal_sign_index]
+ cmd_value = config[equal_sign_index + 1:]
+ return cmd_option + ' = ' '"{}"'.format(cmd_value)
+
+ # Get vm uuid from xenserver host
+ def get_vm_uuid(self, instance_name, ssh_client):
+ cmd = 'xe vm-list name-label={} params=uuid '.format(instance_name)
+ result = ssh_client.execute(cmd)
+ uuid_str = result[0]
+ i = uuid_str.index(":")
+ return uuid_str[i + 1:].strip()
+
+ @attr(tags=["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="true")
+ def test_01_deploy_vm_with_extraconfig_throws_exception_kvm(self):
+ '''
+ Test that extra config is not added when element tag is not added on the allowed list global config on KVM hosts
+ '''
+
+ hypervisor = self.hypervisor.lower()
+ if hypervisor != 'kvm':
+ raise self.skipTest("Skipping test case for non-kvm hypervisor")
+
+ '''
+ The following extraconfig is required for enabling hugepages on kvm
+ <memoryBacking>
+ <hugepages/>
+ </memoryBacking>
+ url encoded extra_config = '%3CmemoryBacking%3E%0D%0A++%3Chugepages%2F%3E%0D%0A%3C%2FmemoryBacking%3E'
+ '''
+ extraconfig = "%3CmemoryBacking%3E%0D%0A++%3Chugepages%2F%3E%0D%0A%3C%2FmemoryBacking%3E"
+
+ try:
+ # Clear KVM allow list to show that code throws exception when command is not included in the list
+ name = 'allow.additional.vm.configuration.list.kvm'
+
+ self.add_global_config(name, "")
+ self.assertRaises(Exception,
+ self.deploy_vm(hypervisor, extraconfig),
+ "Exception was not thrown, check kvm global configuration")
+ except Exception as e:
+ logging.debug(e)
+ finally:
+ self.destroy_vm(self.list_vm().id)
+
+ @attr(tags=["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="true")
+ def test_02_deploy_vm_with_extraconfig_kvm(self):
+ '''
+ Test that extra config is added on KVM hosts
+ '''
+
+ hypervisor = self.hypervisor.lower()
+ if hypervisor != 'kvm':
+ raise self.skipTest("Skipping test case for non-kvm hypervisor")
+
+ name = 'allow.additional.vm.configuration.list.kvm'
+ value = 'memoryBacking, hugepages, unsedConfigKey'
+
+ add_config_response = self.add_global_config(name, value)
+
+ if add_config_response.name:
+ try:
+ '''
+ The following extraconfig is required for enabling hugepages on kvm
+ <memoryBacking>
+ <hugepages/>
+ </memoryBacking>
+ url encoded extra_config = '%3CmemoryBacking%3E%0D%0A++%3Chugepages%2F%3E%0D%0A%3C%2FmemoryBacking%3E'
+ '''
+ extraconfig = "%3CmemoryBacking%3E%0D%0A++%3Chugepages%2F%3E%0D%0A%3C%2FmemoryBacking%3E"
+
+ response = self.deploy_vm(hypervisor, extraconfig)
+
+ host_id = response.hostid
+ host = list_hosts(
+ self.apiclient,
+ id=host_id,
+ hypervisor=hypervisor)
+
+ instance_name = response.instancename
+ host_ipaddress = host[0].ipaddress
+
+ ssh_client = SshClient(host_ipaddress, port=22,
+ user=self.hostConfig['username'],
+ passwd=self.hostConfig['password'])
+ virsh_cmd = 'virsh dumpxml %s' % instance_name
+ xml_res = ssh_client.execute(virsh_cmd)
+ xml_as_str = ''.join(xml_res)
+
+ extraconfig_decoded_xml = '<config>' + urllib.unquote(extraconfig) + '</config>'
+
+ # Root XML Elements
+ parser = etree.XMLParser(remove_blank_text=True)
+ domain_xml_root = ET.fromstring(xml_as_str, parser=parser)
+ decoded_xml_root = ET.fromstring(extraconfig_decoded_xml, parser=parser)
+ for child in decoded_xml_root:
+ find_element_in_domain_xml = domain_xml_root.find(child.tag)
+
+ # Fail if extra config is not found in domain xml
+ self.assertNotEquals(
+ 0,
+ len(find_element_in_domain_xml),
+ 'Element tag from extra config not added to VM'
+ )
+
+ # Compare found XML node with extra config node
+ is_a_match = self.elements_equal(child, find_element_in_domain_xml)
+ self.assertEquals(
+ True,
+ is_a_match,
+ 'The element from tags from extra config do not match with those found in domain xml'
+ )
+ finally:
+ self.destroy_vm(response.id)
+ self.add_global_config(name, "")
+
+ @attr(tags=["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="true")
+ def test_03_update_vm_with_extraconfig_kvm(self):
+ '''
+ Test that extra config is added on KVM hosts
+ '''
+
+ hypervisor = self.hypervisor.lower()
+ if hypervisor != 'kvm':
+ raise self.skipTest("Skipping test case for non-kvm hypervisor")
+
+ name = 'allow.additional.vm.configuration.list.kvm'
+ value = 'memoryBacking, hugepages'
+
+ add_config_response = self.add_global_config(name, value)
+
+ if add_config_response.name:
+ try:
+ '''
+ The following extraconfig is required for enabling hugepages on kvm
+ <memoryBacking>
+ <hugepages/>
+ </memoryBacking>
+ url encoded extra_config = '%3CmemoryBacking%3E%0D%0A++%3Chugepages%2F%3E%0D%0A%3C%2FmemoryBacking%3E'
+ '''
+ extraconfig = "%3CmemoryBacking%3E%0D%0A++%3Chugepages%2F%3E%0D%0A%3C%2FmemoryBacking%3E"
+
+ response = self.deploy_vm(hypervisor)
+ vm_id = response.id
+
+ '''
+ For updateVirtualMachineCmd, the VM must be stopped and restarted for changes to take effect
+ '''
+ self.stop_vm(vm_id)
+ self.update_vm(vm_id, extraconfig)
+ start_resp = self.start_vm(vm_id)
+
+ host_id = start_resp.hostid
+ host = list_hosts(
+ self.apiclient,
+ id=host_id,
+ hypervisor=hypervisor)
+
+ instance_name = response.instancename
+ host_ipaddress = host[0].ipaddress
+
+ ssh_client = SshClient(host_ipaddress, port=22,
+ user=self.hostConfig['username'],
+ passwd=self.hostConfig['password'])
+ virsh_cmd = 'virsh dumpxml %s' % instance_name
+ xml_res = ssh_client.execute(virsh_cmd)
+ xml_as_str = ''.join(xml_res)
+
+ extraconfig_decoded_xml = '<config>' + urllib.unquote(extraconfig) + '</config>'
+
+ # Root XML Elements
+ parser = etree.XMLParser(remove_blank_text=True)
+ domain_xml_root = ET.fromstring(xml_as_str, parser=parser)
+ decoded_xml_root = ET.fromstring(extraconfig_decoded_xml, parser=parser)
+ for child in decoded_xml_root:
+ find_element_in_domain_xml = domain_xml_root.find(child.tag)
+
+ # Fail if extra config is not found in domain xml
+ self.assertNotEquals(
+ 0,
+ len(find_element_in_domain_xml),
+ 'Element tag from extra config not added to VM'
+ )
+
+ # Compare found XML node with extra config node
+ is_a_match = self.elements_equal(child, find_element_in_domain_xml)
+ self.assertEquals(
+ True,
+ is_a_match,
+ 'The element from tags from extra config do not match with those found in domain xml'
+ )
+ finally:
+ self.destroy_vm(vm_id)
+ self.add_global_config(name, "")
+
+ @attr(tags=["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="true")
+ def test_04_deploy_vm_with_extraconfig_throws_exception_vmware(self):
+ '''
+ Test that extra config is not added when configuration key is not added on the allowed list global config for VMWARE hosts
+ '''
+
+ hypervisor = self.hypervisor.lower()
+ if hypervisor != 'vmware':
+ raise self.skipTest("Skipping test case for non-vmware hypervisor")
+
+ '''
+ The following extra configuration is used to set Hyper-V instance to run on ESXi host
+ hypervisor.cpuid.v0 = FALSE
+ '''
+ extraconfig = 'hypervisor.cpuid.v0%3DFALSE'
+
+ try:
+ # Clear VMWARE allow list to show that code throws exception when command is not included in the list
+ name = 'allow.additional.vm.configuration.list.vmware'
+
+ self.add_global_config(name, "")
+ self.assertRaises(Exception,
+ self.deploy_vm(hypervisor, extraconfig),
+ "Exception was not thrown, check VMWARE global configuration")
+ except Exception as e:
+ logging.debug(e)
+ finally:
+ self.destroy_vm(self.list_vm().id)
+
+ @attr(tags=["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="true")
+ def test_05_deploy_vm_with_extraconfig_vmware(self):
+ '''
+ Test that extra config is added on VMware hosts
+ '''
+ hypervisor = self.hypervisor.lower()
+ if hypervisor != 'vmware':
+ raise self.skipTest("Skipping test case for non-vmware hypervisor")
+
+ name = 'allow.additional.vm.configuration.list.vmware'
+ value = 'hypervisor.cpuid.v0'
+
+ add_config_response = self.add_global_config(name, value)
+
+ if add_config_response.name:
+
+ '''
+ The following extra configuration is used to set Hyper-V instance to run on ESXi host
+ hypervisor.cpuid.v0 = FALSE
+ '''
+ extraconfig = 'hypervisor.cpuid.v0%3DFALSE'
+ try:
+ response = self.deploy_vm(hypervisor, extraconfig)
+ host_id = response.hostid
+ host = list_hosts(
+ self.apiclient,
+ id=host_id)
+
+ instance_name = response.instancename
+ host_ipaddress = host[0].ipaddress
+
+ ssh_client = SshClient(host_ipaddress, port=22,
+ user=self.hostConfig['username'],
+ passwd=self.hostConfig['password'])
+
+ extraconfig_decoded = urllib.unquote(extraconfig)
+ config_arr = extraconfig_decoded.splitlines()
+
+ for config in config_arr:
+ vmx_config = self.prepare_vmware_config(config)
+ vmx_file_name = "\"$(esxcli vm process list | grep %s | tail -1 | awk '{print $3}')\"" % instance_name
+ # parse vm instance vmx file to see if extraconfig has been added
+ grep_config = "cat %s | grep -w '%s'" % (vmx_file_name, vmx_config)
+ result = ssh_client.execute(grep_config)
+ # Match exact configuration from vmx file, return empty result array if configuration is not found
+ self.assertNotEquals(
+ 0,
+ len(result),
+ 'Extra configuration not found in instance vmx file'
+ )
+ finally:
+ self.destroy_vm(response.id)
+ self.add_global_config(name, "")
+
+ @attr(tags=["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="true")
+ def test_06_deploy_vm_with_extraconfig_throws_exception_xenserver(self):
+ '''
+ Test that extra config is not added when configuration key is not added on the allowed list global config for XenServer hosts
+ '''
+
+ hypervisor = self.hypervisor.lower()
+ if hypervisor != 'xenserver':
+ raise self.skipTest("Skipping test case for non-xenserver hypervisor")
+
+ '''
+ Following commands are used to convert a VM from HVM to PV and set using vm-param-set
+ HVM-boot-policy=
+ PV-bootloader=pygrub
+ PV-args=hvc0
+ '''
+
+ extraconfig = 'HVM-boot-policy%3D%0APV-bootloader%3Dpygrub%0APV-args%3Dhvc0'
+
+ try:
+ # Clear VMWARE allow list to show that code throws exception when command is not included in the list
+ name = 'allow.additional.vm.configuration.list.xenserver'
+
+ self.add_global_config(name, "")
+ self.assertRaises(Exception,
+ self.deploy_vm(hypervisor, extraconfig),
+ "Exception was not thrown, check XenServer global configuration")
+
+ except Exception as e:
+ logging.debug(e)
+ finally:
+ self.destroy_vm(self.list_vm().id)
+
+ @attr(tags=["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="true")
+ def test_07_deploy_vm_with_extraconfig_xenserver(self):
+ hypervisor = self.hypervisor.lower()
+ if hypervisor != 'xenserver':
+ raise self.skipTest("Skipping test case for non-xenserver hypervisor")
+ """
+ Following commands are used to convert a VM from HVM to PV and set using vm-param-set
+ HVM-boot-policy=
+ PV-bootloader=pygrub
+ PV-args=hvc0
+ """
+
+ name = 'allow.additional.vm.configuration.list.xenserver'
+ value = 'HVM-boot-policy, PV-bootloader, PV-args'
+
+ add_config_response = self.add_global_config(name, value)
+
+ if add_config_response.name:
+ extraconfig = 'HVM-boot-policy%3D%0APV-bootloader%3Dpygrub%0APV-args%3Dhvc0'
+ try:
+ response = self.deploy_vm(hypervisor, extraconfig)
+ host_id = response.hostid
+ host = list_hosts(
+ self.apiclient,
+ id=host_id)
+
+ host_ipaddress = host[0].ipaddress
+
+ ssh_client = SshClient(host_ipaddress, port=22,
+ user=self.hostConfig['username'],
+ passwd=self.hostConfig['password'])
+
+ extraconfig_decoded = urllib.unquote(extraconfig)
+ config_arr = extraconfig_decoded.splitlines()
+
+ # Get vm instance uuid
+ instance_uuid = self.get_vm_uuid(response.instancename, ssh_client)
+ for config in config_arr:
+ config_tuple = self.get_xen_param_values(config)
+ # Log on to XenServer host and check the vm-param-get
+ vm_config_check = 'xe vm-param-get param-name={} uuid={}'.format(config_tuple[0], instance_uuid)
+ result = ssh_client.execute(vm_config_check)
+ param_value = config_tuple[1].strip()
+ # Check if each configuration command has set the configuration as sent with extraconfig
+ self.assertEquals(
+ param_value,
+ result[0],
+ 'Extra configuration not found in VM param list'
+ )
+ finally:
+ self.destroy_vm(response.id)
+ self.add_global_config(name, "")
diff --git a/test/integration/smoke/test_diagnostics.py b/test/integration/smoke/test_diagnostics.py
index 6364d83..810dbb8 100644
--- a/test/integration/smoke/test_diagnostics.py
+++ b/test/integration/smoke/test_diagnostics.py
@@ -16,11 +16,12 @@
# under the License.
""" BVT tests for remote diagnostics of system VMs
"""
+import urllib
+
+from marvin.cloudstackAPI import (runDiagnostics, getDiagnosticsData)
+from marvin.cloudstackTestCase import cloudstackTestCase
# Import Local Modules
from marvin.codes import FAILED
-from marvin.cloudstackTestCase import cloudstackTestCase
-from marvin.cloudstackAPI import runDiagnostics
-from marvin.lib.utils import (cleanup_resources)
from marvin.lib.base import (Account,
ServiceOffering,
VirtualMachine)
@@ -29,7 +30,7 @@
get_test_template,
list_ssvms,
list_routers)
-
+from marvin.lib.utils import (cleanup_resources)
from nose.plugins.attrib import attr
@@ -537,3 +538,197 @@
cmd_response.exitcode,
'Failed to run remote Traceroute in CPVM'
)
+
+ '''
+ Add Get Diagnostics data BVT
+ '''
+
+ @attr(tags=["advanced", "advancedns", "ssh", "smoke"], required_hardware="true")
+ def test_13_retrieve_vr_default_files(self):
+ list_router_response = list_routers(
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
+ self.assertEqual(
+ isinstance(list_router_response, list),
+ True,
+ "Check list response returns a valid list"
+ )
+
+ router = list_router_response[0]
+ self.debug('Setting up VR with ID %s' % router.id)
+ cmd = getDiagnosticsData.getDiagnosticsDataCmd()
+ cmd.targetid = router.id
+
+ response = self.apiclient.getDiagnosticsData(cmd)
+ is_valid_url = self.check_url(response.url)
+
+ self.assertEqual(
+ True,
+ is_valid_url,
+ msg="Failed to create valid download url response"
+ )
+
+ def check_url(self, url):
+ import urllib2
+ try:
+ r = urllib.urlopen(url)
+ if r.code == 200:
+ return True
+ except urllib2.HTTPError:
+ return False
+ except urllib2.URLError:
+ return False
+ return True
+
+ @attr(tags=["advanced", "advancedns", "ssh", "smoke"], required_hardware="true")
+ def test_14_retrieve_vr_one_file(self):
+ list_router_response = list_routers(
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
+ self.assertEqual(
+ isinstance(list_router_response, list),
+ True,
+ "Check list response returns a valid list"
+ )
+
+ router = list_router_response[0]
+ self.debug('Setting up VR with ID %s' % router.id)
+ cmd = getDiagnosticsData.getDiagnosticsDataCmd()
+ cmd.targetid = router.id
+ cmd.type = "/var/log/cloud.log"
+
+ response = self.apiclient.getDiagnosticsData(cmd)
+
+ is_valid_url = self.check_url(response.url)
+
+ self.assertEqual(
+ True,
+ is_valid_url,
+ msg="Failed to create valid download url response"
+ )
+
+ @attr(tags=["advanced", "advancedns", "ssh", "smoke"], required_hardware="true")
+ def test_15_retrieve_ssvm_default_files(self):
+ list_ssvm_response = list_ssvms(
+ self.apiclient,
+ systemvmtype='secondarystoragevm',
+ state='Running',
+ )
+
+ self.assertEqual(
+ isinstance(list_ssvm_response, list),
+ True,
+ 'Check list response returns a valid list'
+ )
+ ssvm = list_ssvm_response[0]
+
+ self.debug('Setting up SSVM with ID %s' % ssvm.id)
+
+ cmd = getDiagnosticsData.getDiagnosticsDataCmd()
+ cmd.targetid = ssvm.id
+
+ response = self.apiclient.getDiagnosticsData(cmd)
+
+ is_valid_url = self.check_url(response.url)
+
+ self.assertEqual(
+ True,
+ is_valid_url,
+ msg="Failed to create valid download url response"
+ )
+
+ @attr(tags=["advanced", "advancedns", "ssh", "smoke"], required_hardware="true")
+ def test_16_retrieve_ssvm_single_file(self):
+ list_ssvm_response = list_ssvms(
+ self.apiclient,
+ systemvmtype='secondarystoragevm',
+ state='Running',
+ )
+
+ self.assertEqual(
+ isinstance(list_ssvm_response, list),
+ True,
+ 'Check list response returns a valid list'
+ )
+ ssvm = list_ssvm_response[0]
+
+ self.debug('Setting up SSVM with ID %s' % ssvm.id)
+
+ cmd = getDiagnosticsData.getDiagnosticsDataCmd()
+ cmd.targetid = ssvm.id
+ cmd.type = "/var/log/cloud.log"
+
+ response = self.apiclient.getDiagnosticsData(cmd)
+
+ is_valid_url = self.check_url(response.url)
+
+ self.assertEqual(
+ True,
+ is_valid_url,
+ msg="Failed to create valid download url response"
+ )
+
+ @attr(tags=["advanced", "advancedns", "ssh", "smoke"], required_hardware="true")
+ def test_17_retrieve_cpvm_default_files(self):
+ list_cpvm_response = list_ssvms(
+ self.apiclient,
+ systemvmtype='consoleproxy',
+ state='Running',
+ )
+
+ self.assertEqual(
+ isinstance(list_cpvm_response, list),
+ True,
+ 'Check list response returns a valid list'
+ )
+ cpvm = list_cpvm_response[0]
+
+ self.debug('Setting up CPVM with ID %s' % cpvm.id)
+
+ cmd = getDiagnosticsData.getDiagnosticsDataCmd()
+ cmd.targetid = cpvm.id
+
+ response = self.apiclient.getDiagnosticsData(cmd)
+
+ is_valid_url = self.check_url(response.url)
+
+ self.assertEqual(
+ True,
+ is_valid_url,
+ msg="Failed to create valid download url response"
+ )
+
+ @attr(tags=["advanced", "advancedns", "ssh", "smoke"], required_hardware="true")
+ def test_18_retrieve_cpvm_single_file(self):
+ list_cpvm_response = list_ssvms(
+ self.apiclient,
+ systemvmtype='consoleproxy',
+ state='Running',
+ )
+
+ self.assertEqual(
+ isinstance(list_cpvm_response, list),
+ True,
+ 'Check list response returns a valid list'
+ )
+ cpvm = list_cpvm_response[0]
+
+ self.debug('Setting up CPVM with ID %s' % cpvm.id)
+
+ cmd = getDiagnosticsData.getDiagnosticsDataCmd()
+ cmd.targetid = cpvm.id
+ cmd.type = "/var/log/cloud.log"
+
+ response = self.apiclient.getDiagnosticsData(cmd)
+
+ is_valid_url = self.check_url(response.url)
+
+ self.assertEqual(
+ True,
+ is_valid_url,
+ msg="Failed to create valid download url response"
+ )
diff --git a/test/integration/smoke/test_direct_download.py b/test/integration/smoke/test_direct_download.py
index 132deb4..324fb59 100644
--- a/test/integration/smoke/test_direct_download.py
+++ b/test/integration/smoke/test_direct_download.py
@@ -23,12 +23,14 @@
NetworkOffering,
Network,
Template,
- VirtualMachine)
+ VirtualMachine,
+ StoragePool)
from marvin.lib.common import (get_pod,
get_zone)
from nose.plugins.attrib import attr
from marvin.cloudstackAPI import (uploadTemplateDirectDownloadCertificate, revokeTemplateDirectDownloadCertificate)
from marvin.lib.decoratorGenerators import skipTestIf
+import uuid
class TestUploadDirectDownloadCertificates(cloudstackTestCase):
@@ -90,7 +92,7 @@
cmd = uploadTemplateDirectDownloadCertificate.uploadTemplateDirectDownloadCertificateCmd()
cmd.hypervisor = self.hypervisor
- cmd.name = "marvin-test-verify-certs"
+ cmd.name = "marvin-test-verify-certs" + str(uuid.uuid1())
cmd.certificate = self.certificates["invalid"]
cmd.zoneid = self.zone.id
@@ -125,7 +127,7 @@
cmd = uploadTemplateDirectDownloadCertificate.uploadTemplateDirectDownloadCertificateCmd()
cmd.hypervisor = self.hypervisor
- cmd.name = "marvin-test-verify-certs"
+ cmd.name = "marvin-test-verify-certs" + str(uuid.uuid1())
cmd.certificate = self.certificates["valid"]
cmd.zoneid = self.zone.id
@@ -160,11 +162,15 @@
cls.services = cls.testClient.getParsedTestDataConfig()
cls._cleanup = []
- cls.hypervisorNotSupported = False
- if cls.hypervisor.lower() not in ['kvm', 'lxc']:
- cls.hypervisorNotSupported = True
+ cls.hypervisorSupported = False
+ cls.nfsStorageFound = False
+ cls.localStorageFound = False
+ cls.sharedMountPointFound = False
- if not cls.hypervisorNotSupported:
+ if cls.hypervisor.lower() in ['kvm', 'lxc']:
+ cls.hypervisorSupported = True
+
+ if cls.hypervisorSupported:
cls.services["test_templates"]["kvm"]["directdownload"] = "true"
cls.template = Template.register(cls.apiclient, cls.services["test_templates"]["kvm"],
zoneid=cls.zone.id, hypervisor=cls.hypervisor)
@@ -192,6 +198,25 @@
)
cls._cleanup.append(cls.l2_network)
cls._cleanup.append(cls.network_offering)
+
+ storage_pools = StoragePool.list(
+ cls.apiclient,
+ zoneid=cls.zone.id
+ )
+ for pool in storage_pools:
+ if not cls.nfsStorageFound and pool.type == "NetworkFilesystem":
+ cls.nfsStorageFound = True
+ cls.nfsPoolId = pool.id
+ elif not cls.localStorageFound and pool.type == "Filesystem":
+ cls.localStorageFound = True
+ cls.localPoolId = pool.id
+ elif not cls.sharedMountPointFound and pool.type == "SharedMountPoint":
+ cls.sharedMountPointFound = True
+ cls.sharedPoolId = pool.id
+
+ cls.nfsKvmNotAvailable = not cls.hypervisorSupported or not cls.nfsStorageFound
+ cls.localStorageKvmNotAvailable = not cls.hypervisorSupported or not cls.localStorageFound
+ cls.sharedMountPointKvmNotAvailable = not cls.hypervisorSupported or not cls.sharedMountPointFound
return
@classmethod
@@ -215,26 +240,124 @@
raise Exception("Warning: Exception during cleanup : %s" % e)
return
- @skipTestIf("hypervisorNotSupported")
+ def getCurrentStoragePoolTags(self, poolId):
+ local_pool = StoragePool.list(
+ self.apiclient,
+ id=poolId
+ )
+ return local_pool[0].tags
+
+ def updateStoragePoolTags(self, poolId, tags):
+ StoragePool.update(
+ self.apiclient,
+ id=poolId,
+ tags=tags
+ )
+
+ def createServiceOffering(self, name, type, tags):
+ services = {
+ "cpunumber": 1,
+ "cpuspeed": 512,
+ "memory": 256,
+ "displaytext": name,
+ "name": name,
+ "storagetype": type
+ }
+ return ServiceOffering.create(
+ self.apiclient,
+ services,
+ tags=tags
+ )
+
+
+ @skipTestIf("nfsKvmNotAvailable")
@attr(tags=["advanced", "basic", "eip", "advancedns", "sg"], required_hardware="false")
- def test_01_deploy_vm_from_direct_download_template(self):
- """Test Deploy VM from direct download template
+ def test_01_deploy_vm_from_direct_download_template_nfs_storage(self):
+ """Test Deploy VM from direct download template on NFS storage
"""
- # Validate the following
- # 1. Register direct download template
- # 2. Deploy VM from direct download template
+ # Create service offering for local storage using storage tags
+ tags = self.getCurrentStoragePoolTags(self.nfsPoolId)
+ test_tag = "marvin_test_nfs_storage_direct_download"
+ self.updateStoragePoolTags(self.nfsPoolId, test_tag)
+ nfs_storage_offering = self.createServiceOffering("TestNFSStorageDirectDownload", "shared", test_tag)
vm = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
- serviceofferingid=self.service_offering.id,
+ serviceofferingid=nfs_storage_offering.id,
networkids=self.l2_network.id
)
self.assertEqual(
vm.state,
"Running",
- "Check VM deployed from direct download template is running"
+ "Check VM deployed from direct download template is running on NFS storage"
)
+
+ # Revert storage tags for the storage pool used in this test
+ self.updateStoragePoolTags(self.nfsPoolId, tags)
self.cleanup.append(vm)
+ self.cleanup.append(nfs_storage_offering)
+ return
+
+ @skipTestIf("localStorageKvmNotAvailable")
+ @attr(tags=["advanced", "basic", "eip", "advancedns", "sg"], required_hardware="false")
+ def test_02_deploy_vm_from_direct_download_template_local_storage(self):
+ """Test Deploy VM from direct download template on local storage
+ """
+
+ # Create service offering for local storage using storage tags
+ tags = self.getCurrentStoragePoolTags(self.localPoolId)
+ test_tag = "marvin_test_local_storage_direct_download"
+ self.updateStoragePoolTags(self.localPoolId, test_tag)
+ local_storage_offering = self.createServiceOffering("TestLocalStorageDirectDownload", "local", test_tag)
+
+ # Deploy VM
+ vm = VirtualMachine.create(
+ self.apiclient,
+ self.services["virtual_machine"],
+ serviceofferingid=local_storage_offering.id,
+ networkids=self.l2_network.id,
+ )
+ self.assertEqual(
+ vm.state,
+ "Running",
+ "Check VM deployed from direct download template is running on local storage"
+ )
+
+ # Revert storage tags for the storage pool used in this test
+ self.updateStoragePoolTags(self.localPoolId, tags)
+ self.cleanup.append(vm)
+ self.cleanup.append(local_storage_offering)
+ return
+
+ @skipTestIf("sharedMountPointKvmNotAvailable")
+ @attr(tags=["advanced", "basic", "eip", "advancedns", "sg"], required_hardware="false")
+ def test_03_deploy_vm_from_direct_download_template_shared_mount_point_storage(self):
+ """Test Deploy VM from direct download template on shared mount point
+ """
+
+ # Create service offering for local storage using storage tags
+ tags = self.getCurrentStoragePoolTags(self.sharedPoolId)
+ test_tag = "marvin_test_shared_mount_point_storage_direct_download"
+ self.updateStoragePoolTags(self.sharedPoolId, test_tag)
+ shared_offering = self.createServiceOffering("TestSharedMountPointStorageDirectDownload", "shared", test_tag)
+
+ # Deploy VM
+ vm = VirtualMachine.create(
+ self.apiclient,
+ self.services["virtual_machine"],
+ serviceofferingid=shared_offering.id,
+ networkids=self.l2_network.id,
+ )
+ self.assertEqual(
+ vm.state,
+ "Running",
+ "Check VM deployed from direct download template is running on shared mount point"
+ )
+
+ # Revert storage tags for the storage pool used in this test
+ self.updateStoragePoolTags(self.sharedPoolId, tags)
+ self.cleanup.append(vm)
+ self.cleanup.append(shared_offering)
return
diff --git a/test/integration/smoke/test_disk_offerings.py b/test/integration/smoke/test_disk_offerings.py
index af7ba6a2..d0d3433 100644
--- a/test/integration/smoke/test_disk_offerings.py
+++ b/test/integration/smoke/test_disk_offerings.py
@@ -223,6 +223,78 @@
)
return
+ @attr(tags=["advanced", "basic", "eip", "sg", "advancedns", "smoke"], required_hardware="false")
+ def test_06_create_disk_offering_with_cache_mode_type(self):
+ """Test to create disk offering with each one of the valid cache mode types : none, writeback and writethrough
+
+ # Validate the following:
+ # 1. createDiskOfferings should return valid info for new offering
+ # 2. The Cloud Database contains the valid information
+ """
+ cache_mode_types=["none", "writeback", "writethrough"]
+ for i in range(3):
+ disk_offering = DiskOffering.create(
+ self.apiclient,
+ self.services["disk_offering"],
+ cacheMode=cache_mode_types[i]
+ )
+ self.cleanup.append(disk_offering)
+
+ self.debug("Created Disk offering with valid cacheMode param with ID: %s" % disk_offering.id)
+
+ list_disk_response = list_disk_offering(
+ self.apiclient,
+ id=disk_offering.id
+ )
+ self.assertEqual(
+ isinstance(list_disk_response, list),
+ True,
+ "Check list response returns a valid list"
+ )
+ self.assertNotEqual(
+ len(list_disk_response),
+ 0,
+ "Check Disk offering is created"
+ )
+ disk_response = list_disk_response[0]
+
+ self.assertEqual(
+ disk_response.displaytext,
+ self.services["disk_offering"]["displaytext"],
+ "Check server id in createServiceOffering"
+ )
+ self.assertEqual(
+ disk_response.name,
+ self.services["disk_offering"]["name"],
+ "Check name in createServiceOffering"
+ )
+ self.assertEqual(
+ disk_response.cacheMode,
+ cache_mode_types[i],
+ "Check cacheMode in createServiceOffering"
+ )
+
+ return
+
+ @attr(tags=["advanced", "basic", "eip", "sg", "advancedns", "smoke"], required_hardware="false")
+ def test_07_create_disk_offering_with_invalid_cache_mode_type(self):
+ """Test to create disk offering with invalid cacheMode type
+
+ # Validate the following:
+ # 1. createDiskOfferings should return valid info for new offering
+ # 2. The Cloud Database contains the valid information
+ """
+
+ with self.assertRaises(Exception):
+ disk_offering = DiskOffering.create(
+ self.apiclient,
+ self.services["disk_offering"],
+ cacheMode="invalid_cache_mode_type"
+ )
+
+
+ return
+
class TestDiskOfferings(cloudstackTestCase):
def setUp(self):
diff --git a/test/integration/smoke/test_global_settings.py b/test/integration/smoke/test_global_settings.py
index 4920421..c0dec78 100644
--- a/test/integration/smoke/test_global_settings.py
+++ b/test/integration/smoke/test_global_settings.py
@@ -48,7 +48,7 @@
self.debug("updated the parameter %s with value %s"%(updateConfigurationResponse.name, updateConfigurationResponse.value))
listConfigurationsCmd = listConfigurations.listConfigurationsCmd()
- listConfigurationsCmd.cfgName = updateConfigurationResponse.name
+ listConfigurationsCmd.name = updateConfigurationResponse.name
listConfigurationsCmd.scopename = "zone"
listConfigurationsCmd.scopeid = 1
listConfigurationsResponse = self.apiClient.listConfigurations(listConfigurationsCmd)
diff --git a/test/integration/smoke/test_host_maintenance.py b/test/integration/smoke/test_host_maintenance.py
index c7cd9d3..3353621 100644
--- a/test/integration/smoke/test_host_maintenance.py
+++ b/test/integration/smoke/test_host_maintenance.py
@@ -21,16 +21,75 @@
from marvin.cloudstackTestCase import *
from marvin.lib.utils import *
from marvin.lib.base import *
-from marvin.lib.common import (get_zone, get_pod, get_template)
+from marvin.lib.common import (get_zone, get_pod, get_template, list_ssvms)
from nose.plugins.attrib import attr
from marvin.lib.decoratorGenerators import skipTestIf
from distutils.util import strtobool
from marvin.sshClient import SshClient
_multiprocess_shared_ = False
+MIN_VMS_FOR_TEST = 3
+
+class TestHostMaintenanceBase(cloudstackTestCase):
+ def get_ssh_client(self, ip, username, password, retries=10):
+ """ Setup ssh client connection and return connection """
+ try:
+ ssh_client = SshClient(ip, 22, username, password, retries)
+ except Exception as e:
+ raise unittest.SkipTest("Unable to create ssh connection: " % e)
+
+ self.assertIsNotNone(
+ ssh_client, "Failed to setup ssh connection to ip=%s" % ip)
+
+ return ssh_client
+
+ def wait_until_host_is_in_state(self, hostid, resourcestate, interval=3, retries=20):
+ def check_resource_state():
+ response = Host.list(
+ self.apiclient,
+ id=hostid
+ )
+ if isinstance(response, list):
+ if response[0].resourcestate == resourcestate:
+ self.logger.debug('Host with id %s is in resource state = %s' % (hostid, resourcestate))
+ return True, None
+ else:
+ self.logger.debug("Waiting for host " + hostid +
+ " to reach state " + resourcestate +
+ ", with current state " + response[0].resourcestate)
+ return False, None
+
+ done, _ = wait_until(interval, retries, check_resource_state)
+ if not done:
+ raise Exception("Failed to wait for host %s to be on resource state %s" % (hostid, resourcestate))
+ return True
+
+ def prepare_host_for_maintenance(self, hostid):
+ self.logger.debug("Sending Host with id %s to prepareHostForMaintenance" % hostid)
+ cmd = prepareHostForMaintenance.prepareHostForMaintenanceCmd()
+ cmd.id = hostid
+ response = self.apiclient.prepareHostForMaintenance(cmd)
+ self.logger.debug("Host with id %s is in prepareHostForMaintenance" % hostid)
+ self.logger.debug(response)
+ return response
+
+ def cancel_host_maintenance(self, hostid):
+ self.logger.debug("Canceling Host with id %s from maintain" % hostid)
+ cmd = cancelHostMaintenance.cancelHostMaintenanceCmd()
+ cmd.id = hostid
+ res = self.apiclient.cancelHostMaintenance(cmd)
+ self.logger.debug("Host with id %s is cancelling maintenance" % hostid)
+ return res
+
+ def revert_host_state_on_failure(self, hostId):
+ cmd = updateHost.updateHostCmd()
+ cmd.id = hostId
+ cmd.allocationstate = "Enable"
+ response = self.apiclient.updateHost(cmd)
+ self.assertEqual(response.resourcestate, "Enabled")
-class TestHostMaintenance(cloudstackTestCase):
+class TestHostMaintenance(TestHostMaintenanceBase):
def setUp(self):
self.logger = logging.getLogger('TestHM')
@@ -44,6 +103,8 @@
self.zone = get_zone(self.apiclient, self.testClient.getZoneForTests())
self.pod = get_pod(self.apiclient, self.zone.id)
self.cleanup = []
+ self.hostConfig = self.config.__dict__["zones"][0].__dict__["pods"][0].__dict__["clusters"][0].__dict__["hosts"][0].__dict__
+
def tearDown(self):
try:
@@ -55,7 +116,7 @@
return
- def createVMs(self, hostId, number):
+ def createVMs(self, hostId, number, offering_key="tiny"):
self.template = get_template(
self.apiclient,
@@ -70,7 +131,7 @@
self.service_offering = ServiceOffering.create(
self.apiclient,
- self.services["service_offerings"]["tiny"]
+ self.services["service_offerings"][offering_key]
)
self.logger.debug("Using service offering %s " % self.service_offering.id)
self.network_offering = NetworkOffering.create(
@@ -106,7 +167,32 @@
self.cleanup.append(self.network_offering)
self.cleanup.append(self.service_offering)
return vms
-
+
+ def checkAllVmsRunningOnHost(self, hostId):
+ listVms1 = VirtualMachine.list(
+ self.apiclient,
+ hostid=hostId
+ )
+
+ if (listVms1 is not None):
+ self.logger.debug('Vms found to test all running = {} '.format(len(listVms1)))
+ for vm in listVms1:
+ if (vm.state != "Running"):
+ self.logger.debug('VirtualMachine on Host with id = {} is in {}'.format(vm.id, vm.state))
+ return (False, None)
+
+ response = list_ssvms(
+ self.apiclient,
+ hostid=hostId
+ )
+ if isinstance(response, list):
+ for systemvm in response:
+ if systemvm.state != 'Running':
+ self.logger.debug("Found not running VM {}".format(systemvm.name))
+ return (False, None)
+
+ return (True, None)
+
def checkVmMigratingOnHost(self, hostId):
vm_migrating=False
listVms1 = VirtualMachine.list(
@@ -118,60 +204,60 @@
self.logger.debug('Vms found = {} '.format(len(listVms1)))
for vm in listVms1:
if (vm.state == "Migrating"):
- self.logger.debug('VirtualMachine on Hyp id = {} is in {}'.format(vm.id, vm.state))
+ self.logger.debug('VirtualMachine on Host with id = {} is in {}'.format(vm.id, vm.state))
vm_migrating=True
break
return (vm_migrating, None)
- def checkNoVmMigratingOnHost(self, hostId):
- no_vm_migrating=True
+ def migrationsFinished(self, hostId):
+ migrations_finished=True
listVms1 = VirtualMachine.list(
self.apiclient,
hostid=hostId
)
if (listVms1 is not None):
- self.logger.debug('Vms found = {} '.format(len(listVms1)))
- for vm in listVms1:
- if (vm.state == "Migrating"):
- self.logger.debug('VirtualMachine on Hyp id = {} is in {}'.format(vm.id, vm.state))
- no_vm_migrating=False
- break
+ numVms = len(listVms1)
+ migrations_finished = (numVms == 0)
- return (no_vm_migrating, None)
-
+ return (migrations_finished, None)
+
def noOfVMsOnHost(self, hostId):
listVms = VirtualMachine.list(
self.apiclient,
hostid=hostId
)
no_of_vms=0
+ self.logger.debug("Counting VMs on host " + hostId)
if (listVms is not None):
for vm in listVms:
- self.logger.debug('VirtualMachine on Hyp 1 = {}'.format(vm.id))
+ self.logger.debug("VirtualMachine on Host " + hostId + " = " + vm.id)
no_of_vms=no_of_vms+1
-
+ self.logger.debug("Found VMs on host " + str(no_of_vms))
return no_of_vms
-
- def hostPrepareAndCancelMaintenance(self, target_host_id, other_host_id, checkVMMigration):
-
- cmd = prepareHostForMaintenance.prepareHostForMaintenanceCmd()
- cmd.id = target_host_id
- response = self.apiclient.prepareHostForMaintenance(cmd)
-
- self.logger.debug('Host with id {} is in prepareHostForMaintenance'.format(target_host_id))
-
- vm_migrating = wait_until(1, 10, checkVMMigration, other_host_id)
-
- cmd = cancelHostMaintenance.cancelHostMaintenanceCmd()
- cmd.id = target_host_id
- response = self.apiclient.cancelHostMaintenance(cmd)
-
- self.logger.debug('Host with id {} is in cancelHostMaintenance'.format(target_host_id) )
-
- return vm_migrating
-
+
+ def hostPrepareAndCancelMaintenance(self, target_host_id, other_host_id):
+ # Wait for all VMs to complete any pending migrations.
+ if not wait_until(3, 100, self.checkAllVmsRunningOnHost, target_host_id) or \
+ not wait_until(3, 100, self.checkAllVmsRunningOnHost, other_host_id):
+ raise Exception("Failed to wait for all VMs to reach running state to execute test")
+
+ self.prepare_host_for_maintenance(target_host_id)
+ migrations_finished = wait_until(5, 200, self.migrationsFinished, target_host_id)
+
+ self.wait_until_host_is_in_state(target_host_id, "Maintenance", 5, 200)
+
+ vm_count_after_maintenance = self.noOfVMsOnHost(target_host_id)
+
+ self.cancel_host_maintenance(target_host_id)
+ self.wait_until_host_is_in_state(target_host_id, "Enabled", 5, 200)
+
+ if vm_count_after_maintenance != 0:
+ self.fail("Host to put to maintenance still has VMs running")
+
+ return migrations_finished
+
@attr(
tags=[
"advanced",
@@ -182,42 +268,45 @@
"sg"],
required_hardware="true")
def test_01_cancel_host_maintenace_with_no_migration_jobs(self):
+ """
+ Tests if putting a host with no migrations (0 VMs) work back and forth
+
+ 1) Verify if there are at least 2 hosts in enabled state.
+ 2) Put the host into maintenance verify success
+ 3) Put the other host into maintenance, verify success
+ """
listHost = Host.list(
self.apiclient,
type='Routing',
zoneid=self.zone.id,
podid=self.pod.id,
+ hypervisor=self.hypervisor,
+ resourcestate='Enabled',
+ state='Up'
)
for host in listHost:
- self.logger.debug('1 Hypervisor = {}'.format(host.id))
-
-
- if (len(listHost) < 2):
- raise unittest.SkipTest("Cancel host maintenance when VMs are migrating should be tested for 2 or more hosts");
- return
+ self.logger.debug('Found Host = {}'.format(host.id))
- vm_migrating=False
-
+
+ if (len(listHost) < 2):
+ raise unittest.SkipTest("Canceling tests for host maintenance as we need 2 or more hosts up and enabled")
+
try:
- vm_migrating = self.hostPrepareAndCancelMaintenance(listHost[0].id, listHost[1].id, self.checkNoVmMigratingOnHost)
-
- vm_migrating = self.hostPrepareAndCancelMaintenance(listHost[1].id, listHost[0].id, self.checkNoVmMigratingOnHost)
-
+ migrations_finished = self.hostPrepareAndCancelMaintenance(listHost[0].id, listHost[1].id)
+
+ if migrations_finished:
+ self.hostPrepareAndCancelMaintenance(listHost[1].id, listHost[0].id)
+ else:
+ raise unittest.SkipTest("VMs are still migrating so reverse migration /maintenace skipped")
+
except Exception as e:
+ self.revert_host_state_on_failure(listHost[0].id)
+ self.revert_host_state_on_failure(listHost[1].id)
self.logger.debug("Exception {}".format(e))
- self.fail("Cancel host maintenance failed {}".format(e[0]))
-
-
- if (vm_migrating == True):
- raise unittest.SkipTest("VMs are migrating and the test will not be able to check the conditions the test is intended for");
-
-
- return
+ self.fail("Host maintenance test failed {}".format(e[0]))
-
-
@attr(
tags=[
"advanced",
@@ -228,53 +317,125 @@
"sg"],
required_hardware="true")
def test_02_cancel_host_maintenace_with_migration_jobs(self):
-
+ """
+ Tests if putting a host with migrations (3 VMs) work back and forth
+
+ 1) Verify if there are at least 2 hosts in enabled state.
+ 2) Deploy VMs if needed
+ 3) Put the host into maintenance verify success -ensure existing host has zero running VMs
+ 4) Put the other host into maintenance, verify success just as step 3
+ """
listHost = Host.list(
self.apiclient,
type='Routing',
zoneid=self.zone.id,
podid=self.pod.id,
+ hypervisor=self.hypervisor,
+ resourcestate='Enabled',
+ state='Up'
)
for host in listHost:
- self.logger.debug('2 Hypervisor = {}'.format(host.id))
-
- if (len(listHost) != 2):
- raise unittest.SkipTest("Cancel host maintenance when VMs are migrating can only be tested with 2 hosts");
- return
+ self.logger.debug('Found Host = {}'.format(host.id))
-
+ if (len(listHost) < 2):
+ raise unittest.SkipTest("Canceling tests for host maintenance as we need 2 or more hosts up and enabled")
+
no_of_vms = self.noOfVMsOnHost(listHost[0].id)
-
+
no_of_vms = no_of_vms + self.noOfVMsOnHost(listHost[1].id)
-
- if no_of_vms < 5:
+
+ if no_of_vms < MIN_VMS_FOR_TEST:
self.logger.debug("Create VMs as there are not enough vms to check host maintenance")
- no_vm_req = 5 - no_of_vms
+ no_vm_req = MIN_VMS_FOR_TEST - no_of_vms
if (no_vm_req > 0):
self.logger.debug("Creating vms = {}".format(no_vm_req))
self.vmlist = self.createVMs(listHost[0].id, no_vm_req)
-
- vm_migrating=False
-
+
try:
-
- vm_migrating = self.hostPrepareAndCancelMaintenance(listHost[0].id, listHost[1].id, self.checkVmMigratingOnHost)
-
- vm_migrating = self.hostPrepareAndCancelMaintenance(listHost[1].id, listHost[0].id, self.checkVmMigratingOnHost)
-
+ migrations_finished = self.hostPrepareAndCancelMaintenance(listHost[0].id, listHost[1].id)
+
+ if migrations_finished:
+ self.hostPrepareAndCancelMaintenance(listHost[1].id, listHost[0].id)
+ else:
+ raise unittest.SkipTest("VMs are still migrating so reverse migration /maintenace skipped")
+
except Exception as e:
+ self.revert_host_state_on_failure(listHost[0].id)
+ self.revert_host_state_on_failure(listHost[1].id)
self.logger.debug("Exception {}".format(e))
- self.fail("Cancel host maintenance failed {}".format(e[0]))
-
+ self.fail("Host maintenance test failed {}".format(e[0]))
- if (vm_migrating == False):
- raise unittest.SkipTest("No VM is migrating and the test will not be able to check the conditions the test is intended for");
-
-
- return
+ @attr(
+ tags=[
+ "advanced",
+ "advancedns",
+ "smoke",
+ "basic",
+ "eip",
+ "sg"],
+ required_hardware="true")
+ def test_03_cancel_host_maintenace_with_migration_jobs_failure(self):
+ """
+ Tests if putting a host with impossible migrations (2 VMs) work pushes to ErrorInMaintenance state
+
+ 1) Verify if there are at least 2 hosts in enabled state.
+ 2) Tag the host and deploy tagged VMs which cannot be migrated to other host without tags
+ 3) Put the host into maintenance verify it fails with it reaching ErrorInMaintenance
+ """
+ listHost = Host.list(
+ self.apiclient,
+ type='Routing',
+ zoneid=self.zone.id,
+ podid=self.pod.id,
+ hypervisor=self.hypervisor,
+ resourcestate='Enabled',
+ state='Up'
+ )
+
+ for host in listHost:
+ self.logger.debug('Found Host = {}'.format(host.id))
+
+ if (len(listHost) < 2):
+ raise unittest.SkipTest("Canceling tests for host maintenance as we need 2 or more hosts up and enabled")
+
+ target_host_id = listHost[0].id
+
+ try:
+ Host.update(self.apiclient,
+ id=target_host_id,
+ hosttags=self.services["service_offerings"]["taggedsmall"]["hosttags"])
+
+ no_of_vms = self.noOfVMsOnHost(target_host_id)
+
+ # Need only 2 VMs for this case.
+ if no_of_vms < 2:
+ self.logger.debug("Create VMs as there are not enough vms to check host maintenance")
+ no_vm_req = 2 - no_of_vms
+ if (no_vm_req > 0):
+ self.logger.debug("Creating vms = {}".format(no_vm_req))
+ self.vmlist = self.createVMs(listHost[0].id, no_vm_req, "taggedsmall")
+
+ # Attempt putting host in maintenance and check if ErrorInMaintenance state is reached
+ self.prepare_host_for_maintenance(target_host_id)
+ error_in_maintenance_reached = self.wait_until_host_is_in_state(target_host_id, "ErrorInMaintenance", 5, 300)
+
+ self.cancel_host_maintenance(target_host_id)
+ self.wait_until_host_is_in_state(target_host_id, "Enabled", 5, 200)
+
+ Host.update(self.apiclient, id=target_host_id, hosttags="")
+
+ if not error_in_maintenance_reached:
+ self.fail("Error in maintenance state should have reached after ports block")
+
+ except Exception as e:
+ self.revert_host_state_on_failure(listHost[0].id)
+ self.revert_host_state_on_failure(listHost[1].id)
+ Host.update(self.apiclient, id=target_host_id, hosttags="")
+ self.logger.debug("Exception {}".format(e))
+ self.fail("Host maintenance test failed {}".format(e[0]))
-class TestHostMaintenanceAgents(cloudstackTestCase):
+class TestHostMaintenanceAgents(TestHostMaintenanceBase):
@classmethod
def setUpClass(cls):
@@ -371,29 +532,6 @@
value = "true" if on else "false"
cls.updateConfiguration('kvm.ssh.to.agent', value)
- def prepare_host_for_maintenance(self, hostid):
- cmd = prepareHostForMaintenance.prepareHostForMaintenanceCmd()
- cmd.id = hostid
- self.apiclient.prepareHostForMaintenance(cmd)
- self.logger.debug('Host with id %s is in prepareHostForMaintenance' % hostid)
-
- def wait_until_host_is_in_state(self, hostid, resourcestate, interval=3, retries=20):
- def check_resource_state():
- response = Host.list(
- self.apiclient,
- id=hostid
- )
- if isinstance(response, list):
- if response[0].resourcestate == resourcestate:
- self.logger.debug('Host with id %s is in resource state = %s' % (hostid, resourcestate))
- return True, None
- return False, None
-
- done, _ = wait_until(interval, retries, check_resource_state)
- if not done:
- raise Exception("Failed to wait for host %s to be on resource state %s" % (hostid, resourcestate))
- return True
-
def wait_until_agent_is_in_state(self, hostid, state, interval=3, retries=20):
def check_agent_state():
response = Host.list(
@@ -411,12 +549,6 @@
raise Exception("Failed to wait for host agent %s to be on state %s" % (hostid, state))
return True
- def cancel_host_maintenance(self, hostid):
- cmd = cancelHostMaintenance.cancelHostMaintenanceCmd()
- cmd.id = hostid
- self.apiclient.cancelHostMaintenance(cmd)
- self.logger.debug('Host with id %s is cancelling maintenance' % hostid)
-
def get_enabled_host_connected_agent(self):
hosts = Host.list(
self.apiclient,
@@ -428,7 +560,7 @@
state='Up'
)
if len(hosts) < 2:
- raise unittest.SkipTest("Cancel host maintenance must be tested for 2 or more hosts")
+ raise unittest.SkipTest("Host maintenance tests must be tested for 2 or more hosts")
return hosts[0]
def deploy_vm_on_host(self, hostid):
@@ -451,13 +583,6 @@
)
self.cleanup.append(vm)
- def revert_host_state_on_failure(self, host):
- cmd = updateHost.updateHostCmd()
- cmd.id = host.id
- cmd.allocationstate = "Enable"
- response = self.apiclient.updateHost(cmd)
- self.assertEqual(response.resourcestate, "Enabled")
-
@skipTestIf("hypervisorNotSupported")
@attr(tags=["advanced", "advancedns", "smoke", "basic", "eip", "sg"], required_hardware="true")
def test_01_cancel_host_maintenance_ssh_enabled_agent_connected(self):
@@ -480,22 +605,9 @@
self.wait_until_host_is_in_state(self.host.id, "Enabled")
self.assert_host_is_functional_after_cancelling_maintenance(self.host.id)
except Exception as e:
- self.revert_host_state_on_failure(self.host)
+ self.revert_host_state_on_failure(self.host.id)
self.fail(e)
- def get_ssh_client(self, ip, username, password, retries=10):
- """ Setup ssh client connection and return connection """
-
- try:
- ssh_client = SshClient(ip, 22, username, password, retries)
- except Exception as e:
- raise unittest.SkipTest("Unable to create ssh connection: " % e)
-
- self.assertIsNotNone(
- ssh_client, "Failed to setup ssh connection to ip=%s" % ip)
-
- return ssh_client
-
@skipTestIf("hypervisorNotSupported")
@attr(tags=["boris", "advancedns", "smoke", "basic", "eip", "sg"], required_hardware="true")
def test_02_cancel_host_maintenance_ssh_enabled_agent_disconnected(self):
@@ -529,7 +641,7 @@
self.assert_host_is_functional_after_cancelling_maintenance(self.host.id)
except Exception as e:
- self.revert_host_state_on_failure(self.host)
+ self.revert_host_state_on_failure(self.host.id)
self.fail(e)
@skipTestIf("hypervisorNotSupported")
@@ -554,7 +666,7 @@
self.wait_until_host_is_in_state(self.host.id, "Enabled")
self.assert_host_is_functional_after_cancelling_maintenance(self.host.id)
except Exception as e:
- self.revert_host_state_on_failure(self.host)
+ self.revert_host_state_on_failure(self.host.id)
self.fail(e)
@skipTestIf("hypervisorNotSupported")
@@ -585,7 +697,7 @@
ssh_client.execute("service cloudstack-agent stop")
self.wait_until_agent_is_in_state(self.host.id, "Disconnected")
except Exception as e:
- self.revert_host_state_on_failure(self.host)
+ self.revert_host_state_on_failure(self.host.id)
self.fail(e)
self.assertRaises(Exception, self.cancel_host_maintenance, self.host.id)
@@ -600,5 +712,5 @@
self.wait_until_host_is_in_state(self.host.id, "Enabled")
self.assert_host_is_functional_after_cancelling_maintenance(self.host.id)
except Exception as e:
- self.revert_host_state_on_failure(self.host)
+ self.revert_host_state_on_failure(self.host.id)
self.fail(e)
diff --git a/test/integration/smoke/test_kubernetes_clusters.py b/test/integration/smoke/test_kubernetes_clusters.py
new file mode 100644
index 0000000..492c970
--- /dev/null
+++ b/test/integration/smoke/test_kubernetes_clusters.py
@@ -0,0 +1,723 @@
+# 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.
+""" Tests for Kubernetes supported version """
+
+#Import Local Modules
+from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackAPI import (listInfrastructure,
+ listKubernetesSupportedVersions,
+ addKubernetesSupportedVersion,
+ deleteKubernetesSupportedVersion,
+ createKubernetesCluster,
+ stopKubernetesCluster,
+ deleteKubernetesCluster,
+ upgradeKubernetesCluster,
+ scaleKubernetesCluster)
+from marvin.cloudstackException import CloudstackAPIException
+from marvin.codes import FAILED
+from marvin.lib.base import (Template,
+ ServiceOffering,
+ Configurations)
+from marvin.lib.utils import (cleanup_resources,
+ random_gen)
+from marvin.lib.common import (get_zone)
+from marvin.sshClient import SshClient
+from nose.plugins.attrib import attr
+
+import time
+
+_multiprocess_shared_ = True
+
+class TestKubernetesCluster(cloudstackTestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ cls.testClient = super(TestKubernetesCluster, cls).getClsTestClient()
+ cls.apiclient = cls.testClient.getApiClient()
+ cls.services = cls.testClient.getParsedTestDataConfig()
+ cls.zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests())
+ cls.hypervisor = cls.testClient.getHypervisorInfo()
+ cls.mgtSvrDetails = cls.config.__dict__["mgtSvr"][0].__dict__
+ cls.cks_template_name_key = "cloud.kubernetes.cluster.template.name." + cls.hypervisor.lower()
+
+ cls.setup_failed = False
+
+ cls.initial_configuration_cks_enabled = Configurations.list(cls.apiclient,
+ name="cloud.kubernetes.service.enabled")[0].value
+ if cls.initial_configuration_cks_enabled not in ["true", True]:
+ cls.debug("Enabling CloudStack Kubernetes Service plugin and restarting management server")
+ Configurations.update(cls.apiclient,
+ "cloud.kubernetes.service.enabled",
+ "true")
+ cls.restartServer()
+
+ cls.cks_template = None
+ cls.initial_configuration_cks_template_name = None
+ cls.cks_service_offering = None
+
+ cls.kubernetes_version_ids = []
+ if cls.setup_failed == False:
+ try:
+ cls.kubernetes_version_1 = cls.addKubernetesSupportedVersion('1.14.9', 'http://download.cloudstack.org/cks/setup-1.14.9.iso')
+ cls.kubernetes_version_ids.append(cls.kubernetes_version_1.id)
+ except Exception as e:
+ cls.setup_failed = True
+ cls.debug("Failed to get Kubernetes version ISO in ready state, http://download.cloudstack.org/cks/setup-1.14.9.iso, %s" % e)
+ if cls.setup_failed == False:
+ try:
+ cls.kubernetes_version_2 = cls.addKubernetesSupportedVersion('1.15.0', 'http://download.cloudstack.org/cks/setup-1.15.0.iso')
+ cls.kubernetes_version_ids.append(cls.kubernetes_version_2.id)
+ except Exception as e:
+ cls.setup_failed = True
+ cls.debug("Failed to get Kubernetes version ISO in ready state, http://download.cloudstack.org/cks/setup-1.15.0.iso, %s" % e)
+ if cls.setup_failed == False:
+ try:
+ cls.kubernetes_version_3 = cls.addKubernetesSupportedVersion('1.16.0', 'http://download.cloudstack.org/cks/setup-1.16.0.iso')
+ cls.kubernetes_version_ids.append(cls.kubernetes_version_3.id)
+ except Exception as e:
+ cls.setup_failed = True
+ cls.debug("Failed to get Kubernetes version ISO in ready state, http://download.cloudstack.org/cks/setup-1.16.0.iso, %s" % e)
+ if cls.setup_failed == False:
+ try:
+ cls.kubernetes_version_4 = cls.addKubernetesSupportedVersion('1.16.3', 'http://download.cloudstack.org/cks/setup-1.16.3.iso')
+ cls.kubernetes_version_ids.append(cls.kubernetes_version_4.id)
+ except Exception as e:
+ cls.setup_failed = True
+ cls.debug("Failed to get Kubernetes version ISO in ready state, http://download.cloudstack.org/cks/setup-1.16.3.iso, %s" % e)
+
+ cks_template_data = {
+ "name": "Kubernetes-Service-Template",
+ "displaytext": "Kubernetes-Service-Template",
+ "format": "qcow2",
+ "hypervisor": "kvm",
+ "ostype": "CoreOS",
+ "url": "http://dl.openvm.eu/cloudstack/coreos/x86_64/coreos_production_cloudstack_image-kvm.qcow2.bz2",
+ "ispublic": "True",
+ "isextractable": "True"
+ }
+ cks_template_data_details = []
+ if cls.hypervisor.lower() == "vmware":
+ cks_template_data["url"] = "http://dl.openvm.eu/cloudstack/coreos/x86_64/coreos_production_cloudstack_image-vmware.ova"
+ cks_template_data["format"] = "OVA"
+ cks_template_data_details = [{"keyboard":"us","nicAdapter":"Vmxnet3","rootDiskController":"pvscsi"}]
+ elif cls.hypervisor.lower() == "xenserver":
+ cks_template_data["url"] = "http://dl.openvm.eu/cloudstack/coreos/x86_64/coreos_production_cloudstack_image-xen.vhd.bz2"
+ cks_template_data["format"] = "VHD"
+ elif cls.hypervisor.lower() == "kvm":
+ cks_template_data["requireshvm"] = "True"
+ if cls.setup_failed == False:
+ cls.cks_template = Template.register(
+ cls.apiclient,
+ cks_template_data,
+ zoneid=cls.zone.id,
+ hypervisor=cls.hypervisor,
+ details=cks_template_data_details
+ )
+ cls.debug("Waiting for CKS template with ID %s to be ready" % cls.cks_template.id)
+ try:
+ cls.waitForTemplateReadyState(cls.cks_template.id)
+ except Exception as e:
+ cls.setup_failed = True
+ cls.debug("Failed to get CKS template in ready state, {}, {}".format(cks_template_data["url"], e))
+
+ cls.initial_configuration_cks_template_name = Configurations.list(cls.apiclient,
+ name=cls.cks_template_name_key)[0].value
+ Configurations.update(cls.apiclient,
+ cls.cks_template_name_key,
+ cls.cks_template.name)
+
+ cks_offering_data = {
+ "name": "CKS-Instance",
+ "displaytext": "CKS Instance",
+ "cpunumber": 2,
+ "cpuspeed": 1000,
+ "memory": 2048,
+ }
+ cks_offering_data["name"] = cks_offering_data["name"] + '-' + random_gen()
+ if cls.setup_failed == False:
+ cls.cks_service_offering = ServiceOffering.create(
+ cls.apiclient,
+ cks_offering_data
+ )
+
+ cls._cleanup = []
+ if cls.cks_template != None:
+ cls._cleanup.append(cls.cks_template)
+ if cls.cks_service_offering != None:
+ cls._cleanup.append(cls.cks_service_offering)
+ return
+
+ @classmethod
+ def tearDownClass(cls):
+ version_delete_failed = False
+ # Delete added Kubernetes supported version
+ for version_id in cls.kubernetes_version_ids:
+ try:
+ cls.deleteKubernetesSupportedVersion(version_id)
+ except Exception as e:
+ version_delete_failed = True
+ cls.debug("Error: Exception during cleanup for added Kubernetes supported versions: %s" % e)
+ try:
+ # Restore original CKS template
+ if cls.initial_configuration_cks_template_name != None:
+ Configurations.update(cls.apiclient,
+ cls.cks_template_name_key,
+ cls.initial_configuration_cks_template_name)
+ # Delete created CKS template
+ if cls.setup_failed == False and cls.cks_template != None:
+ cls.cks_template.delete(cls.apiclient,
+ cls.zone.id)
+ # Restore CKS enabled
+ if cls.initial_configuration_cks_enabled not in ["true", True]:
+ cls.debug("Restoring Kubernetes Service enabled value")
+ Configurations.update(cls.apiclient,
+ "cloud.kubernetes.service.enabled",
+ "false")
+ cls.restartServer()
+
+ cleanup_resources(cls.apiclient, cls._cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ if version_delete_failed == True:
+ raise Exception("Warning: Exception during cleanup, unable to delete Kubernetes supported versions")
+ return
+
+ @classmethod
+ def restartServer(cls):
+ """Restart management server"""
+
+ cls.debug("Restarting management server")
+ sshClient = SshClient(
+ cls.mgtSvrDetails["mgtSvrIp"],
+ 22,
+ cls.mgtSvrDetails["user"],
+ cls.mgtSvrDetails["passwd"]
+ )
+ command = "service cloudstack-management stop"
+ sshClient.execute(command)
+
+ command = "service cloudstack-management start"
+ sshClient.execute(command)
+
+ #Waits for management to come up in 5 mins, when it's up it will continue
+ timeout = time.time() + 300
+ while time.time() < timeout:
+ if cls.isManagementUp() is True: return
+ time.sleep(5)
+ cls.setup_failed = True
+ cls.debug("Management server did not come up, failing")
+ return
+
+ @classmethod
+ def isManagementUp(cls):
+ try:
+ cls.apiclient.listInfrastructure(listInfrastructure.listInfrastructureCmd())
+ return True
+ except Exception:
+ return False
+
+ @classmethod
+ def waitForTemplateReadyState(cls, template_id, retries=30, interval=60):
+ """Check if template download will finish"""
+ while retries > 0:
+ time.sleep(interval)
+ template_response = Template.list(
+ cls.apiclient,
+ id=template_id,
+ zoneid=cls.zone.id,
+ templatefilter='self'
+ )
+
+ if isinstance(template_response, list):
+ template = template_response[0]
+ if not hasattr(template, 'status') or not template or not template.status:
+ retries = retries - 1
+ continue
+ if 'Failed' == template.status:
+ raise Exception("Failed to download template: status - %s" % template.status)
+ elif template.status == 'Download Complete' and template.isready:
+ return
+ retries = retries - 1
+ raise Exception("Template download timed out")
+
+ @classmethod
+ def waitForKubernetesSupportedVersionIsoReadyState(cls, version_id, retries=30, interval=60):
+ """Check if Kubernetes supported version ISO is in Ready state"""
+
+ while retries > 0:
+ time.sleep(interval)
+ list_versions_response = cls.listKubernetesSupportedVersion(version_id)
+ if not hasattr(list_versions_response, 'isostate') or not list_versions_response or not list_versions_response.isostate:
+ retries = retries - 1
+ continue
+ if 'Ready' == list_versions_response.isostate:
+ return
+ elif 'Failed' == list_versions_response.isostate:
+ raise Exception( "Failed to download template: status - %s" % template.status)
+ retries = retries - 1
+ raise Exception("Kubernetes supported version Ready state timed out")
+
+ @classmethod
+ def listKubernetesSupportedVersion(cls, version_id):
+ listKubernetesSupportedVersionsCmd = listKubernetesSupportedVersions.listKubernetesSupportedVersionsCmd()
+ listKubernetesSupportedVersionsCmd.id = version_id
+ versionResponse = cls.apiclient.listKubernetesSupportedVersions(listKubernetesSupportedVersionsCmd)
+ return versionResponse[0]
+
+ @classmethod
+ def addKubernetesSupportedVersion(cls, semantic_version, iso_url):
+ addKubernetesSupportedVersionCmd = addKubernetesSupportedVersion.addKubernetesSupportedVersionCmd()
+ addKubernetesSupportedVersionCmd.semanticversion = semantic_version
+ addKubernetesSupportedVersionCmd.name = 'v' + semantic_version + '-' + random_gen()
+ addKubernetesSupportedVersionCmd.url = iso_url
+ addKubernetesSupportedVersionCmd.mincpunumber = 2
+ addKubernetesSupportedVersionCmd.minmemory = 2048
+ kubernetes_version = cls.apiclient.addKubernetesSupportedVersion(addKubernetesSupportedVersionCmd)
+ cls.debug("Waiting for Kubernetes version with ID %s to be ready" % kubernetes_version.id)
+ cls.waitForKubernetesSupportedVersionIsoReadyState(kubernetes_version.id)
+ kubernetes_version = cls.listKubernetesSupportedVersion(kubernetes_version.id)
+ return kubernetes_version
+
+ @classmethod
+ def deleteKubernetesSupportedVersion(cls, version_id):
+ deleteKubernetesSupportedVersionCmd = deleteKubernetesSupportedVersion.deleteKubernetesSupportedVersionCmd()
+ deleteKubernetesSupportedVersionCmd.id = version_id
+ deleteKubernetesSupportedVersionCmd.deleteiso = True
+ cls.apiclient.deleteKubernetesSupportedVersion(deleteKubernetesSupportedVersionCmd)
+
+ def setUp(self):
+ self.services = self.testClient.getParsedTestDataConfig()
+ self.apiclient = self.testClient.getApiClient()
+ self.dbclient = self.testClient.getDbConnection()
+ self.cleanup = []
+ return
+
+ def tearDown(self):
+ try:
+ #Clean up, terminate the created templates
+ cleanup_resources(self.apiclient, self.cleanup)
+
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ @attr(tags=["advanced", "smoke"], required_hardware="true")
+ def test_01_deploy_kubernetes_cluster(self):
+ """Test to deploy a new Kubernetes cluster
+
+ # Validate the following:
+ # 1. createKubernetesCluster should return valid info for new cluster
+ # 2. The Cloud Database contains the valid information
+ # 3. stopKubernetesCluster should stop the cluster
+ """
+ if self.hypervisor.lower() not in ["kvm", "vmware", "xenserver"]:
+ self.skipTest("CKS not supported for hypervisor: %s" % self.hypervisor.lower())
+ if self.setup_failed == True:
+ self.skipTest("Setup incomplete")
+ name = 'testcluster-' + random_gen()
+ self.debug("Creating for Kubernetes cluster with name %s" % name)
+
+ cluster_response = self.createKubernetesCluster(name, self.kubernetes_version_2.id)
+
+ self.verifyKubernetesCluster(cluster_response, name, self.kubernetes_version_2.id)
+
+ self.debug("Kubernetes cluster with ID: %s successfully deployed, now stopping it" % cluster_response.id)
+
+ self.stopAndVerifyKubernetesCluster(cluster_response.id)
+
+ self.debug("Kubernetes cluster with ID: %s successfully stopped, now deleting it" % cluster_response.id)
+
+ self.deleteAndVerifyKubernetesCluster(cluster_response.id)
+
+ self.debug("Kubernetes cluster with ID: %s successfully deleted" % cluster_response.id)
+
+ return
+
+ @attr(tags=["advanced", "smoke"], required_hardware="true")
+ def test_02_deploy_kubernetes_ha_cluster(self):
+ """Test to deploy a new Kubernetes cluster
+
+ # Validate the following:
+ # 1. createKubernetesCluster should return valid info for new cluster
+ # 2. The Cloud Database contains the valid information
+ """
+ if self.hypervisor.lower() not in ["kvm", "vmware", "xenserver"]:
+ self.skipTest("CKS not supported for hypervisor: %s" % self.hypervisor.lower())
+ if self.setup_failed == True:
+ self.skipTest("Setup incomplete")
+ name = 'testcluster-' + random_gen()
+ self.debug("Creating for Kubernetes cluster with name %s" % name)
+
+ cluster_response = self.createKubernetesCluster(name, self.kubernetes_version_3.id, 1, 2)
+
+ self.verifyKubernetesCluster(cluster_response, name, self.kubernetes_version_3.id, 1, 2)
+
+ self.debug("Kubernetes cluster with ID: %s successfully deployed, now deleting it" % cluster_response.id)
+
+ self.deleteAndVerifyKubernetesCluster(cluster_response.id)
+
+ self.debug("Kubernetes cluster with ID: %s successfully deleted" % cluster_response.id)
+
+ return
+
+ @attr(tags=["advanced", "smoke"], required_hardware="true")
+ def test_03_deploy_invalid_kubernetes_ha_cluster(self):
+ """Test to deploy a new Kubernetes cluster
+
+ # Validate the following:
+ # 1. createKubernetesCluster should return valid info for new cluster
+ # 2. The Cloud Database contains the valid information
+ """
+ if self.hypervisor.lower() not in ["kvm", "vmware", "xenserver"]:
+ self.skipTest("CKS not supported for hypervisor: %s" % self.hypervisor.lower())
+ if self.setup_failed == True:
+ self.skipTest("Setup incomplete")
+ name = 'testcluster-' + random_gen()
+ self.debug("Creating for Kubernetes cluster with name %s" % name)
+
+ try:
+ cluster_response = self.createKubernetesCluster(name, self.kubernetes_version_2.id, 1, 2)
+ self.debug("Invslid CKS Kubernetes HA cluster deployed with ID: %s. Deleting it and failing test." % cluster_response.id)
+ self.deleteKubernetesCluster(cluster_response.id)
+ self.fail("HA Kubernetes cluster deployed with Kubernetes supported version below version 1.16.0. Must be an error.")
+ except CloudstackAPIException as e:
+ self.debug("HA Kubernetes cluster with invalid Kubernetes supported version check successful, API failure: %s" % e)
+
+ return
+
+ @attr(tags=["advanced", "smoke"], required_hardware="true")
+ def test_04_deploy_and_upgrade_kubernetes_cluster(self):
+ """Test to deploy a new Kubernetes cluster and upgrade it to newer version
+
+ # Validate the following:
+ # 1. createKubernetesCluster should return valid info for new cluster
+ # 2. The Cloud Database contains the valid information
+ # 3. upgradeKubernetesCluster should return valid info for the cluster
+ """
+ if self.hypervisor.lower() not in ["kvm", "vmware", "xenserver"]:
+ self.skipTest("CKS not supported for hypervisor: %s" % self.hypervisor.lower())
+ if self.setup_failed == True:
+ self.skipTest("Setup incomplete")
+ name = 'testcluster-' + random_gen()
+ self.debug("Creating for Kubernetes cluster with name %s" % name)
+
+ cluster_response = self.createKubernetesCluster(name, self.kubernetes_version_2.id)
+
+ self.verifyKubernetesCluster(cluster_response, name, self.kubernetes_version_2.id)
+
+ self.debug("Kubernetes cluster with ID: %s successfully deployed, now upgrading it" % cluster_response.id)
+
+ try:
+ cluster_response = self.upgradeKubernetesCluster(cluster_response.id, self.kubernetes_version_3.id)
+ except Exception as e:
+ self.deleteKubernetesCluster(cluster_response.id)
+ self.fail("Failed to upgrade Kubernetes cluster due to: %s" % e)
+
+ self.verifyKubernetesClusterUpgrade(cluster_response, self.kubernetes_version_3.id)
+
+ self.debug("Kubernetes cluster with ID: %s successfully upgraded, now deleting it" % cluster_response.id)
+
+ self.deleteAndVerifyKubernetesCluster(cluster_response.id)
+
+ self.debug("Kubernetes cluster with ID: %s successfully deleted" % cluster_response.id)
+
+ return
+
+
+ @attr(tags=["advanced", "smoke"], required_hardware="true")
+ def test_05_deploy_and_upgrade_kubernetes_ha_cluster(self):
+ """Test to deploy a new HA Kubernetes cluster and upgrade it to newer version
+
+ # Validate the following:
+ # 1. createKubernetesCluster should return valid info for new cluster
+ # 2. The Cloud Database contains the valid information
+ # 3. upgradeKubernetesCluster should return valid info for the cluster
+ """
+ if self.hypervisor.lower() not in ["kvm", "vmware", "xenserver"]:
+ self.skipTest("CKS not supported for hypervisor: %s" % self.hypervisor.lower())
+ if self.setup_failed == True:
+ self.skipTest("Setup incomplete")
+ name = 'testcluster-' + random_gen()
+ self.debug("Creating for Kubernetes cluster with name %s" % name)
+
+ cluster_response = self.createKubernetesCluster(name, self.kubernetes_version_3.id, 1, 2)
+
+ self.verifyKubernetesCluster(cluster_response, name, self.kubernetes_version_3.id, 1, 2)
+
+ self.debug("Kubernetes cluster with ID: %s successfully deployed, now upgrading it" % cluster_response.id)
+
+ try:
+ cluster_response = self.upgradeKubernetesCluster(cluster_response.id, self.kubernetes_version_4.id)
+ except Exception as e:
+ self.deleteKubernetesCluster(cluster_response.id)
+ self.fail("Failed to upgrade Kubernetes HA cluster due to: %s" % e)
+
+ self.verifyKubernetesClusterUpgrade(cluster_response, self.kubernetes_version_4.id)
+
+ self.debug("Kubernetes cluster with ID: %s successfully upgraded, now deleting it" % cluster_response.id)
+
+ self.deleteAndVerifyKubernetesCluster(cluster_response.id)
+
+ self.debug("Kubernetes cluster with ID: %s successfully deleted" % cluster_response.id)
+
+ return
+
+ @attr(tags=["advanced", "smoke"], required_hardware="true")
+ def test_06_deploy_and_invalid_upgrade_kubernetes_cluster(self):
+ """Test to deploy a new Kubernetes cluster and check for failure while tying to upgrade it to a lower version
+
+ # Validate the following:
+ # 1. createKubernetesCluster should return valid info for new cluster
+ # 2. The Cloud Database contains the valid information
+ # 3. upgradeKubernetesCluster should fail
+ """
+ if self.hypervisor.lower() not in ["kvm", "vmware", "xenserver"]:
+ self.skipTest("CKS not supported for hypervisor: %s" % self.hypervisor.lower())
+ if self.setup_failed == True:
+ self.skipTest("Setup incomplete")
+ name = 'testcluster-' + random_gen()
+ self.debug("Creating for Kubernetes cluster with name %s" % name)
+
+ cluster_response = self.createKubernetesCluster(name, self.kubernetes_version_2.id)
+
+ self.verifyKubernetesCluster(cluster_response, name, self.kubernetes_version_2.id)
+
+ self.debug("Kubernetes cluster with ID: %s successfully deployed, now scaling it" % cluster_response.id)
+
+ try:
+ cluster_response = self.upgradeKubernetesCluster(cluster_response.id, self.kubernetes_version_1.id)
+ self.debug("Invalid CKS Kubernetes HA cluster deployed with ID: %s. Deleting it and failing test." % kubernetes_version_1.id)
+ self.deleteKubernetesCluster(cluster_response.id)
+ self.fail("Kubernetes cluster upgraded to a lower Kubernetes supported version. Must be an error.")
+ except Exception as e:
+ self.debug("Upgrading Kubernetes cluster with invalid Kubernetes supported version check successful, API failure: %s" % e)
+
+ self.debug("Deleting Kubernetes cluster with ID: %s" % cluster_response.id)
+
+ self.deleteAndVerifyKubernetesCluster(cluster_response.id)
+
+ self.debug("Kubernetes cluster with ID: %s successfully deleted" % cluster_response.id)
+
+ return
+
+ @attr(tags=["advanced", "smoke"], required_hardware="true")
+ def test_07_deploy_and_scale_kubernetes_cluster(self):
+ """Test to deploy a new Kubernetes cluster and check for failure while tying to scale it
+
+ # Validate the following:
+ # 1. createKubernetesCluster should return valid info for new cluster
+ # 2. The Cloud Database contains the valid information
+ # 3. scaleKubernetesCluster should return valid info for the cluster when it is scaled up
+ # 4. scaleKubernetesCluster should return valid info for the cluster when it is scaled down
+ """
+ if self.hypervisor.lower() not in ["kvm", "vmware", "xenserver"]:
+ self.skipTest("CKS not supported for hypervisor: %s" % self.hypervisor.lower())
+ if self.setup_failed == True:
+ self.skipTest("Setup incomplete")
+ name = 'testcluster-' + random_gen()
+ self.debug("Creating for Kubernetes cluster with name %s" % name)
+
+ cluster_response = self.createKubernetesCluster(name, self.kubernetes_version_2.id)
+
+ self.verifyKubernetesCluster(cluster_response, name, self.kubernetes_version_2.id)
+
+ self.debug("Kubernetes cluster with ID: %s successfully deployed, now upscaling it" % cluster_response.id)
+
+ try:
+ cluster_response = self.scaleKubernetesCluster(cluster_response.id, 2)
+ except Exception as e:
+ self.deleteKubernetesCluster(cluster_response.id)
+ self.fail("Failed to upscale Kubernetes cluster due to: %s" % e)
+
+ self.verifyKubernetesClusterScale(cluster_response, 2)
+
+ self.debug("Kubernetes cluster with ID: %s successfully upscaled, now downscaling it" % cluster_response.id)
+
+ try:
+ cluster_response = self.scaleKubernetesCluster(cluster_response.id, 1)
+ except Exception as e:
+ self.deleteKubernetesCluster(cluster_response.id)
+ self.fail("Failed to downscale Kubernetes cluster due to: %s" % e)
+
+ self.verifyKubernetesClusterScale(cluster_response)
+
+ self.debug("Kubernetes cluster with ID: %s successfully downscaled, now deleting it" % cluster_response.id)
+
+ self.deleteAndVerifyKubernetesCluster(cluster_response.id)
+
+ self.debug("Kubernetes cluster with ID: %s successfully deleted" % cluster_response.id)
+
+ return
+
+ def listKubernetesCluster(self, cluster_id):
+ listKubernetesClustersCmd = listKubernetesClusters.listKubernetesClustersCmd()
+ listKubernetesClustersCmd.id = cluster_id
+ clusterResponse = self.apiclient.listKubernetesClusters(listKubernetesClustersCmd)
+ return clusterResponse[0]
+
+ def createKubernetesCluster(self, name, version_id, size=1, master_nodes=1):
+ createKubernetesClusterCmd = createKubernetesCluster.createKubernetesClusterCmd()
+ createKubernetesClusterCmd.name = name
+ createKubernetesClusterCmd.description = name + "-description"
+ createKubernetesClusterCmd.kubernetesversionid = version_id
+ createKubernetesClusterCmd.size = size
+ createKubernetesClusterCmd.masternodes = master_nodes
+ createKubernetesClusterCmd.serviceofferingid = self.cks_service_offering.id
+ createKubernetesClusterCmd.zoneid = self.zone.id
+ createKubernetesClusterCmd.noderootdisksize = 10
+ clusterResponse = self.apiclient.createKubernetesCluster(createKubernetesClusterCmd)
+ if not clusterResponse:
+ self.cleanup.append(clusterResponse)
+ return clusterResponse
+
+ def stopKubernetesCluster(self, cluster_id):
+ stopKubernetesClusterCmd = stopKubernetesCluster.stopKubernetesClusterCmd()
+ stopKubernetesClusterCmd.id = cluster_id
+ response = self.apiclient.stopKubernetesCluster(stopKubernetesClusterCmd)
+ return response
+
+ def deleteKubernetesCluster(self, cluster_id):
+ deleteKubernetesClusterCmd = deleteKubernetesCluster.deleteKubernetesClusterCmd()
+ deleteKubernetesClusterCmd.id = cluster_id
+ response = self.apiclient.deleteKubernetesCluster(deleteKubernetesClusterCmd)
+ return response
+
+ def upgradeKubernetesCluster(self, cluster_id, version_id):
+ upgradeKubernetesClusterCmd = upgradeKubernetesCluster.upgradeKubernetesClusterCmd()
+ upgradeKubernetesClusterCmd.id = cluster_id
+ upgradeKubernetesClusterCmd.kubernetesversionid = version_id
+ response = self.apiclient.upgradeKubernetesCluster(upgradeKubernetesClusterCmd)
+ return response
+
+ def scaleKubernetesCluster(self, cluster_id, size):
+ scaleKubernetesClusterCmd = scaleKubernetesCluster.scaleKubernetesClusterCmd()
+ scaleKubernetesClusterCmd.id = cluster_id
+ scaleKubernetesClusterCmd.size = size
+ response = self.apiclient.scaleKubernetesCluster(scaleKubernetesClusterCmd)
+ return response
+
+ def verifyKubernetesCluster(self, cluster_response, name, version_id, size=1, master_nodes=1):
+ """Check if Kubernetes cluster is valid"""
+
+ self.verifyKubernetesClusterState(cluster_response, 'Running')
+
+ self.assertEqual(
+ cluster_response.name,
+ name,
+ "Check KubernetesCluster name {}, {}".format(cluster_response.name, name)
+ )
+
+ self.verifyKubernetesClusterVersion(cluster_response, version_id)
+
+ self.assertEqual(
+ cluster_response.zoneid,
+ self.zone.id,
+ "Check KubernetesCluster zone {}, {}".format(cluster_response.zoneid, self.zone.id)
+ )
+
+ self.verifyKubernetesClusterSize(cluster_response, size, master_nodes)
+
+ db_cluster_name = self.dbclient.execute("select name from kubernetes_cluster where uuid = '%s';" % cluster_response.id)[0][0]
+
+ self.assertEqual(
+ str(db_cluster_name),
+ name,
+ "Check KubernetesCluster name in DB {}, {}".format(db_cluster_name, name)
+ )
+
+ def verifyKubernetesClusterState(self, cluster_response, state):
+ """Check if Kubernetes cluster state is Running"""
+
+ self.assertEqual(
+ cluster_response.state,
+ 'Running',
+ "Check KubernetesCluster state {}, {}".format(cluster_response.state, state)
+ )
+
+ def verifyKubernetesClusterVersion(self, cluster_response, version_id):
+ """Check if Kubernetes cluster node sizes are valid"""
+
+ self.assertEqual(
+ cluster_response.kubernetesversionid,
+ version_id,
+ "Check KubernetesCluster version {}, {}".format(cluster_response.kubernetesversionid, version_id)
+ )
+
+ def verifyKubernetesClusterSize(self, cluster_response, size=1, master_nodes=1):
+ """Check if Kubernetes cluster node sizes are valid"""
+
+ self.assertEqual(
+ cluster_response.size,
+ size,
+ "Check KubernetesCluster size {}, {}".format(cluster_response.size, size)
+ )
+
+ self.assertEqual(
+ cluster_response.masternodes,
+ master_nodes,
+ "Check KubernetesCluster master nodes {}, {}".format(cluster_response.masternodes, master_nodes)
+ )
+
+ def verifyKubernetesClusterUpgrade(self, cluster_response, version_id):
+ """Check if Kubernetes cluster state and version are valid after upgrade"""
+
+ self.verifyKubernetesClusterState(cluster_response, 'Running')
+ self.verifyKubernetesClusterVersion(cluster_response, version_id)
+
+ def verifyKubernetesClusterScale(self, cluster_response, size=1, master_nodes=1):
+ """Check if Kubernetes cluster state and node sizes are valid after upgrade"""
+
+ self.verifyKubernetesClusterState(cluster_response, 'Running')
+ self.verifyKubernetesClusterSize(cluster_response, size, master_nodes)
+
+ def stopAndVerifyKubernetesCluster(self, cluster_id):
+ """Stop Kubernetes cluster and check if it is really stopped"""
+
+ stop_response = self.stopKubernetesCluster(cluster_id)
+
+ self.assertEqual(
+ stop_response.success,
+ True,
+ "Check KubernetesCluster stop response {}, {}".format(stop_response.success, True)
+ )
+
+ db_cluster_state = self.dbclient.execute("select state from kubernetes_cluster where uuid = '%s';" % cluster_id)[0][0]
+
+ self.assertEqual(
+ db_cluster_state,
+ 'Stopped',
+ "KubernetesCluster not stopped in DB, {}".format(db_cluster_state)
+ )
+
+ def deleteAndVerifyKubernetesCluster(self, cluster_id):
+ """Delete Kubernetes cluster and check if it is really deleted"""
+
+ delete_response = self.deleteKubernetesCluster(cluster_id)
+
+ self.assertEqual(
+ delete_response.success,
+ True,
+ "Check KubernetesCluster delete response {}, {}".format(delete_response.success, True)
+ )
+
+ db_cluster_removed = self.dbclient.execute("select removed from kubernetes_cluster where uuid = '%s';" % cluster_id)[0][0]
+
+ self.assertNotEqual(
+ db_cluster_removed,
+ None,
+ "KubernetesCluster not removed in DB, {}".format(db_cluster_removed)
+ )
diff --git a/test/integration/smoke/test_kubernetes_supported_versions.py b/test/integration/smoke/test_kubernetes_supported_versions.py
new file mode 100644
index 0000000..b220205
--- /dev/null
+++ b/test/integration/smoke/test_kubernetes_supported_versions.py
@@ -0,0 +1,275 @@
+# 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.
+""" Tests for Kubernetes supported version """
+
+#Import Local Modules
+from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackAPI import (listInfrastructure,
+ listKubernetesSupportedVersions,
+ addKubernetesSupportedVersion,
+ deleteKubernetesSupportedVersion)
+from marvin.cloudstackException import CloudstackAPIException
+from marvin.codes import FAILED
+from marvin.lib.base import Configurations
+from marvin.lib.utils import (cleanup_resources,
+ random_gen)
+from marvin.lib.common import get_zone
+from marvin.sshClient import SshClient
+from nose.plugins.attrib import attr
+
+import time
+
+_multiprocess_shared_ = True
+
+class TestKubernetesSupportedVersion(cloudstackTestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ cls.testClient = super(TestKubernetesSupportedVersion, cls).getClsTestClient()
+ cls.apiclient = cls.testClient.getApiClient()
+ cls.services = cls.testClient.getParsedTestDataConfig()
+ cls.zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests())
+ cls.mgtSvrDetails = cls.config.__dict__["mgtSvr"][0].__dict__
+ cls.kubernetes_version_iso_url = 'http://download.cloudstack.org/cks/setup-1.16.3.iso'
+
+ cls.initial_configuration_cks_enabled = Configurations.list(cls.apiclient,
+ name="cloud.kubernetes.service.enabled")[0].value
+ if cls.initial_configuration_cks_enabled not in ["true", True]:
+ cls.debug("Enabling CloudStack Kubernetes Service plugin and restarting management server")
+ Configurations.update(cls.apiclient,
+ "cloud.kubernetes.service.enabled",
+ "true")
+ cls.restartServer()
+
+ cls._cleanup = []
+ return
+
+ @classmethod
+ def tearDownClass(cls):
+ try:
+ # Restore CKS enabled
+ if cls.initial_configuration_cks_enabled not in ["true", True]:
+ cls.debug("Restoring Kubernetes Service enabled value")
+ Configurations.update(cls.apiclient,
+ "cloud.kubernetes.service.enabled",
+ "false")
+ cls.restartServer()
+ cleanup_resources(cls.apiclient, cls._cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ @classmethod
+ def restartServer(cls):
+ """Restart management server"""
+
+ cls.debug("Restarting management server")
+ sshClient = SshClient(
+ cls.mgtSvrDetails["mgtSvrIp"],
+ 22,
+ cls.mgtSvrDetails["user"],
+ cls.mgtSvrDetails["passwd"]
+ )
+ command = "service cloudstack-management stop"
+ sshClient.execute(command)
+
+ command = "service cloudstack-management start"
+ sshClient.execute(command)
+
+ #Waits for management to come up in 5 mins, when it's up it will continue
+ timeout = time.time() + 300
+ while time.time() < timeout:
+ if cls.isManagementUp() is True: return
+ time.sleep(5)
+ return cls.fail("Management server did not come up, failing")
+
+ @classmethod
+ def isManagementUp(cls):
+ try:
+ cls.apiclient.listInfrastructure(listInfrastructure.listInfrastructureCmd())
+ return True
+ except Exception:
+ return False
+
+ def setUp(self):
+ self.services = self.testClient.getParsedTestDataConfig()
+ self.apiclient = self.testClient.getApiClient()
+ self.dbclient = self.testClient.getDbConnection()
+ self.cleanup = []
+ return
+
+ def tearDown(self):
+ try:
+ #Clean up, terminate the created templates
+ cleanup_resources(self.apiclient, self.cleanup)
+
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ @attr(tags=["advanced", "smoke"], required_hardware="true")
+ def test_01_add_delete_kubernetes_supported_version(self):
+ """Test to add a new Kubernetes supported version
+
+ # Validate the following:
+ # 1. addKubernetesSupportedVersion should return valid info for new version
+ # 2. The Cloud Database contains the valid information when listKubernetesSupportedVersions is called
+ """
+
+ version = '1.16.3'
+ name = 'v' + version + '-' + random_gen()
+
+ self.debug("Adding Kubernetes supported version with name: %s" % name)
+
+ version_response = self.addKubernetesSupportedVersion(version, name, self.zone.id, self.kubernetes_version_iso_url)
+
+ list_versions_response = self.listKubernetesSupportedVersion(version_response.id)
+
+ self.assertEqual(
+ list_versions_response.name,
+ name,
+ "Check KubernetesSupportedVersion name {}, {}".format(list_versions_response.name, name)
+ )
+
+ self.assertEqual(
+ list_versions_response.semanticversion,
+ version,
+ "Check KubernetesSupportedVersion version {}, {}".format(list_versions_response.semanticversion, version)
+ )
+ self.assertEqual(
+ list_versions_response.zoneid,
+ self.zone.id,
+ "Check KubernetesSupportedVersion zone {}, {}".format(list_versions_response.zoneid, self.zone.id)
+ )
+
+ db_version_name = self.dbclient.execute("select name from kubernetes_supported_version where uuid = '%s';" % version_response.id)[0][0]
+
+ self.assertEqual(
+ str(db_version_name),
+ name,
+ "Check KubernetesSupportedVersion name in DB {}, {}".format(db_version_name, name)
+ )
+
+ self.debug("Added Kubernetes supported version with ID: %s. Waiting for its ISO to be Ready" % version_response.id)
+
+ self.waitForKubernetesSupportedVersionIsoReadyState(version_response.id)
+
+ self.debug("Deleting Kubernetes supported version with ID: %s" % version_response.id)
+
+ delete_response = self.deleteKubernetesSupportedVersion(version_response.id, True)
+
+ self.assertEqual(
+ delete_response.success,
+ True,
+ "Check KubernetesSupportedVersion deletion in DB {}, {}".format(delete_response.success, True)
+ )
+
+ db_version_removed = self.dbclient.execute("select removed from kubernetes_supported_version where uuid = '%s';" % version_response.id)[0][0]
+
+ self.assertNotEqual(
+ db_version_removed,
+ None,
+ "KubernetesSupportedVersion not removed in DB"
+ )
+
+ return
+
+ @attr(tags=["advanced", "smoke"], required_hardware="true")
+ def test_02_add_unsupported_kubernetes_supported_version(self):
+ """Test to trying to add a new unsupported Kubernetes supported version
+
+ # Validate the following:
+ # 1. API should return an error
+ """
+
+ version = '1.1.1'
+ name = 'v' + version + '-' + random_gen()
+ try:
+ version_response = self.addKubernetesSupportedVersion(version, name, self.zone.id, self.kubernetes_version_iso_url)
+ self.debug("Unsupported CKS Kubernetes supported added with ID: %s. Deleting it and failing test." % version_response.id)
+ self.waitForKubernetesSupportedVersionIsoReadyState(version_response.id)
+ self.deleteKubernetesSupportedVersion(version_response.id, True)
+ self.fail("Kubernetes supported version below version 1.11.0 been added. Must be an error.")
+ except CloudstackAPIException as e:
+ self.debug("Unsupported version error check successful, API failure: %s" % e)
+ return
+
+ @attr(tags=["advanced", "smoke"], required_hardware="true")
+ def test_03_add_invalid_kubernetes_supported_version(self):
+ """Test to trying to add a new unsupported Kubernetes supported version
+
+ # Validate the following:
+ # 1. API should return an error
+ """
+
+ version = 'invalid'
+ name = 'v' + version + '-' + random_gen()
+ try:
+ version_response = self.addKubernetesSupportedVersion(version, name, self.zone.id, self.kubernetes_version_iso_url)
+ self.debug("Invalid Kubernetes supported added with ID: %s. Deleting it and failing test." % version_response.id)
+ self.waitForKubernetesSupportedVersionIsoReadyState(version_response.id)
+ self.deleteKubernetesSupportedVersion(version_response.id, True)
+ self.fail("Invalid Kubernetes supported version has been added. Must be an error.")
+ except CloudstackAPIException as e:
+ self.debug("Unsupported version error check successful, API failure: %s" % e)
+ return
+
+ def addKubernetesSupportedVersion(self, version, name, zoneId, isoUrl):
+ addKubernetesSupportedVersionCmd = addKubernetesSupportedVersion.addKubernetesSupportedVersionCmd()
+ addKubernetesSupportedVersionCmd.semanticversion = version
+ addKubernetesSupportedVersionCmd.name = name
+ addKubernetesSupportedVersionCmd.zoneid = zoneId
+ addKubernetesSupportedVersionCmd.url = isoUrl
+ addKubernetesSupportedVersionCmd.mincpunumber = 2
+ addKubernetesSupportedVersionCmd.minmemory = 2048
+ versionResponse = self.apiclient.addKubernetesSupportedVersion(addKubernetesSupportedVersionCmd)
+ if not versionResponse:
+ self.cleanup.append(versionResponse)
+ return versionResponse
+
+ def listKubernetesSupportedVersion(self, versionId):
+ listKubernetesSupportedVersionsCmd = listKubernetesSupportedVersions.listKubernetesSupportedVersionsCmd()
+ listKubernetesSupportedVersionsCmd.id = versionId
+ versionResponse = self.apiclient.listKubernetesSupportedVersions(listKubernetesSupportedVersionsCmd)
+ return versionResponse[0]
+
+ def deleteKubernetesSupportedVersion(self, cmd):
+ response = self.apiclient.deleteKubernetesSupportedVersion(cmd)
+ return response
+
+ def deleteKubernetesSupportedVersion(self, versionId, deleteIso):
+ deleteKubernetesSupportedVersionCmd = deleteKubernetesSupportedVersion.deleteKubernetesSupportedVersionCmd()
+ deleteKubernetesSupportedVersionCmd.id = versionId
+ deleteKubernetesSupportedVersionCmd.deleteiso = deleteIso
+ response = self.apiclient.deleteKubernetesSupportedVersion(deleteKubernetesSupportedVersionCmd)
+ return response
+
+ def waitForKubernetesSupportedVersionIsoReadyState(self, version_id, retries=30, interval=60):
+ """Check if Kubernetes supported version ISO is in Ready state"""
+
+ while retries > 0:
+ time.sleep(interval)
+ list_versions_response = self.listKubernetesSupportedVersion(version_id)
+ if not hasattr(list_versions_response, 'isostate') or not list_versions_response or not list_versions_response.isostate:
+ retries = retries - 1
+ continue
+ if 'Ready' == list_versions_response.isostate:
+ return
+ elif 'Failed' == list_versions_response.isostate:
+ raise Exception( "Failed to download template: status - %s" % template.status)
+ retries = retries - 1
+ raise Exception("Kubernetes supported version Ready state timed out")
diff --git a/test/integration/smoke/test_network.py b/test/integration/smoke/test_network.py
index e49f547..b6d1bae 100644
--- a/test/integration/smoke/test_network.py
+++ b/test/integration/smoke/test_network.py
@@ -34,7 +34,9 @@
Network,
NetworkOffering,
LoadBalancerRule,
- Router)
+ Router,
+ NIC,
+ Cluster)
from marvin.lib.common import (get_domain,
get_zone,
get_test_template,
@@ -47,6 +49,7 @@
list_configurations,
verifyGuestTrafficPortGroups)
from nose.plugins.attrib import attr
+from marvin.lib.decoratorGenerators import skipTestIf
from ddt import ddt, data
# Import System modules
import time
@@ -1532,3 +1535,287 @@
)
return
+
+class TestPrivateVlansL2Networks(cloudstackTestCase):
+
+ def setUp(self):
+ self.apiclient = self.testClient.getApiClient()
+
+ self.cleanup = [
+ ]
+
+ def tearDown(self):
+ cleanup_resources(self.apiclient, self.cleanup)
+ return
+
+ @classmethod
+ def setUpClass(cls):
+ testClient = super(TestPrivateVlansL2Networks, cls).getClsTestClient()
+ cls.apiclient = testClient.getApiClient()
+ cls.services = testClient.getParsedTestDataConfig()
+
+ cls.domain = get_domain(cls.apiclient)
+ cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
+ cls.hypervisor = testClient.getHypervisorInfo()
+ cls.services['mode'] = cls.zone.networktype
+
+ # Supported hypervisor = Vmware using dvSwitches for guest traffic
+ isVmware = False
+ isDvSwitch = False
+ if cls.hypervisor.lower() in ["vmware"]:
+ isVmware = True
+ clusters = Cluster.list(cls.apiclient, zoneid=cls.zone.id, hypervisor=cls.hypervisor)
+ for cluster in clusters:
+ if cluster.resourcedetails.guestvswitchtype == "vmwaredvs":
+ # Test only if cluster uses dvSwitch
+ isDvSwitch = True
+ break
+
+ supported = isVmware and isDvSwitch
+ cls.vmwareHypervisorDvSwitchesForGuestTrafficNotPresent = not supported
+
+ cls._cleanup = []
+
+ if supported:
+
+ cls.account = Account.create(
+ cls.apiclient,
+ cls.services["account"],
+ admin=True,
+ domainid=cls.domain.id
+ )
+ cls.template = get_test_template(
+ cls.apiclient,
+ cls.zone.id,
+ cls.hypervisor
+ )
+ cls.service_offering = ServiceOffering.create(
+ cls.apiclient,
+ cls.services["service_offerings"]["tiny"]
+ )
+ cls.services["network"]["zoneid"] = cls.zone.id
+ cls.services['mode'] = cls.zone.networktype
+ cls.services["small"]["zoneid"] = cls.zone.id
+ cls.services["small"]["template"] = cls.template.id
+ cls.services["l2-network-pvlan-community-1"] = {
+ "name": "Test Network L2 PVLAN Community 1",
+ "displaytext": "Test Network L2 PVLAN Community 1",
+ "vlan": 900,
+ "isolatedpvlan": "901",
+ "isolatedpvlantype": "community"
+ }
+ cls.services["l2-network-pvlan-community-2"] = {
+ "name": "Test Network L2 PVLAN Community 2",
+ "displaytext": "Test Network L2 PVLAN Community 2",
+ "vlan": 900,
+ "isolatedpvlan": "902",
+ "isolatedpvlantype": "community"
+ }
+ cls.services["l2-network-pvlan-promiscuous"] = {
+ "name": "Test Network L2 PVLAN Promiscuous",
+ "displaytext": "Test Network L2 PVLAN Promiscuous",
+ "vlan": 900,
+ "isolatedpvlan" : "900",
+ "isolatedpvlantype": "promiscuous"
+ }
+ cls.services["l2-network-pvlan-isolated"] = {
+ "name": "Test Network L2 PVLAN Isolated",
+ "displaytext": "Test Network L2 PVLAN Isolated",
+ "vlan": 900,
+ "isolatedpvlan": "903",
+ "isolatedpvlantype": "isolated"
+ }
+
+ cls.l2_network_offering = NetworkOffering.create(
+ cls.apiclient,
+ cls.services["l2-network_offering"],
+ specifyvlan=True
+ )
+ cls.isolated_network_offering = NetworkOffering.create(
+ cls.apiclient,
+ cls.services["network_offering"]
+ )
+ cls.l2_network_offering.update(cls.apiclient, state='Enabled')
+ cls.isolated_network_offering.update(cls.apiclient, state='Enabled')
+
+ cls.l2_pvlan_community1 = Network.create(
+ cls.apiclient,
+ cls.services["l2-network-pvlan-community-1"],
+ zoneid=cls.zone.id,
+ networkofferingid=cls.l2_network_offering.id
+ )
+ cls.l2_pvlan_community2 = Network.create(
+ cls.apiclient,
+ cls.services["l2-network-pvlan-community-2"],
+ zoneid=cls.zone.id,
+ networkofferingid=cls.l2_network_offering.id
+ )
+ cls.l2_pvlan_isolated = Network.create(
+ cls.apiclient,
+ cls.services["l2-network-pvlan-isolated"],
+ zoneid=cls.zone.id,
+ networkofferingid=cls.l2_network_offering.id
+ )
+ cls.l2_pvlan_promiscuous = Network.create(
+ cls.apiclient,
+ cls.services["l2-network-pvlan-promiscuous"],
+ zoneid=cls.zone.id,
+ networkofferingid=cls.l2_network_offering.id
+ )
+ cls.isolated_network = Network.create(
+ cls.apiclient,
+ cls.services["isolated_network"],
+ zoneid=cls.zone.id,
+ networkofferingid=cls.isolated_network_offering.id,
+ accountid=cls.account.name,
+ domainid=cls.account.domainid
+ )
+
+ cls._cleanup = [
+ cls.l2_pvlan_promiscuous,
+ cls.l2_pvlan_isolated,
+ cls.l2_pvlan_community1,
+ cls.l2_pvlan_community2,
+ cls.isolated_network,
+ cls.l2_network_offering,
+ cls.isolated_network_offering,
+ cls.service_offering,
+ cls.account,
+ ]
+
+ return
+
+ @classmethod
+ def tearDownClass(cls):
+ try:
+ cleanup_resources(cls.apiclient, cls._cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ def deploy_vm_multiple_nics(self, name, l2net):
+ """
+ Deploy VM on L2 network and isolated network so VM can get an IP, to use with arping command for isolation test
+ """
+ self.services["small"]["name"] = name
+
+ vm = VirtualMachine.create(
+ self.apiclient,
+ self.services["small"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ serviceofferingid=self.service_offering.id,
+ networkids=[self.isolated_network.id, l2net.id],
+ mode=self.services["mode"]
+ )
+
+ return vm
+
+ def is_vm_l2_isolated_from_dest(self, vm, eth_device, dest_ip):
+ """
+ True if VM is isolated from dest IP - using arping through the NIC on L2 network:
+ If arping can reach destination, then response is greater than 3 (no reply)
+ """
+ ssh_client = vm.get_ssh_client()
+ response = ssh_client.execute("/usr/sbin/arping -c 5 -I %s %s" % (eth_device, str(dest_ip)))
+ return len(response) == 3
+
+ def enable_l2_nic(self, vm):
+ vm_ip = list(filter(lambda x: x['networkid'] == self.isolated_network.id, vm.nic))[0]['ipaddress']
+ ssh_client = vm.get_ssh_client()
+ eth_device = "eth0"
+ if len(ssh_client.execute("/sbin/ifconfig %s | grep %s" % (eth_device, vm_ip))) > 0:
+ eth_device = "eth1"
+ ssh_client.execute("/sbin/ifconfig %s up" % eth_device)
+ return vm_ip, eth_device
+
+ @attr(tags=["advanced", "advancedns", "smoke", "pvlan"], required_hardware="true")
+ @skipTestIf("vmwareHypervisorDvSwitchesForGuestTrafficNotPresent")
+ def test_l2_network_pvlan_connectivity(self):
+ try:
+ vm_community1_one = self.deploy_vm_multiple_nics("vmcommunity1one", self.l2_pvlan_community1)
+ vm_community1_two = self.deploy_vm_multiple_nics("vmcommunity1two", self.l2_pvlan_community1)
+ vm_community2 = self.deploy_vm_multiple_nics("vmcommunity2", self.l2_pvlan_community2)
+
+ vm_isolated1 = self.deploy_vm_multiple_nics("vmisolated1", self.l2_pvlan_isolated)
+ vm_isolated2 = self.deploy_vm_multiple_nics("vmisolated2", self.l2_pvlan_isolated)
+
+ vm_promiscuous1 = self.deploy_vm_multiple_nics("vmpromiscuous1", self.l2_pvlan_promiscuous)
+ vm_promiscuous2 = self.deploy_vm_multiple_nics("vmpromiscuous2", self.l2_pvlan_promiscuous)
+
+ self.cleanup.append(vm_community1_one)
+ self.cleanup.append(vm_community1_two)
+ self.cleanup.append(vm_community2)
+ self.cleanup.append(vm_isolated1)
+ self.cleanup.append(vm_isolated2)
+ self.cleanup.append(vm_promiscuous1)
+ self.cleanup.append(vm_promiscuous2)
+
+ vm_community1_one_ip, vm_community1_one_eth = self.enable_l2_nic(vm_community1_one)
+ vm_community1_two_ip, vm_community1_two_eth = self.enable_l2_nic(vm_community1_two)
+ vm_community2_ip, vm_community2_eth = self.enable_l2_nic(vm_community2)
+ vm_isolated1_ip, vm_isolated1_eth = self.enable_l2_nic(vm_isolated1)
+ vm_isolated2_ip, vm_isolated2_eth = self.enable_l2_nic(vm_isolated2)
+ vm_promiscuous1_ip, vm_promiscuous1_eth = self.enable_l2_nic(vm_promiscuous1)
+ vm_promiscuous2_ip, vm_promiscuous2_eth = self.enable_l2_nic(vm_promiscuous2)
+
+ # Community PVLAN checks
+ different_community_isolated = self.is_vm_l2_isolated_from_dest(vm_community1_one, vm_community1_one_eth, vm_community2_ip)
+ same_community_isolated = self.is_vm_l2_isolated_from_dest(vm_community1_one, vm_community1_one_eth, vm_community1_two_ip)
+ community_to_promiscuous_isolated = self.is_vm_l2_isolated_from_dest(vm_community1_one, vm_community1_one_eth, vm_promiscuous1_ip)
+ community_to_isolated = self.is_vm_l2_isolated_from_dest(vm_community1_one, vm_community1_one_eth, vm_isolated1_ip)
+
+ self.assertTrue(
+ different_community_isolated,
+ "VMs on different community PVLANs must be isolated on layer 2"
+ )
+
+ self.assertFalse(
+ same_community_isolated,
+ "VMs on the same community PVLAN must not be isolated on layer 2"
+ )
+
+ self.assertFalse(
+ community_to_promiscuous_isolated,
+ "VMs on community PVLANs must not be isolated on layer 2 to VMs on promiscuous PVLAN"
+ )
+
+ self.assertTrue(
+ community_to_isolated,
+ "VMs on community PVLANs must be isolated on layer 2 to Vms on isolated PVLAN"
+ )
+
+ # Isolated PVLAN checks
+ same_isolated = self.is_vm_l2_isolated_from_dest(vm_isolated1, vm_isolated1_eth, vm_isolated2_ip)
+ isolated_to_community_isolated = self.is_vm_l2_isolated_from_dest(vm_isolated1, vm_isolated1_eth, vm_community1_one_ip)
+
+ self.assertTrue(
+ same_isolated,
+ "VMs on isolated PVLANs must be isolated on layer 2"
+ )
+ self.assertTrue(
+ isolated_to_community_isolated,
+ "VMs on isolated PVLANs must be isolated on layer 2 to Vms on community PVLAN"
+ )
+
+ # Promiscuous PVLAN checks
+ same_promiscuous = self.is_vm_l2_isolated_from_dest(vm_promiscuous1, vm_promiscuous1_eth, vm_promiscuous2_ip)
+ prom_to_community_isolated = self.is_vm_l2_isolated_from_dest(vm_promiscuous1, vm_promiscuous1_eth, vm_community1_one_ip)
+ prom_to_isolated = self.is_vm_l2_isolated_from_dest(vm_promiscuous1, vm_promiscuous1_eth, vm_isolated1_ip)
+
+ self.assertFalse(
+ same_promiscuous,
+ "VMs on promiscuous PVLANs must not be isolated on layer 2"
+ )
+ self.assertFalse(
+ prom_to_community_isolated,
+ "VMs on promiscuous PVLANs must not be isolated on layer 2 to Vms on isolated PVLAN"
+ )
+ self.assertFalse(
+ prom_to_isolated,
+ "VMs on promiscuous PVLANs must not be isolated on layer 2 to Vms on community PVLAN"
+ )
+ except Exception as e:
+ self.fail("Failing test. Error: %s" % e)
+
+ return
diff --git a/test/integration/smoke/test_privategw_acl.py b/test/integration/smoke/test_privategw_acl.py
index 59a31d3..b6860c8 100644
--- a/test/integration/smoke/test_privategw_acl.py
+++ b/test/integration/smoke/test_privategw_acl.py
@@ -639,6 +639,7 @@
createPrivateGatewayCmd.netmask = "255.255.255.0"
createPrivateGatewayCmd.ipaddress = ip_address
createPrivateGatewayCmd.vlan = vlan
+ createPrivateGatewayCmd.bypassvlanoverlapcheck = "true"
createPrivateGatewayCmd.vpcid = vpc.id
createPrivateGatewayCmd.sourcenatsupported = "false"
createPrivateGatewayCmd.aclid = aclId
diff --git a/test/integration/smoke/test_projects.py b/test/integration/smoke/test_projects.py
index 173e81d..f4c340d 100644
--- a/test/integration/smoke/test_projects.py
+++ b/test/integration/smoke/test_projects.py
@@ -153,7 +153,7 @@
def tearDownClass(cls):
try:
# Cleanup resources used
- cleanup_resources(cls.api_client, cls._cleanup)
+ cleanup_resources(cls.api_client, reversed(cls._cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -170,7 +170,7 @@
def tearDown(self):
try:
# Clean up, terminate the created accounts, domains etc
- cleanup_resources(self.apiclient, self.cleanup)
+ cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -365,6 +365,7 @@
cls.api_client,
cls.services["domain"]
)
+ cls._cleanup.append(cls.new_domain)
cls.account = Account.create(
cls.api_client,
@@ -387,7 +388,7 @@
def tearDownClass(cls):
try:
# Cleanup resources used
- cleanup_resources(cls.api_client, cls._cleanup)
+ cleanup_resources(cls.api_client, reversed(cls._cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -404,7 +405,7 @@
def tearDown(self):
try:
# Clean up, terminate the created accounts, domains etc
- cleanup_resources(self.apiclient, self.cleanup)
+ cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -518,7 +519,7 @@
def tearDownClass(cls):
try:
# Cleanup resources used
- cleanup_resources(cls.api_client, cls._cleanup)
+ cleanup_resources(cls.api_client, reversed(cls._cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -535,7 +536,7 @@
def tearDown(self):
try:
# Clean up, terminate the created accounts, domains etc
- cleanup_resources(self.apiclient, self.cleanup)
+ cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -1249,7 +1250,7 @@
def tearDownClass(cls):
try:
# Cleanup resources used
- cleanup_resources(cls.api_client, cls._cleanup)
+ cleanup_resources(cls.api_client, reversed(cls._cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -1266,7 +1267,7 @@
def tearDown(self):
try:
# Clean up, terminate the created accounts, domains etc
- cleanup_resources(self.apiclient, self.cleanup)
+ cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -1569,12 +1570,14 @@
admin=True,
domainid=cls.domain.id
)
+ cls._cleanup.append(cls.account)
cls.user = Account.create(
cls.api_client,
cls.services["account"],
admin=True,
domainid=cls.domain.id
)
+ cls._cleanup.append(cls.user)
# Create project as a domain admin
cls.project = Project.create(
@@ -1584,8 +1587,6 @@
domainid=cls.account.domainid
)
cls._cleanup.append(cls.project)
- cls._cleanup.append(cls.account)
- cls._cleanup.append(cls.user)
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
return
@@ -1593,7 +1594,7 @@
def tearDownClass(cls):
try:
# Cleanup resources used
- cleanup_resources(cls.api_client, cls._cleanup)
+ cleanup_resources(cls.api_client, reversed(cls._cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@@ -1610,7 +1611,7 @@
def tearDown(self):
try:
# Clean up, terminate the created accounts, domains etc
- cleanup_resources(self.apiclient, self.cleanup)
+ cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
diff --git a/test/integration/smoke/test_public_ip_range.py b/test/integration/smoke/test_public_ip_range.py
index 40bc098..c8fce47 100644
--- a/test/integration/smoke/test_public_ip_range.py
+++ b/test/integration/smoke/test_public_ip_range.py
@@ -168,14 +168,14 @@
"zoneid":self.services["zoneid"],
"vlan":self.services["vlan"]
}
- public_ip_range = PublicIpRange.create(
+ self.public_ip_range = PublicIpRange.create(
self.apiclient,
services,
forsystemvms = True
)
created_ip_range_response = PublicIpRange.list(
self.apiclient,
- id = public_ip_range.vlan.id
+ id = self.public_ip_range.vlan.id
)
self.assertEqual(
len(created_ip_range_response),
@@ -188,7 +188,7 @@
)
# Delete range
- public_ip_range.delete(self.apiclient)
+ self.public_ip_range.delete(self.apiclient)
def get_ip_as_number(self, ip_string):
""" Return numeric value for ip (passed as a string)
@@ -230,7 +230,7 @@
# Create range for system vms
self.debug("Creating Public IP range for system vms")
- public_ip_range = PublicIpRange.create(
+ self.public_ip_range = PublicIpRange.create(
self.apiclient,
services,
forsystemvms = True
@@ -241,7 +241,7 @@
self.apiclient,
systemvmtype=systemvmtype,
state='Running',
- domainid=public_ip_range.vlan.domainid
+ domainid=self.public_ip_range.vlan.domainid
)
self.assertTrue(
isinstance(list_systemvm_response, list),
@@ -262,7 +262,7 @@
# Wait for CPVM to start
systemvm_id = self.wait_for_system_vm_start(
- public_ip_range.vlan.domainid,
+ self.public_ip_range.vlan.domainid,
systemvmtype
)
self.assertNotEqual(
@@ -309,8 +309,8 @@
cmd.id = systemvm_id
self.apiclient.destroySystemVm(cmd)
- domain_id = public_ip_range.vlan.domainid
- public_ip_range.delete(self.apiclient)
+ domain_id = self.public_ip_range.vlan.domainid
+ self.public_ip_range.delete(self.apiclient)
# Enable Zone
cmd = updateZone.updateZoneCmd()
@@ -417,18 +417,14 @@
self.apiclient.updateZone(cmd)
# Delete System VM and IP range, so System VM can get IP from original ranges
- for v in system_vms:
- self.debug("Destroying System VM: %s" % v.id)
- cmd = destroySystemVm.destroySystemVmCmd()
- cmd.id = v.id
- self.apiclient.destroySystemVm(cmd)
+ if system_vms:
+ for v in system_vms:
+ self.debug("Destroying System VM: %s" % v.id)
+ cmd = destroySystemVm.destroySystemVmCmd()
+ cmd.id = v.id
+ self.apiclient.destroySystemVm(cmd)
- public_ip_range = PublicIpRange.list(
- self.apiclient,
- forsystemvms=True
- )
-
- public_ip_range.delete(self.apiclient)
+ self.public_ip_range.delete(self.apiclient)
# Enable Zone
cmd = updateZone.updateZoneCmd()
diff --git a/test/integration/smoke/test_service_offerings.py b/test/integration/smoke/test_service_offerings.py
index 61d83b9..0e7f068 100644
--- a/test/integration/smoke/test_service_offerings.py
+++ b/test/integration/smoke/test_service_offerings.py
@@ -129,6 +129,7 @@
"Check name in createServiceOffering"
)
return
+
@attr(
tags=[
"advanced",
@@ -197,6 +198,109 @@
return
+ @attr(
+ tags=[
+ "advanced",
+ "advancedns",
+ "smoke",
+ "basic",
+ "eip",
+ "sg"],
+ required_hardware="false")
+ def test_03_create_service_offering_with_cache_mode_type(self):
+ """Test to create service offering with each one of the valid cache mode types : none, writeback and writethrough"""
+
+ # Validate the following:
+ # 1. createServiceOfferings should return a valid information
+ # for newly created offering
+ # 2. The Cloud Database contains the valid information
+
+ cache_mode_types=["none", "writeback", "writethrough"]
+ for i in range(3):
+ service_offering = ServiceOffering.create(
+ self.apiclient,
+ self.services["service_offerings"]["tiny"],
+ cacheMode=cache_mode_types[i]
+ )
+ self.cleanup.append(service_offering)
+
+ self.debug(
+ "Created service offering with ID: %s" %
+ service_offering.id)
+
+ list_service_response = list_service_offering(
+ self.apiclient,
+ id=service_offering.id
+ )
+ self.assertEqual(
+ isinstance(list_service_response, list),
+ True,
+ "Check list response returns a valid list"
+ )
+
+ self.assertNotEqual(
+ len(list_service_response),
+ 0,
+ "Check Service offering is created"
+ )
+
+ self.assertEqual(
+ list_service_response[0].cpunumber,
+ self.services["service_offerings"]["tiny"]["cpunumber"],
+ "Check server id in createServiceOffering"
+ )
+ self.assertEqual(
+ list_service_response[0].cpuspeed,
+ self.services["service_offerings"]["tiny"]["cpuspeed"],
+ "Check cpuspeed in createServiceOffering"
+ )
+ self.assertEqual(
+ list_service_response[0].displaytext,
+ self.services["service_offerings"]["tiny"]["displaytext"],
+ "Check server displaytext in createServiceOfferings"
+ )
+ self.assertEqual(
+ list_service_response[0].memory,
+ self.services["service_offerings"]["tiny"]["memory"],
+ "Check memory in createServiceOffering"
+ )
+ self.assertEqual(
+ list_service_response[0].name,
+ self.services["service_offerings"]["tiny"]["name"],
+ "Check name in createServiceOffering"
+ )
+ self.assertEqual(
+ list_service_response[0].cacheMode,
+ cache_mode_types[i],
+ "Check cacheMode in createServiceOffering"
+ )
+ return
+
+ @attr(
+ tags=[
+ "advanced",
+ "advancedns",
+ "smoke",
+ "basic",
+ "eip",
+ "sg"],
+ required_hardware="false")
+ def test_04_create_service_offering_with_invalid_cache_mode_type(self):
+ """Test to create service offering with invalid cache mode type"""
+
+ # Validate the following:
+ # 1. createServiceOfferings should return a valid information
+ # for newly created offering
+ # 2. The Cloud Database contains the valid information
+
+ with self.assertRaises(Exception):
+ service_offering = ServiceOffering.create(
+ self.apiclient,
+ self.services["service_offerings"]["tiny"],
+ cacheMode="invalid_cache_mode_type"
+ )
+ return
+
class TestServiceOfferings(cloudstackTestCase):
diff --git a/test/integration/smoke/test_templates.py b/test/integration/smoke/test_templates.py
index 7057abe..9e9dd9f 100644
--- a/test/integration/smoke/test_templates.py
+++ b/test/integration/smoke/test_templates.py
@@ -41,49 +41,6 @@
_multiprocess_shared_ = True
-# Function to create template with name existing in test_data without any extensions
-
-
-def create(apiclient, services, volumeid=None, account=None, domainid=None, projectid=None):
- cmd = createTemplate.createTemplateCmd()
- cmd.displaytext = services["displaytext"]
- cmd.name = services["name"]
- if "ostypeid" in services:
- cmd.ostypeid = services["ostypeid"]
- elif "ostype" in services:
- sub_cmd = listOsTypes.listOsTypesCmd()
- sub_cmd.description = services["ostype"]
- ostypes = apiclient.listOsTypes(sub_cmd)
-
- if not isinstance(ostypes, list):
- raise Exception(
- "Unable to find Ostype id with desc: %s" % services["ostype"]
- )
- cmd.ostypeid = ostypes[0].id
- else:
- raise Exception(
- "Unable to find Ostype is required for creating template")
-
- cmd.isfeatured = services[
- "isfeatured"] if "isfeatured" in services else False
-
- cmd.ispublic = services[
- "ispublic"] if "ispublic" in services else False
- cmd.isextractable = services[
- "isextractable"] if "isextractable" in services else False
- cmd.passwordenabled = services[
- "passwordenabled"] if "passwordenabled" in services else False
-
- if volumeid:
- cmd.volumeid = volumeid
- if account:
- cmd.account = account
- if domainid:
- cmd.domainid = domainid
- if projectid:
- cmd.projectid = projectid
- return apiclient.createTemplate(cmd)
-
class TestCreateTemplateWithChecksum(cloudstackTestCase):
def setUp(self):
self.testClient = super(TestCreateTemplateWithChecksum, self).getClsTestClient()
@@ -298,7 +255,7 @@
def tearDown(self):
try:
#Clean up, terminate the created templates
- cleanup_resources(self.apiclient, self.cleanup)
+ cleanup_resources(self.apiclient, reversed(self.cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
@@ -383,9 +340,8 @@
@classmethod
def tearDownClass(cls):
try:
- cls.apiclient = super(TestCreateTemplate, cls).getClsTestClient().getApiClient()
#Cleanup resources used
- cleanup_resources(cls.apiclient, cls._cleanup)
+ cleanup_resources(cls.apiclient, reversed(cls._cleanup))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
@@ -401,14 +357,18 @@
#2. check the db that the templates with same name have different unique_name
#Create templates from Virtual machine and Volume ID
- template1 = create(self.apiclient,
- self.services["template"],
- self.volume.id,
- account=self.account.name)
- template2 = create(self.apiclient,
- self.services["template"],
- self.volume.id,
- account=self.account.name)
+ template1 = Template.create(self.apiclient,
+ self.services["template"],
+ self.volume.id,
+ account=self.account.name,
+ randomise=False)
+ self.cleanup.append(template1)
+ template2 = Template.create(self.apiclient,
+ self.services["template"],
+ self.volume.id,
+ account=self.account.name,
+ randomise=False)
+ self.cleanup.append(template2)
self.debug("Created template with ID: %s" % template1.id)
self.debug("Created template with ID: %s" % template2.id)
@@ -1000,32 +960,12 @@
"ListTemplates should not list any system templates"
)
return
-
-class TestCopyDeleteTemplate(cloudstackTestCase):
- def setUp(self):
-
- self.apiclient = self.testClient.getApiClient()
- self.dbclient = self.testClient.getDbConnection()
- self.cleanup = []
-
- if self.unsupportedHypervisor:
- self.skipTest("Skipping test because unsupported hypervisor\
- %s" % self.hypervisor)
- return
-
- def tearDown(self):
- try:
- #Clean up, terminate the created templates
- cleanup_resources(self.apiclient, self.cleanup)
-
- except Exception as e:
- raise Exception("Warning: Exception during cleanup : %s" % e)
- return
+class TestCopyAndDeleteTemplatesAcrossZones(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- testClient = super(TestCopyDeleteTemplate, cls).getClsTestClient()
+ testClient = super(TestCopyAndDeleteTemplatesAcrossZones, cls).getClsTestClient()
cls.apiclient = testClient.getApiClient()
cls._cleanup = []
cls.services = testClient.getParsedTestDataConfig()
@@ -1042,15 +982,15 @@
cls.services['mode'] = cls.zone.networktype
try:
cls.disk_offering = DiskOffering.create(
- cls.apiclient,
- cls.services["disk_offering"]
- )
+ cls.apiclient,
+ cls.services["disk_offering"]
+ )
cls._cleanup.append(cls.disk_offering)
template = get_template(
- cls.apiclient,
- cls.zone.id,
- cls.services["ostype"]
- )
+ cls.apiclient,
+ cls.zone.id,
+ cls.services["ostype"]
+ )
if template == FAILED:
assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
@@ -1063,35 +1003,35 @@
cls.services["volume"]["zoneid"] = cls.zone.id
cls.services["sourcezoneid"] = cls.zone.id
cls.account = Account.create(
- cls.apiclient,
- cls.services["account"],
- domainid=cls.domain.id
- )
+ cls.apiclient,
+ cls.services["account"],
+ domainid=cls.domain.id
+ )
cls._cleanup.append(cls.account)
cls.service_offering = ServiceOffering.create(
- cls.apiclient,
- cls.services["service_offerings"]["tiny"]
- )
+ cls.apiclient,
+ cls.services["service_offerings"]["tiny"]
+ )
cls._cleanup.append(cls.service_offering)
#create virtual machine
cls.virtual_machine = VirtualMachine.create(
- cls.apiclient,
- cls.services["virtual_machine"],
- templateid=template.id,
- accountid=cls.account.name,
- domainid=cls.account.domainid,
- serviceofferingid=cls.service_offering.id,
- mode=cls.services["mode"]
- )
+ cls.apiclient,
+ cls.services["virtual_machine"],
+ templateid=template.id,
+ accountid=cls.account.name,
+ domainid=cls.account.domainid,
+ serviceofferingid=cls.service_offering.id,
+ mode=cls.services["mode"]
+ )
#Stop virtual machine
cls.virtual_machine.stop(cls.apiclient)
list_volume = Volume.list(
- cls.apiclient,
- virtualmachineid=cls.virtual_machine.id,
- type='ROOT',
- listall=True
- )
+ cls.apiclient,
+ virtualmachineid=cls.virtual_machine.id,
+ type='ROOT',
+ listall=True
+ )
cls.volume = list_volume[0]
except Exception as e:
@@ -1102,71 +1042,83 @@
@classmethod
def tearDownClass(cls):
try:
- cls.apiclient = super(TestCopyDeleteTemplate, cls).getClsTestClient().getApiClient()
#Cleanup resources used
cleanup_resources(cls.apiclient, cls._cleanup)
-
except Exception as e:
- raise Exception("Warning: Exception during cleanup : %s" % e)
-
+ raise Exception("Warning: Exception during cleanup : %s" % e)
return
+ def setUp(self):
+ self.apiclient = self.testClient.getApiClient()
+ self.dbclient = self.testClient.getDbConnection()
+ self.cleanup = []
+ if self.unsupportedHypervisor:
+ self.skipTest("Skipping test because unsupported hypervisor\
+ %s" % self.hypervisor)
+ return
+
+ def tearDown(self):
+ try:
+ #Clean up, terminate the created templates
+ cleanup_resources(self.apiclient, self.cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
@attr(tags=["advanced", "advancedns"], required_hardware="false")
def test_09_copy_delete_template(self):
- cmd = listZones.listZonesCmd()
+ cmd = listZones.listZonesCmd()
zones = self.apiclient.listZones(cmd)
if not isinstance(zones, list):
raise Exception("Failed to find zones.")
if len(zones) < 2:
- self.skipTest(
- "Skipping test due to there are less than two zones.")
- return
-
- self.sourceZone = zones[0]
- self.destZone = zones[1]
-
+ self.skipTest("Skipping test due to there are less than two zones.")
+ return
+
+ self.sourceZone = zones[0]
+ self.destZone = zones[1]
+
template = Template.create(
- self.apiclient,
- self.services["template"],
- self.volume.id,
- account=self.account.name,
- domainid=self.account.domainid
- )
+ self.apiclient,
+ self.services["template"],
+ self.volume.id,
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
self.cleanup.append(template)
self.debug("Created template with ID: %s" % template.id)
list_template_response = Template.list(
- self.apiclient,
- templatefilter=\
- self.services["templatefilter"],
- id=template.id
- )
+ self.apiclient,
+ templatefilter= self.services["templatefilter"],
+ id=template.id
+ )
self.assertEqual(
- isinstance(list_template_response, list),
- True,
- "Check list response returns a valid list"
- )
- #Verify template response to check whether template added successfully
- self.assertNotEqual(
- len(list_template_response),
- 0,
- "Check template available in List Templates"
- )
- #Copy template from zone1 to zone2
- copytemplate = Template.copy(
- cls.apiclient,
- zoneid=cls.sourceZone.id,
- destzoneid = cls.destZone.id
+ isinstance(list_template_response, list),
+ True,
+ "Check list response returns a valid list"
)
- cls._cleanup.append(cls.copytemplate)
+ # Verify template response to check whether template added successfully
+ self.assertNotEqual(
+ len(list_template_response),
+ 0,
+ "Check template available in List Templates"
+ )
+ # todo: check for template ready
+ # Copy template from zone1 to zone2
+ self.copytemplate = template.copy(
+ self.apiclient,
+ sourcezoneid=self.sourceZone.id,
+ destzoneid=self.destZone.id
+ )
+ self.cleanup.append(self.copytemplate)
list_template_response = Template.list(
self.apiclient,
- templatefilter=self.services["template"]["templatefilter"],
+ templatefilter=self.services["template"]["templatefilter"],
id=self.template.id,
zoneid=self.destZone.id
)
@@ -1183,17 +1135,18 @@
self.deltemplate.delete(self.apiclient)
self.debug("Delete template: %s successful" % self.deltemplate)
- copytemplate = Template.copy(
+ copytemplate = template.copy(
self.apiclient,
- zoneid=self.sourceZone.id,
+ sourcezoneid=self.sourceZone.id,
destzoneid = self.destZone.id
)
+ self.cleanup.append(copytemplate)
- removed = cls.dbclient.execute("select removed from template_zone_ref where zone_id='%s' and template_id='%s';" % self.destZone.id, self.template.id)
+ removed = self.dbclient.execute("select removed from template_zone_ref where zone_id='%s' and template_id='%s';" % self.destZone.id, self.template.id)
self.assertEqual(
removed,
- NULL,
+ None,
"Removed state is not correct."
)
return
diff --git a/test/integration/smoke/test_update_security_group.py b/test/integration/smoke/test_update_security_group.py
new file mode 100644
index 0000000..41e4d59
--- /dev/null
+++ b/test/integration/smoke/test_update_security_group.py
@@ -0,0 +1,312 @@
+# 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.
+
+"""
+Tests for updating security group name
+"""
+
+# Import Local Modules
+from nose.plugins.attrib import attr
+from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackAPI import updateSecurityGroup, createSecurityGroup
+from marvin.sshClient import SshClient
+from marvin.lib.utils import (validateList,
+ cleanup_resources,
+ random_gen)
+from marvin.lib.base import (PhysicalNetwork,
+ Account,
+ Host,
+ TrafficType,
+ Domain,
+ Network,
+ NetworkOffering,
+ VirtualMachine,
+ ServiceOffering,
+ Zone,
+ SecurityGroup)
+from marvin.lib.common import (get_domain,
+ get_zone,
+ get_template,
+ list_virtual_machines,
+ list_routers,
+ list_hosts,
+ get_free_vlan)
+from marvin.codes import (PASS, FAIL)
+import logging
+import random
+import time
+
+class TestUpdateSecurityGroup(cloudstackTestCase):
+ @classmethod
+ def setUpClass(cls):
+ cls.testClient = super(
+ TestUpdateSecurityGroup,
+ cls).getClsTestClient()
+ cls.apiclient = cls.testClient.getApiClient()
+ cls.testdata = cls.testClient.getParsedTestDataConfig()
+ cls.services = cls.testClient.getParsedTestDataConfig()
+
+ zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests())
+ cls.zone = Zone(zone.__dict__)
+ cls.template = get_template(cls.apiclient, cls.zone.id)
+ cls._cleanup = []
+
+ if str(cls.zone.securitygroupsenabled) != "True":
+ sys.exit(1)
+
+ cls.logger = logging.getLogger("TestUpdateSecurityGroup")
+ cls.stream_handler = logging.StreamHandler()
+ cls.logger.setLevel(logging.DEBUG)
+ cls.logger.addHandler(cls.stream_handler)
+
+ # Get Zone, Domain and templates
+ cls.domain = get_domain(cls.apiclient)
+ testClient = super(TestUpdateSecurityGroup, cls).getClsTestClient()
+ cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
+ cls.services['mode'] = cls.zone.networktype
+
+ # Create new domain, account, network and VM
+ cls.user_domain = Domain.create(
+ cls.apiclient,
+ services=cls.testdata["acl"]["domain2"],
+ parentdomainid=cls.domain.id)
+
+ # Create account
+ cls.account = Account.create(
+ cls.apiclient,
+ cls.testdata["acl"]["accountD2"],
+ admin=True,
+ domainid=cls.user_domain.id
+ )
+
+ cls._cleanup.append(cls.account)
+ cls._cleanup.append(cls.user_domain)
+
+ @classmethod
+ def tearDownClass(self):
+ try:
+ cleanup_resources(self.apiclient, self._cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ def setUp(self):
+ self.apiclient = self.testClient.getApiClient()
+ self.cleanup = []
+ return
+
+ def tearDown(self):
+ try:
+ cleanup_resources(self.apiclient, self.cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ @attr(tags=["advancedsg"], required_hardware="false")
+ def test_01_create_security_group(self):
+ # Validate the following:
+ #
+ # 1. Create a new security group
+ # 2. Update the security group with new name
+ # 3. List the security group with new name as the keyword
+ # 4. Make sure that the response is not empty
+
+ security_group = SecurityGroup.create(
+ self.apiclient,
+ self.testdata["security_group"],
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
+ self.debug("Created security group with ID: %s" % security_group.id)
+
+ initial_secgroup_name = security_group.name
+ new_secgroup_name = "testing-update-security-group"
+
+ cmd = updateSecurityGroup.updateSecurityGroupCmd()
+ cmd.id = security_group.id
+ cmd.name = new_secgroup_name
+ self.apiclient.updateSecurityGroup(cmd)
+
+ new_security_group = SecurityGroup.list(
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid,
+ keyword=new_secgroup_name
+ )
+ self.assertNotEqual(
+ len(new_security_group),
+ 0,
+ "Update security group failed"
+ )
+
+ @attr(tags=["advancedsg"], required_hardware="false")
+ def test_02_duplicate_security_group_name(self):
+ # Validate the following
+ #
+ # 1. Create a security groups with name "test"
+ # 2. Try to create another security group with name "test"
+ # 3. Creation of second security group should fail
+
+ security_group_name = "test"
+ security_group = SecurityGroup.create(
+ self.apiclient,
+ {"name": security_group_name},
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
+ self.debug("Created security group with name: %s" % security_group.name)
+
+ security_group_list = SecurityGroup.list(
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid,
+ keyword=security_group.name
+ )
+ self.assertNotEqual(
+ len(security_group_list),
+ 0,
+ "Creating security group failed"
+ )
+
+ # Need to use createSecurituGroupCmd since SecurityGroup.create
+ # adds random string to security group name
+ with self.assertRaises(Exception):
+ cmd = createSecurityGroup.createSecurityGroupCmd()
+ cmd.name = security_group.name
+ cmd.account = self.account.name
+ cmd.domainid = self.account.domainid
+ self.apiclient.createSecurityGroup(cmd)
+
+ @attr(tags=["advancedsg"], required_hardware="false")
+ def test_03_update_security_group_with_existing_name(self):
+ # Validate the following
+ #
+ # 1. Create a security groups with name "test"
+ # 2. Create another security group
+ # 3. Try to update the second security group to update its name to "test"
+ # 4. Update security group should fail
+
+ # Create security group
+ security_group = SecurityGroup.create(
+ self.apiclient,
+ self.testdata["security_group"],
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
+ self.debug("Created security group with ID: %s" % security_group.id)
+ security_group_name = security_group.name
+
+ # Make sure its created
+ security_group_list = SecurityGroup.list(
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid,
+ keyword=security_group_name
+ )
+ self.assertNotEqual(
+ len(security_group_list),
+ 0,
+ "Creating security group failed"
+ )
+
+ # Create another security group
+ second_security_group = SecurityGroup.create(
+ self.apiclient,
+ self.testdata["security_group"],
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
+ self.debug("Created security group with ID: %s" % second_security_group.id)
+
+ # Make sure its created
+ security_group_list = SecurityGroup.list(
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid,
+ keyword=second_security_group.name
+ )
+ self.assertNotEqual(
+ len(security_group_list),
+ 0,
+ "Creating security group failed"
+ )
+
+ # Update the security group
+ with self.assertRaises(Exception):
+ cmd = updateSecurityGroup.updateSecurityGroupCmd()
+ cmd.id = second_security_group.id
+ cmd.name = security_group_name
+ self.apiclient.updateSecurityGroup(cmd)
+
+ @attr(tags=["advancedsg"], required_hardware="false")
+ def test_04_update_security_group_with_empty_name(self):
+ # Validate the following
+ #
+ # 1. Create a security group
+ # 2. Update the security group to an empty name
+ # 3. Update security group should fail
+
+ # Create security group
+ security_group = SecurityGroup.create(
+ self.apiclient,
+ self.testdata["security_group"],
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
+ self.debug("Created security group with ID: %s" % security_group.id)
+
+ # Make sure its created
+ security_group_list = SecurityGroup.list(
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid,
+ keyword=security_group.name
+ )
+ self.assertNotEqual(
+ len(security_group_list),
+ 0,
+ "Creating security group failed"
+ )
+
+ # Update the security group
+ with self.assertRaises(Exception):
+ cmd = updateSecurityGroup.updateSecurityGroupCmd()
+ cmd.id = security_group.id
+ cmd.name = ""
+ self.apiclient.updateSecurityGroup(cmd)
+
+ @attr(tags=["advancedsg"], required_hardware="false")
+ def test_05_rename_security_group(self):
+ # Validate the following
+ #
+ # 1. Create a security group
+ # 2. Update the security group and change its name to "default"
+ # 3. Exception should be thrown as "default" name cant be used
+
+ security_group = SecurityGroup.create(
+ self.apiclient,
+ self.testdata["security_group"],
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
+ self.debug("Created security group with ID: %s" % security_group.id)
+
+ with self.assertRaises(Exception):
+ cmd = updateSecurityGroup.updateSecurityGroupCmd()
+ cmd.id = security_group.id
+ cmd.name = "default"
+ self.apiclient.updateSecurityGroup(cmd)
diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py
index 23aa161..3def053 100644
--- a/test/integration/smoke/test_vm_life_cycle.py
+++ b/test/integration/smoke/test_vm_life_cycle.py
@@ -803,7 +803,6 @@
accountid=self.account.name,
domainid=self.account.domainid,
serviceofferingid=self.small_offering.id,
- mode=self.services["mode"]
)
vol1 = Volume.create(
self.apiclient,
diff --git a/test/pom.xml b/test/pom.xml
index 14702fd..346f2a5 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/tools/apidoc/gen_toc.py b/tools/apidoc/gen_toc.py
index 1c5cf27..ef98b13 100644
--- a/tools/apidoc/gen_toc.py
+++ b/tools/apidoc/gen_toc.py
@@ -189,6 +189,13 @@
'Sioc' : 'Sioc',
'Diagnostics': 'Diagnostics',
'Management': 'Management',
+ 'Backup' : 'Backup and Recovery',
+ 'Restore' : 'Backup and Recovery',
+ 'UnmanagedInstance': 'Virtual Machine',
+ 'KubernetesSupportedVersion': 'Kubernetes Service',
+ 'KubernetesCluster': 'Kubernetes Service',
+ 'UnmanagedInstance': 'Virtual Machine',
+ 'Rolling': 'Rolling Maintenance'
}
diff --git a/tools/apidoc/pom.xml b/tools/apidoc/pom.xml
index 2d9cf4f..95e0267 100644
--- a/tools/apidoc/pom.xml
+++ b/tools/apidoc/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-tools</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<properties>
diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh
index edbe11f..25d73f1 100755
--- a/tools/appliance/build.sh
+++ b/tools/appliance/build.sh
@@ -354,6 +354,7 @@
vmware_export
hyperv_export
rm -f "dist/${appliance}"
+ cd dist && chmod +r * && cd ..
cd dist && md5sum * > md5sum.txt && cd ..
cd dist && sha512sum * > sha512sum.txt && cd ..
add_on_exit log INFO "BUILD SUCCESSFUL"
diff --git a/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh b/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
index 56406b7..7349298 100644
--- a/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
+++ b/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
@@ -19,7 +19,7 @@
set -e
set -x
-CLOUDSTACK_RELEASE=4.11.3
+CLOUDSTACK_RELEASE=4.14.0
function configure_apache2() {
# Enable ssl, rewrite and auth
@@ -31,6 +31,21 @@
sed -i 's/SSLProtocol .*$/SSLProtocol TLSv1.2/g' /etc/apache2/mods-available/ssl.conf
}
+function configure_strongswan() {
+ # change the charon stroke timeout from 3 minutes to 30 seconds
+ sed -i "s/# timeout = 0/timeout = 30000/" /etc/strongswan.d/charon/stroke.conf
+}
+
+function configure_issue() {
+ cat > /etc/issue <<EOF
+
+ __?.o/ Apache CloudStack SystemVM $CLOUDSTACK_RELEASE
+ ( )# https://cloudstack.apache.org
+ (___(_) Debian GNU/Linux 9.12 \n \l
+
+EOF
+}
+
function configure_cacerts() {
CDIR=$(pwd)
cd /tmp
@@ -44,10 +59,12 @@
function install_cloud_scripts() {
# ./cloud_scripts/ has been put there by ../../cloud_scripts_shar_archive.sh
rsync -av ./cloud_scripts/ /
+
chmod +x /opt/cloud/bin/* /opt/cloud/bin/setup/* \
/root/{clearUsageRules.sh,reconfigLB.sh,monitorServices.py} \
/etc/profile.d/cloud.sh /etc/cron.daily/* /etc/cron.hourly/*
+ chmod +x /root/health_checks/*
chmod -x /etc/systemd/system/*
systemctl daemon-reload
@@ -62,21 +79,6 @@
echo "Cloudstack Release $CLOUDSTACK_RELEASE $(date)" > /etc/cloudstack-release
}
-function configure_issue() {
- cat > /etc/issue <<EOF
-ESC [ 2J
- __?.o/ Apache CloudStack SystemVM $CLOUDSTACK_RELEASE
- ( )# https://cloudstack.apache.org
- (___(_) Debian GNU/Linux 9 \n \l
-
-EOF
-}
-
-function configure_strongswan() {
- # change the charon stroke timeout from 3 minutes to 30 seconds
- sed -i "s/# timeout = 0/timeout = 30000/" /etc/strongswan.d/charon/stroke.conf
-}
-
function configure_services() {
mkdir -p /var/www/html
mkdir -p /opt/cloud/bin
diff --git a/tools/appliance/systemvmtemplate/scripts/install_systemvm_packages.sh b/tools/appliance/systemvmtemplate/scripts/install_systemvm_packages.sh
index c855341..1f18b25 100644
--- a/tools/appliance/systemvmtemplate/scripts/install_systemvm_packages.sh
+++ b/tools/appliance/systemvmtemplate/scripts/install_systemvm_packages.sh
@@ -61,7 +61,6 @@
ipvsadm conntrackd libnetfilter-conntrack3 \
keepalived irqbalance \
ipcalc \
- openjdk-8-jre-headless \
ipset \
iptables-persistent \
libtcnative-1 libssl-dev libapr1-dev \
@@ -73,7 +72,7 @@
strongswan libcharon-extra-plugins libstrongswan-extra-plugins \
virt-what open-vm-tools qemu-guest-agent hyperv-daemons
- apt-get -q -y -t stretch-backports install nftables
+ apt-get -q -y -t stretch-backports install nftables openjdk-11-jre-headless
apt-get -y autoremove --purge
apt-get clean
diff --git a/tools/appliance/systemvmtemplate/template.json b/tools/appliance/systemvmtemplate/template.json
index 9dab2ee..1397b6c 100644
--- a/tools/appliance/systemvmtemplate/template.json
+++ b/tools/appliance/systemvmtemplate/template.json
@@ -38,8 +38,8 @@
"disk_interface": "virtio",
"net_device": "virtio-net",
- "iso_url": "https://cdimage.debian.org/cdimage/archive/9.9.0/amd64/iso-cd/debian-9.9.0-amd64-netinst.iso",
- "iso_checksum": "42d9818abc4a08681dc0638f07e7aeb35d0c44646ab1e5b05a31a71d76c99da52b6192db9a3e852171ac78c2ba6b110b337c0b562c7be3d32e86a105023a6a0c",
+ "iso_url": "https://cdimage.debian.org/cdimage/archive/9.12.0/amd64/iso-cd/debian-9.12.0-amd64-netinst.iso",
+ "iso_checksum": "af81de39678db1f814be4ce1b7b64b891f6f59926d6f835842c4b52b462ac7e78c45b5efd8273c196d64ba0b2dd1a0aabfb97c6e4f10702ee11a72e07aec9d67",
"iso_checksum_type": "sha512",
"vm_name": "systemvmtemplate",
diff --git a/tools/build/setnextversion.sh b/tools/build/setnextversion.sh
index 8d8037c..b4a2c84 100755
--- a/tools/build/setnextversion.sh
+++ b/tools/build/setnextversion.sh
@@ -142,11 +142,6 @@
perl -pi -e "s/Version=\"$currentversion\"/Version=\"$version\"/" tools/docker/Dockerfile.marvin
perl -pi -e "s/Marvin-(.*).tar.gz/Marvin-${version}.tar.gz/" tools/docker/Dockerfile.marvin
-# centos6 based Dockerfile
-perl -pi -e "s/Version=\"$currentversion\"/Version=\"$version\"/" tools/docker/Dockerfile.centos6
-perl -pi -e "s/cloudstack-common-(.*).el6.x86_64.rpm/cloudstack-common-${version}.el6.x86_64.rpm/" tools/docker/Dockerfile.centos6
-perl -pi -e "s/cloudstack-management-(.*)el6.x86_64.rpm/cloudstack-management-${version}.el6.x86_64.rpm/" tools/docker/Dockerfile.centos6
-
# systemtpl.sh: system vm template version without -SNAPSHOT
git clean -f
diff --git a/tools/checkstyle/pom.xml b/tools/checkstyle/pom.xml
index 067ef87..93f7230 100644
--- a/tools/checkstyle/pom.xml
+++ b/tools/checkstyle/pom.xml
@@ -22,10 +22,25 @@
<name>Apache CloudStack Developer Tools - Checkstyle Configuration</name>
<groupId>org.apache.cloudstack</groupId>
<artifactId>checkstyle</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.8.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.openclover</groupId>
+ <artifactId>clover-maven-plugin</artifactId>
+ <version>4.4.1</version>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/tools/devcloud-kvm/pom.xml b/tools/devcloud-kvm/pom.xml
index 64af20b..f666fe0 100644
--- a/tools/devcloud-kvm/pom.xml
+++ b/tools/devcloud-kvm/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-tools</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/tools/devcloud4/pom.xml b/tools/devcloud4/pom.xml
index 87a6e1d..06edfe2 100644
--- a/tools/devcloud4/pom.xml
+++ b/tools/devcloud4/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-tools</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 72dad8a..7b98e5a 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -20,7 +20,7 @@
FROM ubuntu:16.04
MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org>
-LABEL Vendor="Apache.org" License="ApacheV2" Version="4.13.2.0-SNAPSHOT"
+LABEL Vendor="Apache.org" License="ApacheV2" Version="4.14.1.0-SNAPSHOT"
ARG DEBIAN_FRONTEND=noninteractive
@@ -32,7 +32,7 @@
sudo \
ipmitool \
maven \
- openjdk-8-jdk \
+ openjdk-11-jdk \
python-dev \
python-setuptools \
python-pip \
diff --git a/tools/docker/Dockerfile.centos6 b/tools/docker/Dockerfile.centos6
deleted file mode 100644
index 340218b..0000000
--- a/tools/docker/Dockerfile.centos6
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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 centos:6
-
-MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org>
-LABEL Vendor="Apache.org" License="ApacheV2" Version="4.13.2.0-SNAPSHOT"
-
-ENV PKG_URL=https://builds.cloudstack.org/job/package-master-rhel63/lastSuccessfulBuild/artifact/dist/rpmbuild/RPMS/x86_64
-
-# install CloudStack
-RUN rpm -i http://dev.mysql.com/get/Downloads/Connector-Python/mysql-connector-python-2.1.3-1.el6.x86_64.rpm
-
-RUN yum install -y nc wget \
- ${PKG_URL}/cloudstack-common-4.13.2.0-SNAPSHOT.el6.x86_64.rpm \
- ${PKG_URL}/cloudstack-management-4.13.2.0-SNAPSHOT.el6.x86_64.rpm
-
-RUN cd /etc/cloudstack/management; \
- ln -s tomcat6-nonssl.conf tomcat6.conf; \
- ln -s server-nonssl.xml server.xml; \
- ln -s log4j-cloud.xml log4j.xml; \
- wget -O /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util \
- http://download.cloudstack.org/tools/vhd-util
-
-COPY init.sh_centos6 /root/init.sh
-COPY systemtpl.sh /root/systemtpl.sh
-
-RUN yum clean all
-
-RUN sed -i "s/cluster.node.IP=.*/cluster.node.IP=localhost/" /etc/cloudstack/management/db.properties
-
-EXPOSE 8080 8250 8096 45219 9090 8787
-# Ports:
-# 8080: webui, api
-# 8250: systemvm communication
-# 8096: api port without authentication(default=off)
-# Troubleshooting ports:
-# 8787: CloudStack (Tomcat) debug socket
-# 9090: Cloudstack Management Cluster Interface
-# 45219: JMX console
-
-CMD ["/root/init.sh"]
\ No newline at end of file
diff --git a/tools/docker/Dockerfile.marvin b/tools/docker/Dockerfile.marvin
index 5172b76..ee8fe78 100644
--- a/tools/docker/Dockerfile.marvin
+++ b/tools/docker/Dockerfile.marvin
@@ -20,11 +20,11 @@
FROM python:2
MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org>
-LABEL Vendor="Apache.org" License="ApacheV2" Version="4.13.2.0-SNAPSHOT"
+LABEL Vendor="Apache.org" License="ApacheV2" Version="4.14.1.0-SNAPSHOT"
ENV WORK_DIR=/marvin
-ENV PKG_URL=https://builds.cloudstack.org/job/build-master-marvin/lastSuccessfulBuild/artifact/tools/marvin/dist/Marvin-4.13.2.0-SNAPSHOT.tar.gz
+ENV PKG_URL=https://builds.cloudstack.org/job/build-master-marvin/lastSuccessfulBuild/artifact/tools/marvin/dist/Marvin-4.14.1.0-SNAPSHOT.tar.gz
RUN apt-get update && apt-get install -y vim
RUN pip install --upgrade paramiko nose requests
diff --git a/tools/docker/Dockerfile.smokedev b/tools/docker/Dockerfile.smokedev
index 2faf44b..881e100 100644
--- a/tools/docker/Dockerfile.smokedev
+++ b/tools/docker/Dockerfile.smokedev
@@ -30,7 +30,7 @@
sudo \
ipmitool \
maven \
- openjdk-8-jdk \
+ openjdk-11-jdk \
python-dev \
python-setuptools \
python-pip \
diff --git a/tools/docker/README.md b/tools/docker/README.md
index b196453..e1a7c97 100644
--- a/tools/docker/README.md
+++ b/tools/docker/README.md
@@ -1,6 +1,6 @@
# Docker Files for Apache CloudStack
-Dockerfiles used to build CloudStack images available on Docker hub.
+Dockerfiles used to build CloudStack images are available on Docker hub.
## Using images from docker-hub
@@ -8,7 +8,7 @@
### CloudStack Simulator
-CloudStack Simulator if a all on one CloudStack Build including the simulator that mimic Hypervisor. This is usefull to test CloudStack API behavior without having to deploy real hypervisor nodes. CloudStack Simulator is used for tests and CI.
+CloudStack Simulator is an all in one CloudStack Build including the simulator that mimic Hypervisor. This is useful to test CloudStack API behavior without having to deploy real hypervisor nodes. CloudStack Simulator is used for tests and CI.
```
docker pull cloudstack/simulator
@@ -55,7 +55,7 @@
# How to build images
-Image provide by CloudStack are automatically build by Jenkins performing following tasks:
+Image provided by CloudStack are automatically built by Jenkins performing following tasks:
### CentOS 6
@@ -94,8 +94,8 @@
### Simulator
-Build CloudStack with Simulator. this image is an all on one, including the database. Build from source using maven.
+Build CloudStack with Simulator. This image is an all in one, including the database. Built from source using maven.
```
docker build -f Dockerfile -t cloudstack/simulator ../..
-```
\ No newline at end of file
+```
diff --git a/tools/docker/init.sh_centos6 b/tools/docker/init.sh_centos6
deleted file mode 100755
index 8e52c1d..0000000
--- a/tools/docker/init.sh_centos6
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/bash
-# 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.
-#
-# update database connection
-# /usr/bin/cloudstack-setup-databases cloud:password@$MYSQL_PORT_3306_TCP_ADDR
-# start cloudstack-management server
-
-# initial startup of the container to generage ssh_key
-# performed as privileged
-if [ ! -d /var/cloudstack/management/.ssh ]; then
- mknod /dev/loop6 -m0660 b 7 6
-fi
-
-# if global setting are changed, it will restart the management server
-RESTART_REQUIRED=false
-
-if [ ! $MYSQL_PORT_3306_TCP_ADDR ]; then
- echo "variable MYSQL_PORT_3306_TCP_ADDR not define"
- exit 12
-fi
-
-until nc -z $MYSQL_PORT_3306_TCP_ADDR 3306; do
- echo "waiting for mysql-server..."
- sleep 1
-done
-
-mysql -p"$MYSQL_ENV_MYSQL_ROOT_PASSWORD" -h "$MYSQL_PORT_3306_TCP_ADDR" \
- -e "show databases;"|grep -q cloud
-
-case $? in
- 1)
- echo "deploying new cloud databases"
- INITIATED=false
- cloudstack-setup-databases cloud:password@${MYSQL_PORT_3306_TCP_ADDR} \
- --deploy-as=root:${MYSQL_ENV_MYSQL_ROOT_PASSWORD} -i localhost
- ;;
- 0)
- echo "using existing databases"
- INITIATED=true
- cloudstack-setup-databases cloud:password@${MYSQL_PORT_3306_TCP_ADDR}
- ;;
- *)
- echo "cannot access database"
- exit 12
- ;;
-esac
-
-service cloudstack-management start
-sleep 10
-
-if [ $HYPERVISOR_TEMPLATE ]; then
- #download the systemvm template into /exports
- /root/systemtpl.sh $HYPERVISOR_TEMPLATE
-fi
-
-if [ $CLOUDSTACK_HOST ]; then
- mysql -u root -p${MYSQL_ENV_MYSQL_ROOT_PASSWORD} -h ${MYSQL_PORT_3306_TCP_ADDR} -e \
- "UPDATE cloud.configuration SET value='${CLOUDSTACK_HOST}' where name = 'host';"
- RESTART_REQUIRED=true
-fi
-
-if [ $DEV_API ] && [ $INITIATED == false ]; then
- mysql -u root -p${MYSQL_ENV_MYSQL_ROOT_PASSWORD} -h ${MYSQL_PORT_3306_TCP_ADDR} -e \
- "UPDATE cloud.configuration SET value='8096' where name = 'integration.api.port';"
- mysql -u root -p${MYSQL_ENV_MYSQL_ROOT_PASSWORD} -h ${MYSQL_PORT_3306_TCP_ADDR} -e \
- "UPDATE cloud.configuration SET value='true' where name = 'system.vm.use.local.storage';"
- RESTART_REQUIRED=true
-fi
-
-[ $RESTART_REQUIRED == true ] && service cloudstack-management restart
-
-tail -f /var/log/cloudstack/management/management-server.log
diff --git a/tools/marvin/marvin/codes.py b/tools/marvin/marvin/codes.py
index 317cfd0..1e8a83a 100644
--- a/tools/marvin/marvin/codes.py
+++ b/tools/marvin/marvin/codes.py
@@ -102,6 +102,14 @@
XEN_SERVER = "XenServer"
ADMIN_ACCOUNT = 'ADMIN_ACCOUNT'
USER_ACCOUNT = 'USER_ACCOUNT'
+RESOURCE_USER_VM = 0
+RESOURCE_PUBLIC_IP = 1
+RESOURCE_VOLUME = 2
+RESOURCE_SNAPSHOT = 3
+RESOURCE_TEMPLATE = 4
+RESOURCE_PROJECT = 5
+RESOURCE_NETWORK = 6
+RESOURCE_VPC = 7
RESOURCE_CPU = 8
RESOURCE_MEMORY = 9
RESOURCE_PRIMARY_STORAGE = 10
diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py
index ebf12e3..df38bb5 100755
--- a/tools/marvin/marvin/lib/base.py
+++ b/tools/marvin/marvin/lib/base.py
@@ -181,7 +181,7 @@
self.__dict__.update(items)
@classmethod
- def create(cls, apiclient, services, admin=False, domainid=None, roleid=None):
+ def create(cls, apiclient, services, admin=False, domainid=None, roleid=None, account=None):
"""Creates an account"""
cmd = createAccount.createAccountCmd()
@@ -213,6 +213,9 @@
if roleid:
cmd.roleid = roleid
+ if account:
+ cmd.account = account
+
account = apiclient.createAccount(cmd)
return Account(account.__dict__)
@@ -1077,6 +1080,19 @@
cmd.id = self.id
apiclient.deleteVolume(cmd)
+ def destroy(self, apiclient, expunge=False):
+ """Destroy Volume"""
+ cmd = destroyVolume.destroyVolumeCmd()
+ cmd.id = self.id
+ cmd.expunge = expunge
+ apiclient.destroyVolume(cmd)
+
+ def recover(self, apiclient):
+ """Recover Volume"""
+ cmd = recoverVolume.recoverVolumeCmd()
+ cmd.id = self.id
+ apiclient.recoverVolume(cmd)
+
@classmethod
def list(cls, apiclient, **kwargs):
"""List all volumes matching criteria"""
@@ -1249,12 +1265,15 @@
@classmethod
def create(cls, apiclient, services, volumeid=None,
- account=None, domainid=None, projectid=None):
+ account=None, domainid=None, projectid=None, randomise=True):
"""Create template from Volume"""
# Create template from Virtual machine and Volume ID
cmd = createTemplate.createTemplateCmd()
cmd.displaytext = services["displaytext"]
- cmd.name = "-".join([services["name"], random_gen()])
+ if randomise:
+ cmd.name = "-".join([services["name"], random_gen()])
+ else:
+ cmd.name = services["name"]
if "ostypeid" in services:
cmd.ostypeid = services["ostypeid"]
elif "ostype" in services:
@@ -1667,7 +1686,7 @@
@classmethod
def create(cls, apiclient, accountid=None, zoneid=None, domainid=None,
services=None, networkid=None, projectid=None, vpcid=None,
- isportable=False):
+ isportable=False, ipaddress=None):
"""Associate Public IP address"""
cmd = associateIpAddress.associateIpAddressCmd()
@@ -1697,6 +1716,9 @@
if vpcid:
cmd.vpcid = vpcid
+
+ if ipaddress:
+ cmd.ipaddress = ipaddress
return PublicIPAddress(apiclient.associateIpAddress(cmd).__dict__)
def delete(self, apiclient):
@@ -2145,7 +2167,7 @@
self.__dict__.update(items)
@classmethod
- def create(cls, apiclient, services, tags=None, domainid=None, **kwargs):
+ def create(cls, apiclient, services, tags=None, domainid=None, cacheMode=None, **kwargs):
"""Create Service offering"""
cmd = createServiceOffering.createServiceOfferingCmd()
cmd.cpunumber = services["cpunumber"]
@@ -2198,6 +2220,9 @@
if domainid:
cmd.domainid = domainid
+ if cacheMode:
+ cmd.cacheMode = cacheMode
+
if tags:
cmd.tags = tags
elif "tags" in services:
@@ -2231,7 +2256,7 @@
self.__dict__.update(items)
@classmethod
- def create(cls, apiclient, services, tags=None, custom=False, domainid=None, **kwargs):
+ def create(cls, apiclient, services, tags=None, custom=False, domainid=None, cacheMode=None, **kwargs):
"""Create Disk offering"""
cmd = createDiskOffering.createDiskOfferingCmd()
cmd.displaytext = services["displaytext"]
@@ -2244,6 +2269,9 @@
if domainid:
cmd.domainid = domainid
+ if cacheMode:
+ cmd.cacheMode = cacheMode
+
if tags:
cmd.tags = tags
elif "tags" in services:
@@ -3011,7 +3039,7 @@
networkofferingid=None, projectid=None,
subdomainaccess=None, zoneid=None,
gateway=None, netmask=None, vpcid=None, aclid=None, vlan=None,
- externalid=None):
+ externalid=None, bypassvlanoverlapcheck=None):
"""Create Network for account"""
cmd = createNetwork.createNetworkCmd()
cmd.name = services["name"]
@@ -3048,6 +3076,10 @@
cmd.vlan = services["vlan"]
if "acltype" in services:
cmd.acltype = services["acltype"]
+ if "isolatedpvlan" in services:
+ cmd.isolatedpvlan = services["isolatedpvlan"]
+ if "isolatedpvlantype" in services:
+ cmd.isolatedpvlantype = services["isolatedpvlantype"]
if accountid:
cmd.account = accountid
@@ -3061,6 +3093,8 @@
cmd.aclid = aclid
if externalid:
cmd.externalid = externalid
+ if bypassvlanoverlapcheck:
+ cmd.bypassvlanoverlapcheck = bypassvlanoverlapcheck
return Network(apiclient.createNetwork(cmd).__dict__)
def delete(self, apiclient):
@@ -4056,7 +4090,7 @@
"""Manage Configuration"""
@classmethod
- def update(cls, apiclient, name, value=None, zoneid=None, clusterid=None, storageid=None):
+ def update(cls, apiclient, name, value=None, zoneid=None, clusterid=None, storageid=None, domainid=None, accountid=None):
"""Updates the specified configuration"""
cmd = updateConfiguration.updateConfigurationCmd()
@@ -4069,6 +4103,10 @@
cmd.clusterid = clusterid
if storageid:
cmd.storageid = storageid
+ if domainid:
+ cmd.domainid = domainid
+ if accountid:
+ cmd.accountid = accountid
apiclient.updateConfiguration(cmd)
@classmethod
@@ -4519,7 +4557,7 @@
@classmethod
def create(cls, apiclient, gateway, ipaddress, netmask, vlan, vpcid,
- physicalnetworkid=None, aclid=None):
+ physicalnetworkid=None, aclid=None, bypassvlanoverlapcheck=None):
"""Create private gateway"""
cmd = createPrivateGateway.createPrivateGatewayCmd()
@@ -4532,6 +4570,8 @@
cmd.physicalnetworkid = physicalnetworkid
if aclid:
cmd.aclid = aclid
+ if bypassvlanoverlapcheck:
+ cmd.bypassvlanoverlapcheck = bypassvlanoverlapcheck
return PrivateGateway(apiclient.createPrivateGateway(cmd).__dict__)
@@ -5247,3 +5287,106 @@
cmd.resourceid = resourceid
cmd.resourcetype = resourcetype
return (apiclient.removeResourceDetail(cmd))
+
+# Backup and Recovery
+
+class BackupOffering:
+
+ def __init__(self, items):
+ self.__dict__.update(items)
+
+ @classmethod
+ def importExisting(self, apiclient, zoneid, externalid, name, description, allowuserdrivenbackups=True):
+ """Import existing backup offering from the provider"""
+
+ cmd = importBackupOffering.importBackupOfferingCmd()
+ cmd.zoneid = zoneid
+ cmd.externalid = externalid
+ cmd.name = name
+ cmd.description = description
+ cmd.allowuserdrivenbackups = allowuserdrivenbackups
+ return BackupOffering(apiclient.importBackupOffering(cmd).__dict__)
+
+ @classmethod
+ def listById(self, apiclient, id):
+ """List imported backup policies by id"""
+
+ cmd = listBackupOfferings.listBackupOfferingsCmd()
+ cmd.id = id
+ return (apiclient.listBackupOfferings(cmd))
+
+ @classmethod
+ def listByZone(self, apiclient, zoneid):
+ """List imported backup policies"""
+
+ cmd = listBackupOfferings.listBackupOfferingsCmd()
+ cmd.zoneid = zoneid
+ return (apiclient.listBackupOfferings(cmd))
+
+ @classmethod
+ def listExternal(self, apiclient, zoneid):
+ """List external backup policies"""
+
+ cmd = listBackupProviderOfferings.listBackupProviderOfferingsCmd()
+ cmd.zoneid = zoneid
+ return (apiclient.listBackupProviderOfferings(cmd))
+
+ def delete(self, apiclient):
+ """Delete an imported backup offering"""
+
+ cmd = deleteBackupOffering.deleteBackupOfferingCmd()
+ cmd.id = self.id
+ return (apiclient.deleteBackupOffering(cmd))
+
+ def assignOffering(self, apiclient, vmid):
+ """Add a VM to a backup offering"""
+
+ cmd = assignVirtualMachineToBackupOffering.assignVirtualMachineToBackupOfferingCmd()
+ cmd.backupofferingid = self.id
+ cmd.virtualmachineid = vmid
+ return (apiclient.assignVirtualMachineToBackupOffering(cmd))
+
+ def removeOffering(self, apiclient, vmid, forced=True):
+ """Remove a VM from a backup offering"""
+
+ cmd = removeVirtualMachineFromBackupOffering.removeVirtualMachineFromBackupOfferingCmd()
+ cmd.virtualmachineid = vmid
+ cmd.forced = forced
+ return (apiclient.removeVirtualMachineFromBackupOffering(cmd))
+
+class Backup:
+
+ def __init__(self, items):
+ self.__dict__.update(items)
+
+ @classmethod
+ def create(self, apiclient, vmid):
+ """Create VM backup"""
+
+ cmd = createBackup.createBackupCmd()
+ cmd.virtualmachineid = vmid
+ return (apiclient.createBackup(cmd))
+
+ @classmethod
+ def delete(self, apiclient, id):
+ """Delete VM backup"""
+
+ cmd = deleteBackup.deleteBackupCmd()
+ cmd.id = id
+ return (apiclient.deleteBackup(cmd))
+
+ @classmethod
+ def list(self, apiclient, vmid):
+ """List VM backups"""
+
+ cmd = listBackups.listBackupsCmd()
+ cmd.virtualmachineid = vmid
+ cmd.listall = True
+ return (apiclient.listBackups(cmd))
+
+ def restoreVM(self, apiclient):
+ """Restore VM from backup"""
+
+ cmd = restoreBackup.restoreBackupCmd()
+ cmd.id = self.id
+ return (apiclient.restoreBackup(cmd))
diff --git a/tools/marvin/marvin/lib/common.py b/tools/marvin/marvin/lib/common.py
index 03e5fba..c3a2f1c 100644
--- a/tools/marvin/marvin/lib/common.py
+++ b/tools/marvin/marvin/lib/common.py
@@ -63,6 +63,9 @@
from marvin.codes import (PASS, FAILED, ISOLATED_NETWORK, VPC_NETWORK,
BASIC_ZONE, FAIL, NAT_RULE, STATIC_NAT_RULE,
RESOURCE_PRIMARY_STORAGE, RESOURCE_SECONDARY_STORAGE,
+ RESOURCE_USER_VM, RESOURCE_PUBLIC_IP, RESOURCE_VOLUME,
+ RESOURCE_SNAPSHOT, RESOURCE_TEMPLATE, RESOURCE_PROJECT,
+ RESOURCE_NETWORK, RESOURCE_VPC,
RESOURCE_CPU, RESOURCE_MEMORY, PUBLIC_TRAFFIC,
GUEST_TRAFFIC, MANAGEMENT_TRAFFIC, STORAGE_TRAFFIC,
VMWAREDVS)
@@ -1392,6 +1395,20 @@
resourceCount = resourceholderlist[0].cputotal
elif resourceType == RESOURCE_MEMORY:
resourceCount = resourceholderlist[0].memorytotal
+ elif resourceType == RESOURCE_USER_VM:
+ resourceCount = resourceholderlist[0].vmtotal
+ elif resourceType == RESOURCE_PUBLIC_IP:
+ resourceCount = resourceholderlist[0].iptotal
+ elif resourceType == RESOURCE_VOLUME:
+ resourceCount = resourceholderlist[0].volumetotal
+ elif resourceType == RESOURCE_SNAPSHOT:
+ resourceCount = resourceholderlist[0].snapshottotal
+ elif resourceType == RESOURCE_TEMPLATE:
+ resourceCount = resourceholderlist[0].templatetotal
+ elif resourceType == RESOURCE_NETWORK:
+ resourceCount = resourceholderlist[0].networktotal
+ elif resourceType == RESOURCE_VPC:
+ resourceCount = resourceholderlist[0].vpctotal
assert str(resourceCount) == str(expectedCount),\
"Resource count %s should match with the expected resource count %s" %\
(resourceCount, expectedCount)
@@ -1452,7 +1469,36 @@
isExceptionOccured = True
return [isExceptionOccured, reasonForException, isResourceCountEqual]
- resourcecount = (response[0].resourcecount / (1024**3))
+ if resourcetype == RESOURCE_PRIMARY_STORAGE or resourcetype == RESOURCE_SECONDARY_STORAGE:
+ resourcecount = (response[0].resourcecount / (1024**3))
+ else:
+ resourcecount = response[0].resourcecount
+
+ if resourcecount == expectedcount:
+ isResourceCountEqual = True
+ return [isExceptionOccured, reasonForException, isResourceCountEqual]
+
+def isAccountResourceCountEqualToExpectedCount(apiclient, domainid, account, expectedcount,
+ resourcetype):
+ """Get the resource count of specific account and match
+ it with the expected count
+ Return list [isExceptionOccured, reasonForException, isResourceCountEqual]"""
+ isResourceCountEqual = False
+ isExceptionOccured = False
+ reasonForException = None
+ try:
+ response = Resources.updateCount(apiclient, domainid=domainid, account=account,
+ resourcetype=resourcetype)
+ except Exception as e:
+ reasonForException = "Failed while updating resource count: %s" % e
+ isExceptionOccured = True
+ return [isExceptionOccured, reasonForException, isResourceCountEqual]
+
+ if resourcetype == RESOURCE_PRIMARY_STORAGE or resourcetype == RESOURCE_SECONDARY_STORAGE:
+ resourcecount = (response[0].resourcecount / (1024**3))
+ else:
+ resourcecount = response[0].resourcecount
+
if resourcecount == expectedcount:
isResourceCountEqual = True
return [isExceptionOccured, reasonForException, isResourceCountEqual]
diff --git a/tools/marvin/marvin/lib/utils.py b/tools/marvin/marvin/lib/utils.py
index 05b2194..f170e0d 100644
--- a/tools/marvin/marvin/lib/utils.py
+++ b/tools/marvin/marvin/lib/utils.py
@@ -62,7 +62,7 @@
return timeout
-def _execute_ssh_command(hostip, port, username, password, ssh_command):
+def _execute_ssh_command(hostip, port, username, password, ssh_command, timeout=5):
#SSH to the machine
ssh = SshClient(hostip, port, username, password)
# Ensure the SSH login is successful
@@ -230,6 +230,10 @@
raise Exception("Unresolvable host %s error is %s" % (hostip, e))
raise KeyError("Please provide the marvin configuration file with credentials to your hosts")
+def execute_command_in_host(hostip, port, username, password, command, hypervisor=None):
+ timeout = _configure_timeout(hypervisor)
+ result = _execute_ssh_command(hostip, port, username, password, command)
+ return result
def get_process_status(hostip, port, username, password, linklocalip, command, hypervisor=None):
"""Double hop and returns a command execution result"""
diff --git a/tools/marvin/pom.xml b/tools/marvin/pom.xml
index 5174d5c..376acbd 100644
--- a/tools/marvin/pom.xml
+++ b/tools/marvin/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-tools</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py
index 8e41bc6..b465a28 100644
--- a/tools/marvin/setup.py
+++ b/tools/marvin/setup.py
@@ -27,7 +27,7 @@
raise RuntimeError("python setuptools is required to build Marvin")
-VERSION = "4.13.2.0-SNAPSHOT"
+VERSION = "4.14.1.0-SNAPSHOT"
setup(name="Marvin",
version=VERSION,
diff --git a/tools/pom.xml b/tools/pom.xml
index 9d51791..0b214a4 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
diff --git a/tools/travis/before_install.sh b/tools/travis/before_install.sh
index 6941eb9..86a10a7 100755
--- a/tools/travis/before_install.sh
+++ b/tools/travis/before_install.sh
@@ -72,17 +72,18 @@
echo -e "\nInstalling Development tools: "
RETRY_COUNT=3
+sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1397BC53640DB551
+sudo sh -c 'echo "deb http://mirrors.kernel.org/ubuntu bionic-updates main" >> /etc/apt/sources.list'
+sudo apt-get update -q -y > /dev/null
+sudo apt-get -q -y -t bionic-updates install openjdk-11-jdk
sudo apt-get -q -y install uuid-runtime genisoimage netcat > /dev/null
if [[ $? -ne 0 ]]; then
echo -e "\napt-get packages failed to install"
fi
-# Use latest ipmitool 1.8.16
-sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1397BC53640DB551
-sudo sh -c 'echo "deb http://archive.ubuntu.com/ubuntu xenial main universe" >> /etc/apt/sources.list'
-sudo apt-get update -q -y > /dev/null
sudo apt-get -q -y -V install freeipmi-common libfreeipmi16 libgcrypt20 libgpg-error-dev libgpg-error0 libopenipmi0 ipmitool libpython-dev libssl-dev libffi-dev python-openssl build-essential --no-install-recommends > /dev/null
+echo -e "\nIPMI version"
ipmitool -V
echo "<settings>
diff --git a/tools/travis/install.sh b/tools/travis/install.sh
index 1958cfa..9ddd36c 100755
--- a/tools/travis/install.sh
+++ b/tools/travis/install.sh
@@ -24,8 +24,19 @@
set -e
+DIR=$(pwd)
+
+cd ~
+wget https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz
+tar zxvf apache-maven-3.6.3-bin.tar.gz
+export PATH=`pwd`/apache-maven-3.6.3/bin:$PATH
+cd $DIR
+
+echo -e "\nJDK version"
+export JAVA_HOME=$(readlink -f /usr/lib/jvm/java-11-openjdk-amd64/bin/java | sed "s:bin/java::")
+mvn -v
+
if [ $TEST_SEQUENCE_NUMBER -eq 1 ]; then
- DIR=$(pwd)
# Pylint/pep8 systemvm python codebase
cd systemvm/test && bash -x runtests.sh
# Build noredist
@@ -36,7 +47,7 @@
mvn -P developer,systemvm -Dsimulator -Dnoredist -pl . org.apache.rat:apache-rat-plugin:0.12:check
mvn -q -B -P developer,systemvm -Dsimulator -Dnoredist clean install
else
- mvn -Pdeveloper -Dsimulator clean install -DskipTests -T4 | egrep "Building|Tests|SUCCESS|FAILURE"
+ mvn -Pdeveloper -Dsimulator clean install -DskipTests=true -T4
fi
# Install mysql-connector-python
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 0493919..a2da335 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -1862,7 +1862,7 @@
position: relative;
float: left;
top: 9px;
- width: 245px;
+ width: 550px;
height: 30px;
overflow: auto;
}
@@ -12277,22 +12277,26 @@
.stop .icon,
.removeVmwareDc .icon,
+.removeBackupChain .icon,
.release .icon {
background-position: 0 -31px;
}
.stop:hover .icon,
.removeVmwareDc:hover .icon,
+.removeBackupChain:hover .icon,
.release:hover .icon {
background-position: 0 -613px;
}
.restart .icon,
+.restoreBackup .icon,
.releaseDedicatedZone .icon {
background-position: 0 -63px;
}
.restart:hover .icon,
+.restoreBackup:hover .icon,
.releaseDedicatedZone:hover .icon {
background-position: 0 -645px;
}
@@ -12354,14 +12358,16 @@
.attach .icon,
.attachISO .icon,
.attachDisk .icon,
+.restoreBackupVolume .icon,
.associateProfileToBlade .icon {
background-position: -104px -3px;
}
.attach:hover .icon,
.attachISO:hover .icon,
+.restoreBackupVolume:hover .icon,
.attachDisk:hover .icon {
- background-position: -101px -585px;
+ background-position: -104px -585px;
}
.detach .icon,
@@ -12408,30 +12414,36 @@
.snapshot .icon,
.takeSnapshot .icon,
+.startBackup .icon,
.storageSnapshot .icon {
background-position: -36px -91px;
}
.snapshot:hover .icon,
.takeSnapshot:hover .icon,
+.startBackup:hover .icon,
.storageSnapshot:hover .icon {
background-position: -36px -673px;
}
-.recurringSnapshot .icon {
+.recurringSnapshot .icon,
+.configureBackupSchedule .icon {
background-position: -69px -95px;
}
-.recurringSnapshot:hover .icon {
+.recurringSnapshot:hover .icon,
+.configureBackupSchedule:hover .icon {
background-position: -69px -677px;
}
+.retrieveDiagnostics .icon,
.downloadVolume .icon,
.downloadTemplate .icon,
.downloadISO .icon {
background-position: -35px -125px;
}
+.retrieveDiagnostics:hover .icon,
.downloadVolume:hover .icon,
.downloadTemplate:hover .icon,
.downloadISO:hover .icon {
@@ -12502,6 +12514,7 @@
.createTemplate .icon,
.enableSwift .icon,
.addVM .icon,
+.assignToBackupOffering .icon,
.dedicateZone .icon,
.dedicate .icon {
background-position: -69px -63px;
@@ -12511,6 +12524,7 @@
.createTemplate:hover .icon,
.enableSwift:hover .icon,
.addVM:hover .icon,
+.assignToBackupOffering:hover .icon,
.dedicateZone:hover .icon {
background-position: -69px -645px;
}
@@ -12629,11 +12643,13 @@
background-position: -138px -647px;
}
-.cancelMaintenanceMode .icon {
+.cancelMaintenanceMode .icon,
+.removeFromBackupOffering .icon {
background-position: -138px -123px;
}
-.cancelMaintenanceMode:hover .icon {
+.cancelMaintenanceMode:hover .icon,
+.removeFromBackupOffering .icon {
background-position: -138px -705px;
}
@@ -12653,6 +12669,14 @@
background-position: -100px -614px;
}
+.startRollingMaintenance .icon {
+ background-position: -138px -65px;
+}
+
+.startRollingMaintenance:hover .icon {
+ background-position: -138px -65px;
+}
+
.addVlanRange .icon,
.addVmwareDc .icon {
background-position: -37px -62px;
@@ -12743,10 +12767,12 @@
background-position: -197px -647px;
}
+.createBackup .icon,
.forceReconnect .icon {
background-position: -196px -95px;
}
+.createBackup:hover .icon,
.forceReconnect:hover .icon {
background-position: -196px -677px;
}
diff --git a/ui/css/src/scss/components/action-icons.scss b/ui/css/src/scss/components/action-icons.scss
index 686b6e3..6ed07a3 100644
--- a/ui/css/src/scss/components/action-icons.scss
+++ b/ui/css/src/scss/components/action-icons.scss
@@ -347,6 +347,14 @@
background-position: -165px -704px;
}
+.retrieveDiagnostics .icon {
+ background-position: -35px -125px;
+}
+
+.retrieveDiagnostics:hover .icon {
+ background-position: -35px -707px;
+}
+
.enableOutOfBandManagement .icon {
background-position: -138px -65px;
}
diff --git a/ui/index.html b/ui/index.html
index 7c8aec3..ef7a461 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -480,6 +480,31 @@
</div>
</div>
+ <!-- UEFI Boot -->
+ <div class="select" odd>
+ <div class="name">
+ <span><translate key="label.vm.boottype" /></span>
+ </div>
+ <div class="value">
+ <select name="customboot" id="customboot">
+ <option value="BIOS">BIOS</option>
+ <option value="UEFI">UEFI</option>
+ </select>
+ </div>
+ </div>
+
+ <div class="select field hide-if-unselected">
+ <div class="name">
+ <span><translate key="label.vm.bootmode" /></span>
+ </div>
+ <div class="value">
+ <select name="bootmode" id="bootmode">
+ <option value="LEGACY">LEGACY</option>
+ </select>
+ </div>
+ </div>
+
+
<!-- Zone -->
<div class="select">
<div class="name">
@@ -639,6 +664,7 @@
<th><translate key="label.name"/></th>
<th><translate key="label.username"/></th>
<th><translate key="label.email"/></th>
+ <th><translate key="label.user.conflict"/></th>
</tr>
</thead>
<tbody>
@@ -1918,6 +1944,7 @@
<script type="text/javascript" src="scripts/ui-custom/affinity.js"></script>
<script type="text/javascript" src="scripts/ui-custom/migrate.js"></script>
<script type="text/javascript" src="scripts/ui-custom/copyTemplate.js"></script>
+ <script type="text/javascript" src="scripts/ui-custom/backupSchedule.js"></script>
<script type="text/javascript" src="scripts/instances.js"></script>
<script type="text/javascript" src="scripts/events.js"></script>
<script type="text/javascript" src="scripts/regions.js"></script>
diff --git a/ui/l10n/ar.js b/ui/l10n/ar.js
index 55622b2..acfc553 100644
--- a/ui/l10n/ar.js
+++ b/ui/l10n/ar.js
@@ -180,6 +180,7 @@
"label.action.destroy.instance.processing": "Destroying Instance....",
"label.action.destroy.systemvm": "Destroy System VM",
"label.action.destroy.systemvm.processing": "Destroying System VM....",
+ "label.action.destroy.volume":"Destroy Volume",
"label.action.detach.disk": "Detach Disk",
"label.action.detach.disk.processing": "Detaching Disk....",
"label.action.detach.iso": "Detach ISO",
@@ -258,6 +259,7 @@
"label.action.reboot.router.processing": "Rebooting Router....",
"label.action.reboot.systemvm": "Reboot System VM",
"label.action.reboot.systemvm.processing": "Rebooting System VM....",
+ "label.action.recover.volume":"Recover Volume",
"label.action.recurring.snapshot": "Recurring Snapshots",
"label.action.register.iso": "Register ISO",
"label.action.register.template": "Register Template from URL",
@@ -1847,6 +1849,7 @@
"message.action.delete.zone": "Please confirm that you want to delete this zone.",
"message.action.destroy.instance": "Please confirm that you want to destroy this instance.",
"message.action.destroy.systemvm": "Please confirm that you want to destroy this System VM.",
+ "message.action.destroy.volume":"Please confirm that you want to destroy this volume.",
"message.action.disable.cluster": "Please confirm that you want to disable this cluster.",
"message.action.disable.nexusVswitch": "Please confirm that you want to disable this nexus 1000v",
"message.action.disable.physical.network": "فضلا ، أكّد أنك تريد تعطيل هذه الشبكة الفيزيائية",
@@ -1871,6 +1874,7 @@
"message.action.reboot.instance": "Please confirm that you want to reboot this instance.",
"message.action.reboot.router": "All services provided by this virtual router will be interrupted. Please confirm that you want to reboot this router.",
"message.action.reboot.systemvm": "Please confirm that you want to reboot this system VM.",
+ "message.action.recover.volume":"Please confirm that you would like to recover this volume.",
"message.action.release.ip": "Please confirm that you want to release this IP.",
"message.action.remove.host": "Please confirm that you want to remove this host.",
"message.action.reset.password.off": "Your instance currently does not support this feature.",
diff --git a/ui/l10n/ca.js b/ui/l10n/ca.js
index 0c55524..3a7c045 100644
--- a/ui/l10n/ca.js
+++ b/ui/l10n/ca.js
@@ -180,6 +180,7 @@
"label.action.destroy.instance.processing": "Destroying Instance....",
"label.action.destroy.systemvm": "Destroy System VM",
"label.action.destroy.systemvm.processing": "Destroying System VM....",
+ "label.action.destroy.volume":"Destroy Volume",
"label.action.detach.disk": "Detach Disk",
"label.action.detach.disk.processing": "Detaching Disk....",
"label.action.detach.iso": "Detach ISO",
@@ -258,6 +259,7 @@
"label.action.reboot.router.processing": "Rebooting Router....",
"label.action.reboot.systemvm": "Reboot System VM",
"label.action.reboot.systemvm.processing": "Rebooting System VM....",
+ "label.action.recover.volume":"Recover Volume",
"label.action.recurring.snapshot": "Recurring Snapshots",
"label.action.register.iso": "Register ISO",
"label.action.register.template": "Register Template from URL",
@@ -1847,6 +1849,7 @@
"message.action.delete.zone": "Please confirm that you want to delete this zone.",
"message.action.destroy.instance": "Please confirm that you want to destroy this instance.",
"message.action.destroy.systemvm": "Please confirm that you want to destroy this System VM.",
+ "message.action.destroy.volume":"Please confirm that you want to destroy this volume.",
"message.action.disable.cluster": "Please confirm that you want to disable this cluster.",
"message.action.disable.nexusVswitch": "Please confirm that you want to disable this nexus 1000v",
"message.action.disable.physical.network": "Please confirm that you want to disable this physical network.",
@@ -1871,6 +1874,7 @@
"message.action.reboot.instance": "Please confirm that you want to reboot this instance.",
"message.action.reboot.router": "All services provided by this virtual router will be interrupted. Please confirm that you want to reboot this router.",
"message.action.reboot.systemvm": "Please confirm that you want to reboot this system VM.",
+ "message.action.recover.volume":"Please confirm that you would like to recover this volume.",
"message.action.release.ip": "Please confirm that you want to release this IP.",
"message.action.remove.host": "Please confirm that you want to remove this host.",
"message.action.reset.password.off": "Your instance currently does not support this feature.",
diff --git a/ui/l10n/de_DE.js b/ui/l10n/de_DE.js
index ca1344b..4fbc827 100644
--- a/ui/l10n/de_DE.js
+++ b/ui/l10n/de_DE.js
@@ -180,6 +180,7 @@
"label.action.destroy.instance.processing": "Instanz wird zerstört....",
"label.action.destroy.systemvm": "System-VM vernichten",
"label.action.destroy.systemvm.processing": "System-VM wird zerstört....",
+ "label.action.destroy.volume":"Destroy Volume",
"label.action.detach.disk": "Festplatte loslösen",
"label.action.detach.disk.processing": "Festplatte wird losgelöst...",
"label.action.detach.iso": "ISO loslösen",
@@ -258,6 +259,7 @@
"label.action.reboot.router.processing": "Router wird neu gebootet....",
"label.action.reboot.systemvm": "System-VM neu starten",
"label.action.reboot.systemvm.processing": "System-VM wird neu gebootet....",
+ "label.action.recover.volume":"Recover Volume",
"label.action.recurring.snapshot": "Wiederkehrende Schnappschüsse",
"label.action.register.iso": "ISO registrieren",
"label.action.register.template": "Vorlage von URL registrieren",
@@ -1849,6 +1851,7 @@
"message.action.delete.zone": "Bitte bestätigen Sie, dass Sie diese Zone löschen möchten.",
"message.action.destroy.instance": "Bitte bestätigen Sie, dass Sie diese Instanz löschen möchten.",
"message.action.destroy.systemvm": "Bitte bestätigen Sie, dass Sie diese System-VM zerstören möchten.",
+ "message.action.destroy.volume":"Please confirm that you want to destroy this volume.",
"message.action.disable.cluster": "Bitte bestätigen Sie, dass Sie diesen Cluster deaktivieren möchten.",
"message.action.disable.nexusVswitch": "Bitte bestätigen Sie, dass sie diesen nexus 1000v deaktivieren möchten.",
"message.action.disable.physical.network": "Bitte bestätigen Sie, dass Sie dieses physikalische Netzwerk deaktivieren möchten.",
@@ -1873,6 +1876,7 @@
"message.action.reboot.instance": "Bitte bestätigen Sie, dass Sie diese Instanz neu starten möchten.",
"message.action.reboot.router": "Alle angebotenen Dienste dieses Routers werden unterbrochen. Bitte bestätigen Sie, dass Sie den Router neu starten möchten.",
"message.action.reboot.systemvm": "Bitte bestätigen Sie, dass Sie diese System-VM neu starten möchten.",
+ "message.action.recover.volume":"Please confirm that you would like to recover this volume.",
"message.action.release.ip": "Bitte bestätigen Sie, dass Sie diese IP freigeben möchten.",
"message.action.remove.host": "Bitte bestätigen Sie, dass Sie diesen Host entfernen möchten.",
"message.action.reset.password.off": "Ihre Instanz unterschützt derzeitig nicht dieses Feature.",
diff --git a/ui/l10n/en.js b/ui/l10n/en.js
index 4ce59e0..cb967be 100644
--- a/ui/l10n/en.js
+++ b/ui/l10n/en.js
@@ -58,6 +58,7 @@
"label.ESP.hash":"ESP Hash",
"label.ESP.lifetime":"ESP Lifetime (second)",
"label.ESP.policy":"ESP policy",
+"label.import.backup.offering":"Import Backup Offering",
"label.IKE.DH":"IKE DH",
"label.IKE.encryption":"IKE Encryption",
"label.IKE.hash":"IKE Hash",
@@ -91,6 +92,7 @@
"label.about":"About",
"label.about.app":"About CloudStack",
"label.accept.project.invitation":"Accept project invitation",
+"label.access":"Access",
"label.account":"Account",
"label.accounts":"Accounts",
"label.account.and.security.group":"Account, Security group",
@@ -134,6 +136,7 @@
"label.action.create.vm.processing":"Creating VM....",
"label.action.create.volume":"Create Volume",
"label.action.create.volume.processing":"Creating Volume....",
+"label.action.delete.backup.offering":"Delete Backup Offering",
"label.action.delete.IP.range":"Delete IP Range",
"label.action.delete.IP.range.processing":"Deleting IP Range....",
"label.action.delete.ISO":"Delete ISO",
@@ -182,6 +185,7 @@
"label.action.destroy.instance.processing":"Destroying Instance....",
"label.action.destroy.systemvm":"Destroy System VM",
"label.action.destroy.systemvm.processing":"Destroying System VM....",
+"label.action.destroy.volume":"Destroy Volume",
"label.action.detach.disk":"Detach Disk",
"label.action.detach.disk.processing":"Detaching Disk....",
"label.action.detach.iso":"Detach ISO",
@@ -243,6 +247,7 @@
"label.action.force.reconnect.processing":"Reconnecting....",
"label.action.generate.keys":"Generate Keys",
"label.action.generate.keys.processing":"Generate Keys....",
+"label.action.get.diagnostics":"Get Diagnostics Data",
"label.action.list.nexusVswitch":"List Nexus 1000v",
"label.action.lock.account":"Lock account",
"label.action.lock.account.processing":"Locking account....",
@@ -260,6 +265,7 @@
"label.action.reboot.router.processing":"Rebooting Router....",
"label.action.reboot.systemvm":"Reboot System VM",
"label.action.reboot.systemvm.processing":"Rebooting System VM....",
+"label.action.recover.volume":"Recover Volume",
"label.action.recurring.snapshot":"Recurring Snapshots",
"label.action.register.iso":"Register ISO",
"label.action.register.ncc":"Register NCC",
@@ -290,6 +296,8 @@
"label.action.stop.instance.processing":"Stopping Instance....",
"label.action.stop.router":"Stop Router",
"label.action.stop.router.processing":"Stopping Router....",
+"label.action.router.health.checks":"Get health checks result",
+"label.perform.fresh.checks":"Perform fresh checks",
"label.action.stop.systemvm":"Stop System VM",
"label.action.stop.systemvm.processing":"Stopping System VM....",
"label.action.take.snapshot":"Take Snapshot",
@@ -352,6 +360,8 @@
"label.add.isolated.guest.network":"Add Isolated Guest Network",
"label.add.isolated.guest.network.with.sourcenat":"Add Isolated Guest Network with SourceNat",
"label.add.isolated.network":"Add Isolated Network",
+"label.add.kubernetes.cluster":"Add Kubernetes Cluster",
+"label.add.kubernetes.version":"Add Kubernetes Version",
"label.add.l2.guest.network":"Add L2 Guest Network",
"label.add.ldap.account":"Add LDAP account",
"label.add.list.name":"ACL List Name",
@@ -365,6 +375,7 @@
"label.add.network.device":"Add Network Device",
"label.add.network.offering":"Add network offering",
"label.add.new.F5":"Add new F5",
+"label.add.new.iso":"Add new ISO",
"label.add.new.NetScaler":"Add new NetScaler",
"label.add.new.PA":"Add new Palo Alto",
"label.add.new.SRX":"Add new SRX",
@@ -443,6 +454,7 @@
"label.allocated":"Allocated",
"label.allocation.state":"Allocation State",
"label.allow":"Allow",
+"label.all.zones":"All zones",
"label.annotated.by":"Annotator",
"label.annotation":"Annotation",
"label.anti.affinity":"Anti-affinity",
@@ -549,6 +561,8 @@
"label.cloud.managed":"Cloud.com Managed",
"label.cluster":"Cluster",
"label.cluster.name":"Cluster Name",
+"label.cluster.size":"Cluster size",
+"label.cluster.size.worker.nodes":"Cluster size (Worker nodes)",
"label.cluster.type":"Cluster Type",
"label.clusters":"Clusters",
"label.clvm":"CLVM",
@@ -578,6 +592,7 @@
"label.continue":"Continue",
"label.continue.basic.install":"Continue with basic installation",
"label.copying.iso":"Copying ISO",
+"label.copy.text": "Copy Text",
"label.corrections.saved":"Corrections saved",
"label.counter":"Counter",
"label.cpu":"CPU",
@@ -586,6 +601,7 @@
"label.cpu.limits":"CPU limits",
"label.cpu.mhz":"CPU (in MHz)",
"label.cpu.utilized":"CPU Utilized",
+"label.create.backup":"Start Backup",
"label.create.VPN.connection":"Create VPN Connection",
"label.create.nfs.secondary.staging.storage":"Create NFS Secondary Staging Store",
"label.create.nfs.secondary.staging.store":"Create NFS secondary staging store",
@@ -605,6 +621,7 @@
"label.day":"Day",
"label.day.of.month":"Day of Month",
"label.day.of.week":"Day of Week",
+"label.dashboard.endpoint":"Dashboard endpoint",
"label.dc.name":"DC Name",
"label.dead.peer.detection":"Dead Peer Detection",
"label.decline.invitation":"Decline invitation",
@@ -641,6 +658,8 @@
"label.delete.events":"Delete events",
"label.delete.gateway":"Delete gateway",
"label.delete.internal.lb":"Delete Internal LB",
+"label.delete.iso":"Delete ISO",
+"label.delete.kubernetes.version":"Delete Kubernetes version",
"label.delete.portable.ip.range":"Delete Portable IP Range",
"label.delete.profile":"Delete Profile",
"label.delete.project":"Delete project",
@@ -648,7 +667,7 @@
"label.delete.secondary.staging.store":"Delete Secondary Staging Store",
"label.delete.sslcertificate":"Delete SSL Certificate",
"label.delete.ucs.manager":"Delete UCS Manager",
-"label.delete.volumes":"Volumes to be deleted",
+"label.delete.volumes":"Data Volumes to be deleted",
"label.delete.vpn.user":"Delete VPN user",
"label.deleting.failed":"Deleting Failed",
"label.deleting.processing":"Deleting....",
@@ -658,6 +677,7 @@
"label.destination.physical.network.id":"Destination physical network ID",
"label.destination.zone":"Destination Zone",
"label.destroy":"Destroy",
+"label.destroy.kubernetes.cluster":"Destroy Kubernetes cluster",
"label.destroy.router":"Destroy router",
"label.destroy.vm.graceperiod":"Destroy VM Grace Period",
"label.detaching.disk":"Detaching Disk",
@@ -723,6 +743,7 @@
"label.domain.suffix":"DNS Domain Suffix (i.e., xyz.com)",
"label.done":"Done",
"label.double.quotes.are.not.allowed":"Double quotes are not allowed",
+"label.download.kubernetes.cluster.config":"Download Kubernetes cluster config",
"label.download.progress":"Download Progress",
"label.drag.new.position":"Drag to new position",
"label.duration.in.sec":"Duration (in sec)",
@@ -779,7 +800,9 @@
"label.every":"Every",
"label.example":"Example",
"label.expunge":"Expunge",
+"label.external.id":"External ID",
"label.external.link":"External link",
+'label.external.loadbalancer.ip.address': "External load balancer IP address",
"label.extractable":"Extractable",
"label.extractable.lower":"extractable",
"label.f5":"F5",
@@ -802,6 +825,8 @@
"label.gateway":"Gateway",
"label.general.alerts":"General Alerts",
"label.generating.url":"Generating URL",
+"label.get.diagnostics.desc":"If you wish to override the standard files returned, enter them here. Otherwise leave blank and press OK",
+"label.get.diagnostics.files":"Alternate Files to Retrieve",
"label.globo.dns":"GloboDNS",
"label.globo.dns.configuration":"GloboDNS Configuration",
"label.gluster.volume":"Volume",
@@ -868,6 +893,7 @@
"label.host.name":"Host Name",
"label.host.tag":"Host Tag",
"label.host.tags":"Host Tags",
+"label.host.ueficapability":"UEFI Supported",
"label.hosts":"Hosts",
"label.hourly":"Hourly",
"label.hvm":"HVM",
@@ -952,6 +978,9 @@
"label.iscsi":"iSCSI",
"label.iso":"ISO",
"label.iso.boot":"ISO Boot",
+"label.iso.id":"ISO ID",
+"label.iso.name":"ISO name",
+"label.iso.state":"ISO state",
"label.isolated.networks":"Isolated networks",
"label.isolation.method":"Isolation method",
"label.isolation.mode":"Isolation Mode",
@@ -962,7 +991,14 @@
"label.keep.colon":"Keep:",
"label.key":"Key",
"label.keyboard.language":"Keyboard language",
+"label.vm.boottype":"Boot Type",
+"label.vm.bootmode":"Boot Mode",
"label.keyboard.type":"Keyboard type",
+"label.kubernetes.cluster":"Kubernetes cluster",
+"label.kubernetes.cluster.details":"Kubernetes cluster details",
+"label.kubernetes.service":"Kubernetes Service",
+"label.kubernetes.version":"Kubernetes version",
+"label.kubernetes.version.details":"Kubernetes version details",
"label.kvm.traffic.label":"KVM traffic label",
"label.label":"Label",
"label.lang.arabic":"Arabic",
@@ -1030,6 +1066,7 @@
"label.mac.address": "MAC Address",
"label.management.servers":"Management Servers",
"label.mac.address.changes":"MAC Address Changes",
+"label.master.nodes":"Master nodes",
"label.max.cpus":"Max. CPU cores",
"label.max.guest.limit":"Max guest limit",
"label.max.instances":"Max Instances",
@@ -1058,6 +1095,8 @@
"label.menu.alerts":"Alerts",
"label.menu.all.accounts":"All Accounts",
"label.menu.all.instances":"All Instances",
+"label.menu.backup":"Backup",
+"label.menu.backup.offerings":"Backup Offerings",
"label.menu.community.isos":"Community ISOs",
"label.menu.community.templates":"Community Templates",
"label.menu.configuration":"Configuration",
@@ -1232,6 +1271,7 @@
"label.no.items":"No Available Items",
"label.no.security.groups":"No Available Security Groups",
"label.no.thanks":"No thanks",
+"label.node.root.disk.size.gb":"Node root disk size (in GB)",
"label.none":"None",
"label.not.found":"Not Found",
"label.notifications":"Notifications",
@@ -1338,6 +1378,7 @@
"label.private.key":"Private Key",
"label.private.network":"Private network",
"label.private.port":"Private Port",
+"label.private.registry":"Private registry",
"label.private.zone":"Private Zone",
"label.privatekey":"PKCS#8 Private Key",
"label.privatekey.name":"Private Key",
@@ -1502,6 +1543,12 @@
"label.root.disk.offering":"Root Disk Offering",
"label.root.disk.size":"Root disk size (GB)",
"label.router.vm.scaled.up":"Router VM Scaled Up",
+"label.router.health.checks":"Health Checks",
+"label.router.health.check.name":"Check name",
+"label.router.health.check.type":"Type",
+"label.router.health.check.success":"Success",
+"label.router.health.check.last.updated":"Last updated",
+"label.router.health.check.details":"Details",
"label.routing":"Routing",
"label.routing.host":"Routing Host",
"label.rule":"Rule",
@@ -1529,6 +1576,7 @@
"label.save.and.continue":"Save and continue",
"label.save.changes":"Save changes",
"label.saving.processing":"Saving....",
+"label.scale.kubernetes.cluster":"Scale Kubernetes cluster",
"label.scale.up.policy":"SCALE UP POLICY",
"label.scaledown.policy":"ScaleDown Policy",
"label.scaleup.policy":"ScaleUp Policy",
@@ -1536,6 +1584,11 @@
"label.search":"Search",
"label.secondary.ips":"Secondary IPs",
"label.secondary.isolated.vlan.id":"Secondary Isolated VLAN ID",
+"label.secondary.isolated.vlan.type":"Secondary Isolated VLAN Type",
+"label.secondary.isolated.vlan.type.community":"Community",
+"label.secondary.isolated.vlan.type.isolated":"Isolated",
+"label.secondary.isolated.vlan.type.none":"None",
+"label.secondary.isolated.vlan.type.promiscuous":"Promiscuous",
"label.secondary.staging.store":"Secondary Staging Store",
"label.secondary.staging.store.details":"Secondary Staging Store details",
"label.secondary.storage":"Secondary Storage",
@@ -1564,6 +1617,7 @@
"label.select.template":"Select Template",
"label.select.tier":"Select Tier",
"label.select.vm.for.static.nat":"Select VM for static NAT",
+"label.semantic.version":"Semantic version",
"label.sent":"Sent",
"label.server":"Server",
"label.service.capabilities":"Service Capabilities",
@@ -1614,9 +1668,13 @@
"label.sslcertificates":"SSL Certificates",
"label.standard.us.keyboard":"Standard (US) keyboard",
"label.start.IP":"Start IP",
+"label.start.kuberentes.cluster":"Start Kubernetes cluster",
"label.start.lb.vm":"Start LB VM",
"label.start.port":"Start Port",
"label.start.reserved.system.IP":"Start Reserved system IP",
+"label.start.rolling.maintenance":"Start Rolling Maintenance",
+"label.start.rolling.maintenance.force":"Force",
+"label.start.rolling.maintenance.payload":"Payload",
"label.start.vlan":"Start VLAN",
"label.start.vxlan":"Start VXLAN",
"label.state":"State",
@@ -1654,6 +1712,7 @@
"label.sticky.request-learn":"Request learn",
"label.sticky.tablesize":"Table size",
"label.stop":"Stop",
+"label.stop.kuberentes.cluster":"Stop Kubernetes cluster",
"label.stop.lb.vm":"Stop LB VM",
"label.stopped.vms":"Stopped VMs",
"label.storage":"Storage",
@@ -1732,11 +1791,13 @@
"label.unhealthy.threshold":"Unhealthy Threshold",
"label.unlimited":"Unlimited",
"label.untagged":"Untagged",
+"label.update.kubernetes.version":"Update Kubernetes Version",
"label.update.project.resources":"Update project resources",
"label.update.ssl":" SSL Certificate",
"label.update.ssl.cert":" SSL Certificate",
"label.update.vmware.datacenter":"Update VMware datacenter",
"label.updating":"Updating",
+"label.upgrade.kubernetes.cluster":"Upgrade Kubernetes cluster",
"label.upgrade.required":"Upgrade is required",
"label.upgrade.router.newer.template":"Upgrade Router to Use Newer Template",
"label.upload":"Upload",
@@ -1756,13 +1817,16 @@
"label.use.vm.ips":"Use VM IPs",
"label.used":"Used",
"label.user":"User",
+"label.user.conflict":"Conflict",
"label.user.data":"User Data",
"label.user.details":"User details",
+"label.user.source":"source",
"label.user.vm":"User VM",
"label.username":"Username",
"label.username.lower":"username",
"label.users":"Users",
"label.uuid":"UUID",
+"label.versions":"Versions",
"label.vSwitch.type":"vSwitch Type",
"label.value":"Value",
"label.vcdcname":"vCenter DC name",
@@ -1787,6 +1851,7 @@
"label.view.more":"View more",
"label.view.secondary.ips":"View secondary IPs",
"label.viewing":"Viewing",
+"label.virtual.size":"Virtual Size",
"label.virtual.appliance":"Virtual Appliance",
"label.virtual.appliance.details":"Virtual applicance details",
"label.virtual.appliances":"Virtual Appliances",
@@ -1821,6 +1886,12 @@
"label.vm.stop":"Stop",
"label.vmfs":"VMFS",
"label.vms":"VMs",
+"label.backup":"Backups",
+"label.backup.offering":"Backup Offering",
+"label.backup.offering.assign":"Assign VM to backup offering",
+"label.backup.offering.remove":"Remove VM from backup offering",
+"label.backup.restore":"Restore VM Backup",
+"label.backup.user.driven":"Allow User Driven Backups",
"label.vmsnapshot":"VM Snapshots",
"label.vmsnapshot.current":"isCurrent",
"label.vmsnapshot.memory":"Snapshot memory",
@@ -1838,7 +1909,7 @@
"label.volgroup":"Volume Group",
"label.volume":"Volume",
"label.volume.details":"Volume details",
-"label.volume.empty":"No volumes attached to this VM",
+"label.volume.empty":"No data volumes attached to this VM",
"label.volume.ids":"Volume ID's",
"label.volume.limits":"Volume Limits",
"label.volume.migrated":"Volume migrated",
@@ -1905,6 +1976,7 @@
"message.action.cancel.maintenance.mode":"Please confirm that you want to cancel this maintenance.",
"message.action.change.service.warning.for.instance":"Your instance must be stopped before attempting to change its current service offering.",
"message.action.change.service.warning.for.router":"Your router must be stopped before attempting to change its current service offering.",
+"message.action.delete.backup.offering":"Please confirm that you want to delete this backup offering?",
"message.action.delete.ISO":"Please confirm that you want to delete this ISO.",
"message.action.delete.ISO.for.all.zones":"The ISO is used by all zones. Please confirm that you want to delete it from all zones.",
"message.action.delete.cluster":"Please confirm that you want to delete this cluster.",
@@ -1931,6 +2003,7 @@
"message.action.delete.zone":"Please confirm that you want to delete this zone.",
"message.action.destroy.instance":"Please confirm that you want to destroy this instance.",
"message.action.destroy.systemvm":"Please confirm that you want to destroy this System VM.",
+"message.action.destroy.volume":"Please confirm that you want to destroy this volume.",
"message.action.disable.cluster":"Please confirm that you want to disable this cluster.",
"message.action.disable.nexusVswitch":"Please confirm that you want to disable this nexus 1000v",
"message.action.disable.physical.network":"Please confirm that you want to disable this physical network.",
@@ -1955,6 +2028,7 @@
"message.action.reboot.instance":"Please confirm that you want to reboot this instance.",
"message.action.reboot.router":"All services provided by this virtual router will be interrupted. Please confirm that you want to reboot this router.",
"message.action.reboot.systemvm":"Please confirm that you want to reboot this system VM.",
+"message.action.recover.volume":"Please confirm that you would like to recover this volume.",
"message.action.release.ip":"Please confirm that you want to release this IP.",
"message.action.remove.host":"Please confirm that you want to remove this host.",
"message.action.reset.password.off":"Your instance currently does not support this feature.",
@@ -1969,6 +2043,7 @@
"message.action.start.systemvm":"Please confirm that you want to start this system VM.",
"message.action.stop.instance":"Please confirm that you want to stop this instance.",
"message.action.stop.router":"All services provided by this virtual router will be interrupted. Please confirm that you want to stop this router.",
+"message.action.router.health.checks":"Health checks result will be fetched from router.",
"message.action.stop.systemvm":"Please confirm that you want to stop this system VM.",
"message.action.take.snapshot":"Please confirm that you want to take a snapshot of this volume.",
"message.action.unmanage.cluster":"Please confirm that you want to unmanage the cluster.",
@@ -2058,8 +2133,10 @@
"message.confirm.delete.ciscoASA1000v":"Please confirm you want to delete CiscoASA1000v",
"message.confirm.delete.ciscovnmc.resource":"Please confirm you want to delete CiscoVNMC resource",
"message.confirm.delete.internal.lb":"Please confirm you want to delete Internal LB",
+"message.confirm.delete.kubernetes.version":"Please confirm that you want to delete this Kubernetes version.",
"message.confirm.delete.secondary.staging.store":"Please confirm you want to delete Secondary Staging Store.",
"message.confirm.delete.ucs.manager":"Please confirm that you want to delete UCS Manager",
+"message.confirm.destroy.kubernetes.cluster":"Please confirm that you want to destroy this Kubernetes cluster.",
"message.confirm.destroy.router":"Please confirm that you would like to destroy this router",
"message.confirm.disable.host":"Please confirm that you want to disable the host",
"message.confirm.disable.network.offering":"Are you sure you want to disable this network offering?",
@@ -2092,7 +2169,9 @@
"message.confirm.scale.up.router.vm":"Do you really want to scale up the Router VM ?",
"message.confirm.scale.up.system.vm":"Do you really want to scale up the system VM ?",
"message.confirm.shutdown.provider":"Please confirm that you would like to shutdown this provider",
+"message.confirm.start.kubernetes.cluster":"Please confirm that you want to start this Kubernetes cluster.",
"message.confirm.start.lb.vm":"Please confirm you want to start LB VM",
+"message.confirm.stop.kubernetes.cluster":"Please confirm that you want to stop this Kubernetes cluster.",
"message.confirm.stop.lb.vm":"Please confirm you want to stop LB VM",
"message.confirm.upgrade.router.newer.template":"Please confirm that you want to upgrade router to use newer template",
"message.confirm.upgrade.routers.account.newtemplate":"Please confirm that you want to upgrade all routers in this account to use newer template",
@@ -2149,9 +2228,10 @@
"message.disabling.network.offering":"Disabling network offering",
"message.disabling.vpc.offering":"Disabling VPC offering",
"message.disallowed.characters":"Disallowed characters: <,>",
-"message.download.ISO":"Please click <a href=\"#\">00000</a> to download ISO",
-"message.download.template":"Please click <a href=\"#\">00000</a> to download template",
-"message.download.volume":"Please click <a href=\"#\">00000</a> to download volume",
+"message.download.diagnostics":"Please click the link to download the retrieved diagnostics:<p><a href=\"#\">00000</a>",
+"message.download.ISO":"Please click the link to download the ISO:<p><a href=\"#\">00000</a>",
+"message.download.template":"Please click the link to download the template:<p><a href=\"#\">00000</a>",
+"message.download.volume":"Please click the link to download the volume:<p><a href=\"#\">00000</a>",
"message.download.volume.confirm":"Please confirm that you want to download this volume.",
"message.edit.account":"Edit (\"-1\" indicates no limit to the amount of resources create)",
"message.edit.confirm":"Please confirm your changes before clicking \"Save\".",
diff --git a/ui/l10n/es.js b/ui/l10n/es.js
index a7af4e9..875b7a1 100644
--- a/ui/l10n/es.js
+++ b/ui/l10n/es.js
@@ -180,6 +180,7 @@
"label.action.destroy.instance.processing": "Destruyendo Instancia ....",
"label.action.destroy.systemvm": "Destruye MV de Sistema",
"label.action.destroy.systemvm.processing": "Destruyendo MV de Sistema...",
+ "label.action.destroy.volume":"Destroy Volume",
"label.action.detach.disk": "Desconectar Disco",
"label.action.detach.disk.processing": "Desconectando Disco ....",
"label.action.detach.iso": "Desconectar ISO",
@@ -258,6 +259,7 @@
"label.action.reboot.router.processing": "Reiniciando Router ....",
"label.action.reboot.systemvm": "Reiniciar MV de Sistema",
"label.action.reboot.systemvm.processing": "Reinicando MV de Sistema...",
+ "label.action.recover.volume":"Recover Volume",
"label.action.recurring.snapshot": "Instantáneas Recurrentes",
"label.action.register.iso": "Registrar ISO",
"label.action.register.template": "Registrar Plantilla desde una URL",
@@ -1848,6 +1850,7 @@
"message.action.delete.zone": "Por favor, confirme que desea eliminar esta Zona. ",
"message.action.destroy.instance": "Por favor, confirme que desea destruir esta Instancia.",
"message.action.destroy.systemvm": "Por favor, confirme que desea destruir esta MV de Sistema.",
+ "message.action.destroy.volume":"Please confirm that you want to destroy this volume.",
"message.action.disable.cluster": "Por favor, confirme que desea deshabilitar este clúster.",
"message.action.disable.nexusVswitch": "Por favor confirme que usted quiere deshabilitar este nexus 1000v",
"message.action.disable.physical.network": "Por favor confirmar que usted quiere deshabilitar esta red física",
@@ -1872,6 +1875,7 @@
"message.action.reboot.instance": "Por favor, confirme que desea reiniciar esta Instancia.",
"message.action.reboot.router": "Todos los servicios provistos por este router virtual serán interrumpidos. Por favor confirmar que desea reiniciarlo.",
"message.action.reboot.systemvm": "Por favor, confirme que desea reiniciar esta MV de Sistema.",
+ "message.action.recover.volume":"Please confirm that you would like to recover this volume.",
"message.action.release.ip": "Por favor, confirme que desea liberar esta IP ",
"message.action.remove.host": "Por favor confirme que desea borrar este anfitrión.",
"message.action.reset.password.off": "Su instancia no soporta esta característica actualmente.",
diff --git a/ui/l10n/fr_FR.js b/ui/l10n/fr_FR.js
index 74912f0..92eb8de 100644
--- a/ui/l10n/fr_FR.js
+++ b/ui/l10n/fr_FR.js
@@ -180,6 +180,7 @@
"label.action.destroy.instance.processing": "Suppression de l'instance...",
"label.action.destroy.systemvm": "Supprimer VM Système",
"label.action.destroy.systemvm.processing": "Suppression de la VM Système...",
+ "label.action.destroy.volume":"Destroy Volume",
"label.action.detach.disk": "Détacher le disque",
"label.action.detach.disk.processing": "Détachement du disque...",
"label.action.detach.iso": "Détacher l'image ISO",
@@ -258,6 +259,7 @@
"label.action.reboot.router.processing": "Redémarrage du routeur...",
"label.action.reboot.systemvm": "Redémarrer VM Système",
"label.action.reboot.systemvm.processing": "Redémarrage de la VM Système...",
+ "label.action.recover.volume":"Recover Volume",
"label.action.recurring.snapshot": "Instantanés récurrents",
"label.action.register.iso": "Enregistrer ISO",
"label.action.register.template": "Enregistrer modèle depuis une URL",
@@ -1849,6 +1851,7 @@
"message.action.delete.zone": "Supprimer cette zone ?",
"message.action.destroy.instance": "Supprimer cette instance ?",
"message.action.destroy.systemvm": "Supprimer cette VM Système ?",
+ "message.action.destroy.volume":"Please confirm that you want to destroy this volume.",
"message.action.disable.cluster": "Désactiver ce cluster ?",
"message.action.disable.nexusVswitch": "Confirmer la désactivation de ce Nexus 1000v",
"message.action.disable.physical.network": "Confirmer l'activation de ce réseau physique.",
@@ -1873,6 +1876,7 @@
"message.action.reboot.instance": "Redémarrer cette instance ?",
"message.action.reboot.router": "Tous les services fournit par ce routeur virtuel vont être interrompus. Confirmer le ré-amorçage de ce routeur.",
"message.action.reboot.systemvm": "Redémarrer cette VM Système ?",
+ "message.action.recover.volume":"Please confirm that you would like to recover this volume.",
"message.action.release.ip": "Libérer cette adresse IP ?",
"message.action.remove.host": "Êtes-vous sûr que vous voulez supprimer cet hôte.",
"message.action.reset.password.off": "Votre instance ne supporte pas pour le moment cette fonctionnalité.",
diff --git a/ui/l10n/hu.js b/ui/l10n/hu.js
index b077d7b..6912c1a 100644
--- a/ui/l10n/hu.js
+++ b/ui/l10n/hu.js
@@ -180,6 +180,7 @@
"label.action.destroy.instance.processing": "Példány elpusztítása...",
"label.action.destroy.systemvm": "Rendszer VM elpusztítása",
"label.action.destroy.systemvm.processing": "Rendszer VM elpusztítása...",
+ "label.action.destroy.volume":"Destroy Volume",
"label.action.detach.disk": "Merevlemez leválasztása",
"label.action.detach.disk.processing": "Merevlemez leválasztása...",
"label.action.detach.iso": "ISO leválasztása",
@@ -258,6 +259,7 @@
"label.action.reboot.router.processing": "Router újraindítása...",
"label.action.reboot.systemvm": "Rendszer VM újraindítása",
"label.action.reboot.systemvm.processing": "Rendszer VM újraindítása",
+ "label.action.recover.volume":"Recover Volume",
"label.action.recurring.snapshot": "Ismétlődő pillanatfelvételek",
"label.action.register.iso": "ISO regisztrációja",
"label.action.register.template": "Sablon regisztrációja URL-ről",
@@ -1847,6 +1849,7 @@
"message.action.delete.zone": "Erősítsd meg, hogy törölni akarod ezt a zónát!",
"message.action.destroy.instance": "Erősítsd meg, hogy el akarod pusztítani ezt a példányt!",
"message.action.destroy.systemvm": "Erősítsd meg, hogy el akarod pusztítani ezt a rendszer VM-et!",
+ "message.action.destroy.volume":"Please confirm that you want to destroy this volume.",
"message.action.disable.cluster": "Erősítsd meg, hogy ki akarod kapcsolni ezt a fürtöt!",
"message.action.disable.nexusVswitch": "Erősítsd meg, hogy ki akarod kapcsolni ezt a nexus 1000v-t!",
"message.action.disable.physical.network": "Erősítsd meg, hogy ki akarod kapcsolni ezt a fizikai hálózatot!",
@@ -1871,6 +1874,7 @@
"message.action.reboot.instance": "Erősítsd meg, hogy újra akarod indítani ezt a példányt!",
"message.action.reboot.router": "Minden a router által nyújtott szolgáltatás megszakad. Erősítsd meg, hogy újra akarod indítani a routert!",
"message.action.reboot.systemvm": "Erősítsd meg, hogy újra akarod indítani ezt a rendszer VM-et!",
+ "message.action.recover.volume":"Please confirm that you would like to recover this volume.",
"message.action.release.ip": "Erősítsd meg, hogy el akarod engedni ezt az IP címet!",
"message.action.remove.host": "Erősítsd meg, hogy törölni akarod ezt a kiszolgálót!",
"message.action.reset.password.off": "A példány nem támogatja ezt a lehetőséget.",
diff --git a/ui/l10n/it_IT.js b/ui/l10n/it_IT.js
index cd7b767..4c3ed12 100644
--- a/ui/l10n/it_IT.js
+++ b/ui/l10n/it_IT.js
@@ -180,6 +180,7 @@
"label.action.destroy.instance.processing": "Rimozione Instanza in corso....",
"label.action.destroy.systemvm": "Rimozione VM di sistema",
"label.action.destroy.systemvm.processing": "Rimozione VM di Sistema in corso....",
+ "label.action.destroy.volume":"Destroy Volume",
"label.action.detach.disk": "Scollegamento di un Disco",
"label.action.detach.disk.processing": "Scollegamento Disco in corso....",
"label.action.detach.iso": "Scollegamento immagine ISO",
@@ -258,6 +259,7 @@
"label.action.reboot.router.processing": "Riavvio Router in corso....",
"label.action.reboot.systemvm": "Riavvio VM di Sistema",
"label.action.reboot.systemvm.processing": "Riavvio VM di Sistema in corso....",
+ "label.action.recover.volume":"Recover Volume",
"label.action.recurring.snapshot": "Snapshot Ricorrenti",
"label.action.register.iso": "Registrare una ISO",
"label.action.register.template": "Registra un Template da URL",
@@ -1847,6 +1849,7 @@
"message.action.delete.zone": "Please confirm that you want to delete this zone.",
"message.action.destroy.instance": "Please confirm that you want to destroy this instance.",
"message.action.destroy.systemvm": "Please confirm that you want to destroy this System VM.",
+ "message.action.destroy.volume":"Please confirm that you want to destroy this volume.",
"message.action.disable.cluster": "Please confirm that you want to disable this cluster.",
"message.action.disable.nexusVswitch": "Si prega di confermare di voler disabilitare questo nexus 1000v",
"message.action.disable.physical.network": "Si prega di confermare di voler disabilitare questa rete fisica.",
@@ -1871,6 +1874,7 @@
"message.action.reboot.instance": "Please confirm that you want to reboot this instance.",
"message.action.reboot.router": "Tutti i servizi forniti da questo router virtuale saranno interrotti. Si prega di confermare di voler riavviare questo router.",
"message.action.reboot.systemvm": "Please confirm that you want to reboot this system VM.",
+ "message.action.recover.volume":"Please confirm that you would like to recover this volume.",
"message.action.release.ip": "Please confirm that you want to release this IP.",
"message.action.remove.host": "Si prega di confermare di voler rimuovere questo host.",
"message.action.reset.password.off": "Your instance currently does not support this feature.",
diff --git a/ui/l10n/ja_JP.js b/ui/l10n/ja_JP.js
index 225e5c5..b876d33 100644
--- a/ui/l10n/ja_JP.js
+++ b/ui/l10n/ja_JP.js
@@ -180,6 +180,7 @@
"label.action.destroy.instance.processing": "インスタンスを破棄しています...",
"label.action.destroy.systemvm": "システム VM の破棄",
"label.action.destroy.systemvm.processing": "システム VM を破棄しています...",
+ "label.action.destroy.volume":"ボリュームの破棄",
"label.action.detach.disk": "ディスクのデタッチ",
"label.action.detach.disk.processing": "ディスクをデタッチしています...",
"label.action.detach.iso": "ISO のデタッチ",
@@ -258,6 +259,7 @@
"label.action.reboot.router.processing": "ルーターを再起動しています...",
"label.action.reboot.systemvm": "システム VM の再起動",
"label.action.reboot.systemvm.processing": "システム VM を再起動しています...",
+ "label.action.recover.volume":"ボリュームの復元",
"label.action.recurring.snapshot": "定期スナップショット",
"label.action.register.iso": "ISO の登録",
"label.action.register.template": "URL からのテンプレートの登録",
@@ -1849,6 +1851,7 @@
"message.action.delete.zone": "このゾーンを削除してもよろしいですか?",
"message.action.destroy.instance": "このインスタンスを破棄してもよろしいですか?",
"message.action.destroy.systemvm": "このシステム VM を破棄してもよろしいですか?",
+ "message.action.destroy.volume":"このボリュームを破棄してもよろしいですか?",
"message.action.disable.cluster": "このクラスターを無効にしてもよろしいですか?",
"message.action.disable.nexusVswitch": "この Nexus 1000V を無効にしてもよろしいですか?",
"message.action.disable.physical.network": "この物理ネットワークを無効にしてもよろしいですか?",
@@ -1873,6 +1876,7 @@
"message.action.reboot.instance": "このインスタンスを再起動してもよろしいですか?",
"message.action.reboot.router": "この仮想ルーターで提供するすべてのサービスが中断されます。このルーターを再起動してもよろしいですか?",
"message.action.reboot.systemvm": "このシステム VM を再起動してもよろしいですか?",
+ "message.action.recover.volume":"このボリュームを復元してもよろしいですか?",
"message.action.release.ip": "この IP アドレスを解放してもよろしいですか?",
"message.action.remove.host": "このホストを削除してもよろしいですか?",
"message.action.reset.password.off": "インスタンスは現在この機能をサポートしていません。",
diff --git a/ui/l10n/ko_KR.js b/ui/l10n/ko_KR.js
index dd3de7e..bdcae7d 100644
--- a/ui/l10n/ko_KR.js
+++ b/ui/l10n/ko_KR.js
@@ -180,6 +180,7 @@
"label.action.destroy.instance.processing": "인스턴스를 파기하는 중...",
"label.action.destroy.systemvm": "시스템 VM 파기",
"label.action.destroy.systemvm.processing": "시스템 VM를 파기하는 중...",
+ "label.action.destroy.volume":"Destroy Volume",
"label.action.detach.disk": "디스크 분리",
"label.action.detach.disk.processing": "디스크를 분리 하는 중...",
"label.action.detach.iso": "ISO 분리",
@@ -258,6 +259,7 @@
"label.action.reboot.router.processing": "라우터를 재시작하는 중...",
"label.action.reboot.systemvm": "시스템 VM 재시작",
"label.action.reboot.systemvm.processing": "시스템 VM를 재시작하는 중...",
+ "label.action.recover.volume":"Recover Volume",
"label.action.recurring.snapshot": "정기 스냅샷",
"label.action.register.iso": "ISO 등록",
"label.action.register.template": "Register Template from URL",
@@ -1847,6 +1849,7 @@
"message.action.delete.zone": "현재 Zone을 삭제하시겠습니까?",
"message.action.destroy.instance": "현재 인스턴스를 파기하시겠습니까?",
"message.action.destroy.systemvm": "현재 시스템 VM를 파기하시겠습니까?",
+ "message.action.destroy.volume":"Please confirm that you want to destroy this volume.",
"message.action.disable.cluster": "현재 클러스터를 사용 안 함으로 하시겠습니까?",
"message.action.disable.nexusVswitch": "현재 Nexus 1000V를 사용 안 함으로 하시겠습니까?",
"message.action.disable.physical.network": "현재 물리 네트워크를 사용 안 함으로 하시겠습니까?",
@@ -1871,6 +1874,7 @@
"message.action.reboot.instance": "현재 인스턴스를 재시작하시겠습니까?",
"message.action.reboot.router": "현재 가상 라우터로 제공하는 모든 서비스가 중단됩니다. 이 라우터를 재시작하시겠습니까?",
"message.action.reboot.systemvm": "현재 시스템 VM을 재시작하시겠습니까?",
+ "message.action.recover.volume":"Please confirm that you would like to recover this volume.",
"message.action.release.ip": "현재 IP 주소를 해제하시겠습니까?",
"message.action.remove.host": "현재 호스트를 삭제하시겠습니까?",
"message.action.reset.password.off": "인스턴스는 현재 기능을 지원 하지 않습니다.",
diff --git a/ui/l10n/nb_NO.js b/ui/l10n/nb_NO.js
index 98592cb..364a3fc 100644
--- a/ui/l10n/nb_NO.js
+++ b/ui/l10n/nb_NO.js
@@ -180,6 +180,7 @@
"label.action.destroy.instance.processing": "Ødelegger instans....",
"label.action.destroy.systemvm": "Slett system VM",
"label.action.destroy.systemvm.processing": "Sletter system VM....",
+ "label.action.destroy.volume":"Destroy Volume",
"label.action.detach.disk": "Frakoble disk",
"label.action.detach.disk.processing": "Kobler fra disk....",
"label.action.detach.iso": "Frakoble ISO",
@@ -258,6 +259,7 @@
"label.action.reboot.router.processing": "Omstaer Instans....",
"label.action.reboot.systemvm": "Omstart System VM",
"label.action.reboot.systemvm.processing": "Omstarter System VM",
+ "label.action.recover.volume":"Recover Volume",
"label.action.recurring.snapshot": "Gjentagende øyeblikksbilder",
"label.action.register.iso": "Registrer ISO",
"label.action.register.template": "Registrer mal fra en URL",
@@ -1847,6 +1849,7 @@
"message.action.delete.zone": "Vennligst bekreft at du ønsker å slette denne sone.",
"message.action.destroy.instance": "Vennligst bekreft at du ønsker å fjerne denne instansen.",
"message.action.destroy.systemvm": "Vennligst bekreft at du ønsker å ødelegge denne System VM.",
+ "message.action.destroy.volume":"Please confirm that you want to destroy this volume.",
"message.action.disable.cluster": "Vennligst bekreft at du ønsker å detaktivere denne klyngen.",
"message.action.disable.nexusVswitch": "Vennligst bekreft at du ønsker å deaktivere denne nexus 1000v",
"message.action.disable.physical.network": "Vennligst bekreft at du ønsker å deaktivere dette fysiske nettverket.",
@@ -1871,6 +1874,7 @@
"message.action.reboot.instance": "Vennligst bekreft at du vill restarte denne instansen.",
"message.action.reboot.router": "Alle tjenester levert fra denne virtuelle ruter vil bli avbrutt. Vennligst bekreft at du ønsker å restarte denne ruteren.",
"message.action.reboot.systemvm": "Vennligst bekreft at du vil restarte denne system VM",
+ "message.action.recover.volume":"Please confirm that you would like to recover this volume.",
"message.action.release.ip": "Vennligst bekreft at du ønsker å frigi denne IP.",
"message.action.remove.host": "Vennligst bekreft at du vil gjerne denne tjeneren.",
"message.action.reset.password.off": "Din instans støtter foreløpig ikke denne funksjonen.",
diff --git a/ui/l10n/nl_NL.js b/ui/l10n/nl_NL.js
index 882598b..ffb1f1e 100644
--- a/ui/l10n/nl_NL.js
+++ b/ui/l10n/nl_NL.js
@@ -180,6 +180,7 @@
"label.action.destroy.instance.processing": "Bezig met vernietigen van Instantie....",
"label.action.destroy.systemvm": "Vernietig Systeem VM",
"label.action.destroy.systemvm.processing": "Bezig met vernietigen van Systeem VM....",
+ "label.action.destroy.volume":"Vernietig schijf",
"label.action.detach.disk": "Ontkoppel Schijf",
"label.action.detach.disk.processing": "Bezig met ontkoppelen van Schijf....",
"label.action.detach.iso": "Ontkoppel ISO",
@@ -258,6 +259,7 @@
"label.action.reboot.router.processing": "Bezig met herstarten van Router....",
"label.action.reboot.systemvm": "Herstart Systeem VM",
"label.action.reboot.systemvm.processing": "Bezig met herstarten van Systeem VM....",
+ "label.action.recover.volume":"Herstel schijf",
"label.action.recurring.snapshot": "Terugkerende Snapshots",
"label.action.register.iso": "Registreer ISO",
"label.action.register.template": "Registreer een template van een URL",
@@ -1847,6 +1849,7 @@
"message.action.delete.zone": "Bevestig dat u deze zone wilt verwijderen",
"message.action.destroy.instance": "Bevestig dat u deze instantie wilt vernietigen",
"message.action.destroy.systemvm": "Bevestig dat u deze Systeem VM wilt vernietigen",
+ "message.action.destroy.volume":"Bevestig alstublieft dat U deze schijf wilt vernietigen?",
"message.action.disable.cluster": "Bevestig dat u dit cluster wilt uitschakelen.",
"message.action.disable.nexusVswitch": "Bevestig dat u deze nexus 1000v wilt uitschakelen.",
"message.action.disable.physical.network": "Bevestig dat u dit fysieke netwerk wilt uitschakelen.",
@@ -1871,6 +1874,7 @@
"message.action.reboot.instance": "Bevestig dat u deze instantie wilt herstarten.",
"message.action.reboot.router": "Als u deze router herstarten zullen de diensten op de router verstoord worden. Weet u zeker dat u deze actie wil uitvoeren?",
"message.action.reboot.systemvm": "Bevestig dat u deze Systeem VM wilt herstarten.",
+ "message.action.recover.volume":"Bevestig alstublieft dat U deze schijf wilt herstellen?",
"message.action.release.ip": "Bevestigd dat u dit IP adres wilt los koppelen.",
"message.action.remove.host": "Bevestig dat u deze host wilt verwijderen.",
"message.action.reset.password.off": "Uw instantie ondersteunt deze functie momenteel niet.",
diff --git a/ui/l10n/pl.js b/ui/l10n/pl.js
index ec3dacc..7f993c6 100644
--- a/ui/l10n/pl.js
+++ b/ui/l10n/pl.js
@@ -180,6 +180,7 @@
"label.action.destroy.instance.processing": "Usuwam instancję",
"label.action.destroy.systemvm": "Destroy System VM",
"label.action.destroy.systemvm.processing": "Destroying System VM....",
+ "label.action.destroy.volume":"Destroy Volume",
"label.action.detach.disk": "Odłącz dysk",
"label.action.detach.disk.processing": "Odłączanie dysku....",
"label.action.detach.iso": "Odłącz obraz ISO",
@@ -258,6 +259,7 @@
"label.action.reboot.router.processing": "Restartuje router.....",
"label.action.reboot.systemvm": "Restartuj system VM",
"label.action.reboot.systemvm.processing": "Restartuje system VM....",
+ "label.action.recover.volume":"Recover Volume",
"label.action.recurring.snapshot": "Recurring Snapshots",
"label.action.register.iso": "Rejestruj ISO",
"label.action.register.template": "Register Template from URL",
@@ -1847,6 +1849,7 @@
"message.action.delete.zone": "Please confirm that you want to delete this zone.",
"message.action.destroy.instance": "Please confirm that you want to destroy this instance.",
"message.action.destroy.systemvm": "Please confirm that you want to destroy this System VM.",
+ "message.action.destroy.volume":"Please confirm that you want to destroy this volume.",
"message.action.disable.cluster": "Please confirm that you want to disable this cluster.",
"message.action.disable.nexusVswitch": "Please confirm that you want to disable this nexus 1000v",
"message.action.disable.physical.network": "Please confirm that you want to disable this physical network.",
@@ -1871,6 +1874,7 @@
"message.action.reboot.instance": "Please confirm that you want to reboot this instance.",
"message.action.reboot.router": "All services provided by this virtual router will be interrupted. Please confirm that you want to reboot this router.",
"message.action.reboot.systemvm": "Please confirm that you want to reboot this system VM.",
+ "message.action.recover.volume":"Please confirm that you would like to recover this volume.",
"message.action.release.ip": "Please confirm that you want to release this IP.",
"message.action.remove.host": "Please confirm that you want to remove this host.",
"message.action.reset.password.off": "Your instance currently does not support this feature.",
diff --git a/ui/l10n/pt_BR.js b/ui/l10n/pt_BR.js
index b3aacfb..eb5a290 100644
--- a/ui/l10n/pt_BR.js
+++ b/ui/l10n/pt_BR.js
@@ -180,6 +180,7 @@
"label.action.destroy.instance.processing": "Apagando Instância....",
"label.action.destroy.systemvm": "Apagar VM de Sistema",
"label.action.destroy.systemvm.processing": "Apagando VM de Sistema....",
+ "label.action.destroy.volume":"Destroy Volume",
"label.action.detach.disk": "Desplugar Disco",
"label.action.detach.disk.processing": "Desplugando Disco....",
"label.action.detach.iso": "Desplugar ISO",
@@ -258,6 +259,7 @@
"label.action.reboot.router.processing": "Reiniciando Roteador....",
"label.action.reboot.systemvm": "Reiniciar VM de Sistema",
"label.action.reboot.systemvm.processing": "Reiniciando VM de Sistema....",
+ "label.action.recover.volume":"Recover Volume",
"label.action.recurring.snapshot": "Snapshots recorrentes",
"label.action.register.iso": "Registrar ISO",
"label.action.register.template": "Registrar Template da URL",
@@ -1847,6 +1849,7 @@
"message.action.delete.zone": "Confirme que você deseja remover esta Zona.",
"message.action.destroy.instance": "Por favor, confirme que você deseja excluir esta Instância.",
"message.action.destroy.systemvm": "Confirme que você deseja excluir esta VM de Sistema.",
+ "message.action.destroy.volume":"Please confirm that you want to destroy this volume.",
"message.action.disable.cluster": "Confirma a desativação do cluster.",
"message.action.disable.nexusVswitch": "Por favor confirme que você deseja desabilitar este nexusVswitch",
"message.action.disable.physical.network": "Por favor confirme que você deseja desabilitar esta rede física.",
@@ -1871,6 +1874,7 @@
"message.action.reboot.instance": "Por favor, confirme que você deseja reiniciar esta instância.",
"message.action.reboot.router": "Confirme que você deseja reiniciar este roteador.",
"message.action.reboot.systemvm": "Confirme que você deseja reiniciar esta VM de sistema.",
+ "message.action.recover.volume":"Please confirm that you would like to recover this volume.",
"message.action.release.ip": "Confirme que você deseja liberar este IP.",
"message.action.remove.host": "Favor confirmar que você deseja remover este host.",
"message.action.reset.password.off": "Sua Instância não suporta esta funcionalidade.",
diff --git a/ui/l10n/ru_RU.js b/ui/l10n/ru_RU.js
index d201175..49f4d8a 100644
--- a/ui/l10n/ru_RU.js
+++ b/ui/l10n/ru_RU.js
@@ -180,6 +180,7 @@
"label.action.destroy.instance.processing": "Уничтожение машины...",
"label.action.destroy.systemvm": "Уничтожить системную ВМ",
"label.action.destroy.systemvm.processing": "Уничтожение системной ВМ....",
+ "label.action.destroy.volume":"Destroy Volume",
"label.action.detach.disk": "Отсоединить диск",
"label.action.detach.disk.processing": "Отсоединение диска....",
"label.action.detach.iso": "Отсоединить ISO",
@@ -258,6 +259,7 @@
"label.action.reboot.router.processing": "Перезагрузка роутера...",
"label.action.reboot.systemvm": "Перезапустить системную ВМ",
"label.action.reboot.systemvm.processing": "Перезагрузка системной ВМ",
+ "label.action.recover.volume":"Recover Volume",
"label.action.recurring.snapshot": "Повторяемые снимки",
"label.action.register.iso": "Регистрация ISO",
"label.action.register.template": "Регистрация шаблона по URL",
@@ -1847,6 +1849,7 @@
"message.action.delete.zone": "Пожалуйста подтвердите, что Вы хотите удалть эту зону.",
"message.action.destroy.instance": "Пожалуйста подтвердите, что Вы хотите уничтожить эту машину.",
"message.action.destroy.systemvm": "Подтвердите, что вы действительно хотите удалить эту системную ВМ.",
+ "message.action.destroy.volume":"Please confirm that you want to destroy this volume.",
"message.action.disable.cluster": "Пожалуйста подтвердите, что Вы хотите отключить данный кластер.",
"message.action.disable.nexusVswitch": "Пожалуйста, подтвердите, что вы хотите включить это nexusVswitch.",
"message.action.disable.physical.network": "Подтвердите, что вы действительно хотите выключить эту физическую сеть.",
@@ -1871,6 +1874,7 @@
"message.action.reboot.instance": "Подтвердите, что вы действительно хотите перезагрузить эту машину.",
"message.action.reboot.router": "Подтвердите, что вы действительно хотите перезагрузить этот роутер.",
"message.action.reboot.systemvm": "Подтвердите, что вы действительно хотите запустить эту системную ВМ.",
+ "message.action.recover.volume":"Please confirm that you would like to recover this volume.",
"message.action.release.ip": "Пожалуйста подтвержите желание освободить этот IP адрес.",
"message.action.remove.host": "Удаление последнего/единственного сервера в кластере и повторная его установка приведет уничтожению рабочего окружения/базы данных на сервере и сделае гостевые машины непригодными к использованию.",
"message.action.reset.password.off": "На данный момент машина не поддерживает данную функцию",
diff --git a/ui/l10n/zh_CN.js b/ui/l10n/zh_CN.js
index bb5f1d9..26cb708 100644
--- a/ui/l10n/zh_CN.js
+++ b/ui/l10n/zh_CN.js
@@ -180,6 +180,7 @@
"label.action.destroy.instance.processing": "正在销毁实例...",
"label.action.destroy.systemvm": "销毁系统 VM",
"label.action.destroy.systemvm.processing": "正在销毁系统 VM...",
+ "label.action.destroy.volume":"销毁卷",
"label.action.detach.disk": "取消附加磁盘",
"label.action.detach.disk.processing": "正在取消附加磁盘...",
"label.action.detach.iso": "取消附加 ISO",
@@ -258,6 +259,7 @@
"label.action.reboot.router.processing": "正在重新启动路由器...",
"label.action.reboot.systemvm": "重新启动系统 VM",
"label.action.reboot.systemvm.processing": "正在重新启动系统 VM...",
+ "label.action.recover.volume":"恢复卷",
"label.action.recurring.snapshot": "重现快照",
"label.action.register.iso": "注册 ISO",
"label.action.register.template": "使用URL注册模板",
@@ -1849,6 +1851,7 @@
"message.action.delete.zone": "请确认您确实要删除此资源域。",
"message.action.destroy.instance": "请确认您确实要销毁此实例。",
"message.action.destroy.systemvm": "请确认您确实要销毁此系统 VM。",
+ "message.action.destroy.volume":"你确定要销毁这个卷吗?",
"message.action.disable.cluster": "请确认您确实要禁用此群集。",
"message.action.disable.nexusVswitch": "请确认您确实要禁用此 Nexus 1000v",
"message.action.disable.physical.network": "请确认您确实要禁用此物理网络。",
@@ -1873,6 +1876,7 @@
"message.action.reboot.instance": "请确认您确实要重新启动此实例。",
"message.action.reboot.router": "此虚拟路由器提供的所有服务都将中断。请确认您确实要重新启动此路由器。",
"message.action.reboot.systemvm": "请确认您确实要重新启动此系统 VM。",
+ "message.action.recover.volume":"你确定要恢复这个卷吗?",
"message.action.release.ip": "请确认您确实要释放此 IP。",
"message.action.remove.host": "请确认您确实要删除此主机。",
"message.action.reset.password.off": "您的实例当前不支持此功能。",
diff --git a/ui/plugins/cks/cks.css b/ui/plugins/cks/cks.css
new file mode 100644
index 0000000..acdd1e6
--- /dev/null
+++ b/ui/plugins/cks/cks.css
@@ -0,0 +1,43 @@
+/*[fmt]1C20-1C0D-E*/
+/*
+* 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.
+*/
+
+.downloadKubernetesClusterKubeConfig .icon {
+ background-position: -35px -125px;
+}
+
+.downloadKubernetesClusterKubeConfig:hover .icon {
+ background-position: -35px -707px;
+}
+
+.scaleKubernetesCluster .icon {
+ background-position: -264px -2px;
+}
+
+.scaleKubernetesCluster:hover .icon {
+ background-position: -263px -583px;
+}
+
+.upgradeKubernetesCluster .icon {
+ background-position: -138px -65px;
+}
+
+.upgradeKubernetesCluster:hover .icon {
+ background-position: -138px -647px;
+}
diff --git a/ui/plugins/cks/cks.js b/ui/plugins/cks/cks.js
new file mode 100644
index 0000000..c353c24
--- /dev/null
+++ b/ui/plugins/cks/cks.js
@@ -0,0 +1,1581 @@
+// 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.
+(function (cloudStack) {
+
+ var rootCaCert = "";
+ var downloadCaCert = function() {
+ var blob = new Blob([rootCaCert], {type: 'application/x-x509-ca-cert'});
+ var filename = "cloudstack-ca.pem";
+ if(window.navigator.msSaveOrOpenBlob) {
+ window.navigator.msSaveBlob(blob, filename);
+ } else{
+ var elem = window.document.createElement('a');
+ elem.href = window.URL.createObjectURL(blob);
+ elem.download = filename;
+ document.body.appendChild(elem)
+ elem.click();
+ document.body.removeChild(elem);
+ }
+ };
+ var clusterKubeConfig = "";
+ var downloadClusterKubeConfig = function() {
+ var blob = new Blob([clusterKubeConfig], {type: 'text/plain'});
+ var filename = "kube.conf";
+ if(window.navigator.msSaveOrOpenBlob) {
+ window.navigator.msSaveBlob(blob, filename);
+ } else{
+ var elem = window.document.createElement('a');
+ elem.href = window.URL.createObjectURL(blob);
+ elem.download = filename;
+ document.body.appendChild(elem)
+ elem.click();
+ document.body.removeChild(elem);
+ }
+ };
+ var minCpu = 0;
+ var minRamSize = 0;
+ cloudStack.plugins.cks = function(plugin) {
+ plugin.ui.addSection({
+ id: 'cks',
+ title: 'label.kubernetes.service',
+ preFilter: function(args) {
+ var pluginEnabled = false;
+ $.ajax({
+ url: createURL('listCapabilities'),
+ async: false,
+ success: function(json) {
+ pluginEnabled = json.listcapabilitiesresponse.capability.kubernetesserviceenabled;
+ },
+ error: function(XMLHttpResponse) {
+ pluginEnabled = false;
+ }
+ });
+ return pluginEnabled;
+ },
+ showOnNavigation: true,
+ sectionSelect: {
+ label: 'label.select-view',
+ preFilter: function() {
+ return ['kubernetesclusters', 'kubernetesversions'];
+ }
+ },
+ sections: {
+ kubernetesclusters: {
+ id: 'kubernetesclusters',
+ type: 'select',
+ title: "label.clusters",
+ listView: {
+ filters: {
+ all: {
+ label: 'ui.listView.filters.all'
+ },
+ running: {
+ label: 'state.Running'
+ },
+ stopped: {
+ label: 'state.Stopped'
+ },
+ destroyed: {
+ label: 'state.Destroyed'
+ }
+ },
+ fields: {
+ name: {
+ label: 'label.name'
+ },
+ zonename: {
+ label: 'label.zone.name'
+ },
+ size : {
+ label: 'label.size'
+ },
+ cpunumber: {
+ label: 'label.num.cpu.cores'
+ },
+ memory: {
+ label: 'label.memory.mb'
+ },
+ state: {
+ label: 'label.state',
+ indicator: {
+ 'Running': 'on',
+ 'Stopped': 'off',
+ 'Destroyed': 'off',
+ 'Error': 'off'
+ }
+ }
+ },
+ advSearchFields: {
+ name: {
+ label: 'label.name'
+ },
+ zoneid: {
+ label: 'label.zone',
+ select: function(args) {
+ $.ajax({
+ url: createURL('listZones'),
+ data: {
+ listAll: true
+ },
+ success: function(json) {
+ var zones = json.listzonesresponse.zone ? json.listzonesresponse.zone : [];
+
+ args.response.success({
+ data: $.map(zones, function(zone) {
+ return {
+ id: zone.id,
+ description: zone.name
+ };
+ })
+ });
+ }
+ });
+ }
+ },
+ },
+ // List view actions
+ actions: {
+ add: {
+ label: 'label.add.kubernetes.cluster',
+ createForm: {
+ title: 'label.add.kubernetes.cluster',
+ preFilter: function(args) {
+ args.$form.find('.form-item[rel=masternodes]').find('input[name=masternodes]').val('2');
+ args.$form.find('.form-item[rel=size]').find('input[name=size]').val('1');
+ var experimentalFeaturesEnabled = false;
+ $.ajax({
+ url: createURL('listCapabilities'),
+ async: false,
+ success: function(json) {
+ experimentalFeaturesEnabled = json.listcapabilitiesresponse.capability.kubernetesclusterexperimentalfeaturesenabled;
+ }
+ });
+ if (experimentalFeaturesEnabled == true) {
+ args.$form.find('.form-item[rel=supportPrivateRegistry]').css('display', 'inline-block');
+ }
+ },
+ fields: {
+ name: {
+ label: 'label.name',
+ //docID: 'Name of the cluster',
+ validation: {
+ required: true
+ }
+ },
+ description: {
+ label: 'label.description',
+ //docID: 'helpKubernetesClusterDesc',
+ validation: {
+ required: true
+ }
+ },
+ zone: {
+ label: 'label.zone',
+ //docID: 'helpKubernetesClusterZone',
+ validation: {
+ required: true
+ },
+ select: function(args) {
+ $.ajax({
+ url: createURL("listZones&available=true"),
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var items = [];
+ var zoneObjs = json.listzonesresponse.zone;
+ if (zoneObjs != null) {
+ for (var i = 0; i < zoneObjs.length; i++) {
+ items.push({
+ id: zoneObjs[i].id,
+ description: zoneObjs[i].name
+ });
+ }
+ }
+ args.response.success({
+ data: items
+ });
+ }
+ });
+ }
+ },
+ kubernetesversion: {
+ label: 'label.kubernetes.version',
+ dependsOn: ['zone'],
+ //docID: 'helpKubernetesClusterZone',
+ validation: {
+ required: true
+ },
+ select: function(args) {
+ var versionObjs;
+ var filterData = { zoneid: args.zone };
+ $.ajax({
+ url: createURL("listKubernetesSupportedVersions"),
+ data: filterData,
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var items = [];
+ versionObjs = json.listkubernetessupportedversionsresponse.kubernetessupportedversion;
+ if (versionObjs != null) {
+ for (var i = 0; i < versionObjs.length; i++) {
+ if (versionObjs[i].state == 'Enabled' && versionObjs[i].isostate == 'Ready') {
+ items.push({
+ id: versionObjs[i].id,
+ description: versionObjs[i].name
+ });
+ }
+ }
+ }
+ args.response.success({
+ data: items
+ });
+ }
+ });
+
+ args.$select.change(function() {
+ var $form = $(this).closest("form");
+ $form.find('.form-item[rel=multimaster]').find('input[name=multimaster]').prop('checked', false);
+ $form.find('.form-item[rel=multimaster]').hide();
+ $form.find('.form-item[rel=masternodes]').hide();
+ var currentVersionId = $(this).val();
+ if (currentVersionId != null && versionObjs != null) {
+ for (var i = 0; i < versionObjs.length; i++) {
+ if (currentVersionId == versionObjs[i].id) {
+ if (versionObjs[i].supportsha === true) {
+ $form.find('.form-item[rel=multimaster]').css('display', 'inline-block');
+ }
+ minCpu = 0;
+ if (versionObjs[i].mincpunumber != null && versionObjs[i].mincpunumber != undefined) {
+ minCpu = versionObjs[i].mincpunumber;
+ }
+ minRamSize = 0;
+ if (versionObjs[i].minmemory != null && versionObjs[i].minmemory != undefined) {
+ minRamSize = versionObjs[i].minmemory;
+ }
+ break;
+ }
+ }
+ }
+ });
+ }
+ },
+ serviceoffering: {
+ label: 'label.menu.service.offerings',
+ dependsOn: ['kubernetesversion'],
+ //docID: 'helpKubernetesClusterServiceOffering',
+ validation: {
+ required: true
+ },
+ select: function(args) {
+ $.ajax({
+ url: createURL("listServiceOfferings"),
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var offeringObjs = [];
+ var items = json.listserviceofferingsresponse.serviceoffering;
+ if (items != null) {
+ for (var i = 0; i < items.length; i++) {
+ if (items[i].iscustomized == false &&
+ items[i].cpunumber >= minCpu && items[i].memory >= minRamSize) {
+ offeringObjs.push({
+ id: items[i].id,
+ description: items[i].name
+ });
+ }
+ }
+ }
+ args.response.success({
+ data: offeringObjs
+ });
+ }
+ });
+ }
+ },
+ noderootdisksize: {
+ label: 'label.node.root.disk.size.gb',
+ //docID: 'helpKubernetesClusterNodeRootDiskSize',
+ validation: {
+ number: true
+ }
+ },
+ network: {
+ label: 'label.network',
+ //docID: 'helpKubernetesClusterNetwork',
+ select: function(args) {
+ $.ajax({
+ url: createURL("listNetworks"),
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var networkObjs = [];
+ networkObjs.push({
+ id: "",
+ description: ""
+ });
+ var items = json.listnetworksresponse.network;
+ if (items != null) {
+ for (var i = 0; i < items.length; i++) {
+ networkObjs.push({
+ id: items[i].id,
+ description: items[i].name
+ });
+ }
+ }
+ args.response.success({
+ data: networkObjs
+ });
+ }
+ });
+ }
+ },
+ multimaster: {
+ label: "label.ha.enabled",
+ dependsOn: 'kubernetesversion',
+ isBoolean: true,
+ isChecked: false,
+ },
+ masternodes: {
+ label: 'label.master.nodes',
+ //docID: 'helpKubernetesClusterSize',
+ validation: {
+ required: true,
+ multiplecountnumber: true
+ },
+ dependsOn: "multimaster",
+ isHidden: true,
+ },
+ externalloadbalanceripaddress: {
+ label: 'label.external.loadbalancer.ip.address',
+ validation: {
+ ipv4AndIpv6AddressValidator: true
+ },
+ dependsOn: "multimaster",
+ isHidden: true,
+ },
+ size: {
+ label: 'label.cluster.size.worker.nodes',
+ //docID: 'helpKubernetesClusterSize',
+ validation: {
+ required: true,
+ naturalnumber: true
+ },
+ },
+ sshkeypair: {
+ label: 'label.ssh.key.pair',
+ //docID: 'helpKubernetesClusterSSH',
+ select: function(args) {
+ $.ajax({
+ url: createURL("listSSHKeyPairs"),
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var keypairObjs = [];
+ keypairObjs.push({
+ id: "",
+ description: ""
+ });
+ var items = json.listsshkeypairsresponse.sshkeypair;
+ if (items != null) {
+ for (var i = 0; i < items.length; i++) {
+ keypairObjs.push({
+ id: items[i].name,
+ description: items[i].name
+ });
+ }
+ }
+ args.response.success({
+ data: keypairObjs
+ });
+ }
+ });
+ }
+ },
+ supportPrivateRegistry: {
+ label: 'label.private.registry',
+ isBoolean: true,
+ isChecked: false,
+ isHidden: true
+ },
+ username: {
+ label: 'label.username',
+ dependsOn: 'supportPrivateRegistry',
+ validation: {
+ required: true
+ },
+ isHidden: true
+ },
+ password: {
+ label: 'label.password',
+ dependsOn: 'supportPrivateRegistry',
+ validation: {
+ required: true
+ },
+ isHidden: true,
+ isPassword: true
+ },
+ url: {
+ label: 'label.url',
+ dependsOn: 'supportPrivateRegistry',
+ validation: {
+ required: true
+ },
+ isHidden: true,
+ },
+ email: {
+ label: 'label.email',
+ dependsOn: 'supportPrivateRegistry',
+ validation: {
+ required: true
+ },
+ isHidden: true,
+ }
+ }
+ },
+
+ action: function(args) {
+ var data = {
+ name: args.data.name,
+ description: args.data.description,
+ zoneid: args.data.zone,
+ kubernetesversionid: args.data.kubernetesversion,
+ serviceofferingid: args.data.serviceoffering,
+ size: args.data.size,
+ keypair: args.data.sshkeypair
+ };
+
+ if (args.data.noderootdisksize != null && args.data.noderootdisksize != "" && args.data.noderootdisksize > 0) {
+ $.extend(data, {
+ noderootdisksize: args.data.noderootdisksize
+ });
+ }
+
+ var masterNodes = 1;
+ if (args.data.multimaster === 'on') {
+ masterNodes = args.data.masternodes;
+ if (args.data.externalloadbalanceripaddress != null && args.data.externalloadbalanceripaddress != "") {
+ $.extend(data, {
+ externalloadbalanceripaddress: args.data.externalloadbalanceripaddress
+ });
+ }
+ }
+ $.extend(data, {
+ masternodes: masterNodes
+ });
+
+ if (args.data.supportPrivateRegistry) {
+ $.extend(data, {
+ dockerregistryusername: args.data.username,
+ dockerregistrypassword: args.data.password,
+ dockerregistryurl: args.data.url,
+ dockerregistryemail: args.data.email
+ });
+ }
+
+ if (args.data.network != null && args.data.network.length > 0) {
+ $.extend(data, {
+ networkid: args.data.network
+ });
+ }
+ $.ajax({
+ url: createURL('createKubernetesCluster'),
+ data: data,
+ success: function(json) {
+ var jid = json.createkubernetesclusterresponse.jobid;
+ args.response.success({
+ _custom: {
+ jobId: jid
+ }
+ });
+ },
+ error: function(XMLHttpResponse) {
+ var errorMsg = parseXMLHttpResponse(XMLHttpResponse);
+ args.response.error(errorMsg);
+ }
+ });
+ },
+
+
+ messages: {
+ notification: function(args) {
+ return 'Kubernetes Cluster Add';
+ }
+ },
+ notification: {
+ poll: pollAsyncJobResult
+ }
+ }
+ },
+ dataProvider: function(args) {
+ var data = {
+ page: args.page,
+ pagesize: pageSize
+ };
+ listViewDataProvider(args, data);
+ if (args.filterBy != null) { //filter dropdown
+ if (args.filterBy.kind != null) {
+ switch (args.filterBy.kind) {
+ case "all":
+ break;
+ case "running":
+ $.extend(data, {
+ state: 'Running'
+ });
+ break;
+ case "stopped":
+ $.extend(data, {
+ state: 'Stopped'
+ });
+ break;
+ case "destroyed":
+ $.extend(data, {
+ state: 'Destroyed'
+ });
+ break;
+ }
+ }
+ }
+
+ $.ajax({
+ url: createURL("listKubernetesClusters"),
+ data: data,
+ dataType: "json",
+ sync: true,
+ success: function(json) {
+ var items = [];
+ if (json.listkubernetesclustersresponse.kubernetescluster != null) {
+ items = json.listkubernetesclustersresponse.kubernetescluster;
+ }
+ args.response.success({
+ actionFilter: cksActionfilter,
+ data: items
+ });
+ }
+ });
+ },
+
+ detailView: {
+ name: 'label.kubernetes.cluster.details',
+ isMaximized: true,
+ actions: {
+ start: {
+ label: 'label.start.kuberentes.cluster',
+ action: function(args) {
+ $.ajax({
+ url: createURL("startKubernetesCluster"),
+ data: {"id": args.context.kubernetesclusters[0].id},
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var jid = json.startkubernetesclusterresponse.jobid;
+ args.response.success({
+ _custom: {
+ jobId: jid
+ }
+ });
+ }
+ });
+ },
+ messages: {
+ confirm: function(args) {
+ return 'message.confirm.start.kubernetes.cluster';
+ },
+ notification: function(args) {
+ return 'Started Kubernetes cluster.';
+ }
+ },
+ notification: {
+ poll: pollAsyncJobResult
+ }
+ },
+ stop: {
+ label: 'label.stop.kuberentes.cluster',
+ action: function(args) {
+ $.ajax({
+ url: createURL("stopKubernetesCluster"),
+ data: {"id": args.context.kubernetesclusters[0].id},
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var jid = json.stopkubernetesclusterresponse.jobid;
+ args.response.success({
+ _custom: {
+ jobId: jid
+ }
+ });
+ }
+ });
+ },
+ messages: {
+ confirm: function(args) {
+ return 'message.confirm.stop.kubernetes.cluster';
+ },
+ notification: function(args) {
+ return 'Stopped Kubernetes cluster.';
+ }
+ },
+ notification: {
+ poll: pollAsyncJobResult
+ }
+ },
+ destroy: {
+ label: 'label.destroy.kubernetes.cluster',
+ compactLabel: 'label.destroy',
+ createForm: {
+ title: 'label.destroy.kubernetes.cluster',
+ desc: 'label.destroy.kubernetes.cluster',
+ isWarning: true,
+ fields: {
+ }
+ },
+ messages: {
+ confirm: function(args) {
+ return 'message.confirm.destroy.kubernetes.cluster';
+ },
+ notification: function(args) {
+ return 'Destroyed Kubernetes cluster.';
+ }
+ },
+ action: function(args) {
+ var data = {
+ id: args.context.kubernetesclusters[0].id
+ };
+ $.ajax({
+ url: createURL('deleteKubernetesCluster'),
+ data: data,
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ args.response.success({
+ _custom: {
+ jobId: json.deletekubernetesclusterresponse.jobid,
+ getUpdatedItem: function(json) {
+ return { 'toRemove': true };
+ }
+ }
+ });
+ }
+ });
+ },
+ notification: {
+ poll: pollAsyncJobResult
+ }
+ },
+ downloadKubernetesClusterKubeConfig: {
+ label: 'label.download.kubernetes.cluster.config',
+ messages: {
+ notification: function(args) {
+ return 'label.download.kubernetes.cluster.config';
+ }
+ },
+ action: function(args) {
+ var data = {
+ id: args.context.kubernetesclusters[0].id
+ }
+ $.ajax({
+ url: createURL("getKubernetesClusterConfig"),
+ dataType: "json",
+ data: data,
+ async: false,
+ success: function(json) {
+ var jsonObj;
+ if (json.getkubernetesclusterconfigresponse.clusterconfig != null &&
+ json.getkubernetesclusterconfigresponse.clusterconfig.configdata != null ) {
+ jsonObj = json.getkubernetesclusterconfigresponse.clusterconfig;
+ clusterKubeConfig = jsonObj.configdata;
+ downloadClusterKubeConfig();
+ args.response.success({});
+ } else {
+ args.response.error("Unable to retrieve Kubernetes cluster config");
+ }
+ },
+ error: function(XMLHttpResponse) {
+ var errorMsg = parseXMLHttpResponse(XMLHttpResponse);
+ args.response.error(errorMsg);
+ }
+ });
+ },
+ notification: {
+ poll: function(args) {
+ args.complete();
+ }
+ }
+ },
+ scaleKubernetesCluster: {
+ label: 'label.scale.kubernetes.cluster',
+ messages: {
+ notification: function(args) {
+ return 'label.scale.kubernetes.cluster';
+ }
+ },
+ createForm: {
+ title: 'label.scale.kubernetes.cluster',
+ desc: '',
+ preFilter: function(args) {
+ var options = args.$form.find('.form-item[rel=serviceoffering]').find('option');
+ $.each(options, function(optionIndex, option) {
+ if ($(option).val() === args.context.kubernetesclusters[0].serviceofferingid) {
+ $(option).attr('selected','selected');
+ }
+ });
+ args.$form.find('.form-item[rel=size]').find('input[name=size]').val(args.context.kubernetesclusters[0].size);
+ },
+ fields: {
+ serviceoffering: {
+ label: 'label.menu.service.offerings',
+ //docID: 'helpKubernetesClusterServiceOffering',
+ validation: {
+ required: true
+ },
+ select: function(args) {
+ $.ajax({
+ url: createURL("listKubernetesSupportedVersions"),
+ data: {id: args.context.kubernetesclusters[0].kubernetesversionid},
+ dataType: "json",
+ async: false,
+ success: function(json) {
+ var versionObjs = json.listkubernetessupportedversionsresponse.kubernetessupportedversion;
+ if (versionObjs != null && versionObjs.length > 0) {
+ minCpu = 0;
+ if (versionObjs[0].mincpunumber != null && versionObjs[0].mincpunumber != undefined) {
+ minCpu = versionObjs[0].mincpunumber;
+ }
+ minRamSize = 0;
+ if (versionObjs[0].minmemory != null && versionObjs[0].minmemory != undefined) {
+ minRamSize = versionObjs[0].minmemory;
+ }
+ }
+ }
+ });
+ $.ajax({
+ url: createURL("listServiceOfferings"),
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var offeringObjs = [];
+ var items = json.listserviceofferingsresponse.serviceoffering;
+ if (items != null) {
+ for (var i = 0; i < items.length; i++) {
+ if (items[i].iscustomized == false &&
+ items[i].cpunumber >= minCpu && items[i].memory >= minRamSize) {
+ offeringObjs.push({
+ id: items[i].id,
+ description: items[i].name
+ });
+ }
+ }
+ }
+ args.response.success({
+ data: offeringObjs
+ });
+ }
+ });
+ }
+ },
+ size: {
+ label: 'label.cluster.size',
+ //docID: 'helpKubernetesClusterSize',
+ validation: {
+ required: true,
+ number: true
+ },
+ }
+ }
+ },
+ action: function(args) {
+ var data = {
+ id: args.context.kubernetesclusters[0].id,
+ serviceofferingid: args.data.serviceoffering,
+ size: args.data.size
+ };
+ $.ajax({
+ url: createURL('scaleKubernetesCluster'),
+ data: data,
+ dataType: "json",
+ success: function (json) {
+ var jid = json.scalekubernetesclusterresponse.jobid;
+ args.response.success({
+ _custom: {
+ jobId: jid,
+ getActionFilter: function() {
+ return cksActionfilter;
+ }
+ }
+ });
+ }
+ }); //end ajax
+ },
+ notification: {
+ poll: pollAsyncJobResult
+ }
+ },
+ upgradeKubernetesCluster: {
+ label: 'label.upgrade.kubernetes.cluster',
+ messages: {
+ notification: function(args) {
+ return 'label.upgrade.kubernetes.cluster';
+ }
+ },
+ createForm: {
+ title: 'label.upgrade.kubernetes.cluster',
+ desc: '',
+ preFilter: function(args) {},
+ fields: {
+ kubernetesversion: {
+ label: 'label.kubernetes.version',
+ //docID: 'helpKubernetesClusterZone',
+ validation: {
+ required: true
+ },
+ select: function(args) {
+ var filterData = { minimumkubernetesversionid: args.context.kubernetesclusters[0].kubernetesversionid };
+ $.ajax({
+ url: createURL("listKubernetesSupportedVersions"),
+ data: filterData,
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var items = [];
+ var versionObjs = json.listkubernetessupportedversionsresponse.kubernetessupportedversion;
+ if (versionObjs != null) {
+ var clusterVersion = null;
+ for (var j = 0; j < versionObjs.length; j++) {
+ if (versionObjs[j].id == args.context.kubernetesclusters[0].kubernetesversionid) {
+ clusterVersion = versionObjs[j];
+ break;
+ }
+ }
+ for (var i = 0; i < versionObjs.length; i++) {
+ if (versionObjs[i].id != args.context.kubernetesclusters[0].kubernetesversionid &&
+ (clusterVersion == null || (clusterVersion != null && versionObjs[i].semanticversion != clusterVersion.semanticversion)) &&
+ versionObjs[i].state == 'Enabled' && versionObjs[i].isostate == 'Ready') {
+ items.push({
+ id: versionObjs[i].id,
+ description: versionObjs[i].name
+ });
+ }
+ }
+ }
+ args.response.success({
+ data: items
+ });
+ }
+ });
+ }
+ },
+ }
+ },
+ action: function(args) {
+ var data = {
+ id: args.context.kubernetesclusters[0].id,
+ kubernetesversionid: args.data.kubernetesversion
+ };
+ $.ajax({
+ url: createURL('upgradeKubernetesCluster'),
+ data: data,
+ dataType: "json",
+ success: function (json) {
+ var jid = json.upgradekubernetesclusterresponse.jobid;
+ args.response.success({
+ _custom: {
+ jobId: jid,
+ getActionFilter: function() {
+ return cksActionfilter;
+ }
+ }
+ });
+ }
+ }); //end ajax
+ },
+ notification: {
+ poll: pollAsyncJobResult
+ }
+ },
+ },
+ tabs: {
+ // Details tab
+ details: {
+ title: 'label.details',
+ fields: [{
+ id: {
+ label: 'label.id'
+ },
+ name: {
+ label: 'label.name'
+ },
+ zonename: {
+ label: 'label.zone.name'
+ },
+ kubernetesversionname: {
+ label: 'label.kubernetes.version'
+ },
+ masternodes : {
+ label: 'label.master.nodes'
+ },
+ size : {
+ label: 'label.cluster.size'
+ },
+ cpunumber: {
+ label: 'label.num.cpu.cores'
+ },
+ memory: {
+ label: 'label.memory.mb'
+ },
+ state: {
+ label: 'label.state',
+ },
+ serviceofferingname: {
+ label: 'label.compute.offering'
+ },
+ associatednetworkname: {
+ label: 'label.network'
+ },
+ keypair: {
+ label: 'label.ssh.key.pair'
+ }
+ }],
+
+ dataProvider: function(args) {
+ $.ajax({
+ url: createURL("listKubernetesClusters&id=" + args.context.kubernetesclusters[0].id),
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var jsonObj;
+ if (json.listkubernetesclustersresponse.kubernetescluster != null && json.listkubernetesclustersresponse.kubernetescluster.length > 0) {
+ jsonObj = json.listkubernetesclustersresponse.kubernetescluster[0];
+ }
+ args.response.success({
+ actionFilter: cksActionfilter,
+ data: jsonObj
+ });
+ }
+ });
+ }
+ },
+ clusteraccess: {
+ title: 'label.access',
+ custom : function (args) {
+ var showAccess = function() {
+ var state = args.context.kubernetesclusters[0].state;
+ if (state == "Created") { // Created
+ return jQuery('<br><p>').html("Kubernetes cluster setup is under progress, please check again in few minutes.");
+ } else if (state == "Error") { // Error
+ return jQuery('<br><p>').html("Kubernetes cluster is in error state, it cannot be accessed.");
+ } else if (state == "Destroying") { // Destroying
+ return jQuery('<br><p>').html("Kubernetes cluster is in destroying state, it cannot be accessed.");
+ } else if (state == "Destroyed") { // Destroyed
+ return jQuery('<br><p>').html("Kubernetes cluster is already destroyed, it cannot be accessed.");
+ }
+ var data = {
+ id: args.context.kubernetesclusters[0].kubernetesversionid
+ }
+ var version = '';
+ $.ajax({
+ url: createURL("listKubernetesSupportedVersions"),
+ dataType: "json",
+ data: data,
+ async: false,
+ success: function(json) {
+ var jsonObj;
+ if (json.listkubernetessupportedversionsresponse.kubernetessupportedversion != null) {
+ version = json.listkubernetessupportedversionsresponse.kubernetessupportedversion[0].semanticversion;
+ }
+ }
+ });
+ return jQuery('<br><p>').html("Access Kubernetes cluster<br><br>Download cluster's kubeconfig file using action from Details tab.<br>Download kubectl tool for cluster's Kubernetes version from,<br>Linux: <a href='https://storage.googleapis.com/kubernetes-release/release/v" + version + "/bin/linux/amd64/kubectl'>https://storage.googleapis.com/kubernetes-release/release/v" + version + "/bin/linux/amd64/kubectl</a><br>MacOS: <a href='https://storage.googleapis.com/kubernetes-release/release/v" + version + "/bin/darwin/amd64/kubectl'>https://storage.googleapis.com/kubernetes-release/release/v" + version + "/bin/darwin/amd64/kubectl</a><br>Windows: <a href='https://storage.googleapis.com/kubernetes-release/release/v" + version + "/bin/windows/amd64/kubectl.exe'>https://storage.googleapis.com/kubernetes-release/release/v" + version + "/bin/windows/amd64/kubectl.exe</a><br><br>Using kubectl and kubeconfig file to access cluster<br><code>kubectl --kubeconfig /custom/path/kube.conf {COMMAND}</code><br><br>List pods<br><code>kubectl --kubeconfig /custom/path/kube.conf get pods --all-namespaces</code><br>List nodes<br><code>kubectl --kubeconfig /custom/path/kube.conf get nodes --all-namespaces</code><br>List services<br><code>kubectl --kubeconfig /custom/path/kube.conf get services --all-namespaces</code><br><br>Access dashboard web UI<br>Run proxy locally<br><code>kubectl --kubeconfig /custom/path/kube.conf proxy</code><br>Open URL in browser<br><code><a href='http://localhost:8001/api/v1/namespaces/kubernetes-dashboard/services/https:kubernetes-dashboard:/proxy/'>http://localhost:8001/api/v1/namespaces/kubernetes-dashboard/services/https:kubernetes-dashboard:/proxy/</a></code><br><br>Token for dashboard login can be retrieved using following command<br><code>kubectl --kubeconfig /custom/path/kube.conf describe secret $(kubectl --kubeconfig /custom/path/kube.conf get secrets -n kubernetes-dashboard | grep kubernetes-dashboard-token | awk '{print $1}') -n kubernetes-dashboard</code><br><br>More about accessing dashboard UI, https://kubernetes.io/docs/tasks/access-application-cluster/web-ui-dashboard/#accessing-the-dashboard-ui");
+ };
+ return showAccess();
+ }
+ },
+ clusterinstances: {
+ title: 'label.instances',
+ listView: {
+ section: 'clusterinstances',
+ preFilter: function(args) {
+ var hiddenFields = [];
+ if (!isAdmin()) {
+ hiddenFields.push('instancename');
+ }
+ return hiddenFields;
+ },
+ fields: {
+ name: {
+ label: 'label.name',
+ truncate: true
+ },
+ instancename: {
+ label: 'label.internal.name'
+ },
+ displayname: {
+ label: 'label.display.name',
+ truncate: true
+ },
+ ipaddress: {
+ label: 'label.ip.address'
+ },
+ zonename: {
+ label: 'label.zone.name'
+ },
+ state: {
+ label: 'label.state',
+ indicator: {
+ 'Running': 'on',
+ 'Stopped': 'off',
+ 'Destroyed': 'off',
+ 'Error': 'off'
+ }
+ }
+ },
+ dataProvider: function(args) {
+ var data = {};
+ listViewDataProvider(args, data);
+
+ $.ajax({
+ url: createURL("listKubernetesClusters"),
+ data: {"id": args.context.kubernetesclusters[0].id},
+ success: function(json) {
+ var items = json.listkubernetesclustersresponse.kubernetescluster;
+
+ var vmlist = [];
+ $.each(items, function(idx, item) {
+ if ("virtualmachineids" in item) {
+ vmlist = vmlist.concat(item.virtualmachineids);
+ }
+ });
+
+ $.extend(data, {
+ ids: vmlist.join()
+ });
+
+ if (items && items.length > 0 && items[0].projectid != null &&
+ items[0].projectid != undefined && items[0].projectid.length > 0) {
+ $.extend(data, {
+ projectid: items[0].projectid
+ });
+ }
+
+ if (data.ids.length == 0) {
+ args.response.success({
+ data: []
+ });
+ } else {
+ $.ajax({
+ url: createURL('listVirtualMachines'),
+ data: data,
+ success: function(json) {
+ var items = json.listvirtualmachinesresponse.virtualmachine;
+ if (items) {
+ $.each(items, function(idx, vm) {
+ if (vm.nic && vm.nic.length > 0 && vm.nic[0].ipaddress) {
+ items[idx].ipaddress = vm.nic[0].ipaddress;
+ }
+ });
+ }
+ args.response.success({
+ data: items
+ });
+ },
+ error: function(XMLHttpResponse) {
+ cloudStack.dialog.notice({
+ message: parseXMLHttpResponse(XMLHttpResponse)
+ });
+ args.response.error();
+ }
+ });
+ }
+ }
+ });
+ },
+ }
+ },
+ firewall: {
+ title: 'label.firewall',
+ custom: function(args) {
+ var data = {
+ id: args.context.kubernetesclusters[0].networkid,
+ listAll: true
+ }
+ if (args.context.kubernetesclusters[0].projectid != null &&
+ args.context.kubernetesclusters[0].projectid != undefined &&
+ args.context.kubernetesclusters[0].projectid.length > 0) {
+ $.extend(data, {
+ projectid: args.context.kubernetesclusters[0].projectid
+ });
+ $.extend(args.context, {"projectid": args.context.kubernetesclusters[0].projectid});
+ }
+ $.ajax({
+ url: createURL('listNetworks'),
+ data: data,
+ async: false,
+ dataType: "json",
+ success: function(json) {
+ var network = json.listnetworksresponse.network;
+ $.extend(args.context, {"networks": [network]});
+ }
+ });
+ data = {
+ associatedNetworkId: args.context.kubernetesclusters[0].networkid,
+ listAll: true,
+ forvirtualnetwork: true
+ }
+ if (args.context.kubernetesclusters[0].projectid != null &&
+ args.context.kubernetesclusters[0].projectid != undefined &&
+ args.context.kubernetesclusters[0].projectid.length > 0) {
+ $.extend(data, {
+ projectid: args.context.kubernetesclusters[0].projectid
+ });
+ }
+ $.ajax({
+ url: createURL('listPublicIpAddresses'),
+ data: data,
+ async: false,
+ dataType: "json",
+ success: function(json) {
+ var ips = json.listpublicipaddressesresponse.publicipaddress;
+ var fwip = ips[0];
+ $.each(ips, function(idx, ip) {
+ if (ip.issourcenat || ip.isstaticnat) {
+ fwip = ip;
+ return false;
+ }
+ });
+ $.extend(args.context, {"ipAddresses": [fwip]});
+ }
+ });
+ return cloudStack.sections.network.sections.ipAddresses.listView.detailView.tabs.ipRules.custom(args);
+ },
+ },
+ }
+ }
+ }
+ },
+ kubernetesversions: {
+ id: 'kubernetesversions',
+ type: 'select',
+ title: "label.versions",
+ listView: {
+ fields: {
+ name: {
+ label: 'label.name'
+ },
+ semanticversion: {
+ label: 'label.kubernetes.version'
+ },
+ zonename: {
+ label: 'label.zone.name'
+ },
+ isoname: {
+ label: 'label.iso.name'
+ },
+ isostate: {
+ label: 'label.iso.state'
+ },
+ mincpunumber: {
+ label: 'label.min.cpu.cores'
+ },
+ minmemory: {
+ label: 'label.memory.minimum.mb'
+ },
+ state: {
+ label: 'label.state',
+ indicator: {
+ 'Enabled': 'on',
+ 'Disabled': 'off'
+ }
+ }
+ },
+ advSearchFields: {
+ name: {
+ label: 'label.name'
+ },
+ zoneid: {
+ label: 'label.zone',
+ select: function(args) {
+ $.ajax({
+ url: createURL('listZones'),
+ data: {
+ listAll: true
+ },
+ success: function(json) {
+ var zones = json.listzonesresponse.zone ? json.listzonesresponse.zone : [];
+
+ args.response.success({
+ data: $.map(zones, function(zone) {
+ return {
+ id: zone.id,
+ description: zone.name
+ };
+ })
+ });
+ }
+ });
+ }
+ },
+ },
+ // List view actions
+ actions: {
+ add: {
+ label: 'label.add.kubernetes.version',
+ preFilter: function(args) { return isAdmin(); },
+ createForm: {
+ title: 'label.add.kubernetes.version',
+ preFilter: cloudStack.preFilter.createTemplate,
+ fields: {
+ version: {
+ label: 'label.semantic.version',
+ //docID: 'Name of the cluster',
+ validation: {
+ required: true
+ }
+ },
+ name: {
+ label: 'label.name',
+ //docID: 'Name of the cluster',
+ },
+ zone: {
+ label: 'label.zone',
+ //docID: 'helpKubernetesClusterZone',
+ validation: {
+ required: true
+ },
+ select: function(args) {
+ $.ajax({
+ url: createURL("listZones&available=true"),
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var items = [];
+ var zoneObjs = json.listzonesresponse.zone;
+ if (zoneObjs != null) {
+ for (var i = 0; i < zoneObjs.length; i++) {
+ items.push({
+ id: zoneObjs[i].id,
+ description: zoneObjs[i].name
+ });
+ }
+ }
+ items.sort(function(a, b) {
+ return a.description.localeCompare(b.description);
+ });
+ items.unshift({
+ id: -1,
+ description: 'label.all.zones'
+ });
+ args.response.success({
+ data: items
+ });
+ }
+ });
+ }
+ },
+ isourl: {
+ label: 'label.url',
+ //docID: 'Name of the cluster',
+ validation: {
+ required: true
+ }
+ },
+ isochecksum: {
+ label: 'label.checksum',
+ //docID: 'Name of the cluster',
+ },
+ mincpunumber: {
+ label: 'label.min.cpu.cores',
+ validation: {
+ required: true,
+ number: true
+ },
+ },
+ minmemory: {
+ label: 'label.memory.minimum.mb',
+ validation: {
+ required: true,
+ number: true
+ }
+ }
+ }
+ },
+
+ action: function(args) {
+ var data = {
+ name: args.data.name,
+ semanticversion: args.data.version,
+ url: args.data.isourl,
+ checksum: args.data.isochecksum
+ };
+ if (args.data.zone != null && args.data.zone != -1) {
+ $.extend(data, {
+ zoneid: args.data.zone
+ });
+ }
+ if (args.data.mincpunumber != null && args.data.mincpunumber != "" && args.data.mincpunumber > 0) {
+ $.extend(data, {
+ mincpunumber: args.data.mincpunumber
+ });
+ }
+ if (args.data.minmemory != null && args.data.minmemory != "" && args.data.minmemory > 0) {
+ $.extend(data, {
+ minmemory: args.data.minmemory
+ });
+ }
+ $.ajax({
+ url: createURL('addKubernetesSupportedVersion'),
+ data: data,
+ success: function(json) {
+ var version = json.addkubernetessupportedversionresponse.kubernetessupportedversion;
+ args.response.success({
+ data: version
+ });
+ },
+ error: function(XMLHttpResponse) {
+ var errorMsg = parseXMLHttpResponse(XMLHttpResponse);
+ args.response.error(errorMsg);
+ }
+ });
+ },
+ messages: {
+ notification: function(args) {
+ return 'Kubernetes Supported Version Add';
+ }
+ }
+ }
+ },
+ dataProvider: function(args) {
+ var data = {
+ page: args.page,
+ pagesize: pageSize
+ };
+ listViewDataProvider(args, data);
+ $.ajax({
+ url: createURL("listKubernetesSupportedVersions"),
+ data: data,
+ dataType: "json",
+ sync: true,
+ success: function(json) {
+ var items = [];
+ if (json.listkubernetessupportedversionsresponse.kubernetessupportedversion != null) {
+ items = json.listkubernetessupportedversionsresponse.kubernetessupportedversion;
+ }
+ args.response.success({
+ data: items
+ });
+ }
+ });
+ },
+
+ detailView: {
+ name: 'label.kubernetes.version.details',
+ isMaximized: true,
+ actions: {
+ update: {
+ label: 'label.edit',
+ messages: {
+ notification: function(args) {
+ return 'label.update.kubernetes.version';
+ }
+ },
+ createForm: {
+ title: 'label.update.kubernetes.version',
+ desc: '',
+ preFilter: function(args) {
+ var formVersion = args.context.kubernetesversions[0];
+ $.ajax({
+ url: createURL('listKubernetesSupportedVersions'),
+ data: {
+ id: args.context.kubernetesversions[0].id
+ },
+ dataType: "json",
+ async: false,
+ success: function (json) {
+ if (json.listkubernetessupportedversionsresponse.kubernetessupportedversion != null &&
+ json.listkubernetessupportedversionsresponse.kubernetessupportedversion.length > 0) {
+ formVersion = json.listkubernetessupportedversionsresponse.kubernetessupportedversion[0];
+ }
+ }
+ });
+ if (formVersion.state != null) {
+ var options = args.$form.find('.form-item[rel=state]').find('option');
+ $.each(options, function(optionIndex, option) {
+ if ($(option).val() === formVersion.state) {
+ $(option).attr('selected','selected');
+ }
+ });
+ }
+ },
+ fields: {
+ state: {
+ label: 'label.state',
+ //docID: 'helpKubernetesClusterZone',
+ validation: {
+ required: true
+ },
+ select: function(args) {
+ var items = [];
+ items.push({
+ id: 'Enabled',
+ description: 'state.Enabled'
+ }, {
+ id: 'Disabled',
+ description: 'state.Disabled'
+ });
+ args.response.success({
+ data: items
+ });
+ }
+ },
+ }
+ },
+ action: function(args) {
+ var data = {
+ id: args.context.kubernetesversions[0].id,
+ state: args.data.state
+ };
+ $.ajax({
+ url: createURL('updateKubernetesSupportedVersion'),
+ data: data,
+ dataType: "json",
+ success: function (json) {
+ var jsonObj;
+ if (json.updatekubernetessupportedversionresponse.kubernetessupportedversion != null) {
+ jsonObj = json.updatekubernetessupportedversionresponse.kubernetessupportedversion;
+ }
+ args.response.success({
+ data: jsonObj
+ });
+ },
+ error: function(XMLHttpResponse) {
+ var errorMsg = parseXMLHttpResponse(XMLHttpResponse);
+ args.response.error(errorMsg);
+ }
+ }); //end ajax
+ }
+ },
+ destroy: {
+ label: 'label.delete.kubernetes.version',
+ compactLabel: 'label.delete',
+ preFilter: function(args) { return isAdmin(); },
+ createForm: {
+ title: 'label.delete.kubernetes.version',
+ desc: 'label.delete.kubernetes.version',
+ isWarning: true,
+ fields: {}
+ },
+ messages: {
+ confirm: function(args) {
+ return 'message.confirm.delete.kubernetes.version';
+ },
+ notification: function(args) {
+ return 'Deleted Kubernetes version.';
+ }
+ },
+ action: function(args) {
+ var data = {
+ id: args.context.kubernetesversions[0].id
+ };
+ $.ajax({
+ url: createURL('deleteKubernetesSupportedVersion'),
+ data: data,
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ args.response.success({
+ _custom: {
+ jobId: json.deletekubernetessupportedversionresponse.jobid,
+ getUpdatedItem: function(json) {
+ return { 'toRemove': true };
+ }
+ }
+ });
+ }
+ });
+ },
+ notification: {
+ poll: pollAsyncJobResult
+ }
+ }
+ },
+ tabs: {
+ // Details tab
+ details: {
+ title: 'label.details',
+ fields: [{
+ id: {
+ label: 'label.id'
+ },
+ name: {
+ label: 'label.name'
+ },
+ zonename: {
+ label: 'label.zone.name'
+ },
+ isoid: {
+ label: 'label.iso.id'
+ },
+ isoname: {
+ label: 'label.iso.name'
+ },
+ isostate: {
+ label: 'label.iso.name'
+ }
+ }],
+
+ dataProvider: function(args) {
+ $.ajax({
+ url: createURL("listKubernetesSupportedVersions&id=" + args.context.kubernetesversions[0].id),
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var jsonObj;
+ if (json.listkubernetessupportedversionsresponse.kubernetessupportedversion != null && json.listkubernetessupportedversionsresponse.kubernetessupportedversion.length > 0) {
+ jsonObj = json.listkubernetessupportedversionsresponse.kubernetessupportedversion[0];
+ }
+ args.response.success({
+ data: jsonObj
+ });
+ }
+ });
+ }
+ }
+ }
+ }
+ }
+ },
+ }
+ });
+ };
+
+ var cksActionfilter = cloudStack.actionFilter.cksActionfilter = function(args) {
+ var jsonObj = args.context.item;
+ var allowedActions = [];
+ if (jsonObj.state != "Destroyed" && jsonObj.state != "Destroying") {
+ if (jsonObj.state == "Stopped") {
+ allowedActions.push("start");
+ } else {
+ allowedActions.push("downloadKubernetesClusterKubeConfig");
+ allowedActions.push("stop");
+ }
+ if (jsonObj.state == "Created" || jsonObj.state == "Running") {
+ allowedActions.push("scaleKubernetesCluster");
+ allowedActions.push("upgradeKubernetesCluster");
+ }
+ allowedActions.push("destroy");
+ }
+ return allowedActions;
+ }
+
+}(cloudStack));
diff --git a/ui/plugins/cks/config.js b/ui/plugins/cks/config.js
new file mode 100644
index 0000000..a5ea163
--- /dev/null
+++ b/ui/plugins/cks/config.js
@@ -0,0 +1,25 @@
+// 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.
+(function (cloudStack) {
+ cloudStack.plugins.cks.config = {
+ title: 'Kubernetes Service',
+ desc: 'Kubernetes Service',
+ externalLink: 'http://www.cloudstack.org/',
+ authorName: 'Apache CloudStack',
+ authorEmail: 'dev@cloudstack.apache.org'
+ };
+}(cloudStack));
diff --git a/ui/plugins/cks/icon.png b/ui/plugins/cks/icon.png
new file mode 100644
index 0000000..1d04967
--- /dev/null
+++ b/ui/plugins/cks/icon.png
Binary files differ
diff --git a/ui/plugins/plugins.js b/ui/plugins/plugins.js
index 6edfe88..30cdf4f 100644
--- a/ui/plugins/plugins.js
+++ b/ui/plugins/plugins.js
@@ -18,6 +18,7 @@
cloudStack.plugins = [
//'testPlugin',
'cloudian',
- 'quota'
+ 'quota',
+ 'cks'
];
}(jQuery, cloudStack));
diff --git a/ui/scripts/accountsWizard.js b/ui/scripts/accountsWizard.js
index 5b8e9a6..3f87ea8 100644
--- a/ui/scripts/accountsWizard.js
+++ b/ui/scripts/accountsWizard.js
@@ -68,10 +68,43 @@
required: true
},
docID: 'helpAccountLastName'
- }
+ },
+ conflictingusersource: {
+ label: 'label.user.conflict',
+ validation: {
+ required: true
+ },
+ docID: 'helpConflictSource'
+ }
},
informationNotInLdap: {
+ filter: {
+ label: 'label.filterBy',
+ docID: 'helpLdapUserFilter',
+ select: function(args) {
+ var items = [];
+ items.push({
+ id: "NoFilter",
+ description: "No filter"
+ });
+ items.push({
+ id: "LocalDomain",
+ description: "Local domain"
+ });
+ items.push({
+ id: "AnyDomain",
+ description: "Any domain"
+ });
+ items.push({
+ id: "PotentialImport",
+ description: "Potential import"
+ });
+ args.response.success({
+ data: items
+ });
+ }
+ },
domainid: {
label: 'label.domain',
docID: 'helpAccountDomain',
diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
index 9b5f011..e6550b7 100644
--- a/ui/scripts/cloudStack.js
+++ b/ui/scripts/cloudStack.js
@@ -102,6 +102,64 @@
var $container = $('#cloudStack3-container');
+ var updateSharedConfigs = function() {
+ // Update global pagesize for list APIs in UI
+ $.ajax({
+ type: 'GET',
+ url: createURL('listConfigurations'),
+ data: {name: 'default.ui.page.size'},
+ dataType: 'json',
+ async: false,
+ success: function(data, textStatus, xhr) {
+ if (data && data.listconfigurationsresponse && data.listconfigurationsresponse.configuration) {
+ var config = data.listconfigurationsresponse.configuration[0];
+ if (config && config.name == 'default.ui.page.size') {
+ pageSize = parseInt(config.value);
+ }
+ }
+ },
+ error: function(xhr) { // ignore any errors, fallback to the default
+ }
+ });
+
+ // Update global pagesize for sort key in UI
+ $.ajax({
+ type: 'GET',
+ url: createURL('listConfigurations'),
+ data: {name: 'sortkey.algorithm'},
+ dataType: 'json',
+ async: false,
+ success: function(data, textStatus, xhr) {
+ if (data && data.listconfigurationsresponse && data.listconfigurationsresponse.configuration) {
+ var config = data.listconfigurationsresponse.configuration[0];
+ if (config && config.name == 'sortkey.algorithm') {
+ g_sortKeyIsAscending = config.value == 'true';
+ }
+ }
+ },
+ error: function(xhr) { // ignore any errors, fallback to the default
+ }
+ });
+
+ // Update global router health checks enabled
+ $.ajax({
+ type: 'GET',
+ url: createURL('listConfigurations'),
+ data: {name: 'router.health.checks.enabled'},
+ dataType: 'json',
+ async: false,
+ success: function(data, textStatus, xhr) {
+ if (data && data.listconfigurationsresponse && data.listconfigurationsresponse.configuration) {
+ var config = data.listconfigurationsresponse.configuration[0];
+ if (config && config.name == 'router.health.checks.enabled') {
+ g_routerHealthChecksEnabled = config.value == 'true';
+ }
+ }
+ },
+ error: function(xhr) { // ignore any errors, fallback to the default
+ }
+ });
+ }
var loginArgs = {
$container: $container,
@@ -148,6 +206,7 @@
}
g_allowUserExpungeRecoverVm = json.listcapabilitiesresponse.capability.allowuserexpungerecovervm;
+ g_allowUserExpungeRecoverVolume = json.listcapabilitiesresponse.capability.allowuserexpungerecovervolume;
g_userProjectsEnabled = json.listcapabilitiesresponse.capability.allowusercreateprojects;
g_cloudstackversion = json.listcapabilitiesresponse.capability.cloudstackversion;
@@ -170,61 +229,25 @@
}
});
- // Update global pagesize for list APIs in UI
- $.ajax({
- type: 'GET',
- url: createURL('listConfigurations'),
- data: {name: 'default.ui.page.size'},
- dataType: 'json',
- async: false,
- success: function(data, textStatus, xhr) {
- if (data && data.listconfigurationsresponse && data.listconfigurationsresponse.configuration) {
- var config = data.listconfigurationsresponse.configuration[0];
- if (config && config.name == 'default.ui.page.size') {
- pageSize = parseInt(config.value);
- }
- }
- },
- error: function(xhr) { // ignore any errors, fallback to the default
- }
- });
+ updateSharedConfigs()
- // Update global pagesize for sort key in UI
- $.ajax({
- type: 'GET',
- url: createURL('listConfigurations'),
- data: {name: 'sortkey.algorithm'},
- dataType: 'json',
- async: false,
- success: function(data, textStatus, xhr) {
- if (data && data.listconfigurationsresponse && data.listconfigurationsresponse.configuration) {
- var config = data.listconfigurationsresponse.configuration[0];
- if (config && config.name == 'sortkey.algorithm') {
- g_sortKeyIsAscending = config.value == 'true';
- }
- }
- },
- error: function(xhr) { // ignore any errors, fallback to the default
- }
- });
-
- // Populate IDP list
- $.ajax({
- type: 'GET',
- url: createURL('listIdps'),
- dataType: 'json',
- async: false,
- success: function(data, textStatus, xhr) {
- if (data && data.listidpsresponse && data.listidpsresponse.idp) {
- var idpList = data.listidpsresponse.idp.sort(function (a, b) {
- return a.orgName.localeCompare(b.orgName);
- });
- g_idpList = idpList;
- }
- },
- error: function(xhr) {
- }
- });
+ // Populate IDP list
+ $.ajax({
+ type: 'GET',
+ url: createURL('listIdps'),
+ dataType: 'json',
+ async: false,
+ success: function(data, textStatus, xhr) {
+ if (data && data.listidpsresponse && data.listidpsresponse.idp) {
+ var idpList = data.listidpsresponse.idp.sort(function (a, b) {
+ return a.orgName.localeCompare(b.orgName);
+ });
+ g_idpList = idpList;
+ }
+ },
+ error: function(xhr) {
+ }
+ });
return userValid ? {
user: {
@@ -315,6 +338,7 @@
g_userPublicTemplateEnabled = json.listcapabilitiesresponse.capability.userpublictemplateenabled.toString(); //convert boolean to string if it's boolean
}
g_allowUserExpungeRecoverVm = json.listcapabilitiesresponse.capability.allowuserexpungerecovervm;
+ g_allowUserExpungeRecoverVolume = json.listcapabilitiesresponse.capability.allowuserexpungerecovervolume;
g_userProjectsEnabled = json.listcapabilitiesresponse.capability.allowusercreateprojects;
g_cloudstackversion = json.listcapabilitiesresponse.capability.cloudstackversion;
@@ -337,6 +361,7 @@
})
}
});
+ updateSharedConfigs();
},
error: function(xmlHTTP) {
args.response.error();
@@ -377,6 +402,7 @@
g_regionsecondaryenabled = null;
g_loginCmdText = null;
g_allowUserViewAllDomainAccounts = null;
+ g_routerHealthChecksEnabled = false;
// Remove any cookies
var cookies = document.cookie.split(";");
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index 62a6022..3d3783d 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -28,7 +28,7 @@
sectionSelect: {
preFilter: function(args) {
if(isAdmin())
- return ["serviceOfferings", "systemServiceOfferings", "diskOfferings", "networkOfferings", "vpcOfferings"];
+ return ["serviceOfferings", "systemServiceOfferings", "diskOfferings", "networkOfferings", "vpcOfferings", "backupOfferings"];
else if(isDomainAdmin())
return ["serviceOfferings", "diskOfferings"];
else
@@ -137,6 +137,28 @@
});
}
},
+ cacheMode: {
+ label: 'label.cache.mode',
+ docID: 'helpDiskOfferingCacheMode',
+ select: function (args) {
+ var items = [];
+ items.push({
+ id: 'none',
+ description: 'No disk cache'
+ });
+ items.push({
+ id: 'writeback',
+ description: 'Write-back disk caching'
+ });
+ items.push({
+ id: "writethrough",
+ description: 'Write-through'
+ });
+ args.response.success({
+ data: items
+ })
+ }
+ },
offeringType: {
label: 'label.compute.offering.type',
docID: 'helpComputeOfferingType',
@@ -731,7 +753,8 @@
displaytext: args.data.description,
storageType: args.data.storageType,
provisioningType :args.data.provisioningType,
- customized: !isFixedOfferingType
+ customized: !isFixedOfferingType,
+ cacheMode: args.data.cacheMode
};
//custom fields (begin)
@@ -1221,6 +1244,9 @@
provisioningtype: {
label: 'label.disk.provisioningtype'
},
+ cacheMode: {
+ label: 'label.cache.mode'
+ },
cpunumber: {
label: 'label.num.cpu.cores'
},
@@ -1481,6 +1507,28 @@
});
}
},
+ cacheMode: {
+ label: 'label.cache.mode',
+ docID: 'helpDiskOfferingCacheMode',
+ select: function(args) {
+ var items = [];
+ items.push({
+ id: 'none',
+ description: 'No disk cache'
+ });
+ items.push({
+ id: 'writeback',
+ description: 'Write-back disk caching'
+ });
+ items.push({
+ id: 'writethrough',
+ description: 'Write-through disk caching'
+ });
+ args.response.success({
+ data: items
+ })
+ }
+ },
cpuNumber: {
label: 'label.num.cpu.cores',
docID: 'helpSystemOfferingCPUCores',
@@ -1694,7 +1742,8 @@
provisioningType: args.data.provisioningType,
cpuNumber: args.data.cpuNumber,
cpuSpeed: args.data.cpuSpeed,
- memory: args.data.memory
+ memory: args.data.memory,
+ cacheMode: args.data.cacheMode
};
if (args.data.networkRate != null && args.data.networkRate.length > 0) {
@@ -1920,6 +1969,9 @@
provisioningtype: {
label: 'label.disk.provisioningtype'
},
+ cacheMode: {
+ label: 'label.cache.mode'
+ },
cpunumber: {
label: 'label.num.cpu.cores'
},
@@ -2926,6 +2978,270 @@
}
},
+ backupOfferings: {
+ type: 'select',
+ title: 'label.menu.backup.offerings',
+ listView: {
+ id: 'backupOfferings',
+ label: 'label.menu.backup.offerings',
+ fields: {
+ name: {
+ label: 'label.name',
+ editable: true
+ },
+ description: {
+ label: 'label.description'
+ },
+ zonename: {
+ label: 'label.zone',
+ }
+ },
+
+ actions: {
+ add: {
+ label: 'label.import.backup.offering',
+ createForm: {
+ title: 'label.import.backup.offering',
+ fields: {
+ name: {
+ label: 'label.name',
+ validation: {
+ required: true
+ }
+ },
+ description: {
+ label: 'label.description',
+ validation: {
+ required: true
+ }
+ },
+ zoneid: {
+ label: 'label.zone',
+ validation: {
+ required: true
+ },
+ select: function(args) {
+ $.ajax({
+ url: createURL("listZones"),
+ data: {available: 'true'},
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var items = [];
+ var zoneObjs = json.listzonesresponse.zone;
+ $(zoneObjs).each(function() {
+ items.push({
+ id: this.id,
+ description: this.name
+ });
+ });
+ items.sort(function(a, b) {
+ return a.description.localeCompare(b.description);
+ });
+ items.unshift({
+ id: -1,
+ description: ''
+ });
+ args.response.success({
+ data: items
+ });
+ args.$select.change(function() {
+ var $form = $(this).closest('form');
+ var zoneId = $form.find('select#label_zone').val();
+ var extSelect = $form.find('select#label_external_id');
+ extSelect.empty();
+ if (zoneId === -1) {
+ return;
+ }
+ $.ajax({
+ url: createURL("listBackupProviderOfferings"),
+ data: {zoneid: zoneId},
+ dataType: "json",
+ success: function(json) {
+ var items = [];
+ var offerings = json.listbackupproviderofferingsresponse.backupoffering;
+ $(offerings).each(function() {
+ extSelect.append(new Option(this.name, this.externalid))
+ });
+ }
+ });
+ })
+ }
+ });
+ }
+ },
+ externalid: {
+ label: 'label.external.id',
+ select: function(args) {
+ args.response.success({
+ data: []
+ });
+ }
+ },
+ allowuserdrivenbackups: {
+ label: 'label.backup.user.driven',
+ isBoolean: true,
+ isChecked: true
+ }
+ }//end of fields
+ }, //end of createForm
+
+ action: function(args) {
+ $.ajax({
+ url: createURL('importBackupOffering'),
+ data: {
+ name: args.data.name,
+ description: args.data.description,
+ zoneid: args.data.zoneid,
+ externalid: args.data.externalid,
+ allowuserdrivenbackups: args.data.allowuserdrivenbackups === 'on'
+ },
+ dataType: 'json',
+ success: function(json) {
+ var jid = json.importbackupofferingresponse.jobid;
+ args.response.success({
+ _custom: {
+ jobId: jid,
+ getActionFilter: function() {
+ return backupOfferingActionfilter;
+ }
+ }
+
+ });
+ },
+ error: function(data) {
+ args.response.error(parseXMLHttpResponse(data));
+ }
+ });
+ },
+
+ notification: {
+ poll: pollAsyncJobResult
+ },
+
+ messages: {
+ notification: function(args) {
+ return 'label.import.backup.offering';
+ }
+ }
+ }
+ },
+
+ dataProvider: function(args) {
+ var data = {};
+ listViewDataProvider(args, data);
+
+ $.ajax({
+ url: createURL('listBackupOfferings'),
+ data: data,
+ success: function(json) {
+ var items = json.listbackupofferingsresponse.backupoffering;
+ args.response.success({
+ data: items
+ });
+ },
+ error: function(data) {
+ args.response.error(parseXMLHttpResponse(data));
+ }
+ });
+ },
+
+ detailView: {
+ name: 'label.system.backup.offering.details',
+ actions: {
+ remove: {
+ label: 'label.action.delete.backup.offering',
+ messages: {
+ confirm: function(args) {
+ return 'message.action.delete.backup.offering';
+ },
+ notification: function(args) {
+ return 'label.action.delete.backup.offering';
+ }
+ },
+ action: function(args) {
+ var data = {
+ id: args.context.backupOfferings[0].id
+ };
+ $.ajax({
+ url: createURL('deleteBackupOffering'),
+ data: data,
+ success: function(json) {
+ args.response.success();
+ },
+ error: function(data) {
+ args.response.error(parseXMLHttpResponse(data));
+ }
+ });
+ },
+ notification: {
+ poll: function(args) {
+ args.complete();
+ }
+ }
+ }
+ },
+
+ tabs: {
+ details: {
+ title: 'label.details',
+
+ fields: [{
+ name: {
+ label: 'label.name',
+ isEditable: true,
+ validation: {
+ required: true
+ }
+ }
+ }, {
+ id: {
+ label: 'label.id'
+ },
+ description: {
+ label: 'label.description',
+ isEditable: true,
+ validation: {
+ required: true
+ }
+ },
+ externalid: {
+ label: 'label.external.id',
+ },
+ allowuserdrivenbackups: {
+ label: 'label.backup.user.driven'
+ },
+ zoneid: {
+ label: 'label.zone.id'
+ },
+ created: {
+ label: 'label.created',
+ converter: cloudStack.converters.toLocalDate
+ }
+ }],
+
+ dataProvider: function(args) {
+ var data = {
+ id: args.context.backupOfferings[0].id
+ };
+ $.ajax({
+ url: createURL('listBackupOfferings'),
+ data: data,
+ success: function(json) {
+ var item = json.listbackupofferingsresponse.backupoffering[0];
+ args.response.success({
+ actionFilter: backupOfferingActionfilter,
+ data: item
+ });
+ }
+ });
+ }
+ }
+ }
+ }
+ }
+ },
+
networkOfferings: {
type: 'select',
title: 'label.menu.network.offerings',
@@ -5574,6 +5890,13 @@
return allowedActions;
};
+ var backupOfferingActionfilter = function(args) {
+ var jsonObj = args.context.item;
+ var allowedActions = [];
+ allowedActions.push("remove");
+ return allowedActions;
+ };
+
var diskOfferingActionfilter = function(args) {
var jsonObj = args.context.item;
var allowedActions = [];
diff --git a/ui/scripts/docs.js b/ui/scripts/docs.js
index 4d00c83..7f29f2b 100755
--- a/ui/scripts/docs.js
+++ b/ui/scripts/docs.js
@@ -110,6 +110,11 @@
},
//Ldap
+ helpLdapUserFilter: {
+ desc: 'Filter to apply to listing of ldap accounts\n\t"NoFilter": no filtering is done\n\t"LocalDomain": shows only users not in the current or requested domain\n\t"AnyDomain": shows only users not currently known to cloudstack (in any domain)\n\t"PotentialImport": shows all users that (would be) automatically imported to cloudstack with their current usersource',
+ externalLink: ''
+ },
+
helpLdapQueryFilter: {
desc: 'Query filter is used to find a mapped user in the external LDAP server.Cloudstack provides some wildchars to represent the unique attributes in its database . Example - If Cloudstack account-name is same as the LDAP uid, then following will be a valid filter: Queryfilter : (&(uid=%u) , Queryfilter: .incase of Active Directory , Email _ID :(&(mail=%e)) , displayName :(&(displayName=%u)',
@@ -127,7 +132,7 @@
helpIPReservationNetworkCidr: {
desc: 'The CIDR of the entire network when IP reservation is configured',
- externalLink: ' '
+ externalLink: ''
},
diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index e85ab29..dc7708d 100644
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@ -168,11 +168,16 @@
});
}
- return $.grep(selectedNetworks, function(network) {
+ var total = $.grep(selectedNetworks, function(network) {
return $.grep(network.service, function(service) {
return service.name == 'SecurityGroup';
}).length;
}).length; //return total number of selected sg networks
+
+ if (total > 0 && selectedHypervisor == "KVM") {
+ return -1; // vm with multiple IPs is supported in KVM
+ }
+ return total;
},
// Data providers for each wizard step
@@ -1286,8 +1291,10 @@
if (selectedZoneObj.networktype == "Advanced" && selectedZoneObj.securitygroupsenabled == true) { // Advanced SG-enabled zone
var array2 = [];
+ var array3 = [];
var myNetworks = $('.multi-wizard:visible form').data('my-networks'); //widget limitation: If using an advanced security group zone, get the guest networks like this
- var defaultNetworkId = $('.multi-wizard:visible form').find('input[name=defaultNetwork]:checked').val();
+ var defaultNetworkId = $('.multi-wizard:visible form').data('defaultNetwork');
+ //var defaultNetworkId = $('.multi-wizard:visible form').find('input[name=defaultNetwork]:checked').val();
var checkedNetworkIdArray;
if (typeof(myNetworks) == "object" && myNetworks.length != null) { //myNetworks is an array of string, e.g. ["203", "202"],
@@ -1304,17 +1311,43 @@
array2.push(defaultNetworkId);
}
- //then, add other checked networks
+ var myNetworkIps = $('.multi-wizard:visible form').data('my-network-ips');
if (checkedNetworkIdArray.length > 0) {
for (var i = 0; i < checkedNetworkIdArray.length; i++) {
- if (checkedNetworkIdArray[i] != defaultNetworkId) //exclude defaultNetworkId that has been added to array2
+ if (checkedNetworkIdArray[i] == defaultNetworkId) {
+ array2.unshift(defaultNetworkId);
+
+ var ipToNetwork = {
+ networkid: defaultNetworkId
+ };
+ if (myNetworkIps[i] != null && myNetworkIps[i].length > 0) {
+ $.extend(ipToNetwork, {
+ ip: myNetworkIps[i]
+ });
+ }
+ array3.unshift(ipToNetwork);
+ } else {
array2.push(checkedNetworkIdArray[i]);
+
+ var ipToNetwork = {
+ networkid: checkedNetworkIdArray[i]
+ };
+ if (myNetworkIps[i] != null && myNetworkIps[i].length > 0) {
+ $.extend(ipToNetwork, {
+ ip: myNetworkIps[i]
+ });
+ }
+ array3.push(ipToNetwork);
+ }
}
}
- $.extend(deployVmData, {
- networkids : array2.join(",")
- });
+ for (var k = 0; k < array3.length; k++) {
+ deployVmData["iptonetworklist[" + k + "].networkid"] = array3[k].networkid;
+ if (array3[k].ip != undefined && array3[k].ip.length > 0) {
+ deployVmData["iptonetworklist[" + k + "].ip"] = array3[k].ip;
+ }
+ }
}
} else if (step6ContainerType == 'nothing-to-select') {
if ("vpc" in args.context) { //from VPC tier
@@ -1368,6 +1401,18 @@
keyboard : keyboard
});
}
+ var boottype = args.data.customboot;
+ if (boottype != null && boottype.length > 0) {
+ $.extend(deployVmData, {
+ boottype : boottype
+ });
+ }
+ var bootmode = args.data.bootmode;
+ if (bootmode != null && bootmode.length > 0) {
+ $.extend(deployVmData, {
+ bootmode : bootmode
+ });
+ }
if (g_hostid != null) {
$.extend(deployVmData, {
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 6d7e26f..58cb86c 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -517,7 +517,7 @@
'Destroyed': 'off',
'Expunging': 'off',
'Stopping': 'warning',
- 'Shutdowned': 'warning'
+ 'Shutdown': 'warning'
}
}
},
@@ -796,6 +796,9 @@
path: 'storage.vmsnapshots',
label: 'label.snapshots'
}, {
+ path: 'storage.backups',
+ label: 'label.backup'
+ }, {
path: 'affinityGroups',
label: 'label.affinity.groups'
}, {
@@ -1257,6 +1260,422 @@
poll: pollAsyncJobResult
}
},
+
+ createBackup: {
+ messages: {
+ confirm: function(args) {
+ return 'label.create.backup';
+ },
+ notification: function() {
+ return 'label.create.backup';
+ }
+ },
+ label: 'label.create.backup',
+ action: function(args) {
+ var data = {
+ virtualmachineid: args.context.instances[0].id
+ };
+ $.ajax({
+ url: createURL('createBackup'),
+ data: data,
+ dataType: 'json',
+ success: function(json) {
+ var jid = json.createbackupresponse.jobid;
+ args.response.success({
+ _custom: {
+ jobId: jid
+ }
+ });
+ }
+ });
+ },
+ notification: {
+ poll: pollAsyncJobResult
+ }
+ },
+
+ configureBackupSchedule: {
+ label: 'Backup Schedule',
+ action: {
+ custom: cloudStack.uiCustom.backupSchedule({
+ desc: 'Configure VM backup schedule',
+ dataProvider: function(args) {
+ $.ajax({
+ url: createURL('listBackupSchedule'),
+ data: {
+ virtualmachineid: args.context.instances[0].id
+ },
+ async: true,
+ dataType: 'json',
+ success: function(data) {
+ var schedule = {}
+ if (data && data.listbackupscheduleresponse && data.listbackupscheduleresponse.backupschedule) {
+ schedule = data.listbackupscheduleresponse.backupschedule;
+ schedule.id = schedule.virtualmachineid;
+ if (schedule.intervaltype == 'HOURLY') {
+ schedule.type = 0;
+ schedule.time = schedule.schedule;
+ } else if (schedule.intervaltype == 'DAILY') {
+ schedule.type = 1;
+ schedule.time = schedule.schedule.split(':')[1] + ':' + schedule.schedule.split(':')[0];
+ } else if (schedule.intervaltype == 'WEEKLY') {
+ schedule.type = 2;
+ schedule.time = schedule.schedule.split(':')[1] + ':' + schedule.schedule.split(':')[0];
+ schedule['day-of-week'] = schedule.schedule.split(':')[2];
+ } else if (schedule.intervaltype == 'MONTHLY') {
+ schedule.type = 3;
+ schedule.time = schedule.schedule.split(':')[1] + ':' + schedule.schedule.split(':')[0];
+ schedule['day-of-month'] = schedule.schedule.split(':')[2];
+ }
+ schedule.time = '(' + schedule.intervaltype + ') ' + schedule.time
+ }
+ args.response.success({
+ data: [schedule]
+ });
+ },
+ error: function(data) {
+ }
+ });
+ },
+ actions: {
+ add: function(args) {
+ var snap = args.snapshot;
+
+ var data = {
+ virtualmachineid: args.context.instances[0].id,
+ intervaltype: snap['snapshot-type'],
+ timezone: snap.timezone
+ };
+
+ var convertTime = function(minute, hour, meridiem, extra) {
+ var convertedHour = meridiem == 'PM' ?
+ (hour != 12 ? parseInt(hour) + 12 : 12) : (hour != 12 ? hour : '00');
+ var time = minute + ':' + convertedHour;
+ if (extra) time += ':' + extra;
+
+ return time;
+ };
+
+ switch (snap['snapshot-type']) {
+ case 'hourly': // Hourly
+ $.extend(data, {
+ schedule: snap.schedule
+ });
+ break;
+
+ case 'daily': // Daily
+ $.extend(data, {
+ schedule: convertTime(
+ snap['time-minute'],
+ snap['time-hour'],
+ snap['time-meridiem']
+ )
+ });
+ break;
+
+ case 'weekly': // Weekly
+ $.extend(data, {
+ schedule: convertTime(
+ snap['time-minute'],
+ snap['time-hour'],
+ snap['time-meridiem'],
+ snap['day-of-week']
+ )
+ });
+ break;
+
+ case 'monthly': // Monthly
+ $.extend(data, {
+ schedule: convertTime(
+ snap['time-minute'],
+ snap['time-hour'],
+ snap['time-meridiem'],
+ snap['day-of-month']
+ )
+ });
+ break;
+ }
+
+ $.ajax({
+ url: createURL('createBackupSchedule'),
+ data: data,
+ dataType: 'json',
+ async: true,
+ success: function(data) {
+ var schedule = {}
+ if (data && data.createbackupscheduleresponse && data.createbackupscheduleresponse.backupschedule) {
+ schedule = data.createbackupscheduleresponse.backupschedule;
+ schedule.id = schedule.virtualmachineid;
+ if (schedule.intervaltype == 'HOURLY') {
+ schedule.type = 0;
+ schedule.time = schedule.schedule;
+ } else if (schedule.intervaltype == 'DAILY') {
+ schedule.type = 1;
+ schedule.time = schedule.schedule.split(':')[1] + ':' + schedule.schedule.split(':')[0];
+ } else if (schedule.intervaltype == 'WEEKLY') {
+ schedule.type = 2;
+ schedule.time = schedule.schedule.split(':')[1] + ':' + schedule.schedule.split(':')[0];
+ schedule['day-of-week'] = schedule.schedule.split(':')[2];
+ } else if (schedule.intervaltype == 'MONTHLY') {
+ schedule.type = 3;
+ schedule.time = schedule.schedule.split(':')[1] + ':' + schedule.schedule.split(':')[0];
+ schedule['day-of-month'] = schedule.schedule.split(':')[2];
+ }
+ schedule.time = schedule.time + ' (' + schedule.intervaltype + ')'
+ }
+ args.response.success({
+ data: schedule
+ });
+ }
+ });
+ },
+ remove: function(args) {
+ console.log(args);
+ $.ajax({
+ url: createURL('deleteBackupSchedule'),
+ data: {
+ virtualmachineid: args.context.instances[0].id
+ },
+ dataType: 'json',
+ async: true,
+ success: function(data) {
+ args.response.success();
+ }
+ });
+ }
+ },
+
+ // Select data
+ selects: {
+ schedule: function(args) {
+ var time = [];
+
+ for (var i = 1; i <= 59; i++) {
+ time.push({
+ id: i,
+ name: i
+ });
+ }
+
+ args.response.success({
+ data: time
+ });
+ },
+ timezone: function(args) {
+ args.response.success({
+ data: $.map(timezoneMap, function(value, key) {
+ return {
+ id: key,
+ name: value
+ };
+ })
+ });
+ },
+ 'day-of-week': function(args) {
+ args.response.success({
+ data: [{
+ id: 1,
+ name: 'label.sunday'
+ }, {
+ id: 2,
+ name: 'label.monday'
+ }, {
+ id: 3,
+ name: 'label.tuesday'
+ }, {
+ id: 4,
+ name: 'label.wednesday'
+ }, {
+ id: 5,
+ name: 'label.thursday'
+ }, {
+ id: 6,
+ name: 'label.friday'
+ }, {
+ id: 7,
+ name: 'label.saturday'
+ }]
+ });
+ },
+
+ 'day-of-month': function(args) {
+ var time = [];
+
+ for (var i = 1; i <= 28; i++) {
+ time.push({
+ id: i,
+ name: i
+ });
+ }
+
+ args.response.success({
+ data: time
+ });
+ },
+
+ 'time-hour': function(args) {
+ var time = [];
+
+ for (var i = 1; i <= 12; i++) {
+ time.push({
+ id: i,
+ name: i
+ });
+ }
+
+ args.response.success({
+ data: time
+ });
+ },
+
+ 'time-minute': function(args) {
+ var time = [];
+
+ for (var i = 0; i <= 59; i++) {
+ time.push({
+ id: i < 10 ? '0' + i : i,
+ name: i < 10 ? '0' + i : i
+ });
+ }
+
+ args.response.success({
+ data: time
+ });
+ },
+
+ 'time-meridiem': function(args) {
+ args.response.success({
+ data: [{
+ id: 'AM',
+ name: 'AM'
+ }, {
+ id: 'PM',
+ name: 'PM'
+ }]
+ });
+ }
+ }
+ })
+ },
+ messages: {
+ notification: function(args) {
+ return 'Backup Schedule';
+ }
+ }
+ },
+
+ assignToBackupOffering: {
+ messages: {
+ confirm: function(args) {
+ return 'label.backup.offering.assign';
+ },
+ notification: function() {
+ return 'label.backup.offering.assign';
+ }
+ },
+ label: 'label.backup.offering.assign',
+ createForm: {
+ title: 'label.backup.offering.assign',
+ fields: {
+ backupofferingid: {
+ label: 'label.backup.offering',
+ select: function(args) {
+ var data = {
+ zoneid: args.context.instances[0].zoneid
+ };
+ $.ajax({
+ url: createURL('listBackupOfferings'),
+ data: data,
+ async: false,
+ success: function(json) {
+ var offerings = json.listbackupofferingsresponse.backupoffering;
+ var items = [{
+ id: -1,
+ description: ''
+ }];
+ $(offerings).each(function() {
+ items.push({
+ id: this.id,
+ description: this.name
+ });
+ });
+ args.response.success({
+ data: items
+ });
+ }
+ });
+ }
+ }
+ }
+ },
+ action: function(args) {
+ var data = {
+ virtualmachineid: args.context.instances[0].id,
+ backupofferingid: args.data.backupofferingid
+ };
+ $.ajax({
+ url: createURL('assignVirtualMachineToBackupOffering'),
+ data: data,
+ dataType: 'json',
+ success: function(json) {
+ var jid = json.assignvirtualmachinetobackupofferingresponse.jobid;
+ args.response.success({
+ _custom: {
+ jobId: jid
+ }
+ });
+ }
+ });
+ },
+ notification: {
+ poll: pollAsyncJobResult
+ }
+ },
+
+ removeFromBackupOffering: {
+ messages: {
+ confirm: function(args) {
+ return 'label.backup.offering.remove';
+ },
+ notification: function() {
+ return 'label.backup.offering.remove';
+ }
+ },
+ label: 'label.backup.offering.remove',
+ createForm: {
+ title: 'label.backup.offering.remove',
+ fields: {
+ forced: {
+ label: 'force.remove',
+ isBoolean: true,
+ isChecked: false
+ }
+ }
+ },
+ action: function(args) {
+ var data = {
+ virtualmachineid: args.context.instances[0].id,
+ forced: args.data.forced === "on"
+ };
+ $.ajax({
+ url: createURL('removeVirtualMachineFromBackupOffering'),
+ data: data,
+ dataType: 'json',
+ success: function(json) {
+ var jid = json.removevirtualmachinefrombackupofferingresponse.jobid;
+ args.response.success({
+ _custom: {
+ jobId: jid
+ }
+ });
+ }
+ });
+ },
+ notification: {
+ poll: pollAsyncJobResult
+ }
+ },
+
destroy: vmDestroyAction(),
expunge: {
label: 'label.action.expunge.instance',
@@ -2884,6 +3303,9 @@
keypair: {
label: 'label.ssh.key.pair'
},
+ backupofferingname: {
+ label: 'label.backup.offering'
+ },
domain: {
label: 'label.domain'
},
@@ -2900,6 +3322,12 @@
},
id: {
label: 'label.id'
+ },
+ boottype: {
+ label: 'label.vm.boottype'
+ },
+ bootmode: {
+ label: 'label.vm.bootmode'
}
}],
@@ -3354,6 +3782,16 @@
label: 'label.description'
}
}],
+ viewAll: {
+ path: 'network.securityGroups',
+ attachTo: 'id',
+ label: 'label.security.groups',
+ title: function(args) {
+ var title = _l('label.security.groups');
+
+ return title;
+ }
+ },
dataProvider: function(args) {
// args.response.success({data: args.context.instances[0].securitygroup});
$.ajax({
@@ -3382,6 +3820,9 @@
cpuused: {
label: 'label.cpu.utilized'
},
+ memorykbs: {
+ label: 'label.memory.used'
+ },
networkkbsread: {
label: 'label.network.read'
},
@@ -3412,6 +3853,7 @@
data: {
totalCPU: jsonObj.cpunumber + " x " + cloudStack.converters.convertHz(jsonObj.cpuspeed),
cpuused: jsonObj.cpuused,
+ memorykbs: jsonObj.memorykbs + " of "+ cloudStack.converters.convertBytes(jsonObj.memory * 1024.0 * 1024.0),
networkkbsread: (jsonObj.networkkbsread == null) ? "N/A" : cloudStack.converters.convertBytes(jsonObj.networkkbsread * 1024),
networkkbswrite: (jsonObj.networkkbswrite == null) ? "N/A" : cloudStack.converters.convertBytes(jsonObj.networkkbswrite * 1024),
diskkbsread: (jsonObj.diskkbsread == null) ? "N/A" : ((jsonObj.hypervisor == "KVM") ? cloudStack.converters.convertBytes(jsonObj.diskkbsread * 1024) : ((jsonObj.hypervisor == "XenServer") ? cloudStack.converters.convertBytes(jsonObj.diskkbsread * 1024) + "/s" : "N/A")),
@@ -3721,6 +4163,13 @@
allowedActions.push("expunge");
}
}
+ if (jsonObj.backupofferingid) {
+ allowedActions.push("createBackup");
+ allowedActions.push("configureBackupSchedule");
+ allowedActions.push("removeFromBackupOffering");
+ } else {
+ allowedActions.push("assignToBackupOffering");
+ }
if (jsonObj.state == 'Starting' || jsonObj.state == 'Stopping' || jsonObj.state == 'Migrating') {
allowedActions.push("viewConsole");
diff --git a/ui/scripts/metrics.js b/ui/scripts/metrics.js
index 2784eab..19419cb 100644
--- a/ui/scripts/metrics.js
+++ b/ui/scripts/metrics.js
@@ -447,7 +447,7 @@
'Destroyed': 'off',
'Expunging': 'off',
'Stopping': 'warning',
- 'Shutdowned': 'warning'
+ 'Shutdown': 'warning'
},
compact: true
},
@@ -679,6 +679,7 @@
'Down': 'off',
'Removed': 'off',
'ErrorInMaintenance': 'off',
+ 'ErrorInPrepareForMaintenance': 'warning',
'PrepareForMaintenance': 'warning',
'CancelMaintenance': 'warning',
'Maintenance': 'warning',
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index aa6af96..77cce33 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -41,6 +41,10 @@
elemData.endport = icmpcode;
}
+ if (elemData.protocol != 'tcp' && elemData.protocol != 'udp' && elemData.protocol != 'icmp') {
+ elemData.startport = 'all';
+ elemData.endport = 'all';
+ }
return elemData;
};
@@ -357,6 +361,7 @@
args.context.item.state != 'Destroyed' &&
args.context.item.name != 'default') {
allowedActions.push('remove');
+ allowedActions.push('edit');
}
return allowedActions;
@@ -2121,6 +2126,47 @@
});
},
isHidden: true
+ },
+ ipaddress: {
+ label: 'label.ip.address',
+ select: function(args) {
+ var data = {
+ forvirtualnetwork : true,
+ allocatedonly: false
+ };
+ if ('vpc' in args.context) { //from VPC section
+ $.extend(data, {
+ zoneid: args.context.vpc[0].zoneid,
+ domainid: args.context.vpc[0].domainid,
+ account: args.context.vpc[0].account
+ });
+ } else if ('networks' in args.context) { //from Guest Network section
+ $.extend(data, {
+ zoneid: args.context.networks[0].zoneid,
+ domainid: args.context.networks[0].domainid,
+ account: args.context.networks[0].account
+ });
+ }
+ $.ajax({
+ url: createURL('listPublicIpAddresses'),
+ data: data,
+ success: function(json) {
+ var ips = json.listpublicipaddressesresponse.publicipaddress;
+ var items = [];
+ $(ips).each(function() {
+ if (this.state == "Free") {
+ items.push({
+ id: this.ipaddress,
+ description: this.ipaddress
+ });
+ }
+ });
+ args.response.success({
+ data: items
+ });
+ }
+ })
+ }
}
}
},
@@ -2149,6 +2195,11 @@
}
}
+ if (args.data.ipaddress != null && args.data.ipaddress.length > 0) {
+ $.extend(dataObj, {
+ ipaddress: args.data.ipaddress
+ });
+ }
$.ajax({
url: createURL('associateIpAddress'),
data: dataObj,
@@ -3391,21 +3442,21 @@
isEditable: true,
select: function(args) {
var data = [{
- id: 'ssl',
- name: 'ssl',
- description: _l('label.lb.protocol.ssl')
- }, {
id: 'tcp',
name: 'tcp',
description: _l('label.lb.protocol.tcp')
}, {
+ id: 'udp',
+ name: 'udp',
+ description: _l('label.lb.protocol.udp')
+ }, {
id: 'tcp-proxy',
name: 'tcp-proxy',
description: _l('label.lb.protocol.tcp.proxy')
}, {
- id: 'udp',
- name: 'udp',
- description: _l('label.lb.protocol.udp')
+ id: 'ssl',
+ name: 'ssl',
+ description: _l('label.lb.protocol.ssl')
}];
if (typeof args.context != 'undefined') {
var lbProtocols = getLBProtocols(args.context.networks[0]);
@@ -4453,6 +4504,14 @@
var data = {};
listViewDataProvider(args, data);
+ if (args.context != null) {
+ if ("securityGroups" in args.context) {
+ $.extend(data, {
+ id: args.context.securityGroups[0].id
+ });
+ }
+ }
+
$.ajax({
url: createURL('listSecurityGroups'),
data: data,
@@ -4473,7 +4532,11 @@
title: 'label.details',
fields: [{
name: {
- label: 'label.name'
+ label: 'label.name',
+ isEditable: true,
+ validation: {
+ required: true
+ }
}
}, {
id: {
@@ -4535,7 +4598,8 @@
var $otherFields = $inputs.filter(function() {
var name = $(this).attr('rel');
- return name != 'icmptype' &&
+ return name != 'protocolnumber' &&
+ name != 'icmptype' &&
name != 'icmpcode' &&
name != 'protocol' &&
name != 'add-rule' &&
@@ -4544,12 +4608,35 @@
name != 'securitygroup';
});
- if ($(this).val() == 'icmp') {
- $icmpFields.show();
- $otherFields.hide();
- } else {
+ $portFields = $inputs.filter(function() {
+ var name = $(this).attr('rel');
+ return $.inArray(name, [
+ 'startport',
+ 'endport'
+ ]) > -1;
+ });
+ $protocolFields = $inputs.filter(function() {
+ var name = $(this).attr('rel');
+
+ return $.inArray(name, ['protocolnumber']) > -1;
+ });
+
+ if ($(this).val() == 'protocolnumber') {
$icmpFields.hide();
+ $portFields.hide();
+ $protocolFields.show();
+ } else if ($(this).val() == 'icmp') {
+ $icmpFields.show();
+ $protocolFields.hide();
+ $portFields.hide();
+ } else if ($(this).val() == 'all') {
+ $portFields.hide();
+ $icmpFields.hide();
+ $protocolFields.hide();
+ } else {
$otherFields.show();
+ $icmpFields.hide();
+ $protocolFields.hide();
}
});
@@ -4563,10 +4650,22 @@
}, {
name: 'icmp',
description: 'ICMP'
+ }, {
+ name: 'all',
+ description: 'ALL'
+ }, {
+ name: 'protocolnumber',
+ description: 'Protocol Number'
}]
});
}
},
+ 'protocolnumber': {
+ label: 'label.protocol.number',
+ edit: true,
+ isHidden: true,
+ isEditable: true
+ },
'startport': {
edit: true,
label: 'label.start.port',
@@ -4617,11 +4716,20 @@
action: function(args) {
var data = {
securitygroupid: args.context.securityGroups[0].id,
- protocol: args.data.protocol,
domainid: args.context.securityGroups[0].domainid,
account: args.context.securityGroups[0].account
};
+ if (args.data.protocol == 'protocolnumber') {
+ $.extend(data, {
+ protocol: args.data.protocolnumber
+ });
+ } else {
+ $.extend(data, {
+ protocol: args.data.protocol
+ });
+ }
+
if (args.data.icmptype && args.data.icmpcode) { // ICMP
$.extend(data, {
icmptype: args.data.icmptype,
@@ -4745,7 +4853,8 @@
var $otherFields = $inputs.filter(function() {
var name = $(this).attr('rel');
- return name != 'icmptype' &&
+ return name != 'protocolnumber' &&
+ name != 'icmptype' &&
name != 'icmpcode' &&
name != 'protocol' &&
name != 'add-rule' &&
@@ -4754,12 +4863,35 @@
name != 'securitygroup';
});
- if ($(this).val() == 'icmp') {
- $icmpFields.show();
- $otherFields.hide();
- } else {
+ $portFields = $inputs.filter(function() {
+ var name = $(this).attr('rel');
+ return $.inArray(name, [
+ 'startport',
+ 'endport'
+ ]) > -1;
+ });
+ $protocolFields = $inputs.filter(function() {
+ var name = $(this).attr('rel');
+
+ return $.inArray(name, ['protocolnumber']) > -1;
+ });
+
+ if ($(this).val() == 'protocolnumber') {
$icmpFields.hide();
+ $portFields.hide();
+ $protocolFields.show();
+ } else if ($(this).val() == 'icmp') {
+ $icmpFields.show();
+ $protocolFields.hide();
+ $portFields.hide();
+ } else if ($(this).val() == 'all') {
+ $portFields.hide();
+ $icmpFields.hide();
+ $protocolFields.hide();
+ } else {
$otherFields.show();
+ $icmpFields.hide();
+ $protocolFields.hide();
}
});
@@ -4773,10 +4905,22 @@
}, {
name: 'icmp',
description: 'ICMP'
+ }, {
+ name: 'all',
+ description: 'ALL'
+ }, {
+ name: 'protocolnumber',
+ description: 'Protocol Number'
}]
});
}
},
+ 'protocolnumber': {
+ label: 'label.protocol.number',
+ edit: true,
+ isHidden: true,
+ isEditable: true
+ },
'startport': {
edit: true,
label: 'label.start.port',
@@ -4827,11 +4971,20 @@
action: function(args) {
var data = {
securitygroupid: args.context.securityGroups[0].id,
- protocol: args.data.protocol,
domainid: args.context.securityGroups[0].domainid,
account: args.context.securityGroups[0].account
};
+ if (args.data.protocol == 'protocolnumber') {
+ $.extend(data, {
+ protocol: args.data.protocolnumber
+ });
+ } else {
+ $.extend(data, {
+ protocol: args.data.protocol
+ });
+ }
+
if (args.data.icmptype && args.data.icmpcode) { // ICMP
$.extend(data, {
icmptype: args.data.icmptype,
@@ -4935,6 +5088,30 @@
},
actions: {
+ edit: {
+ label: 'label.edit',
+ action: function(args) {
+ var data = {
+ id: args.context.securityGroups[0].id
+ };
+ if (args.data.name != args.context.securityGroups[0].name) {
+ $.extend(data, {
+ name: args.data.name
+ });
+ };
+ $.ajax({
+ url: createURL('updateSecurityGroup'),
+ data: data,
+ success: function(json) {
+ var item = json.updatesecuritygroupresponse.securitygroup;
+ args.response.success({
+ data: item
+ });
+ }
+ });
+ }
+ },
+
remove: {
label: 'label.action.delete.security.group',
messages: {
@@ -5652,6 +5829,66 @@
}
},
+ advSearchFields: {
+ keyword: {
+ label: 'label.name'
+ },
+ domainid: {
+ label: 'label.domain',
+ select: function(args) {
+ if (isAdmin() || isDomainAdmin()) {
+ $.ajax({
+ url: createURL('listDomains'),
+ data: {
+ listAll: true,
+ details: 'min'
+ },
+ success: function(json) {
+ var array1 = [{
+ id: '',
+ description: ''
+ }];
+ var domains = json.listdomainsresponse.domain;
+ if (domains != null && domains.length > 0) {
+ for (var i = 0; i < domains.length; i++) {
+ array1.push({
+ id: domains[i].id,
+ description: domains[i].path
+ });
+ }
+ }
+ array1.sort(function(a, b) {
+ return a.description.localeCompare(b.description);
+ });
+ args.response.success({
+ data: array1
+ });
+ }
+ });
+ } else {
+ args.response.success({
+ data: null
+ });
+ }
+ },
+ isHidden: function(args) {
+ if (isAdmin() || isDomainAdmin())
+ return false;
+ else
+ return true;
+ }
+ },
+ account: {
+ label: 'Account',
+ isHidden: function(args) {
+ if (isAdmin() || isDomainAdmin())
+ return false;
+ else
+ return true;
+ }
+ }
+ },
+
dataProvider: function(args) {
var data = {};
listViewDataProvider(args, data);
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index 48c6be5..c13af41 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -31,12 +31,14 @@
var g_regionsecondaryenabled = null;
var g_userPublicTemplateEnabled = "true";
var g_allowUserExpungeRecoverVm = "false";
+var g_allowUserExpungeRecoverVolume = "false";
var g_cloudstackversion = null;
var g_queryAsyncJobResultInterval = 3000;
var g_idpList = null;
var g_appendIdpDomain = false;
var g_sortKeyIsAscending = false;
var g_allowUserViewAllDomainAccounts = false;
+var g_routerHealthChecksEnabled = false;
//keyboard keycode
var keycode_Enter = 13;
@@ -356,6 +358,41 @@
isolatedpvlanId: {
label: 'label.secondary.isolated.vlan.id'
},
+ pvlanType: {
+ label: 'label.secondary.isolated.vlan.type',
+ isHidden: true,
+ select: function (args) {
+ var type = [{
+ id: 'none',
+ description: _l('label.secondary.isolated.vlan.type.none')
+ }, {
+ id: 'community',
+ description: _l('label.secondary.isolated.vlan.type.community')
+ }, {
+ id: 'isolated',
+ description: _l('label.secondary.isolated.vlan.type.isolated')
+ }, {
+ id: 'promiscuous',
+ description: _l('label.secondary.isolated.vlan.type.promiscuous')
+ }
+ ];
+
+ args.response.success({
+ data: type
+ });
+
+ args.$select.change(function () {
+ var $form = $(this).closest('form');
+ var pvlanType = $(this).val();
+
+ if (pvlanType === 'none' || pvlanType === 'promiscuous') {
+ $form.find('.form-item[rel=isolatedpvlanId]').hide();
+ } else if (pvlanType === 'isolated' || pvlanType === 'community') {
+ $form.find('.form-item[rel=isolatedpvlanId]').css('display', 'inline-block');
+ }
+ })
+ }
+ },
scope: {
label: 'label.scope',
@@ -633,12 +670,12 @@
$form.find('.form-item[rel=vlanId]').hide();
cloudStack.dialog.createFormField.validation.required.remove($form.find('.form-item[rel=vlanId]')); //make vlanId optional
- $form.find('.form-item[rel=isolatedpvlanId]').hide();
+ $form.find('.form-item[rel=pvlanType]').hide();
} else {
$form.find('.form-item[rel=vlanId]').css('display', 'inline-block');
cloudStack.dialog.createFormField.validation.required.add($form.find('.form-item[rel=vlanId]')); //make vlanId required
- $form.find('.form-item[rel=isolatedpvlanId]').css('display', 'inline-block');
+ $form.find('.form-item[rel=pvlanType]').css('display', 'inline-block');
}
return false; //break each loop
}
@@ -814,6 +851,9 @@
if (args.data.hideipaddressusage != null && args.data.hideipaddressusage) {
array1.push("&hideipaddressusage=true")
}
+ if (args.$form.find('.form-item[rel=pvlanType]').css('display') != 'none' && args.data.pvlanType != 'none') {
+ array1.push("&isolatedpvlantype=" + args.data.pvlanType);
+ }
$.ajax({
url: createURL("createNetwork" + array1.join("")),
@@ -1004,6 +1044,7 @@
args.$select.change(function() {
var $vlan = args.$select.closest('form').find('[rel=vlan]');
var $bypassVlanOverlapCheck = args.$select.closest('form').find('[rel=bypassVlanOverlapCheck]');
+ var $pvlanType = args.$select.closest('form').find('[rel=pvlanType]');
var networkOffering = $.grep(
networkOfferingObjs, function(netoffer) {
return netoffer.id == args.$select.val();
@@ -1013,9 +1054,11 @@
if (networkOffering.specifyvlan) {
$vlan.css('display', 'inline-block');
$bypassVlanOverlapCheck.css('display', 'inline-block');
+ $pvlanType.css('display', 'inline-block');
} else {
$vlan.hide();
$bypassVlanOverlapCheck.hide();
+ $pvlanType.hide();
}
});
@@ -1044,6 +1087,45 @@
isBoolean: true,
isHidden: true
},
+ pvlanId: {
+ label: 'label.secondary.isolated.vlan.id',
+ isHidden: true
+ },
+ pvlanType: {
+ label: 'label.secondary.isolated.vlan.type',
+ isHidden: true,
+ select: function (args) {
+ var type = [{
+ id: 'none',
+ description: _l('label.secondary.isolated.vlan.type.none')
+ }, {
+ id: 'community',
+ description: _l('label.secondary.isolated.vlan.type.community')
+ }, {
+ id: 'isolated',
+ description: _l('label.secondary.isolated.vlan.type.isolated')
+ }, {
+ id: 'promiscuous',
+ description: _l('label.secondary.isolated.vlan.type.promiscuous')
+ }
+ ];
+
+ args.response.success({
+ data: type
+ });
+
+ args.$select.change(function () {
+ var $form = $(this).closest('form');
+ var pvlanType = $(this).val();
+
+ if (pvlanType === 'none' || pvlanType === 'promiscuous') {
+ $form.find('.form-item[rel=pvlanId]').hide();
+ } else if (pvlanType === 'isolated' || pvlanType === 'community') {
+ $form.find('.form-item[rel=pvlanId]').css('display', 'inline-block');
+ }
+ })
+ }
+ },
account: {
label: 'label.account',
validation: {
@@ -1074,6 +1156,18 @@
});
}
+ if (args.$form.find('.form-item[rel=pvlanId]').css('display') != 'none') {
+ $.extend(dataObj, {
+ isolatedpvlan: args.data.pvlanId
+ });
+ }
+
+ if (args.$form.find('.form-item[rel=pvlanType]').css('display') != 'none' && args.data.pvlanType != 'none') {
+ $.extend(dataObj, {
+ isolatedpvlantype: args.data.pvlanType
+ });
+ }
+
if (args.data.domain != null && args.data.domain.length > 0) {
$.extend(dataObj, {
domainid: args.data.domain
@@ -2706,16 +2800,37 @@
return jQuery.validator.methods.ipv6.call(this, value, element);
}, "The specified IPv6 address is invalid.");
-
$.validator.addMethod("allzonesonly", function(value, element){
- if ((value.indexOf("-1") != -1) &&(value.length > 1))
+ if ((value.indexOf("-1") != -1) && (value.length > 1))
return false;
return true;
},
"All Zones cannot be combined with any other zone");
+$.validator.addMethod("naturalnumber", function(value, element){
+ if (this.optional(element) && value.length == 0)
+ return true;
+ if (isNaN(value))
+ return false;
+ value = parseInt(value);
+ return (typeof value === 'number') && (value > 0) && (Math.floor(value) === value) && value !== Infinity;
+
+},
+"Please enter a valid number, 1 or greater");
+
+$.validator.addMethod("multiplecountnumber", function(value, element){
+ if (this.optional(element) && value.length == 0)
+ return true;
+ if (isNaN(value))
+ return false;
+ value = parseInt(value);
+ return (typeof value === 'number') && (value > 1) && (Math.floor(value) === value) && value !== Infinity;
+
+},
+"Please enter a valid number, 2 or greater");
+
cloudStack.createTemplateMethod = function (isSnapshot){
return {
label: 'label.create.template',
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index f790593..aa355ef 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -213,6 +213,9 @@
zonename: {
label: 'label.zone'
},
+ vmdisplayname: {
+ label: 'label.vm.display.name'
+ },
state: {
label: 'label.metrics.state',
converter: function (str) {
@@ -224,6 +227,7 @@
'Ready': 'on',
'Destroy': 'off',
'Expunging': 'off',
+ 'Expunged': 'off',
'Migrating': 'warning',
'UploadOp': 'warning',
'Snapshotting': 'warning',
@@ -817,6 +821,33 @@
}
},
+ state: {
+ label: 'label.state',
+ select: function(args) {
+ args.response.success({
+ data: [{
+ name: '',
+ description: ''
+ }, {
+ name: 'Allocated',
+ description: 'state.Allocated'
+ }, {
+ name: 'Ready',
+ description: 'state.Ready'
+ }, {
+ name: 'Destroy',
+ description: 'state.Destroy'
+ }, {
+ name: 'Expunging',
+ description: 'state.Expunging'
+ }, {
+ name: 'Expunged',
+ description: 'state.Expunged'
+ }]
+ });
+ }
+ },
+
tagKey: {
label: 'label.tag.key'
},
@@ -1446,6 +1477,102 @@
}
},
+ destroy: {
+ label: 'label.action.destroy.volume',
+ createForm: {
+ title: 'label.action.destroy.volume',
+ desc: 'message.action.destroy.volume',
+ isWarning: true,
+ preFilter: function(args) {
+ if (!isAdmin() && ! g_allowUserExpungeRecoverVolume) {
+ args.$form.find('.form-item[rel=expunge]').hide();
+ }
+ },
+ fields: {
+ expunge: {
+ label: 'label.expunge',
+ isBoolean: true,
+ isChecked: false
+ }
+ }
+ },
+ messages: {
+ confirm: function(args) {
+ return 'message.action.destroy.volume';
+ },
+ notification: function(args) {
+ return 'label.action.destroy.volume';
+ }
+ },
+ action: function(args) {
+ var data = {
+ id: args.context.volumes[0].id
+ };
+ if (args.data.expunge == 'on') {
+ $.extend(data, {
+ expunge: true
+ });
+ }
+ $.ajax({
+ url: createURL("destroyVolume"),
+ data: data,
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var jid = json.destroyvolumeresponse.jobid;
+ args.response.success({
+ _custom: {
+ jobId: jid,
+ getUpdatedItem: function(json) {
+ if ('volume' in json.queryasyncjobresultresponse.jobresult) { //destroy without expunge
+ var volume = json.queryasyncjobresultresponse.jobresult.volume;
+ if (volume.state == 'Expunged') {
+ return { 'toRemove': true };
+ } else {
+ return volume;
+ }
+ } else //destroy with expunge
+ return { 'toRemove': true };
+ },
+ getActionFilter: function() {
+ return volumeActionfilter;
+ }
+ }
+ });
+ }
+ });
+ },
+ notification: {
+ poll: pollAsyncJobResult
+ }
+ },
+
+ recover: {
+ label: 'label.action.recover.volume',
+ messages: {
+ confirm: function(args) {
+ return 'message.action.recover.volume';
+ },
+ notification: function(args) {
+ return 'label.action.recover.volume';
+ }
+ },
+ action: function(args) {
+ $.ajax({
+ url: createURL("recoverVolume&id=" + args.context.volumes[0].id),
+ dataType: "json",
+ success: function(json) {
+ args.response.success();
+ }
+ });
+ },
+ notification: {
+ poll: function(args) {
+ args.complete();
+ }
+ }
+ },
+
resize: {
label: 'label.action.resize.volume',
messages: {
@@ -2646,6 +2773,328 @@
}
//detailview end
}
+ },
+
+ /**
+ * Backups
+ */
+ backups: {
+ type: 'select',
+ title: 'label.backup',
+ listView: {
+ id: 'backups',
+ isMaximized: true,
+ fields: {
+ virtualmachinename: {
+ label: 'label.vm.name'
+ },
+ status: {
+ label: 'label.state',
+ indicator: {
+ 'BackedUp': 'on',
+ 'Failed': 'off',
+ 'Error': 'off'
+ }
+ },
+ type: {
+ label: 'label.type'
+ },
+ created: {
+ label: 'label.date'
+ },
+ account: {
+ label: 'label.account'
+ },
+ zone: {
+ label: 'label.zone'
+ }
+ },
+
+ dataProvider: function(args) {
+ var data = {
+ listAll: true
+ };
+ listViewDataProvider(args, data);
+
+ if (args.context != null) {
+ if ("instances" in args.context) {
+ $.extend(data, {
+ virtualmachineid: args.context.instances[0].id
+ });
+ }
+ }
+
+ $.ajax({
+ url: createURL('listBackups'),
+ data: data,
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var jsonObj;
+ jsonObj = json.listbackupsresponse.backup;
+ args.response.success({
+ actionFilter: backupActionfilter,
+ data: jsonObj
+ });
+ }
+ });
+ },
+ //dataProvider end
+ detailView: {
+ tabs: {
+ details: {
+ title: 'label.details',
+ fields: {
+ id: {
+ label: 'label.id'
+ },
+ virtualmachinename: {
+ label: 'label.vm.name'
+ },
+ virtualmachineid: {
+ label: 'label.vm.id'
+ },
+ status: {
+ label: 'label.state'
+ },
+ externalid: {
+ label: 'label.external.id'
+ },
+ type: {
+ label: 'label.type'
+ },
+ size: {
+ label: 'label.size'
+ },
+ virtualsize: {
+ label: 'label.virtual.size'
+ },
+ volumes: {
+ label: 'label.volumes'
+ },
+ account: {
+ label: 'label.account'
+ },
+ domain: {
+ label: 'label.domain'
+ },
+ zone: {
+ label: 'label.zone'
+ },
+ created: {
+ label: 'label.date'
+ }
+ },
+ dataProvider: function(args) {
+ $.ajax({
+ url: createURL("listBackups&id=" + args.context.backups[0].id),
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var jsonObj;
+ jsonObj = json.listbackupsresponse.backup[0];
+ args.response.success({
+ actionFilter: backupActionfilter,
+ data: jsonObj
+ });
+ }
+ });
+ }
+ }
+ },
+ actions: {
+ remove: {
+ label: 'Delete Backup',
+ messages: {
+ confirm: function(args) {
+ return 'Are you sure you want to delete the backup?';
+ },
+ notification: function(args) {
+ return 'Delete Backup';
+ }
+ },
+ action: function(args) {
+ $.ajax({
+ url: createURL("deleteBackup&id=" + args.context.backups[0].id),
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var jid = json.deletebackupresponse.jobid;
+ args.response.success({
+ _custom: {
+ jobId: jid
+ }
+ });
+ }
+ });
+ },
+ notification: {
+ poll: pollAsyncJobResult
+ }
+ },
+
+ restoreBackup: {
+ label: 'label.backup.restore',
+ messages: {
+ confirm: function(args) {
+ return 'Please confirm that you want to restore the vm backup?';
+ },
+ notification: function(args) {
+ return 'label.backup.restore';
+ }
+ },
+ action: function(args) {
+ var data = {
+ id: args.context.backups[0].id
+ };
+ $.ajax({
+ url: createURL("restoreBackup"),
+ data: data,
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var jid = json.restorebackupresponse.jobid;
+ args.response.success({
+ _custom: {
+ jobId: jid
+ }
+ });
+ }
+ });
+
+ },
+ notification: {
+ poll: pollAsyncJobResult
+ }
+ },
+
+ restoreBackupVolume: {
+ label: 'Restore and Attach Backup Volume',
+ messages: {
+ confirm: function(args) {
+ return 'Please confirm that you want to restore and attach the volume from the backup?';
+ },
+ notification: function(args) {
+ return 'Restore and Attach Backup Volume';
+ }
+ },
+ createForm: {
+ title: 'Restore and Attach Backup Volume',
+ desc: 'Please select the volume you want to restore and attach to the VM.',
+ fields: {
+ volume: {
+ label: 'label.volume',
+ validation: {
+ required: true
+ },
+ select: function(args) {
+ var volumes = JSON.parse(args.context.backups[0].volumes);
+ var items = [];
+ $(volumes).each(function() {
+ items.push({
+ id: this.uuid,
+ description: '(' + this.type + ') ' + this.uuid
+ });
+ });
+ args.response.success({
+ data: items
+ });
+ }
+ },
+ virtualmachine: {
+ label: 'label.virtual.machine',
+ validation: {
+ required: true
+ },
+ select: function(args) {
+ $.ajax({
+ url: createURL("listVirtualMachines"),
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var vms = json.listvirtualmachinesresponse.virtualmachine;
+ var items = [];
+ $(vms).each(function() {
+ items.push({
+ id: this.id,
+ description: this.name
+ });
+ });
+ args.response.success({
+ data: items
+ });
+
+ }
+ });
+ }
+ }
+ }
+ },
+ action: function(args) {
+ console.log(args);
+ var data = {
+ backupid: args.context.backups[0].id,
+ volumeid: args.data.volume,
+ virtualmachineid: args.data.virtualmachine
+ };
+ $.ajax({
+ url: createURL("restoreVolumeFromBackupAndAttachToVM"),
+ data: data,
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var jid = json.restorevolumefrombackupandattachtovmresponse.jobid;
+ args.response.success({
+ _custom: {
+ jobId: jid
+ }
+ });
+ }
+ });
+
+ },
+ notification: {
+ poll: pollAsyncJobResult
+ }
+ },
+
+ removeBackupChain: {
+ label: 'Delete Backup Chain',
+ messages: {
+ confirm: function(args) {
+ return 'Are you sure you want to remove VM from backup offering and delete the backup chain?';
+ },
+ notification: function(args) {
+ return 'Delete Backup Chain';
+ }
+ },
+ action: function(args) {
+ $.ajax({
+ url: createURL("removeVirtualMachineFromBackupOffering"),
+ data: {
+ virtualmachineid: args.context.backups[0].virtualmachineid,
+ forced: true
+ },
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var jid = json.removevirtualmachinefrombackupofferingresponse.jobid;
+ args.response.success({
+ _custom: {
+ jobId: jid
+ }
+ });
+ }
+ });
+ },
+ notification: {
+ poll: pollAsyncJobResult
+ }
+ }
+ }
+ }
+ //detailview end
+ }
}
}
};
@@ -2655,6 +3104,15 @@
var jsonObj = args.context.item;
var allowedActions = [];
+ if ((isAdmin() || g_allowUserExpungeRecoverVolume) && jsonObj.state == 'Destroy') {
+ return ["recover", "remove"];
+ } else if (jsonObj.state == 'Destroy') {
+ return [];
+ }
+
+ if (jsonObj.state == 'Expunging' || jsonObj.state == 'Expunged') {
+ return ["remove"];
+ }
if (jsonObj.state == 'Destroyed' || jsonObj.state == 'Migrating' || jsonObj.state == 'Uploading') {
return [];
@@ -2709,7 +3167,12 @@
allowedActions.push("detachDisk");
}
} else { // Disk not attached
- allowedActions.push("remove");
+ if (jsonObj.state == "Allocated" || jsonObj.state == "Uploaded") {
+ allowedActions.push("remove");
+ } else {
+ allowedActions.push("createTemplate");
+ allowedActions.push("destroy");
+ }
if (jsonObj.state == "Ready" && isAdmin()) {
allowedActions.push("migrateToAnotherStorage");
}
@@ -2762,4 +3225,22 @@
return allowedActions;
}
+ var backupActionfilter = cloudStack.actionFilter.backupActionfilter = function(args) {
+ var jsonObj = args.context.item;
+
+ if (jsonObj.state == 'Destroyed') {
+ return [];
+ }
+
+ var allowedActions = [];
+ allowedActions.push("remove");
+ allowedActions.push("restoreBackup");
+ allowedActions.push("restoreBackupVolume");
+ allowedActions.push("removeBackupChain");
+
+ return allowedActions;
+ };
+
+
+
})(cloudStack);
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index e016b22..29f428a 100755
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -258,6 +258,100 @@
return allowedActions;
};
+ var rollingMaintenanceAction = function(args) {
+ var isCluster = args.entity === 'clusters';
+ var isZone = args.entity === 'zones';
+ var isPod = args.entity === 'pods';
+ var isHost = args.entity === 'hosts';
+ var action = {
+ messages: {
+ notification: function(args) {
+ return 'label.start.rolling.maintenance';
+ }
+ },
+ label: 'label.start.rolling.maintenance',
+ addRow: 'false',
+ createForm: {
+ title: 'label.start.rolling.maintenance',
+ fields: {
+ timeout: {
+ label: 'label.timeout',
+ },
+ force: {
+ isBoolean: true,
+ label: 'label.start.rolling.maintenance.force'
+ },
+ payload: {
+ label: 'label.start.rolling.maintenance.payload'
+ }
+ }
+ },
+ action: function(args) {
+ var selectedIds;
+ if (isCluster) {
+ selectedIds = args.context.clusters.map(x => x.id);
+ } else if (isZone) {
+ selectedIds = args.context.physicalResources.map(x => x.id);
+ } else if (isPod) {
+ selectedIds = args.context.pods.map(x => x.id);
+ } else if (isHost) {
+ selectedIds = args.context.hosts.map(x => x.id);
+ }
+ var ids = selectedIds.join(',');
+ var data = {
+ force: args.data.force,
+ timeout: args.data.timeout,
+ payload: args.data.payload
+ };
+ if (isCluster) {
+ $.extend(data, {
+ clusterids : ids
+ });
+ } else if (isZone) {
+ $.extend(data, {
+ zoneids : ids
+ });
+ } else if (isPod) {
+ $.extend(data, {
+ podids : ids
+ });
+ } else if (isHost) {
+ $.extend(data, {
+ hostids : ids
+ });
+ }
+
+ $.ajax({
+ url: createURL("startRollingMaintenance"),
+ dataType: "json",
+ data: data,
+ async: true,
+ success: function (json) {
+ var item = json.startrollingmaintenanceresponse;
+ var jid = item.jobid;
+ args.response.success({
+ _custom: {
+ jobId: jid
+ }
+ });
+ }
+ });
+ },
+ notification: {
+ poll: pollAsyncJobResult
+ }
+ };
+
+ if (args && args.listView) {
+ $.extend(action, {
+ isHeader: true,
+ isMultiSelectAction: true
+ });
+ }
+
+ return action;
+ };
+
cloudStack.sections.system = {
title: 'label.menu.infrastructure',
id: 'system',
@@ -3933,6 +4027,56 @@
}
},
+ retrieveDiagnostics: {
+ label: 'label.action.get.diagnostics',
+ messages: {
+ notification: function (args) {
+ return 'label.action.get.diagnostics';
+ },
+ complete: function(args) {
+ var url = args.url;
+ var htmlMsg = _l('message.download.diagnostics');
+ var htmlMsg2 = htmlMsg.replace(/#/, url).replace(/00000/, url);
+ return htmlMsg2;
+ }
+ },
+ createForm: {
+ title: 'label.action.get.diagnostics',
+ desc: 'label.get.diagnostics.desc',
+ fields: {
+ files: {
+ label: 'label.get.diagnostics.files'
+ }
+ }
+ },
+ action: function (args) {
+ $.ajax({
+ url: createURL("getDiagnosticsData&targetid=" + args.context.routers[0].id + "&files=" + args.data.files),
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var jid = json.getdiagnosticsdataresponse.jobid;
+ args.response.success({
+ _custom: {
+ jobId : jid,
+ getUpdatedItem: function (json) {
+ return json.queryasyncjobresultresponse.jobresult.diagnostics;
+
+ },
+ getActionFilter: function(){
+ return systemvmActionfilter;
+ }
+ }
+
+ });
+ }
+ }); //end ajax
+ },
+ notification: {
+ poll: pollAsyncJobResult
+ }
+ },
+
viewConsole: {
label: 'label.view.console',
action: {
@@ -7616,6 +7760,7 @@
zones: {
id: 'physicalResources',
label: 'label.menu.physical.resources',
+ multiSelect: true,
fields: {
name: {
label: 'label.zone'
@@ -7705,12 +7850,65 @@
return 'label.metrics';
}
}
- }
+ },
+ startRollingMaintenance: rollingMaintenanceAction({ listView: true, entity: 'zones' })
},
detailView: {
isMaximized: true,
actions: {
+
+ startRollingMaintenance: {
+ label: 'label.start.rolling.maintenance',
+ textLabel: 'label.start.rolling.maintenance',
+ messages: {
+ notification: function (args) {
+ return 'label.start.rolling.maintenance';
+ }
+ },
+ createForm: {
+ title: 'label.start.rolling.maintenance',
+ fields: {
+ timeout: {
+ label: 'label.timeout',
+ },
+ force: {
+ isBoolean: true,
+ label: 'label.start.rolling.maintenance.force'
+ },
+ payload: {
+ label: 'label.start.rolling.maintenance.payload'
+ }
+ }
+ },
+ action: function (args) {
+ var data = {
+ zoneids: args.context.physicalResources[0].id,
+ force: args.data.force,
+ timeout: args.data.timeout,
+ payload: args.data.payload
+ };
+ $.ajax({
+ url: createURL("startRollingMaintenance"),
+ dataType: "json",
+ data: data,
+ async: true,
+ success: function (json) {
+ var item = json.rollingmaintenance;
+ args.response.success({
+ actionFilter: zoneActionfilter,
+ data: item
+ });
+ }
+ });
+ },
+ notification: {
+ poll: function (args) {
+ args.complete();
+ }
+ }
+ },
+
addVmwareDc: {
label: 'label.add.vmware.datacenter',
textLabel: 'label.add.vmware.datacenter',
@@ -8847,6 +9045,56 @@
}
},
+ retrieveDiagnostics: {
+ label: 'label.action.get.diagnostics',
+ messages: {
+ notification: function (args) {
+ return 'label.action.get.diagnostics';
+ },
+ complete: function(args) {
+ var url = args.url;
+ var htmlMsg = _l('message.download.diagnostics');
+ var htmlMsg2 = htmlMsg.replace(/#/, url).replace(/00000/, url);
+ return htmlMsg2;
+ }
+ },
+ createForm: {
+ title: 'label.action.get.diagnostics',
+ desc: '',
+ fields: {
+ files: {
+ label: 'label.get.diagnostics.files'
+ }
+ }
+ },
+ action: function (args) {
+ $.ajax({
+ url: createURL("getDiagnosticsData&targetid=" + args.context.systemVMs[0].id + "&files=" + args.data.files),
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var jid = json.getdiagnosticsdataresponse.jobid;
+ args.response.success({
+ _custom: {
+ jobId : jid,
+ getUpdatedItem: function (json) {
+ return json.queryasyncjobresultresponse.jobresult.diagnostics;
+
+ },
+ getActionFilter: function(){
+ return systemvmActionfilter;
+ }
+ }
+
+ });
+ }
+ }); //end ajax
+ },
+ notification: {
+ poll: pollAsyncJobResult
+ }
+ },
+
scaleUp: {
label: 'label.change.service.offering',
createForm: {
@@ -9763,6 +10011,7 @@
listView: {
id: 'routers',
label: 'label.virtual.appliances',
+ horizontalOverflow: true,
fields: {
name: {
label: 'label.name'
@@ -9791,7 +10040,19 @@
indicator: {
'Running': 'on',
'Stopped': 'off',
- 'Error': 'off'
+ 'Error': 'off',
+ 'Alert': 'warning'
+ }
+ },
+ healthchecksfailed: {
+ converter: function (str) {
+ if (str) return 'Failed'
+ return 'Passed';
+ },
+ label: 'label.health.check',
+ indicator: {
+ false: 'on',
+ true: 'warning'
}
},
requiresupgrade: {
@@ -9799,6 +10060,12 @@
converter: cloudStack.converters.toBooleanText
}
},
+ preFilter: function () {
+ if (!g_routerHealthChecksEnabled) {
+ return ['healthchecksfailed']
+ }
+ return []
+ },
dataProvider: function (args) {
var array1 =[];
if (args.filterBy != null) {
@@ -9859,44 +10126,47 @@
routers.push(item);
});
- /*
- * In project view, the first listRotuers API(without projectid=-1) will return the same objects as the second listRouters API(with projectid=-1),
- * because in project view, all API calls are appended with projectid=[projectID].
- * Therefore, we only call the second listRouters API(with projectid=-1) in non-project view.
- */
- if (cloudStack.context && cloudStack.context.projects == null) { //non-project view
- /*
- * account parameter(account+domainid) and project parameter(projectid) are not allowed to be passed together to listXXXXXXX API.
- * So, remove account parameter(account+domainid) from data2
- */
- if ("account" in data2) {
- delete data2.account;
- }
- if ("domainid" in data2) {
- delete data2.domainid;
- }
-
- $.ajax({
- url: createURL("listRouters&page=" + args.page + "&pagesize=" + pageSize + array1.join("") + "&projectid=-1"),
- data: data2,
- async: false,
- success: function (json) {
- var items = json.listroutersresponse.router ?
- json.listroutersresponse.router:[];
-
- $(items).map(function (index, item) {
- routers.push(item);
- });
- }
- });
- }
-
- args.response.success({
- actionFilter: routerActionfilter,
- data: $(routers).map(mapRouterType)
- });
+ /*
+ * In project view, the first listRotuers API(without projectid=-1) will return the same objects as the second listRouters API(with projectid=-1),
+ * because in project view, all API calls are appended with projectid=[projectID].
+ * Therefore, we only call the second listRouters API(with projectid=-1) in non-project view.
+ */
+ if (cloudStack.context && cloudStack.context.projects == null) { //non-project view
+ /*
+ * account parameter(account+domainid) and project parameter(projectid) are not allowed to be passed together to listXXXXXXX API.
+ * So, remove account parameter(account+domainid) from data2
+ */
+ if ("account" in data2) {
+ delete data2.account;
}
+ if ("domainid" in data2) {
+ delete data2.domainid;
+ }
+
+ $.ajax({
+ url: createURL("listRouters&page=" + args.page + "&pagesize=" + pageSize + array1.join("") + "&projectid=-1"),
+ data: data2,
+ async: false,
+ success: function (json) {
+ var items = json.listroutersresponse.router ?
+ json.listroutersresponse.router:[];
+
+ var items = json.listroutersresponse.router ?
+ json.listroutersresponse.router:[];
+
+ $(items).map(function (index, item) {
+ routers.push(item);
+ });
+ }
+ });
+ }
+
+ args.response.success({
+ actionFilter: routerActionfilter,
+ data: $(routers).map(mapRouterType)
});
+ }
+ });
},
detailView: {
name: 'label.virtual.appliance.details',
@@ -10270,6 +10540,56 @@
}
},
+ retrieveDiagnostics: {
+ label: 'label.action.get.diagnostics',
+ messages: {
+ notification: function (args) {
+ return 'label.action.get.diagnostics';
+ },
+ complete: function(args) {
+ var url = args.url;
+ var htmlMsg = _l('message.download.diagnostics');
+ var htmlMsg2 = htmlMsg.replace(/#/, url).replace(/00000/, url);
+ return htmlMsg2;
+ }
+ },
+ createForm: {
+ title: 'label.action.get.diagnostics',
+ desc: 'label.get.diagnostics.desc',
+ fields: {
+ files: {
+ label: 'label.get.diagnostics.files'
+ }
+ }
+ },
+ action: function (args) {
+ $.ajax({
+ url: createURL("getDiagnosticsData&targetid=" + args.context.routers[0].id + "&files=" + args.data.files),
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var jid = json.getdiagnosticsdataresponse.jobid;
+ args.response.success({
+ _custom: {
+ jobId : jid,
+ getUpdatedItem: function (json) {
+ return json.queryasyncjobresultresponse.jobresult.diagnostics;
+
+ },
+ getActionFilter: function(){
+ return systemvmActionfilter;
+ }
+ }
+
+ });
+ }
+ }); //end ajax
+ },
+ notification: {
+ poll: pollAsyncJobResult
+ }
+ },
+
scaleUp: { //*** Infrastructure > Virtual Routers > change service offering ***
label: 'label.change.service.offering',
createForm: {
@@ -10369,6 +10689,56 @@
height: 640
}
}
+ },
+
+ healthChecks: {
+ label: 'label.action.router.health.checks',
+ createForm: {
+ title: 'label.action.router.health.checks',
+ desc: 'message.action.router.health.checks',
+ fields: {
+ performfreshchecks: {
+ label: 'label.perform.fresh.checks',
+ isBoolean: true
+ }
+ }
+ },
+ action: function (args) {
+ if (!g_routerHealthChecksEnabled) {
+ cloudStack.dialog.notice({
+ message: 'Router health checks are disabled. Please enable router.health.checks.enabled to execute this action'
+ })
+ args.response.success()
+ return
+ }
+ var data = {
+ 'routerid': args.context.routers[0].id,
+ 'performfreshchecks': (args.data.performfreshchecks === 'on')
+ };
+ $.ajax({
+ url: createURL('getRouterHealthCheckResults'),
+ dataType: 'json',
+ data: data,
+ async: true,
+ success: function (json) {
+ var healthChecks = json.getrouterhealthcheckresultsresponse.routerhealthchecks.healthchecks
+ var numChecks = healthChecks.length
+ var failedChecks = 0
+ $.each(healthChecks, function(idx, check) {
+ if (!check.success) failedChecks = failedChecks + 1
+ })
+ cloudStack.dialog.notice({
+ message: 'Found ' + numChecks + ' checks for router, with ' + failedChecks + ' failing checks. Please visit router > Health Checks tab to see details'
+ })
+ args.response.success();
+ }
+ });
+ },
+ messages: {
+ notification: function(args) {
+ return 'label.action.router.health.checks'
+ }
+ }
}
},
tabs: {
@@ -10558,6 +10928,78 @@
}
});
}
+ },
+ healthCheckResults: {
+ title: 'label.router.health.checks',
+ listView: {
+ id: 'routerHealthCheckResults',
+ label: 'label.router.health.checks',
+ hideToolbar: true,
+ fields: {
+ checkname: {
+ label: 'label.router.health.check.name'
+ },
+ checktype: {
+ label: 'label.router.health.check.type'
+ },
+ success: {
+ label: 'label.router.health.check.success',
+ converter: function (args) {
+ if (args) {
+ return _l('True');
+ } else {
+ return _l('False');
+ }
+ },
+ indicator: {
+ true: 'on',
+ false: 'off'
+ }
+ },
+ lastupdated: {
+ label: 'label.router.health.check.last.updated'
+ }
+ },
+ actions: {
+ details: {
+ label: 'label.router.health.check.details',
+ action: {
+ custom: function (args) {
+ cloudStack.dialog.notice({
+ message: args.context.routerHealthCheckResults[0].details
+ })
+ }
+ }
+ }
+ },
+ dataProvider: function(args) {
+ if (!g_routerHealthChecksEnabled) {
+ cloudStack.dialog.notice({
+ message: 'Router health checks are disabled. Please enable router.health.checks.enabled to get data'
+ })
+ args.response.success({})
+ return
+ }
+ if (args.page > 1) {
+ // Only one page is supported as it's not list command.
+ args.response.success({});
+ return
+ }
+
+ $.ajax({
+ url: createURL('getRouterHealthCheckResults'),
+ data: {
+ 'routerid': args.context.routers[0].id
+ },
+ success: function (json) {
+ var hcData = json.getrouterhealthcheckresultsresponse.routerhealthchecks.healthchecks
+ args.response.success({
+ data: hcData
+ });
+ }
+ });
+ }
+ }
}
}
}
@@ -11620,6 +12062,56 @@
}
},
+ retrieveDiagnostics: {
+ label: 'label.action.get.diagnostics',
+ messages: {
+ notification: function (args) {
+ return 'label.action.get.diagnostics';
+ },
+ complete: function(args) {
+ var url = args.url;
+ var htmlMsg = _l('message.download.diagnostics');
+ var htmlMsg2 = htmlMsg.replace(/#/, url).replace(/00000/, url);
+ return htmlMsg2;
+ }
+ },
+ createForm: {
+ title: 'label.action.get.diagnostics',
+ desc: 'label.get.diagnostics.desc',
+ fields: {
+ files: {
+ label: 'label.get.diagnostics.files'
+ }
+ }
+ },
+ action: function (args) {
+ $.ajax({
+ url: createURL("getDiagnosticsData&targetid=" + args.context.systemVMs[0].id + "&files=" + args.data.files),
+ dataType: "json",
+ async: true,
+ success: function(json) {
+ var jid = json.getdiagnosticsdataresponse.jobid;
+ args.response.success({
+ _custom: {
+ jobId : jid,
+ getUpdatedItem: function (json) {
+ return json.queryasyncjobresultresponse.jobresult.diagnostics;
+
+ },
+ getActionFilter: function(){
+ return systemvmActionfilter;
+ }
+ }
+
+ });
+ }
+ }); //end ajax
+ },
+ notification: {
+ poll: pollAsyncJobResult
+ }
+ },
+
scaleUp: { //*** Infrastructure > System VMs (consoleProxy or SSVM) > change service offering ***
label: 'label.change.service.offering',
createForm: {
@@ -13448,6 +13940,7 @@
listView: {
id: 'pods',
section: 'pods',
+ multiSelect: true,
fields: {
name: {
label: 'label.name'
@@ -13709,7 +14202,8 @@
return 'label.add.pod';
}
}
- }
+ },
+ startRollingMaintenance: rollingMaintenanceAction({ listView: true, entity: 'pods' })
},
detailView: {
@@ -13731,6 +14225,57 @@
return hiddenTabs;
},
actions: {
+ startRollingMaintenance: {
+ label: 'label.start.rolling.maintenance',
+ textLabel: 'label.start.rolling.maintenance',
+ messages: {
+ notification: function (args) {
+ return 'label.start.rolling.maintenance';
+ }
+ },
+ createForm: {
+ title: 'label.start.rolling.maintenance',
+ fields: {
+ timeout: {
+ label: 'label.timeout',
+ },
+ force: {
+ isBoolean: true,
+ label: 'label.start.rolling.maintenance.force'
+ },
+ payload: {
+ label: 'label.start.rolling.maintenance.payload'
+ }
+ }
+ },
+ action: function (args) {
+ var data = {
+ podids: args.context.pods[0].id,
+ force: args.data.force,
+ timeout: args.data.timeout,
+ payload: args.data.payload
+ };
+ $.ajax({
+ url: createURL("startRollingMaintenance"),
+ dataType: "json",
+ data: data,
+ async: true,
+ success: function (json) {
+ var item = json.rollingmaintenance;
+ args.response.success({
+ actionFilter: zoneActionfilter,
+ data: item
+ });
+ }
+ });
+ },
+ notification: {
+ poll: function (args) {
+ args.complete();
+ }
+ }
+ },
+
edit: {
label: 'label.edit',
action: function (args) {
@@ -14102,6 +14647,7 @@
listView: {
id: 'clusters',
section: 'clusters',
+ multiSelect: true,
fields: {
name: {
label: 'label.name'
@@ -14840,7 +15386,8 @@
return 'label.metrics';
}
}
- }
+ },
+ startRollingMaintenance: rollingMaintenanceAction({ listView: true, entity: 'clusters' })
},
detailView: {
@@ -14871,6 +15418,56 @@
actions: {
+ startRollingMaintenance: {
+ label: 'label.start.rolling.maintenance',
+ textLabel: 'label.start.rolling.maintenance',
+ messages: {
+ notification: function (args) {
+ return 'label.start.rolling.maintenance';
+ }
+ },
+ createForm: {
+ title: 'label.start.rolling.maintenance',
+ fields: {
+ timeout: {
+ label: 'label.timeout',
+ },
+ force: {
+ isBoolean: true,
+ label: 'label.start.rolling.maintenance.force'
+ },
+ payload: {
+ label: 'label.start.rolling.maintenance.payload'
+ }
+ }
+ },
+ action: function (args) {
+ var data = {
+ clusterids: args.context.clusters[0].id,
+ force: args.data.force,
+ timeout: args.data.timeout,
+ payload: args.data.payload
+ };
+ $.ajax({
+ url: createURL("startRollingMaintenance"),
+ dataType: "json",
+ data: data,
+ async: true,
+ success: function (json) {
+ var item = json.rollingmaintenance;
+ args.response.success({
+ actionFilter: zoneActionfilter,
+ data: item
+ });
+ }
+ });
+ },
+ notification: {
+ poll: function (args) {
+ args.complete();
+ }
+ }
+ },
edit: {
label: 'label.edit',
action: function (args) {
@@ -15658,6 +16255,7 @@
listView: {
section: 'hosts',
id: 'hosts',
+ multiSelect: true,
fields: {
name: {
label: 'label.name'
@@ -16353,7 +16951,8 @@
return 'label.metrics';
}
}
- }
+ },
+ startRollingMaintenance: rollingMaintenanceAction({ listView: true, entity: 'hosts' })
},
detailView: {
name: "Host details",
@@ -16362,6 +16961,56 @@
path: 'instances'
},
actions: {
+ startRollingMaintenance: {
+ label: 'label.start.rolling.maintenance',
+ textLabel: 'label.start.rolling.maintenance',
+ messages: {
+ notification: function (args) {
+ return 'label.start.rolling.maintenance';
+ }
+ },
+ createForm: {
+ title: 'label.start.rolling.maintenance',
+ fields: {
+ timeout: {
+ label: 'label.timeout',
+ },
+ force: {
+ isBoolean: true,
+ label: 'label.start.rolling.maintenance.force'
+ },
+ payload: {
+ label: 'label.start.rolling.maintenance.payload'
+ }
+ }
+ },
+ action: function (args) {
+ var data = {
+ hostids: args.context.hosts[0].id,
+ force: args.data.force,
+ timeout: args.data.timeout,
+ payload: args.data.payload
+ };
+ $.ajax({
+ url: createURL("startRollingMaintenance"),
+ dataType: "json",
+ data: data,
+ async: true,
+ success: function (json) {
+ var item = json.rollingmaintenance;
+ args.response.success({
+ actionFilter: zoneActionfilter,
+ data: item
+ });
+ }
+ });
+ },
+ notification: {
+ poll: function (args) {
+ args.complete();
+ }
+ }
+ },
edit: {
label: 'label.edit',
action: function (args) {
@@ -17139,7 +17788,8 @@
title: 'label.outofbandmanagement.action.issue',
desc: function(args) {
var host = args.context.hosts[0];
- if (host.resourcestate == 'Maintenance' || host.resourcestate == 'PrepareForMaintenance' || host.resourcestate == 'ErrorInMaintenance') {
+ if (host.resourcestate == 'Maintenance' || host.resourcestate == 'PrepareForMaintenance' ||
+ host.resourcestate == 'ErrorInPrepareForMaintenance' || host.resourcestate == 'ErrorInMaintenance') {
return _l('message.outofbandmanagement.action.maintenance');
}
},
@@ -17374,6 +18024,10 @@
});
}
},
+ ueficapability: {
+ label:'label.host.ueficapability',
+ converter: cloudStack.converters.toBooleanText
+ },
hahost: {
label: 'label.ha.enabled',
converter: cloudStack.converters.toBooleanText
@@ -17753,6 +18407,7 @@
'Down': 'off',
'Removed': 'off',
'ErrorInMaintenance': 'off',
+ 'ErrorInPrepareForMaintenance': 'warning',
'PrepareForMaintenance': 'warning',
'CancelMaintenance': 'warning',
'Maintenance': 'warning',
@@ -21827,6 +22482,7 @@
allowedActions.push("disableHA");
}
+ allowedActions.push("startRollingMaintenance");
return allowedActions;
}
@@ -21878,6 +22534,7 @@
//$("#tab_ipallocation, #add_iprange_button, #tab_network_device, #add_network_device_button").hide();
}
+ allowedActions.push("startRollingMaintenance");
return allowedActions;
}
@@ -21924,6 +22581,7 @@
allowedActions.push("disableHA");
}
+ allowedActions.push("startRollingMaintenance");
return allowedActions;
}
@@ -21946,13 +22604,17 @@
if (jsonObj.hypervisor == "KVM") {
allowedActions.push("secureKVMHost");
+ allowedActions.push("startRollingMaintenance");
}
} else if (jsonObj.resourcestate == "ErrorInMaintenance") {
allowedActions.push("edit");
allowedActions.push("enableMaintenanceMode");
allowedActions.push("cancelMaintenanceMode");
- } else if (jsonObj.resourcestate == "PrepareForMaintenance") {
+ if (jsonObj.hypervisor == "KVM") {
+ allowedActions.push("startRollingMaintenance");
+ }
+ } else if (jsonObj.resourcestate == "PrepareForMaintenance" || jsonObj.resourcestate == 'ErrorInPrepareForMaintenance') {
allowedActions.push("edit");
allowedActions.push("cancelMaintenanceMode");
} else if (jsonObj.resourcestate == "Maintenance") {
@@ -22006,7 +22668,7 @@
} else if (jsonObj.state == "ErrorInMaintenance") {
allowedActions.push("enableMaintenanceMode");
allowedActions.push("cancelMaintenanceMode");
- } else if (jsonObj.state == "PrepareForMaintenance") {
+ } else if (jsonObj.state == "PrepareForMaintenance" || jsonObj.resourcestate == "ErrorInPrepareForMaintenance") {
allowedActions.push("cancelMaintenanceMode");
} else if (jsonObj.state == "Maintenance") {
allowedActions.push("cancelMaintenanceMode");
@@ -22047,6 +22709,8 @@
if (isAdmin()) {
allowedActions.push("migrate");
allowedActions.push("diagnostics");
+ allowedActions.push("retrieveDiagnostics");
+ allowedActions.push("healthChecks");
}
} else if (jsonObj.state == 'Stopped') {
allowedActions.push("start");
@@ -22098,6 +22762,7 @@
if (isAdmin()) {
allowedActions.push("migrate");
allowedActions.push("diagnostics");
+ allowedActions.push("retrieveDiagnostics");
}
} else if (jsonObj.state == 'Stopped') {
allowedActions.push("start");
diff --git a/ui/scripts/ui-custom/accountsWizard.js b/ui/scripts/ui-custom/accountsWizard.js
index a932887..dfaad05 100644
--- a/ui/scripts/ui-custom/accountsWizard.js
+++ b/ui/scripts/ui-custom/accountsWizard.js
@@ -111,6 +111,14 @@
});
if (ldapStatus) {
+ var userFilter = $wizard.find('#label_filterBy').val();
+ if (userFilter == null) {
+ userFilter = 'AnyDomain';
+ }
+ var domainId = $wizard.find('#label_domain').val();
+ if (domainId == null) {
+ domainId = $.cookie('domainid');
+ }
var $table = $wizard.find('.ldap-account-choice tbody');
$("#label_ldap_group_name").on("keypress", function(event) {
if ($table.find("#tr-groupname-message").length === 0) {
@@ -125,94 +133,13 @@
$table.find("#tr-groupname-message").hide();
}
});
- $.ajax({
- url: createURL("listLdapUsers&listtype=new"),
+ loadList = function() { $.ajax({
+ url: createURL("listLdapUsers&listtype=new&domainid=" + domainId + "&userfilter=" + userFilter),
dataType: "json",
async: false,
success: function(json) {
- //for testing only (begin)
- /*
- json = {
- "ldapuserresponse": {
- "count": 11,
- "LdapUser": [
- {
- "email": "test@test.com",
- "principal": "CN=Administrator,CN=Users,DC=hyd-qa,DC=com",
- "username": "Administrator",
- "domain": "CN=Administrator"
- },
- {
- "email": "test@test.com",
- "principal": "CN=Guest,CN=Users,DC=hyd-qa,DC=com",
- "username": "Guest",
- "domain": "CN=Guest"
- },
- {
- "email": "test@test.com",
- "principal": "CN=IUSR_HYD-QA12,CN=Users,DC=hyd-qa,DC=com",
- "username": "IUSR_HYD-QA12",
- "domain": "CN=IUSR_HYD-QA12"
- },
- {
- "email": "test@test.com",
- "principal": "CN=IWAM_HYD-QA12,CN=Users,DC=hyd-qa,DC=com",
- "username": "IWAM_HYD-QA12",
- "domain": "CN=IWAM_HYD-QA12"
- },
- {
- "email": "test@test.com",
- "principal": "CN=SUPPORT_388945a0,CN=Users,DC=hyd-qa,DC=com",
- "username": "SUPPORT_388945a0",
- "domain": "CN=SUPPORT_388945a0"
- },
- {
- "principal": "CN=jessica j,CN=Users,DC=hyd-qa,DC=com",
- "firstname": "jessica",
- "lastname": "j",
- "username": "jessica",
- "domain": "CN=jessica j"
- },
- {
- "principal": "CN=krbtgt,CN=Users,DC=hyd-qa,DC=com",
- "username": "krbtgt",
- "domain": "CN=krbtgt"
- },
- {
- "email": "sadhu@sadhu.com",
- "principal": "CN=sadhu,CN=Users,DC=hyd-qa,DC=com",
- "firstname": "sadhu",
- "username": "sadhu",
- "domain": "CN=sadhu"
- },
- {
- "email": "test@test.com",
- "principal": "CN=sangee1 hariharan,CN=Users,DC=hyd-qa,DC=com",
- "firstname": "sangee1",
- "lastname": "hariharan",
- "username": "sangee1",
- "domain": "CN=sangee1 hariharan"
- },
- {
- "email": "test@test.com",
- "principal": "CN=sanjeev n.,CN=Users,DC=hyd-qa,DC=com",
- "firstname": "sanjeev",
- "username": "sanjeev",
- "domain": "CN=sanjeev n."
- },
- {
- "email": "test@test.com",
- "principal": "CN=test1dddd,CN=Users,DC=hyd-qa,DC=com",
- "firstname": "test1",
- "username": "test1dddd",
- "domain": "CN=test1dddd"
- }
- ]
- }
- };
- */
- //for testing only (end)
+ $table.find('tr').remove();
if (json.ldapuserresponse.count > 0) {
$(json.ldapuserresponse.LdapUser).each(function() {
var $result = $('<tr>');
@@ -228,7 +155,9 @@
$('<td>').addClass('username').html(_s(this.username))
.attr('title', this.username),
$('<td>').addClass('email').html(_s(this.email))
- .attr('title', _s(this.email))
+ .attr('title', _s(this.email)),
+ $('<td>').addClass('email').html(_s(this.conflictingusersource))
+ .attr('title', _s(this.conflictingusersource))
)
$table.append($result);
@@ -243,14 +172,20 @@
$table.append($result);
}
}
- });
+ }) };
+ loadList();
+
} else {
+ var informationWithinLdapFields = $.extend(true,{},args.informationWithinLdap);
+ // we are not in ldap so
+ delete informationWithinLdapFields.conflictingusersource;
+
var informationWithinLdap = cloudStack.dialog.createForm({
context: context,
noDialog: true,
form: {
title: '',
- fields: args.informationWithinLdap
+ fields: informationWithinLdapFields
}
});
@@ -267,13 +202,16 @@
$wizard.removeClass('multi-wizard');
}
+ var informationNotInLdap = $.extend(true,{},args.informationNotInLdap);
+
if (!ldapStatus) {
- delete args.informationNotInLdap.ldapGroupName;
+ delete informationNotInLdap.filter;
+ delete informationNotInLdap.ldapGroupName;
}
if (g_idpList == null) {
- delete args.informationNotInLdap.samlEnable;
- delete args.informationNotInLdap.samlEntity;
+ delete informationNotInLdap.samlEnable;
+ delete informationNotInLdap.samlEntity;
}
var informationNotInLdap = cloudStack.dialog.createForm({
@@ -281,12 +219,21 @@
noDialog: true,
form: {
title: '',
- fields: args.informationNotInLdap
+ fields: informationNotInLdap
}
});
var informationNotInLdapForm = informationNotInLdap.$formContainer.find('form .form-item');
+ informationNotInLdapForm.find('.value #label_filterBy').addClass('required');
+ informationNotInLdapForm.find('.value #label_filterBy').change(function() {
+ userFilter = $wizard.find('#label_filterBy').val();
+ loadList();
+ });
informationNotInLdapForm.find('.value #label_domain').addClass('required');
+ informationNotInLdapForm.find('.value #label_domain').change(function() {
+ domainId = $wizard.find('#label_domain').val();
+ loadList();
+ });
informationNotInLdapForm.find('.value #label_type').addClass('required');
if (!ldapStatus) {
informationNotInLdapForm.css('background', 'none');
diff --git a/ui/scripts/ui-custom/backupSchedule.js b/ui/scripts/ui-custom/backupSchedule.js
new file mode 100644
index 0000000..5646898
--- /dev/null
+++ b/ui/scripts/ui-custom/backupSchedule.js
@@ -0,0 +1,181 @@
+// 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.
+(function(cloudStack, $) {
+ cloudStack.uiCustom.backupSchedule = function(args) {
+ var desc = args.desc;
+ var selects = args.selects;
+ var actions = args.actions;
+ var dataProvider = args.dataProvider;
+
+ return function(args) {
+ var $backups = $('#template').find('.recurring-snapshots').clone();
+ var context = args.context;
+
+ // Update labels
+ $backups.find('.forms ul li.hourly a').html(_l('label.hourly'));
+ $backups.find('.forms ul li.daily a').html(_l('label.daily'));
+ $backups.find('.forms ul li.weekly a').html(_l('label.weekly'));
+ $backups.find('.forms ul li.monthly a').html(_l('label.monthly'));
+ $backups.find('.field.timezone .name').html(_l('label.timezone'));
+ $backups.find('.field.time .name').html(_l('label.time'));
+ $backups.find('.field.time .value label').html(_l('label.minute.past.hour'));
+ $backups.find('.field.maxsnaps').hide();
+ $backups.find('.add-snapshot-action.add').html(_l('label.configure'));
+
+ $backups.find('.desc').html(_l(desc));
+ $backups.find('.forms').tabs();
+
+ $backups.find('form select').each(function() {
+ var $select = $(this);
+ var selectData = selects[$select.attr('name')];
+
+ if (selectData) {
+ selectData({
+ response: {
+ success: function(args) {
+ $(args.data).each(function() {
+ var $option = $('<option>').appendTo($select);
+
+ $option.val(this.id).html(_l(this.name));
+ });
+ }
+ }
+ });
+ }
+ });
+
+ $backups.find('form').validate();
+ $backups.find('.scheduled-snapshots p').html('Backup Schedule');
+ $($.find('.scheduled-snapshots tr td.keep')).hide();
+
+ $backups.find('.add-snapshot-action.add').click(function() {
+ var $form = $backups.find('form:visible');
+ if (!$form.valid()) return false;
+ var formData = cloudStack.serializeForm($form);
+ actions.add({
+ context: context,
+ snapshot: formData,
+ response: {
+ success: function(args) {
+ $backups.find('.scheduled-snapshots tr').hide();
+ var $backupScheduleRow = $backups.find('.scheduled-snapshots tr').filter(function() {
+ return $(this).index() == args.data.type;
+ }).addClass('active').show();
+
+ $backupScheduleRow.data('json-obj', args.data);
+
+ // Update fields
+ $backupScheduleRow.find('td.time span').html(args.data.time);
+ $backupScheduleRow.find('td.day-of-week span').html(_l(
+ args.data['day-of-week'] ?
+ $backups.find('select[name=day-of-week] option').filter(function() {
+ return $(this).val() == args.data['day-of-week'];
+ }).html() :
+ args.data['day-of-month']
+ ));
+ $backupScheduleRow.find('td.timezone span').html(
+ $backups.find('select[name=timezone] option').filter(function() {
+ return $(this).val() == args.data['timezone'];
+ }).html()
+ );
+ $backupScheduleRow.find('td.keep').hide();
+
+ $(':ui-dialog').dialog('option', 'position', 'center');
+
+ }
+ }
+ });
+
+ return true;
+ });
+
+ // Remove backup
+ $backups.find('.action.destroy').click(function() {
+ var $tr = $(this).closest('tr');
+ actions.remove({
+ context: context,
+ snapshot: $tr.data('json-obj'),
+ response: {
+ success: function(args) {
+ $tr.hide().removeClass('active');
+ $(':ui-dialog').dialog('option', 'position', 'center');
+
+ }
+ }
+ });
+ });
+
+ // Get existing data
+ dataProvider({
+ context: context,
+ response: {
+ success: function(args) {
+ $(args.data).each(function() {
+ var backup = this;
+
+ // Get matching table row
+ var $tr = $backups.find('tr').filter(function() {
+ return $(this).index() == backup.type;
+ }).addClass('active').show();
+
+ $tr.data('json-obj', backup);
+
+ $tr.find('td.time span').html(backup.time);
+ $tr.find('td.timezone span').html(
+ $backups.find('select[name=timezone] option').filter(function() {
+ return $(this).val() == backup['timezone'];
+ }).html()
+ );
+ $tr.find('td.day-of-week span').html(
+ backup['day-of-week'] ?
+ $backups.find('select[name=day-of-week] option').filter(function() {
+ return $(this).val() == backup['day-of-week'];
+ }).html() :
+ backup['day-of-month']
+ );
+ $tr.find('td.keep').hide();
+ });
+
+ }
+ }
+ });
+
+ // Create dialog
+ var $dialog = $backups.dialog({
+ title: _l('Backup Schedule'),
+ dialogClass: 'recurring-snapshots',
+ closeOnEscape: false,
+ width: 600,
+ buttons: [{
+ text: _l('label.close'),
+ 'class': 'ok',
+ click: function() {
+ $dialog.fadeOut(function() {
+ $dialog.remove();
+ });
+
+ $('div.overlay').fadeOut(function() {
+ $('div.overlay').remove();
+ });
+ }
+ }]
+ });
+
+ return cloudStack.applyDefaultZindexAndOverlayOnJqueryDialogAndRemoveCloseButton($dialog);
+ };
+ };
+}(cloudStack, jQuery));
diff --git a/ui/scripts/ui-custom/instanceWizard.js b/ui/scripts/ui-custom/instanceWizard.js
index b732b9c..4aefa97 100644
--- a/ui/scripts/ui-custom/instanceWizard.js
+++ b/ui/scripts/ui-custom/instanceWizard.js
@@ -1392,6 +1392,50 @@
$(this).closest('div.select').hide();
}
}
+
+ var uefi = function(bootType){
+ var $bootmode = $step.find('select[name=bootmode]');
+
+ if(bootType.toLowerCase() == 'uefi' ){
+ $bootmode.html('');
+ var $option = $('<option>');
+ var id = 'LEGACY';
+ var description = 'LEGACY';
+
+ $option.attr('value', id);
+ $option.html(description);
+ $option.appendTo($bootmode);
+
+ var $option2 = $('<option>');
+ var id2 = 'SECURE';
+ var description2 = 'SECURE';
+
+ $option2.attr('value', id2);
+ $option2.html(description2);
+ $option2.appendTo($bootmode);
+
+ }
+
+ if(bootType.toLowerCase() == 'bios' ){
+ $bootmode.html('');
+
+ var $option = $('<option>');
+ var id = 'LEGACY';
+ var description = 'LEGACY';
+
+ $option.attr('value', id);
+ $option.html(description);
+ $option.appendTo($bootmode);
+ }
+
+ }
+
+ var $uefiselect = $step.find('select[name=customboot]');
+ $uefiselect.unbind('change');
+ $uefiselect.change(function(){
+ uefi($uefiselect.val());
+ });
+
});
}
};
@@ -1516,14 +1560,29 @@
if (advSGFilter == 0) { //when total number of selected sg networks is 0, then 'Select Security Group' is skipped, go to step 6 directly
showStep(6);
- } else { //when total number of selected sg networks > 0
+ } else if (advSGFilter > 0) { //when total number of selected sg networks > 0
if ($activeStep.find('input[type=checkbox]:checked').length > 1) { //when total number of selected networks > 1
cloudStack.dialog.notice({
message: "Can't create a vm with multiple networks one of which is Security Group enabled"
});
return false;
}
+ } else if (advSGFilter == -1) { // vm with multiple IPs is supported in KVM
+ var $selectNetwork = $activeStep.find('input[type=checkbox]:checked');
+ var myNetworkIps = [];
+ $selectNetwork.each(function() {
+ var $specifyIp = $(this).parent().find('.specify-ip input[type=text]');
+ myNetworkIps.push($specifyIp.val() == -1 ? null : $specifyIp.val());
+ });
+ $activeStep.closest('form').data('my-network-ips', myNetworkIps);
+ $selectNetwork.each(function() {
+ if ($(this).parent().find('input[type=radio]').is(':checked')) {
+ $activeStep.closest('form').data('defaultNetwork', $(this).val());
+ return;
+ }
+ })
}
+
}
}
diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js
index 48e4bcc..7449a61 100644
--- a/ui/scripts/ui/widgets/listView.js
+++ b/ui/scripts/ui/widgets/listView.js
@@ -168,8 +168,11 @@
} else {
if (needsRefresh) {
var $loading = $('<div>').addClass('loading-overlay');
-
- $listView.prepend($loading);
+ if ($listView) {
+ $listView.prepend($loading);
+ } else {
+ $instanceRow.closest('.list-view').prepend($loading)
+ }
}
var actionArgs = {
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index f7fb478..c340c18 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -2055,6 +2055,10 @@
},
docID: 'helpVPCGatewayVLAN'
},
+ bypassVlanOverlapCheck: {
+ label: 'label.bypass.vlan.overlap.check',
+ isBoolean: true
+ },
ipaddress: {
label: 'label.ip.address',
validation: {
@@ -2124,6 +2128,9 @@
} else
array1.push("&sourcenatsupported=false");
+ if (args.$form.find('.form-item[rel=bypassVlanOverlapCheck]').css("display") != "none") {
+ array1.push("&bypassVlanOverlapCheck=" + encodeURIComponent((args.data.bypassVlanOverlapCheck == "on")));
+ }
$.ajax({
url: createURL('createPrivateGateway' + array1.join("")),
@@ -2233,6 +2240,10 @@
},
docID: 'helpVPCGatewayVLAN'
},
+ bypassVlanOverlapCheck: {
+ label: 'label.bypass.vlan.overlap.check',
+ isBoolean: true
+ },
ipaddress: {
label: 'label.ip.address',
validation: {
@@ -2307,6 +2318,9 @@
} else
array1.push("&sourcenatsupported=false");
+ if (args.$form.find('.form-item[rel=bypassVlanOverlapCheck]').css("display") != "none") {
+ array1.push("&bypassVlanOverlapCheck=" + encodeURIComponent((args.data.bypassVlanOverlapCheck == "on")));
+ }
$.ajax({
url: createURL('createPrivateGateway' + array1.join("")),
diff --git a/usage/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in b/usage/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in
deleted file mode 100755
index cd12a1c..0000000
--- a/usage/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/bin/bash
-
-### BEGIN INIT INFO
-# Provides: cloudstack-usage
-# Required-Start: $network $local_fs
-# Required-Stop: $network $local_fs
-# Default-Start: 3 4 5
-# Default-Stop: 0 1 2 6
-# Short-Description: Start/stop Apache CloudStack Usage Monitor
-# Description: This scripts Starts/Stops the Apache CloudStack Usage Monitor
-## The CloudStack Usage Monitor is a part of the Apache CloudStack project and is used
-## for storing usage statistics from instances.
-## JSVC (Java daemonizing) is used for starting and stopping the usage monitor.
-### END INIT INFO
-
-# 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.
-
-. /etc/rc.d/init.d/functions
-
-SHORTNAME="cloud-usage"
-PIDFILE=@PIDDIR@/"$SHORTNAME".pid
-LOCKFILE=@LOCKDIR@/"$SHORTNAME"
-LOGFILE=@USAGELOG@
-PROGNAME="CloudStack Usage Monitor"
-CLASS="com.cloud.usage.UsageServer"
-PROG="jsvc"
-DAEMON="/usr/bin/jsvc"
-USER=@MSUSER@
-
-unset OPTIONS
-[ -r @SYSCONFDIR@/default/"$SHORTNAME" ] && source @SYSCONFDIR@/default/"$SHORTNAME"
-
-# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun /usr/lib/jvm/jre-1.6.0 /usr/lib/j2sdk1.5-sun /usr/lib/jre-openjdk"
-
-for jdir in $JDK_DIRS; do
- if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
- JAVA_HOME="$jdir"
- fi
-done
-export JAVA_HOME
-
-SCP="@SYSTEMCLASSPATH@"
-DCP="@DEPSCLASSPATH@"
-UCP="@USAGECLASSPATH@"
-JCP="/usr/share/java/commons-daemon.jar"
-
-# We need to append the JSVC daemon JAR to the classpath
-# AgentShell implements the JSVC daemon methods
-export CLASSPATH="$SCP:$DCP:$UCP:$JCP:@USAGESYSCONFDIR@"
-
-start() {
- if [ -s "$PIDFILE" ] && kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
- echo "$PROGNAME apparently already running"
- exit 0
- fi
-
- if hostname --fqdn >/dev/null 2>&1 ; then
- true
- else
- echo "The host name does not resolve properly to an IP address. Cannot start $PROGNAME"
- exit 1
- fi
-
- echo -n "Starting $PROGNAME" "$SHORTNAME"
-
- if daemon --pidfile $PIDFILE $DAEMON -cp "$CLASSPATH" -pidfile "$PIDFILE" -user "$USER" -errfile SYSLOG -Dpid=$$ $CLASS
- RETVAL=$?
- then
- rc=0
- sleep 1
- if ! kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
- failure
- rc=1
- fi
- else
- rc=1
- fi
-
- if [ $rc -eq 0 ]; then
- success
- else
- failure
- rm -f "$PIDFILE"
- fi
- echo
-}
-
-stop() {
- echo -n "Stopping $PROGNAME" "$SHORTNAME"
- killproc -p $PIDFILE $DAEMON
- if [ "$?" -eq 0 ]; then
- success
- else
- failure
- fi
- rm -f "$PIDFILE"
- echo
-}
-
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- status)
- status -p $PIDFILE $SHORTNAME
- RETVAL=$?
- ;;
- restart | force-reload)
- stop
- sleep 3
- start
- ;;
- *)
- echo "Usage: $0 {start|stop|restart|force-reload|status}"
- RETVAL=3
-esac
-
-exit $RETVAL
-
diff --git a/usage/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in b/usage/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in
deleted file mode 100755
index cd12a1c..0000000
--- a/usage/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/bin/bash
-
-### BEGIN INIT INFO
-# Provides: cloudstack-usage
-# Required-Start: $network $local_fs
-# Required-Stop: $network $local_fs
-# Default-Start: 3 4 5
-# Default-Stop: 0 1 2 6
-# Short-Description: Start/stop Apache CloudStack Usage Monitor
-# Description: This scripts Starts/Stops the Apache CloudStack Usage Monitor
-## The CloudStack Usage Monitor is a part of the Apache CloudStack project and is used
-## for storing usage statistics from instances.
-## JSVC (Java daemonizing) is used for starting and stopping the usage monitor.
-### END INIT INFO
-
-# 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.
-
-. /etc/rc.d/init.d/functions
-
-SHORTNAME="cloud-usage"
-PIDFILE=@PIDDIR@/"$SHORTNAME".pid
-LOCKFILE=@LOCKDIR@/"$SHORTNAME"
-LOGFILE=@USAGELOG@
-PROGNAME="CloudStack Usage Monitor"
-CLASS="com.cloud.usage.UsageServer"
-PROG="jsvc"
-DAEMON="/usr/bin/jsvc"
-USER=@MSUSER@
-
-unset OPTIONS
-[ -r @SYSCONFDIR@/default/"$SHORTNAME" ] && source @SYSCONFDIR@/default/"$SHORTNAME"
-
-# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun /usr/lib/jvm/jre-1.6.0 /usr/lib/j2sdk1.5-sun /usr/lib/jre-openjdk"
-
-for jdir in $JDK_DIRS; do
- if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
- JAVA_HOME="$jdir"
- fi
-done
-export JAVA_HOME
-
-SCP="@SYSTEMCLASSPATH@"
-DCP="@DEPSCLASSPATH@"
-UCP="@USAGECLASSPATH@"
-JCP="/usr/share/java/commons-daemon.jar"
-
-# We need to append the JSVC daemon JAR to the classpath
-# AgentShell implements the JSVC daemon methods
-export CLASSPATH="$SCP:$DCP:$UCP:$JCP:@USAGESYSCONFDIR@"
-
-start() {
- if [ -s "$PIDFILE" ] && kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
- echo "$PROGNAME apparently already running"
- exit 0
- fi
-
- if hostname --fqdn >/dev/null 2>&1 ; then
- true
- else
- echo "The host name does not resolve properly to an IP address. Cannot start $PROGNAME"
- exit 1
- fi
-
- echo -n "Starting $PROGNAME" "$SHORTNAME"
-
- if daemon --pidfile $PIDFILE $DAEMON -cp "$CLASSPATH" -pidfile "$PIDFILE" -user "$USER" -errfile SYSLOG -Dpid=$$ $CLASS
- RETVAL=$?
- then
- rc=0
- sleep 1
- if ! kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
- failure
- rc=1
- fi
- else
- rc=1
- fi
-
- if [ $rc -eq 0 ]; then
- success
- else
- failure
- rm -f "$PIDFILE"
- fi
- echo
-}
-
-stop() {
- echo -n "Stopping $PROGNAME" "$SHORTNAME"
- killproc -p $PIDFILE $DAEMON
- if [ "$?" -eq 0 ]; then
- success
- else
- failure
- fi
- rm -f "$PIDFILE"
- echo
-}
-
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- status)
- status -p $PIDFILE $SHORTNAME
- RETVAL=$?
- ;;
- restart | force-reload)
- stop
- sleep 3
- start
- ;;
- *)
- echo "Usage: $0 {start|stop|restart|force-reload|status}"
- RETVAL=3
-esac
-
-exit $RETVAL
-
diff --git a/usage/distro/opensuse/SYSCONFDIR/init.d/cloud-usage.in b/usage/distro/opensuse/SYSCONFDIR/init.d/cloud-usage.in
deleted file mode 100755
index 985e2fe..0000000
--- a/usage/distro/opensuse/SYSCONFDIR/init.d/cloud-usage.in
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/bin/bash
-
-### BEGIN INIT INFO
-# Provides: cloudstack-usage
-# Required-Start: $network $local_fs
-# Required-Stop: $network $local_fs
-# Default-Start: 3 4 5
-# Default-Stop: 0 1 2 6
-# Short-Description: Start/stop Apache CloudStack Usage Monitor
-# Description: This scripts Starts/Stops the Apache CloudStack Usage Monitor
-## The CloudStack Usage Monitor is a part of the Apache CloudStack project and is used
-## for storing usage statistics from instances.
-## JSVC (Java daemonizing) is used for starting and stopping the usage monitor.
-### END INIT INFO
-
-# 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.
-
-. /lib/lsb/init-functions
-
-SHORTNAME="cloud-usage"
-PIDFILE=@PIDDIR@/"$SHORTNAME".pid
-LOCKFILE=@LOCKDIR@/"$SHORTNAME"
-LOGFILE=@USAGELOG@
-PROGNAME="CloudStack Usage Monitor"
-CLASS="com.cloud.usage.UsageServer"
-PROG="jsvc"
-DAEMON="/usr/bin/jsvc"
-USER=@MSUSER@
-
-unset OPTIONS
-[ -r @SYSCONFDIR@/default/"$SHORTNAME" ] && source @SYSCONFDIR@/default/"$SHORTNAME"
-
-# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun /usr/lib/jvm/jre-1.6.0 /usr/lib/j2sdk1.5-sun /usr/lib/jre-openjdk"
-
-for jdir in $JDK_DIRS; do
- if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
- JAVA_HOME="$jdir"
- fi
-done
-export JAVA_HOME
-
-SCP="@SYSTEMCLASSPATH@"
-DCP="@DEPSCLASSPATH@"
-UCP="@USAGECLASSPATH@"
-JCP="/usr/share/java/commons-daemon.jar"
-
-# We need to append the JSVC daemon JAR to the classpath
-# AgentShell implements the JSVC daemon methods
-export CLASSPATH="$SCP:$DCP:$UCP:$JCP:@USAGESYSCONFDIR@"
-
-start() {
- if [ -s "$PIDFILE" ] && kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
- log_daemon_msg "$PROGNAME apparently already running"
- log_end_msg 0
- exit 0
- fi
-
- log_daemon_msg "Starting $PROGNAME" "$SHORTNAME"
- if hostname --fqdn >/dev/null 2>&1 ; then
- true
- else
- log_failure_msg "The host name does not resolve properly to an IP address. Cannot start $PROGNAME"
- log_end_msg 1
- exit 1
- fi
-
- if start_daemon -p $PIDFILE $DAEMON -cp "$CLASSPATH" -pidfile "$PIDFILE" -user "$USER" -outfile SYSLOG -errfile SYSLOG -Dpid=$$ $CLASS
- RETVAL=$?
- then
- rc=0
- sleep 1
- if ! kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
- log_failure_msg "$PROG failed to start"
- rc=1
- fi
- else
- rc=1
- fi
-
- if [ $rc -eq 0 ]; then
- log_end_msg 0
- else
- log_end_msg 1
- rm -f "$PIDFILE"
- fi
-}
-
-stop() {
- log_daemon_msg "Stopping $PROGNAME" "$SHORTNAME"
- killproc -p $PIDFILE $DAEMON
- log_end_msg $?
- rm -f "$PIDFILE"
-}
-
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- status)
- status_of_proc -p "$PIDFILE" "$PROG" "$SHORTNAME"
- RETVAL=$?
- ;;
- restart | force-reload)
- stop
- sleep 3
- start
- ;;
- *)
- echo "Usage: $0 {start|stop|restart|force-reload|status}"
- RETVAL=3
-esac
-
-exit $RETVAL
-
diff --git a/usage/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in b/usage/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in
deleted file mode 100644
index cd12a1c..0000000
--- a/usage/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/bin/bash
-
-### BEGIN INIT INFO
-# Provides: cloudstack-usage
-# Required-Start: $network $local_fs
-# Required-Stop: $network $local_fs
-# Default-Start: 3 4 5
-# Default-Stop: 0 1 2 6
-# Short-Description: Start/stop Apache CloudStack Usage Monitor
-# Description: This scripts Starts/Stops the Apache CloudStack Usage Monitor
-## The CloudStack Usage Monitor is a part of the Apache CloudStack project and is used
-## for storing usage statistics from instances.
-## JSVC (Java daemonizing) is used for starting and stopping the usage monitor.
-### END INIT INFO
-
-# 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.
-
-. /etc/rc.d/init.d/functions
-
-SHORTNAME="cloud-usage"
-PIDFILE=@PIDDIR@/"$SHORTNAME".pid
-LOCKFILE=@LOCKDIR@/"$SHORTNAME"
-LOGFILE=@USAGELOG@
-PROGNAME="CloudStack Usage Monitor"
-CLASS="com.cloud.usage.UsageServer"
-PROG="jsvc"
-DAEMON="/usr/bin/jsvc"
-USER=@MSUSER@
-
-unset OPTIONS
-[ -r @SYSCONFDIR@/default/"$SHORTNAME" ] && source @SYSCONFDIR@/default/"$SHORTNAME"
-
-# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun /usr/lib/jvm/jre-1.6.0 /usr/lib/j2sdk1.5-sun /usr/lib/jre-openjdk"
-
-for jdir in $JDK_DIRS; do
- if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
- JAVA_HOME="$jdir"
- fi
-done
-export JAVA_HOME
-
-SCP="@SYSTEMCLASSPATH@"
-DCP="@DEPSCLASSPATH@"
-UCP="@USAGECLASSPATH@"
-JCP="/usr/share/java/commons-daemon.jar"
-
-# We need to append the JSVC daemon JAR to the classpath
-# AgentShell implements the JSVC daemon methods
-export CLASSPATH="$SCP:$DCP:$UCP:$JCP:@USAGESYSCONFDIR@"
-
-start() {
- if [ -s "$PIDFILE" ] && kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
- echo "$PROGNAME apparently already running"
- exit 0
- fi
-
- if hostname --fqdn >/dev/null 2>&1 ; then
- true
- else
- echo "The host name does not resolve properly to an IP address. Cannot start $PROGNAME"
- exit 1
- fi
-
- echo -n "Starting $PROGNAME" "$SHORTNAME"
-
- if daemon --pidfile $PIDFILE $DAEMON -cp "$CLASSPATH" -pidfile "$PIDFILE" -user "$USER" -errfile SYSLOG -Dpid=$$ $CLASS
- RETVAL=$?
- then
- rc=0
- sleep 1
- if ! kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
- failure
- rc=1
- fi
- else
- rc=1
- fi
-
- if [ $rc -eq 0 ]; then
- success
- else
- failure
- rm -f "$PIDFILE"
- fi
- echo
-}
-
-stop() {
- echo -n "Stopping $PROGNAME" "$SHORTNAME"
- killproc -p $PIDFILE $DAEMON
- if [ "$?" -eq 0 ]; then
- success
- else
- failure
- fi
- rm -f "$PIDFILE"
- echo
-}
-
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- status)
- status -p $PIDFILE $SHORTNAME
- RETVAL=$?
- ;;
- restart | force-reload)
- stop
- sleep 3
- start
- ;;
- *)
- echo "Usage: $0 {start|stop|restart|force-reload|status}"
- RETVAL=3
-esac
-
-exit $RETVAL
-
diff --git a/usage/distro/sles/SYSCONFDIR/init.d/cloud-usage.in b/usage/distro/sles/SYSCONFDIR/init.d/cloud-usage.in
deleted file mode 100755
index 985e2fe..0000000
--- a/usage/distro/sles/SYSCONFDIR/init.d/cloud-usage.in
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/bin/bash
-
-### BEGIN INIT INFO
-# Provides: cloudstack-usage
-# Required-Start: $network $local_fs
-# Required-Stop: $network $local_fs
-# Default-Start: 3 4 5
-# Default-Stop: 0 1 2 6
-# Short-Description: Start/stop Apache CloudStack Usage Monitor
-# Description: This scripts Starts/Stops the Apache CloudStack Usage Monitor
-## The CloudStack Usage Monitor is a part of the Apache CloudStack project and is used
-## for storing usage statistics from instances.
-## JSVC (Java daemonizing) is used for starting and stopping the usage monitor.
-### END INIT INFO
-
-# 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.
-
-. /lib/lsb/init-functions
-
-SHORTNAME="cloud-usage"
-PIDFILE=@PIDDIR@/"$SHORTNAME".pid
-LOCKFILE=@LOCKDIR@/"$SHORTNAME"
-LOGFILE=@USAGELOG@
-PROGNAME="CloudStack Usage Monitor"
-CLASS="com.cloud.usage.UsageServer"
-PROG="jsvc"
-DAEMON="/usr/bin/jsvc"
-USER=@MSUSER@
-
-unset OPTIONS
-[ -r @SYSCONFDIR@/default/"$SHORTNAME" ] && source @SYSCONFDIR@/default/"$SHORTNAME"
-
-# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun /usr/lib/jvm/jre-1.6.0 /usr/lib/j2sdk1.5-sun /usr/lib/jre-openjdk"
-
-for jdir in $JDK_DIRS; do
- if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
- JAVA_HOME="$jdir"
- fi
-done
-export JAVA_HOME
-
-SCP="@SYSTEMCLASSPATH@"
-DCP="@DEPSCLASSPATH@"
-UCP="@USAGECLASSPATH@"
-JCP="/usr/share/java/commons-daemon.jar"
-
-# We need to append the JSVC daemon JAR to the classpath
-# AgentShell implements the JSVC daemon methods
-export CLASSPATH="$SCP:$DCP:$UCP:$JCP:@USAGESYSCONFDIR@"
-
-start() {
- if [ -s "$PIDFILE" ] && kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
- log_daemon_msg "$PROGNAME apparently already running"
- log_end_msg 0
- exit 0
- fi
-
- log_daemon_msg "Starting $PROGNAME" "$SHORTNAME"
- if hostname --fqdn >/dev/null 2>&1 ; then
- true
- else
- log_failure_msg "The host name does not resolve properly to an IP address. Cannot start $PROGNAME"
- log_end_msg 1
- exit 1
- fi
-
- if start_daemon -p $PIDFILE $DAEMON -cp "$CLASSPATH" -pidfile "$PIDFILE" -user "$USER" -outfile SYSLOG -errfile SYSLOG -Dpid=$$ $CLASS
- RETVAL=$?
- then
- rc=0
- sleep 1
- if ! kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
- log_failure_msg "$PROG failed to start"
- rc=1
- fi
- else
- rc=1
- fi
-
- if [ $rc -eq 0 ]; then
- log_end_msg 0
- else
- log_end_msg 1
- rm -f "$PIDFILE"
- fi
-}
-
-stop() {
- log_daemon_msg "Stopping $PROGNAME" "$SHORTNAME"
- killproc -p $PIDFILE $DAEMON
- log_end_msg $?
- rm -f "$PIDFILE"
-}
-
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- status)
- status_of_proc -p "$PIDFILE" "$PROG" "$SHORTNAME"
- RETVAL=$?
- ;;
- restart | force-reload)
- stop
- sleep 3
- start
- ;;
- *)
- echo "Usage: $0 {start|stop|restart|force-reload|status}"
- RETVAL=3
-esac
-
-exit $RETVAL
-
diff --git a/usage/distro/ubuntu/SYSCONFDIR/init.d/cloud-usage.in b/usage/distro/ubuntu/SYSCONFDIR/init.d/cloud-usage.in
deleted file mode 100755
index 985e2fe..0000000
--- a/usage/distro/ubuntu/SYSCONFDIR/init.d/cloud-usage.in
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/bin/bash
-
-### BEGIN INIT INFO
-# Provides: cloudstack-usage
-# Required-Start: $network $local_fs
-# Required-Stop: $network $local_fs
-# Default-Start: 3 4 5
-# Default-Stop: 0 1 2 6
-# Short-Description: Start/stop Apache CloudStack Usage Monitor
-# Description: This scripts Starts/Stops the Apache CloudStack Usage Monitor
-## The CloudStack Usage Monitor is a part of the Apache CloudStack project and is used
-## for storing usage statistics from instances.
-## JSVC (Java daemonizing) is used for starting and stopping the usage monitor.
-### END INIT INFO
-
-# 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.
-
-. /lib/lsb/init-functions
-
-SHORTNAME="cloud-usage"
-PIDFILE=@PIDDIR@/"$SHORTNAME".pid
-LOCKFILE=@LOCKDIR@/"$SHORTNAME"
-LOGFILE=@USAGELOG@
-PROGNAME="CloudStack Usage Monitor"
-CLASS="com.cloud.usage.UsageServer"
-PROG="jsvc"
-DAEMON="/usr/bin/jsvc"
-USER=@MSUSER@
-
-unset OPTIONS
-[ -r @SYSCONFDIR@/default/"$SHORTNAME" ] && source @SYSCONFDIR@/default/"$SHORTNAME"
-
-# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun /usr/lib/jvm/jre-1.6.0 /usr/lib/j2sdk1.5-sun /usr/lib/jre-openjdk"
-
-for jdir in $JDK_DIRS; do
- if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
- JAVA_HOME="$jdir"
- fi
-done
-export JAVA_HOME
-
-SCP="@SYSTEMCLASSPATH@"
-DCP="@DEPSCLASSPATH@"
-UCP="@USAGECLASSPATH@"
-JCP="/usr/share/java/commons-daemon.jar"
-
-# We need to append the JSVC daemon JAR to the classpath
-# AgentShell implements the JSVC daemon methods
-export CLASSPATH="$SCP:$DCP:$UCP:$JCP:@USAGESYSCONFDIR@"
-
-start() {
- if [ -s "$PIDFILE" ] && kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
- log_daemon_msg "$PROGNAME apparently already running"
- log_end_msg 0
- exit 0
- fi
-
- log_daemon_msg "Starting $PROGNAME" "$SHORTNAME"
- if hostname --fqdn >/dev/null 2>&1 ; then
- true
- else
- log_failure_msg "The host name does not resolve properly to an IP address. Cannot start $PROGNAME"
- log_end_msg 1
- exit 1
- fi
-
- if start_daemon -p $PIDFILE $DAEMON -cp "$CLASSPATH" -pidfile "$PIDFILE" -user "$USER" -outfile SYSLOG -errfile SYSLOG -Dpid=$$ $CLASS
- RETVAL=$?
- then
- rc=0
- sleep 1
- if ! kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
- log_failure_msg "$PROG failed to start"
- rc=1
- fi
- else
- rc=1
- fi
-
- if [ $rc -eq 0 ]; then
- log_end_msg 0
- else
- log_end_msg 1
- rm -f "$PIDFILE"
- fi
-}
-
-stop() {
- log_daemon_msg "Stopping $PROGNAME" "$SHORTNAME"
- killproc -p $PIDFILE $DAEMON
- log_end_msg $?
- rm -f "$PIDFILE"
-}
-
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- status)
- status_of_proc -p "$PIDFILE" "$PROG" "$SHORTNAME"
- RETVAL=$?
- ;;
- restart | force-reload)
- stop
- sleep 3
- start
- ;;
- *)
- echo "Usage: $0 {start|stop|restart|force-reload|status}"
- RETVAL=3
-esac
-
-exit $RETVAL
-
diff --git a/usage/pom.xml b/usage/pom.xml
index 3ff1b11..cb82a8b 100644
--- a/usage/pom.xml
+++ b/usage/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -50,6 +50,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-framework-db</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-daemon</groupId>
<artifactId>commons-daemon</artifactId>
</dependency>
diff --git a/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java b/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java
index 1abe5f7..98b94e4 100644
--- a/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java
+++ b/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java
@@ -57,6 +57,7 @@
import com.cloud.usage.dao.UsageNetworkOfferingDao;
import com.cloud.usage.dao.UsagePortForwardingRuleDao;
import com.cloud.usage.dao.UsageSecurityGroupDao;
+import com.cloud.usage.dao.UsageBackupDao;
import com.cloud.usage.dao.UsageVMSnapshotOnPrimaryDao;
import com.cloud.usage.dao.UsageStorageDao;
import com.cloud.usage.dao.UsageVMInstanceDao;
@@ -71,12 +72,13 @@
import com.cloud.usage.parser.PortForwardingUsageParser;
import com.cloud.usage.parser.SecurityGroupUsageParser;
import com.cloud.usage.parser.StorageUsageParser;
+import com.cloud.usage.parser.BackupUsageParser;
import com.cloud.usage.parser.VMInstanceUsageParser;
+import com.cloud.usage.parser.VMSanpshotOnPrimaryParser;
import com.cloud.usage.parser.VMSnapshotUsageParser;
import com.cloud.usage.parser.VPNUserUsageParser;
import com.cloud.usage.parser.VmDiskUsageParser;
import com.cloud.usage.parser.VolumeUsageParser;
-import com.cloud.usage.parser.VMSanpshotOnPrimaryParser;
import com.cloud.user.Account;
import com.cloud.user.AccountVO;
import com.cloud.user.UserStatisticsVO;
@@ -150,6 +152,8 @@
@Inject
private UsageVMSnapshotOnPrimaryDao _usageSnapshotOnPrimaryDao;
@Inject
+ private UsageBackupDao usageBackupDao;
+ @Inject
private QuotaManager _quotaManager;
@Inject
private QuotaAlertManager _alertManager;
@@ -956,6 +960,12 @@
s_logger.debug("VM Snapshot on primary usage successfully parsed? " + parsed + " (for account: " + account.getAccountName() + ", id: " + account.getId() + ")");
}
}
+ parsed = BackupUsageParser.parse(account, currentStartDate, currentEndDate);
+ if (s_logger.isDebugEnabled()) {
+ if (!parsed) {
+ s_logger.debug("VM Backup usage successfully parsed? " + parsed + " (for account: " + account.getAccountName() + ", id: " + account.getId() + ")");
+ }
+ }
return parsed;
}
@@ -987,6 +997,8 @@
createVMSnapshotEvent(event);
} else if (isVmSnapshotOnPrimaryEvent(eventType)) {
createVmSnapshotOnPrimaryEvent(event);
+ } else if (isBackupEvent(eventType)) {
+ createBackupEvent(event);
}
}
@@ -1068,6 +1080,13 @@
return (eventType.equals(EventTypes.EVENT_VM_SNAPSHOT_ON_PRIMARY) || eventType.equals(EventTypes.EVENT_VM_SNAPSHOT_OFF_PRIMARY));
}
+ private boolean isBackupEvent(String eventType) {
+ return eventType != null && (
+ eventType.equals(EventTypes.EVENT_VM_BACKUP_OFFERING_ASSIGN) ||
+ eventType.equals(EventTypes.EVENT_VM_BACKUP_OFFERING_REMOVE) ||
+ eventType.equals(EventTypes.EVENT_VM_BACKUP_USAGE_METRIC));
+ }
+
private void createVMHelperEvent(UsageEventVO event) {
// One record for handling VM.START and VM.STOP
@@ -1884,6 +1903,25 @@
}
}
+ private void createBackupEvent(final UsageEventVO event) {
+ Long vmId = event.getResourceId();
+ Long zoneId = event.getZoneId();
+ Long accountId = event.getAccountId();
+ Long backupOfferingId = event.getOfferingId();
+ Account account = _accountDao.findByIdIncludingRemoved(event.getAccountId());
+ Long domainId = account.getDomainId();
+ Date created = event.getCreateDate();
+
+ if (EventTypes.EVENT_VM_BACKUP_OFFERING_ASSIGN.equals(event.getType())) {
+ final UsageBackupVO backupVO = new UsageBackupVO(zoneId, accountId, domainId, vmId, backupOfferingId, created);
+ usageBackupDao.persist(backupVO);
+ } else if (EventTypes.EVENT_VM_BACKUP_OFFERING_REMOVE.equals(event.getType())) {
+ usageBackupDao.removeUsage(accountId, vmId, event.getCreateDate());
+ } else if (EventTypes.EVENT_VM_BACKUP_USAGE_METRIC.equals(event.getType())) {
+ usageBackupDao.updateMetrics(vmId, event.getSize(), event.getVirtualSize());
+ }
+ }
+
private class Heartbeat extends ManagedContextRunnable {
@Override
protected void runInContext() {
diff --git a/usage/src/main/java/com/cloud/usage/parser/BackupUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/BackupUsageParser.java
new file mode 100644
index 0000000..bacf706
--- /dev/null
+++ b/usage/src/main/java/com/cloud/usage/parser/BackupUsageParser.java
@@ -0,0 +1,132 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.usage.parser;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+
+import org.apache.cloudstack.backup.Backup;
+import org.apache.cloudstack.usage.UsageTypes;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
+import com.cloud.usage.UsageBackupVO;
+import com.cloud.usage.UsageVO;
+import com.cloud.usage.dao.UsageDao;
+import com.cloud.usage.dao.UsageBackupDao;
+import com.cloud.user.AccountVO;
+
+@Component
+public class BackupUsageParser {
+ public static final Logger LOGGER = Logger.getLogger(BackupUsageParser.class);
+
+ private static UsageDao s_usageDao;
+ private static UsageBackupDao s_usageBackupDao;
+
+ @Inject
+ private UsageDao usageDao;
+ @Inject
+ private UsageBackupDao usageBackupDao;
+
+ @PostConstruct
+ void init() {
+ s_usageDao = usageDao;
+ s_usageBackupDao = usageBackupDao;
+ }
+
+ public static boolean parse(AccountVO account, Date startDate, Date endDate) {
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Parsing all VM Backup usage events for account: " + account.getId());
+ }
+ if ((endDate == null) || endDate.after(new Date())) {
+ endDate = new Date();
+ }
+
+ final List<UsageBackupVO> usageBackups = s_usageBackupDao.getUsageRecords(account.getId(), startDate, endDate);
+ if (usageBackups == null || usageBackups.isEmpty()) {
+ LOGGER.debug("No VM Backup usage for this period");
+ return true;
+ }
+
+ final Map<Long, BackupInfo> vmUsageMap = new HashMap<>();
+ for (final UsageBackupVO usageBackup : usageBackups) {
+ final Long vmId = usageBackup.getVmId();
+ final Long zoneId = usageBackup.getZoneId();
+ final Long offeringId = usageBackup.getBackupOfferingId();
+ if (vmUsageMap.get(vmId) == null) {
+ vmUsageMap.put(vmId, new BackupUsageParser.BackupInfo(new Backup.Metric(0L, 0L), zoneId, vmId, offeringId));
+ }
+ final Backup.Metric metric = vmUsageMap.get(vmId).getMetric();
+ metric.setBackupSize(metric.getBackupSize() + usageBackup.getSize());
+ metric.setDataSize(metric.getDataSize() + usageBackup.getProtectedSize());
+ }
+
+ for (final BackupInfo backupInfo : vmUsageMap.values()) {
+ final Long vmId = backupInfo.getVmId();
+ final Long zoneId = backupInfo.getZoneId();
+ final Long offeringId = backupInfo.getOfferingId();
+ final Double rawUsage = (double) backupInfo.getMetric().getBackupSize();
+ final Double sizeGib = rawUsage / (1024.0 * 1024.0 * 1024.0);
+ final String description = String.format("Backup usage VM ID: %d", vmId);
+ final String usageDisplay = String.format("%.4f GiB", sizeGib);
+
+ final UsageVO usageRecord =
+ new UsageVO(zoneId, account.getAccountId(), account.getDomainId(), description, usageDisplay,
+ UsageTypes.BACKUP, rawUsage, vmId, null, offeringId, null, vmId,
+ backupInfo.getMetric().getBackupSize(), backupInfo.getMetric().getDataSize(), startDate, endDate);
+ s_usageDao.persist(usageRecord);
+ }
+
+ return true;
+ }
+
+ static class BackupInfo {
+ Backup.Metric metric;
+ Long zoneId;
+ Long vmId;
+ Long offeringId;
+
+ public BackupInfo(Backup.Metric metric, Long zoneId, Long vmId, Long offeringId) {
+ this.metric = metric;
+ this.zoneId = zoneId;
+ this.vmId = vmId;
+ this.offeringId = offeringId;
+ }
+
+ public Backup.Metric getMetric() {
+ return metric;
+ }
+
+ public Long getZoneId() {
+ return zoneId;
+ }
+
+ public Long getVmId() {
+ return vmId;
+ }
+
+ public Long getOfferingId() {
+ return offeringId;
+ }
+ }
+}
\ No newline at end of file
diff --git a/usage/src/test/resources/cloud1.xml b/usage/src/test/resources/cloud1.xml
index 2b139fd..773283a 100644
--- a/usage/src/test/resources/cloud1.xml
+++ b/usage/src/test/resources/cloud1.xml
@@ -9,16 +9,20 @@
governing permissions and limitations under the License. -->
<!-- cloud -->
<dataset>
-<configuration name="usage.stats.job.aggregation.range" value="600"/>
+ <configuration name="usage.stats.job.aggregation.range" value="600" instance="test"/>
-<vm_instance type="User" id="8" removed="0" />
+ <vm_instance type="User" id="8" account_id="1" domain_id="1" name="test" instance_name="test" state="destoyed" guest_os_id="1" service_offering_id="1" data_center_id="1" vnc_password="xyz" vm_type="User" created="2019-01-01 00:00:01" removed="2018-01-01 00:00:01" />
-<volumes id="16" removed="0"/>
-<volumes id="17" removed="0"/>
+ <volumes id="16" account_id="1" domain_id="1" size="1" data_center_id="1" volume_type="root" disk_offering_id="1" removed="2018-01-01 00:00:01"/>
+ <volumes id="17" account_id="1" domain_id="1" size="1" data_center_id="1" volume_type="root" disk_offering_id="1" removed="2019-01-01 00:00:01"/>
-<template_zone_ref template_id="14" zone_id="1" removed="0" />
-<template_zone_ref template_id="15" zone_id="1" removed="0" />
-<template_zone_ref template_id="16" zone_id="1" removed="0" />
+ <vm_template id="14" account_id="1" unique_name="test" name="test" public="1" featured="1" hvm="1" bits="64" guest_os_id="1" format="ova" created="2019-01-01 00:00:01"/>
+ <vm_template id="15" account_id="1" unique_name="test" name="test" public="1" featured="1" hvm="1" bits="64" guest_os_id="1" format="ova" created="2019-01-01 00:00:01"/>
+ <vm_template id="16" account_id="1" unique_name="test" name="test" public="1" featured="1" hvm="1" bits="64" guest_os_id="1" format="ova" created="2019-01-01 00:00:01"/>
-<snapshots id="18" removed="0" />
+ <template_zone_ref template_id="14" zone_id="1" created="2019-01-01 00:00:01" removed="2018-01-01 00:00:01" />
+ <template_zone_ref template_id="15" zone_id="1" created="2019-01-01 00:00:01" removed="2019-01-01 00:00:01" />
+ <template_zone_ref template_id="16" zone_id="1" created="2019-01-01 00:00:01" removed="2019-01-01 00:00:01" />
+
+ <snapshots id="18" account_id="1" domain_id="1" volume_id="1" disk_offering_id="1" name="test" snapshot_type="0" size="10" hypervisor_type="KVM" removed="2018-01-01 00:00:01" data_center_id="1"/>
</dataset>
diff --git a/usage/src/test/resources/cloud2.xml b/usage/src/test/resources/cloud2.xml
index 2b139fd..099dde5 100644
--- a/usage/src/test/resources/cloud2.xml
+++ b/usage/src/test/resources/cloud2.xml
@@ -9,16 +9,20 @@
governing permissions and limitations under the License. -->
<!-- cloud -->
<dataset>
-<configuration name="usage.stats.job.aggregation.range" value="600"/>
+<configuration name="usage.stats.job.aggregation.range" value="600" instance="test" />
-<vm_instance type="User" id="8" removed="0" />
+ <vm_instance type="User" id="8" account_id="1" domain_id="1" name="test" instance_name="test" state="destoyed" guest_os_id="1" service_offering_id="1" data_center_id="1" vnc_password="xyz" vm_type="User" created="2019-01-01 00:00:01" removed="2018-01-01 00:00:01" />
-<volumes id="16" removed="0"/>
-<volumes id="17" removed="0"/>
+ <volumes id="16" account_id="1" domain_id="1" size="1" data_center_id="1" volume_type="root" disk_offering_id="1" removed="2018-01-01 00:00:01"/>
+ <volumes id="17" account_id="1" domain_id="1" size="1" data_center_id="1" volume_type="root" disk_offering_id="1" removed="2018-01-01 00:00:01"/>
-<template_zone_ref template_id="14" zone_id="1" removed="0" />
-<template_zone_ref template_id="15" zone_id="1" removed="0" />
-<template_zone_ref template_id="16" zone_id="1" removed="0" />
+ <vm_template id="14" account_id="1" unique_name="test" name="test" public="1" featured="1" hvm="1" bits="64" guest_os_id="1" format="ova" created="2019-01-01 00:00:01"/>
+ <vm_template id="15" account_id="1" unique_name="test" name="test" public="1" featured="1" hvm="1" bits="64" guest_os_id="1" format="ova" created="2019-01-01 00:00:01"/>
+ <vm_template id="16" account_id="1" unique_name="test" name="test" public="1" featured="1" hvm="1" bits="64" guest_os_id="1" format="ova" created="2019-01-01 00:00:01"/>
-<snapshots id="18" removed="0" />
+ <template_zone_ref template_id="14" zone_id="1" created="2019-01-01 00:00:01" removed="2018-01-01 00:00:01" />
+ <template_zone_ref template_id="15" zone_id="1" created="2019-01-01 00:00:01" removed="2019-01-01 00:00:01" />
+ <template_zone_ref template_id="16" zone_id="1" created="2019-01-01 00:00:01" removed="2018-01-01 00:00:01" />
+
+ <snapshots id="18" account_id="1" domain_id="1" volume_id="1" disk_offering_id="1" name="test" snapshot_type="0" size="10" hypervisor_type="KVM" removed="2018-01-01 00:00:01" data_center_id="1" />
</dataset>
diff --git a/usage/src/test/resources/cloud3.xml b/usage/src/test/resources/cloud3.xml
index a4687ff..8308027 100644
--- a/usage/src/test/resources/cloud3.xml
+++ b/usage/src/test/resources/cloud3.xml
@@ -9,5 +9,6 @@
governing permissions and limitations under the License. -->
<!-- cloud -->
<dataset>
-<volumes id="17" removed="0"/>
+ <volumes id="17" account_id="1" domain_id="1" size="1" data_center_id="1" volume_type="root" disk_offering_id="1" removed="2019-01-01 00:00:01"/>
+ <configuration instance="test" name="test"/>
</dataset>
diff --git a/usage/src/test/resources/cloud_usage1.xml b/usage/src/test/resources/cloud_usage1.xml
index 20528bf..6219a06 100644
--- a/usage/src/test/resources/cloud_usage1.xml
+++ b/usage/src/test/resources/cloud_usage1.xml
@@ -9,18 +9,18 @@
governing permissions and limitations under the License. -->
<!-- cloud_usage -->
<dataset>
-<cloud_usage usage_type="1" raw_usage="11" usage_id="8" id="8" start_date="1" zone_id="1"/>
-<cloud_usage usage_type="1" raw_usage="13" usage_id="6" id="6" start_date="1" zone_id="1"/>
+<cloud_usage usage_type="1" account_id="1" domain_id="1" description="test" usage_display=" " raw_usage="11" usage_id="8" id="8" start_date="2019-01-01 00:00:01" end_date="2019-01-01 00:00:01" zone_id="1"/>
+<cloud_usage usage_type="1" account_id="1" domain_id="1" description="test" usage_display=" " raw_usage="13" usage_id="6" id="6" start_date="2019-01-01 00:00:01" end_date="2019-01-01 00:00:01" zone_id="1"/>
-<cloud_usage usage_type="6" usage_id="16" id="7" start_date="1" zone_id="1"/>
-<cloud_usage usage_type="8" usage_id="14" id="7" start_date="1" zone_id="1" />
+<cloud_usage usage_type="6" account_id="1" domain_id="1" description="test" usage_display=" " raw_usage="2" usage_id="16" id="7" start_date="2019-01-01 00:00:01" end_date="2019-01-01 00:00:01" zone_id="1"/>
+<cloud_usage usage_type="8" account_id="1" domain_id="1" description="test" usage_display=" " raw_usage="4" usage_id="14" id="9" start_date="2019-01-01 00:00:01" end_date="2019-01-01 00:00:01" zone_id="1" />
-<cloud_usage usage_type="9" usage_id="18" id="7" start_date="1" zone_id="1" />
+<cloud_usage usage_type="9" account_id="1" domain_id="1" description="test" usage_display=" " raw_usage="5" usage_id="18" id="10" start_date="2019-01-01 00:00:01" end_date="2019-01-01 00:00:01" zone_id="1" />
-<usage_volume id="2" />
-<usage_volume id="4" />
+<usage_volume id="2" zone_id="1" account_id="1" domain_id="1" created="2019-01-01 00:00:01"/>
+<usage_volume id="4" zone_id="1" account_id="1" domain_id="1" created="2019-01-01 00:00:01"/>
-<usage_vm_instance usage_type="1" vm_instance_id="1" />
-<usage_vm_instance usage_type="2" vm_instance_id="2" />
-<usage_vm_instance usage_type="2" vm_instance_id="2" />
+<usage_vm_instance usage_type="1" vm_instance_id="1" zone_id="1" account_id="1" vm_name="test" service_offering_id="1" template_id="1" start_date="2019-01-01 00:00:01"/>
+<usage_vm_instance usage_type="2" vm_instance_id="2" zone_id="1" account_id="1" vm_name="test" service_offering_id="1" template_id="1" start_date="2019-01-01 00:00:01"/>
+<usage_vm_instance usage_type="2" vm_instance_id="2" zone_id="1" account_id="1" vm_name="test" service_offering_id="1" template_id="1" start_date="2019-01-01 00:00:02"/>
</dataset>
diff --git a/usage/src/test/resources/cloud_usage2.xml b/usage/src/test/resources/cloud_usage2.xml
index 7cc3991..2dd3734 100644
--- a/usage/src/test/resources/cloud_usage2.xml
+++ b/usage/src/test/resources/cloud_usage2.xml
@@ -9,35 +9,37 @@
governing permissions and limitations under the License. -->
<!-- cloud_usage -->
<dataset>
-<cloud_usage usage_type="1" raw_usage="11" usage_id="8" id="8" start_date="1" zone_id="1"/>
-<cloud_usage usage_type="1" raw_usage="12" usage_id="7" id="7" start_date="1" zone_id="1"/>
-<cloud_usage usage_type="1" raw_usage="13" usage_id="6" id="6" start_date="1" zone_id="1"/>
+<cloud_usage usage_type="1" account_id="1" domain_id="1" description="test" usage_display=" " raw_usage="11" usage_id="8" id="8" start_date="2019-01-01 00:00:01" end_date="2019-01-01 00:00:01" zone_id="1"/>
+<cloud_usage usage_type="1" account_id="1" domain_id="1" description="test" usage_display=" " raw_usage="12" usage_id="7" id="7" start_date="2019-01-01 00:00:01" end_date="2019-01-01 00:00:01" zone_id="1"/>
+<cloud_usage usage_type="1" account_id="1" domain_id="1" description="test" usage_display=" " raw_usage="13" usage_id="6" id="6" start_date="2019-01-01 00:00:01" end_date="2019-01-01 00:00:01" zone_id="1"/>
-<cloud_usage usage_type="6" usage_id="16" id="7" start_date="1" zone_id="1"/>
-<cloud_usage usage_type="6" usage_id="16" id="7" start_date="1" zone_id="1" />
-<cloud_usage usage_type="8" usage_id="14" id="7" start_date="1" zone_id="1" />
-<cloud_usage usage_type="8" usage_id="14" id="7" start_date="1" zone_id="1" />
+<cloud_usage usage_type="6" account_id="1" domain_id="1" description="test" usage_display=" " raw_usage="1" usage_id="16" id="15" start_date="2019-01-01 00:00:01" end_date="2019-01-01 00:00:01" zone_id="1"/>
+<cloud_usage usage_type="6" account_id="1" domain_id="1" description="test" usage_display=" " raw_usage="1" usage_id="17" id="16" start_date="2019-01-01 00:00:01" end_date="2019-01-01 00:00:01" zone_id="1"/>
-<cloud_usage usage_type="9" usage_id="18" id="7" start_date="1" zone_id="1" />
+<cloud_usage usage_type="6" account_id="1" domain_id="1" description="test" usage_display=" " raw_usage="5" usage_id="14" id="9" start_date="2019-01-01 00:00:01" end_date="2019-01-01 00:00:01" zone_id="1" />
+<cloud_usage usage_type="8" account_id="1" domain_id="1" description="test" usage_display=" " raw_usage="6" usage_id="14" id="10" start_date="2019-01-01 00:00:01" end_date="2019-01-01 00:00:01" zone_id="1" />
+<cloud_usage usage_type="7" account_id="1" domain_id="1" description="test" usage_display=" " raw_usage="7" usage_id="16" id="11" start_date="2019-01-01 00:00:01" end_date="2019-01-01 00:00:01" zone_id="1" />
-<usage_volume id="2" />
-<usage_volume id="3" />
-<usage_volume id="4" />
-<usage_volume id="2" />
-<usage_volume id="3" />
-<usage_volume id="4" />
+<cloud_usage usage_type="9" account_id="1" domain_id="1" description="test" usage_display=" " raw_usage="8" usage_id="18" id="12" start_date="2019-01-01 00:00:01" end_date="2019-01-01 00:00:01" zone_id="1" />
-<usage_vm_instance usage_type="1" vm_instance_id="1" />
-<usage_vm_instance usage_type="1" vm_instance_id="1" />
-<usage_vm_instance usage_type="1" vm_instance_id="2" />
-<usage_vm_instance usage_type="1" vm_instance_id="2" />
-<usage_vm_instance usage_type="1" vm_instance_id="3" />
-<usage_vm_instance usage_type="1" vm_instance_id="3" />
-<usage_vm_instance usage_type="1" vm_instance_id="3" />
-<usage_vm_instance usage_type="1" vm_instance_id="3" />
+<usage_volume id="3" zone_id="1" account_id="1" domain_id="1" created="2019-01-01 00:00:01"/>
+<usage_volume id="3" zone_id="1" account_id="1" domain_id="1" created="2019-01-01 00:00:02"/>
+<usage_volume id="3" zone_id="1" account_id="1" domain_id="1" created="2019-01-01 00:00:03"/>
+<usage_volume id="3" zone_id="1" account_id="1" domain_id="1" created="2019-01-01 00:00:04"/>
+<usage_volume id="3" zone_id="1" account_id="1" domain_id="1" created="2019-01-01 00:00:05"/>
+<usage_volume id="3" zone_id="1" account_id="1" domain_id="1" created="2019-01-01 00:00:06"/>
-<usage_vm_instance usage_type="2" vm_instance_id="1" />
-<usage_vm_instance usage_type="2" vm_instance_id="1" />
-<usage_vm_instance usage_type="2" vm_instance_id="2" />
-<usage_vm_instance usage_type="2" vm_instance_id="2" />
+<usage_vm_instance usage_type="1" vm_instance_id="1" zone_id="1" account_id="1" vm_name="test" service_offering_id="1" template_id="1" start_date="2019-01-01 00:00:01"/>
+<usage_vm_instance usage_type="1" vm_instance_id="1" zone_id="1" account_id="1" vm_name="test" service_offering_id="1" template_id="1" start_date="2019-01-01 00:00:02"/>
+<usage_vm_instance usage_type="1" vm_instance_id="2" zone_id="1" account_id="1" vm_name="test" service_offering_id="1" template_id="1" start_date="2019-01-01 00:00:03"/>
+<usage_vm_instance usage_type="1" vm_instance_id="2" zone_id="1" account_id="1" vm_name="test" service_offering_id="1" template_id="1" start_date="2019-01-01 00:00:04"/>
+<usage_vm_instance usage_type="1" vm_instance_id="3" zone_id="1" account_id="1" vm_name="test" service_offering_id="1" template_id="1" start_date="2019-01-01 00:00:05"/>
+<usage_vm_instance usage_type="1" vm_instance_id="3" zone_id="1" account_id="1" vm_name="test" service_offering_id="1" template_id="1" start_date="2019-01-01 00:00:06"/>
+<usage_vm_instance usage_type="1" vm_instance_id="3" zone_id="1" account_id="1" vm_name="test" service_offering_id="1" template_id="1" start_date="2019-01-01 00:00:07"/>
+<usage_vm_instance usage_type="1" vm_instance_id="3" zone_id="1" account_id="1" vm_name="test" service_offering_id="1" template_id="1" start_date="2019-01-01 00:00:08"/>
+
+<usage_vm_instance usage_type="2" vm_instance_id="1" zone_id="1" account_id="1" vm_name="test" service_offering_id="1" template_id="1" start_date="2019-01-01 00:00:08"/>
+<usage_vm_instance usage_type="2" vm_instance_id="1" zone_id="1" account_id="1" vm_name="test" service_offering_id="1" template_id="1" start_date="2019-01-01 00:00:10"/>
+<usage_vm_instance usage_type="2" vm_instance_id="2" zone_id="1" account_id="1" vm_name="test" service_offering_id="1" template_id="1" start_date="2019-01-01 00:00:11"/>
+<usage_vm_instance usage_type="2" vm_instance_id="2" zone_id="1" account_id="1" vm_name="test" service_offering_id="1" template_id="1" start_date="2019-01-01 00:00:21"/>
</dataset>
diff --git a/usage/src/test/resources/cloud_usage3.xml b/usage/src/test/resources/cloud_usage3.xml
index d8922e1..8dea516 100644
--- a/usage/src/test/resources/cloud_usage3.xml
+++ b/usage/src/test/resources/cloud_usage3.xml
@@ -9,5 +9,5 @@
governing permissions and limitations under the License. -->
<!-- cloud_usage -->
<dataset>
-<cloud_usage usage_type="1" raw_usage="11" usage_id="8" id="8" start_date="1" zone_id="1"/>
+<cloud_usage usage_type="1" account_id="1" domain_id="1" description="test" usage_display=" " raw_usage="11" usage_id="8" id="8" start_date="2019-01-01 00:00:01" end_date="2019-01-01 00:00:01" zone_id="1"/>
</dataset>
diff --git a/utils/conf/db.properties b/utils/conf/db.properties
index 2fd6910..3ed7039 100644
--- a/utils/conf/db.properties
+++ b/utils/conf/db.properties
@@ -44,7 +44,7 @@
db.cloud.timeBetweenEvictionRunsMillis=40000
db.cloud.minEvictableIdleTimeMillis=240000
db.cloud.poolPreparedStatements=false
-db.cloud.url.params=prepStmtCacheSize=517&cachePrepStmts=true&prepStmtCacheSqlLimit=4096&sessionVariables=sql_mode='STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'
+db.cloud.url.params=prepStmtCacheSize=517&cachePrepStmts=true&prepStmtCacheSqlLimit=4096&sessionVariables=sql_mode='STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'&serverTimezone=UTC
# usage database settings
db.usage.username=cloud
@@ -60,6 +60,7 @@
db.usage.maxIdle=30
db.usage.maxWait=10000
db.usage.autoReconnect=true
+db.usage.url.params=serverTimezone=UTC
# Simulator database settings
db.simulator.username=cloud
diff --git a/utils/pom.xml b/utils/pom.xml
index 8b0235e..ebd3822 100755
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
@@ -112,6 +112,11 @@
<artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${cs.javax.annotation.version}</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
diff --git a/utils/src/main/java/com/cloud/utils/Profiler.java b/utils/src/main/java/com/cloud/utils/Profiler.java
index addee2d..e99141e 100644
--- a/utils/src/main/java/com/cloud/utils/Profiler.java
+++ b/utils/src/main/java/com/cloud/utils/Profiler.java
@@ -37,6 +37,14 @@
return stopTickNanoSeconds;
}
+ public void setStartTick(long value) {
+ this.startTickNanoSeconds = value;
+ }
+
+ public void setStopTick(long value) {
+ this.stopTickNanoSeconds = value;
+ }
+
/**
* 1 millisecond = 1e+6 nanoseconds
* 1 second = 1000 milliseconds = 1e+9 nanoseconds
diff --git a/utils/src/main/java/com/cloud/utils/ReflectUtil.java b/utils/src/main/java/com/cloud/utils/ReflectUtil.java
index 1d31093..4cf09bb 100644
--- a/utils/src/main/java/com/cloud/utils/ReflectUtil.java
+++ b/utils/src/main/java/com/cloud/utils/ReflectUtil.java
@@ -29,8 +29,6 @@
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
@@ -39,14 +37,13 @@
import org.apache.log4j.Logger;
import org.reflections.Reflections;
-import org.reflections.util.ConfigurationBuilder;
-import org.reflections.util.ClasspathHelper;
import org.reflections.scanners.SubTypesScanner;
import org.reflections.scanners.TypeAnnotationsScanner;
-
-import com.google.common.collect.ImmutableSet;
+import org.reflections.util.ClasspathHelper;
+import org.reflections.util.ConfigurationBuilder;
import com.cloud.utils.exception.CloudRuntimeException;
+import com.google.common.collect.ImmutableSet;
public class ReflectUtil {
@@ -212,23 +209,4 @@
}
}
- /**
- * Finds and returns class loader based on the provided module/jar name
- * @param name
- * @return returns ClassLoader
- */
- public static ClassLoader getClassLoaderForName(final String name) {
- final URL[] urls = ((URLClassLoader) (Thread.currentThread().getContextClassLoader())).getURLs();
- final List<URL> searchUrls = new ArrayList<>();
- for (final URL url: urls) {
- if (url.toString().contains(name)) {
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("Search URL: " + url.toString());
- }
- searchUrls.add(url);
- }
- }
- return new URLClassLoader(searchUrls.toArray(new URL[searchUrls.size()]));
- }
-
}
diff --git a/utils/src/main/java/com/cloud/utils/UriUtils.java b/utils/src/main/java/com/cloud/utils/UriUtils.java
index 6a580ca..3796296 100644
--- a/utils/src/main/java/com/cloud/utils/UriUtils.java
+++ b/utils/src/main/java/com/cloud/utils/UriUtils.java
@@ -36,7 +36,9 @@
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
+import java.util.Set;
import java.util.StringTokenizer;
+import java.util.function.Predicate;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -62,9 +64,12 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+
import com.cloud.utils.crypt.DBEncryptionUtil;
import com.cloud.utils.exception.CloudRuntimeException;
-import com.google.common.base.Strings;
public class UriUtils {
@@ -484,75 +489,65 @@
}
}
+ public static final Set<String> COMMPRESSION_FORMATS = ImmutableSet.of("zip", "bz2", "gz");
+
+ public static final Set<String> buildExtensionSet(boolean metalink, String... baseExtensions) {
+ final ImmutableSet.Builder<String> builder = ImmutableSet.builder();
+
+ for (String baseExtension : baseExtensions) {
+ builder.add("." + baseExtension);
+ for (String format : COMMPRESSION_FORMATS) {
+ builder.add("." + baseExtension + "." + format);
+ }
+ }
+
+ if (metalink) {
+ builder.add(".metalink");
+ }
+
+ return builder.build();
+ }
+
+ private final static Map<String, Set<String>> SUPPORTED_EXTENSIONS_BY_FORMAT =
+ ImmutableMap.<String, Set<String>>builder()
+ .put("vhd", buildExtensionSet(false, "vhd"))
+ .put("vhdx", buildExtensionSet(false, "vhdx"))
+ .put("qcow2", buildExtensionSet(true, "qcow2"))
+ .put("ova", buildExtensionSet(true, "ova"))
+ .put("tar", buildExtensionSet(false, "tar"))
+ .put("raw", buildExtensionSet(false, "img", "raw"))
+ .put("vmdk", buildExtensionSet(false, "vmdk"))
+ .put("iso", buildExtensionSet(true, "iso"))
+ .build();
+
+ public final static Set<String> getSupportedExtensions(String format) {
+ return SUPPORTED_EXTENSIONS_BY_FORMAT.get(format);
+ }
+
// verify if a URI path is compliance with the file format given
private static void checkFormat(String format, String uripath) {
- if ((!uripath.toLowerCase().endsWith("vhd")) && (!uripath.toLowerCase().endsWith("vhd.zip")) && (!uripath.toLowerCase().endsWith("vhd.bz2")) &&
- (!uripath.toLowerCase().endsWith("vhdx")) && (!uripath.toLowerCase().endsWith("vhdx.gz")) &&
- (!uripath.toLowerCase().endsWith("vhdx.bz2")) && (!uripath.toLowerCase().endsWith("vhdx.zip")) &&
- (!uripath.toLowerCase().endsWith("vhd.gz")) && (!uripath.toLowerCase().endsWith("qcow2")) && (!uripath.toLowerCase().endsWith("qcow2.zip")) &&
- (!uripath.toLowerCase().endsWith("qcow2.bz2")) && (!uripath.toLowerCase().endsWith("qcow2.gz")) && (!uripath.toLowerCase().endsWith("ova")) &&
- (!uripath.toLowerCase().endsWith("ova.zip")) && (!uripath.toLowerCase().endsWith("ova.bz2")) && (!uripath.toLowerCase().endsWith("ova.gz")) &&
- (!uripath.toLowerCase().endsWith("tar")) && (!uripath.toLowerCase().endsWith("tar.zip")) && (!uripath.toLowerCase().endsWith("tar.bz2")) &&
- (!uripath.toLowerCase().endsWith("tar.gz")) && (!uripath.toLowerCase().endsWith("vmdk")) && (!uripath.toLowerCase().endsWith("vmdk.gz")) &&
- (!uripath.toLowerCase().endsWith("vmdk.zip")) && (!uripath.toLowerCase().endsWith("vmdk.bz2")) && (!uripath.toLowerCase().endsWith("img")) &&
- (!uripath.toLowerCase().endsWith("img.gz")) && (!uripath.toLowerCase().endsWith("img.zip")) && (!uripath.toLowerCase().endsWith("img.bz2")) &&
- (!uripath.toLowerCase().endsWith("raw")) && (!uripath.toLowerCase().endsWith("raw.gz")) && (!uripath.toLowerCase().endsWith("raw.bz2")) &&
- (!uripath.toLowerCase().endsWith("raw.zip")) && (!uripath.toLowerCase().endsWith("iso")) && (!uripath.toLowerCase().endsWith("iso.zip"))
- && (!uripath.toLowerCase().endsWith("iso.bz2")) && (!uripath.toLowerCase().endsWith("iso.gz"))
- && (!uripath.toLowerCase().endsWith("metalink"))) {
- throw new IllegalArgumentException("Please specify a valid " + format.toLowerCase());
- }
+ final String lowerCaseUri = uripath.toLowerCase();
- if ((format.equalsIgnoreCase("vhd")
- && (!uripath.toLowerCase().endsWith("vhd")
- && !uripath.toLowerCase().endsWith("vhd.zip")
- && !uripath.toLowerCase().endsWith("vhd.bz2")
- && !uripath.toLowerCase().endsWith("vhd.gz")))
- || (format.equalsIgnoreCase("vhdx")
- && (!uripath.toLowerCase().endsWith("vhdx")
- && !uripath.toLowerCase().endsWith("vhdx.zip")
- && !uripath.toLowerCase().endsWith("vhdx.bz2")
- && !uripath.toLowerCase().endsWith("vhdx.gz")))
- || (format.equalsIgnoreCase("qcow2")
- && (!uripath.toLowerCase().endsWith("qcow2")
- && !uripath.toLowerCase().endsWith("qcow2.zip")
- && !uripath.toLowerCase().endsWith("qcow2.bz2")
- && !uripath.toLowerCase().endsWith("qcow2.gz"))
- && !uripath.toLowerCase().endsWith("metalink"))
- || (format.equalsIgnoreCase("ova")
- && (!uripath.toLowerCase().endsWith("ova")
- && !uripath.toLowerCase().endsWith("ova.zip")
- && !uripath.toLowerCase().endsWith("ova.bz2")
- && !uripath.toLowerCase().endsWith("ova.gz")
- && !uripath.toLowerCase().endsWith("metalink")))
- || (format.equalsIgnoreCase("tar")
- && (!uripath.toLowerCase().endsWith("tar")
- && !uripath.toLowerCase().endsWith("tar.zip")
- && !uripath.toLowerCase().endsWith("tar.bz2")
- && !uripath.toLowerCase().endsWith("tar.gz")))
- || (format.equalsIgnoreCase("raw")
- && (!uripath.toLowerCase().endsWith("img")
- && !uripath.toLowerCase().endsWith("img.zip")
- && !uripath.toLowerCase().endsWith("img.bz2")
- && !uripath.toLowerCase().endsWith("img.gz")
- && !uripath.toLowerCase().endsWith("raw")
- && !uripath.toLowerCase().endsWith("raw.bz2")
- && !uripath.toLowerCase().endsWith("raw.zip")
- && !uripath.toLowerCase().endsWith("raw.gz")))
- || (format.equalsIgnoreCase("vmdk")
- && (!uripath.toLowerCase().endsWith("vmdk")
- && !uripath.toLowerCase().endsWith("vmdk.zip")
- && !uripath.toLowerCase().endsWith("vmdk.bz2")
- && !uripath.toLowerCase().endsWith("vmdk.gz")))
- || (format.equalsIgnoreCase("iso")
- && (!uripath.toLowerCase().endsWith("iso")
- && !uripath.toLowerCase().endsWith("iso.zip")
- && !uripath.toLowerCase().endsWith("iso.bz2")
- && !uripath.toLowerCase().endsWith("iso.gz"))
- && !uripath.toLowerCase().endsWith("metalink"))) {
- throw new IllegalArgumentException("Please specify a valid URL. URL:" + uripath + " is an invalid for the format " + format.toLowerCase());
- }
+ final boolean unknownExtensionForFormat = SUPPORTED_EXTENSIONS_BY_FORMAT.get(format.toLowerCase())
+ .stream()
+ .noneMatch(lowerCaseUri::endsWith);
+ if (unknownExtensionForFormat) {
+ final Predicate<Set<String>> uriMatchesAnyExtension =
+ supportedExtensions -> supportedExtensions.stream()
+ .anyMatch(lowerCaseUri::endsWith);
+
+ boolean unknownExtension = SUPPORTED_EXTENSIONS_BY_FORMAT.values()
+ .stream()
+ .noneMatch(uriMatchesAnyExtension);
+
+ if (unknownExtension) {
+ throw new IllegalArgumentException("Please specify a valid " + format.toLowerCase());
+ }
+
+ throw new IllegalArgumentException("Please specify a valid URL. "
+ + "URL:" + uripath + " is an invalid for the format " + format.toLowerCase());
+ }
}
public static InputStream getInputStreamFromUrl(String url, String user, String password) {
@@ -629,4 +624,15 @@
}
return !Collections.disjoint(vlans1, vlans2);
}
+
+ public static List<Integer> expandPvlanUri(String pvlanRange) {
+ final List<Integer> expandedVlans = new ArrayList<>();
+ if (Strings.isNullOrEmpty(pvlanRange)) {
+ return expandedVlans;
+ }
+ String[] parts = pvlanRange.split("-i");
+ expandedVlans.add(Integer.parseInt(parts[0]));
+ expandedVlans.add(Integer.parseInt(parts[1]));
+ return expandedVlans;
+ }
}
diff --git a/utils/src/main/java/com/cloud/utils/UuidUtils.java b/utils/src/main/java/com/cloud/utils/UuidUtils.java
index 9c4a756..e733eff 100644
--- a/utils/src/main/java/com/cloud/utils/UuidUtils.java
+++ b/utils/src/main/java/com/cloud/utils/UuidUtils.java
@@ -19,6 +19,7 @@
package com.cloud.utils;
+import com.cloud.utils.exception.CloudRuntimeException;
import org.apache.xerces.impl.xpath.regex.RegularExpression;
public class UuidUtils {
@@ -31,4 +32,25 @@
RegularExpression regex = new RegularExpression("[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}");
return regex.matches(uuid);
}
+
+ /**
+ * Returns a valid UUID in string format from a 32 digit UUID string without hyphens.
+ * Example: 24abcb8f4211374fa2e1e5c0b7e88a2d -> 24abcb8f-4211-374f-a2e1-e5c0b7e88a2d
+ */
+ public static String normalize(String noHyphen) {
+ if (noHyphen.length() != 32 || noHyphen.contains("-")) {
+ throw new CloudRuntimeException("Invalid string format");
+ }
+ StringBuilder stringBuilder = new StringBuilder();
+ stringBuilder.append(noHyphen.substring(0, 8)).append("-")
+ .append(noHyphen.substring(8, 12)).append("-")
+ .append(noHyphen.substring(12, 16)).append("-")
+ .append(noHyphen.substring(16, 20)).append("-")
+ .append(noHyphen.substring(20, 32));
+ String uuid = stringBuilder.toString();
+ if (!validateUUID(uuid)) {
+ throw new CloudRuntimeException("Error generating UUID");
+ }
+ return uuid;
+ }
}
\ No newline at end of file
diff --git a/utils/src/main/java/com/cloud/utils/exception/CSExceptionErrorCode.java b/utils/src/main/java/com/cloud/utils/exception/CSExceptionErrorCode.java
index 62af14e..34fe46d 100644
--- a/utils/src/main/java/com/cloud/utils/exception/CSExceptionErrorCode.java
+++ b/utils/src/main/java/com/cloud/utils/exception/CSExceptionErrorCode.java
@@ -41,6 +41,7 @@
ExceptionErrorCodeMap.put("com.cloud.utils.exception.CloudRuntimeException", 4250);
ExceptionErrorCodeMap.put("com.cloud.utils.exception.ExecutionException", 4260);
ExceptionErrorCodeMap.put("com.cloud.utils.exception.HypervisorVersionChangedException", 4265);
+ ExceptionErrorCodeMap.put("com.cloud.utils.exception.NioConnectionException", 4270);
ExceptionErrorCodeMap.put("com.cloud.exception.CloudException", 4275);
ExceptionErrorCodeMap.put("com.cloud.exception.AccountLimitException", 4280);
ExceptionErrorCodeMap.put("com.cloud.exception.AgentUnavailableException", 4285);
diff --git a/utils/src/main/java/com/cloud/utils/net/NetUtils.java b/utils/src/main/java/com/cloud/utils/net/NetUtils.java
index fca35ad..0fb055f 100644
--- a/utils/src/main/java/com/cloud/utils/net/NetUtils.java
+++ b/utils/src/main/java/com/cloud/utils/net/NetUtils.java
@@ -268,19 +268,7 @@
final String defDev = Script.runSimpleBashScript("/sbin/route -n get default 2> /dev/null | grep interface | awk '{print $2}'");
return defDev;
}
- final String defaultRoute = Script.runSimpleBashScript("/sbin/route | grep default");
-
- if (defaultRoute == null) {
- return null;
- }
-
- final String[] defaultRouteList = defaultRoute.split("\\s+");
-
- if (defaultRouteList.length != 8) {
- return null;
- }
-
- return defaultRouteList[7];
+ return Script.runSimpleBashScript("ip route show default 0.0.0.0/0 | head -1 | awk '{print $5}'");
}
public static String getLocalIPString() {
diff --git a/utils/src/main/java/com/cloud/utils/nio/Link.java b/utils/src/main/java/com/cloud/utils/nio/Link.java
index 6582440..5040c83 100644
--- a/utils/src/main/java/com/cloud/utils/nio/Link.java
+++ b/utils/src/main/java/com/cloud/utils/nio/Link.java
@@ -489,7 +489,7 @@
try {
sslEngine.closeInbound();
} catch (SSLException e) {
- s_logger.warn("This SSL engine was forced to close inbound due to end of stream.");
+ s_logger.warn("This SSL engine was forced to close inbound due to end of stream.", e);
}
sslEngine.closeOutbound();
// After closeOutbound the engine will be set to WRAP state,
@@ -608,8 +608,8 @@
while (handshakeStatus != SSLEngineResult.HandshakeStatus.FINISHED
&& handshakeStatus != SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING) {
final long timeTaken = System.currentTimeMillis() - startTimeMills;
- if (timeTaken > 15000L) {
- s_logger.warn("SSL Handshake has taken more than 15s to connect to: " + socketChannel.getRemoteAddress() +
+ if (timeTaken > 30000L) {
+ s_logger.warn("SSL Handshake has taken more than 30s to connect to: " + socketChannel.getRemoteAddress() +
". Please investigate this connection.");
return false;
}
diff --git a/utils/src/main/java/com/cloud/utils/nio/NioServer.java b/utils/src/main/java/com/cloud/utils/nio/NioServer.java
index ff54165..0f83eda 100644
--- a/utils/src/main/java/com/cloud/utils/nio/NioServer.java
+++ b/utils/src/main/java/com/cloud/utils/nio/NioServer.java
@@ -61,7 +61,7 @@
_serverSocket.register(_selector, SelectionKey.OP_ACCEPT, null);
- s_logger.info("NioConnection started and listening on " + _serverSocket.socket().getLocalSocketAddress());
+ s_logger.info("NioServer started and listening on " + _serverSocket.socket().getLocalSocketAddress());
}
@Override
diff --git a/utils/src/main/java/com/cloud/utils/script/Script.java b/utils/src/main/java/com/cloud/utils/script/Script.java
index 35aa24b..13845cd 100644
--- a/utils/src/main/java/com/cloud/utils/script/Script.java
+++ b/utils/src/main/java/com/cloud/utils/script/Script.java
@@ -66,6 +66,10 @@
Process _process;
Thread _thread;
+ public boolean isTimeout() {
+ return _isTimeOut;
+ }
+
public int getExitValue() {
return _process.exitValue();
}
diff --git a/utils/src/main/java/com/cloud/utils/ssh/SSHKeysHelper.java b/utils/src/main/java/com/cloud/utils/ssh/SSHKeysHelper.java
index f80baaf..f25881c 100644
--- a/utils/src/main/java/com/cloud/utils/ssh/SSHKeysHelper.java
+++ b/utils/src/main/java/com/cloud/utils/ssh/SSHKeysHelper.java
@@ -88,7 +88,13 @@
if (!keyMaterial.contains(" "))
keyMaterial = new String(Base64.decodeBase64(keyMaterial.getBytes()));
- if ((!keyMaterial.startsWith("ssh-rsa") && !keyMaterial.startsWith("ssh-dss")) || !keyMaterial.contains(" "))
+ if ((!keyMaterial.startsWith("ssh-rsa")
+ && !keyMaterial.startsWith("ssh-dss")
+ && !keyMaterial.startsWith("ecdsa-sha2-nistp256")
+ && !keyMaterial.startsWith("ecdsa-sha2-nistp384")
+ && !keyMaterial.startsWith("ecdsa-sha2-nistp521")
+ && !keyMaterial.startsWith("ssh-ed25519"))
+ || !keyMaterial.contains(" "))
return null;
String[] key = keyMaterial.split(" ");
diff --git a/utils/src/main/java/com/cloud/utils/ssh/SshHelper.java b/utils/src/main/java/com/cloud/utils/ssh/SshHelper.java
index 88be577..537ebe7 100644
--- a/utils/src/main/java/com/cloud/utils/ssh/SshHelper.java
+++ b/utils/src/main/java/com/cloud/utils/ssh/SshHelper.java
@@ -58,6 +58,30 @@
scpTo(host, port, user, pemKeyFile, password, remoteTargetDirectory, data, remoteFileName, fileMode, DEFAULT_CONNECT_TIMEOUT, DEFAULT_KEX_TIMEOUT);
}
+ public static void scpFrom(String host, int port, String user, File permKeyFile, String localTargetDirectory, String remoteTargetFile) throws Exception {
+ com.trilead.ssh2.Connection conn = null;
+ com.trilead.ssh2.SCPClient scpClient = null;
+
+ try {
+ conn = new com.trilead.ssh2.Connection(host, port);
+ conn.connect(null, DEFAULT_CONNECT_TIMEOUT, DEFAULT_KEX_TIMEOUT);
+
+ if (!conn.authenticateWithPublicKey(user, permKeyFile, null)) {
+ String msg = "Failed to authentication SSH user " + user + " on host " + host;
+ s_logger.error(msg);
+ throw new Exception(msg);
+ }
+ scpClient = conn.createSCPClient();
+
+ scpClient.get(remoteTargetFile, localTargetDirectory);
+
+ } finally {
+ if (conn != null) {
+ conn.close();
+ }
+ }
+ }
+
public static void scpTo(String host, int port, String user, File pemKeyFile, String password, String remoteTargetDirectory, String localFile, String fileMode,
int connectTimeoutInMs, int kexTimeoutInMs) throws Exception {
@@ -165,7 +189,6 @@
byte[] buffer = new byte[8192];
StringBuffer sbResult = new StringBuffer();
-
int currentReadBytes = 0;
while (true) {
throwSshExceptionIfStdoutOrStdeerIsNull(stdout, stderr);
@@ -183,22 +206,18 @@
if (canEndTheSshConnection(waitResultTimeoutInMs, sess, conditions)) {
break;
}
-
}
- while (stdout.available() > 0) {
- currentReadBytes = stdout.read(buffer);
- sbResult.append(new String(buffer, 0, currentReadBytes));
+ while((currentReadBytes = stdout.read(buffer)) != -1) {
+ sbResult.append(new String(buffer, 0 , currentReadBytes));
}
- while (stderr.available() > 0) {
- currentReadBytes = stderr.read(buffer);
+ while((currentReadBytes = stderr.read(buffer)) != -1) {
sbResult.append(new String(buffer, 0, currentReadBytes));
}
}
String result = sbResult.toString();
-
if (StringUtils.isBlank(result)) {
try {
result = IOUtils.toString(stdout, StandardCharsets.UTF_8);
@@ -219,7 +238,6 @@
s_logger.error(String.format("SSH execution of command %s has an error status code in return. Result output: %s", command, result));
return new Pair<Boolean, String>(false, result);
}
-
return new Pair<Boolean, String>(true, result);
} finally {
if (sess != null)
diff --git a/utils/src/main/java/org/apache/cloudstack/utils/imagestore/ImageStoreUtil.java b/utils/src/main/java/org/apache/cloudstack/utils/imagestore/ImageStoreUtil.java
index 890e075..da19419 100644
--- a/utils/src/main/java/org/apache/cloudstack/utils/imagestore/ImageStoreUtil.java
+++ b/utils/src/main/java/org/apache/cloudstack/utils/imagestore/ImageStoreUtil.java
@@ -18,6 +18,7 @@
*/
package org.apache.cloudstack.utils.imagestore;
+import com.cloud.utils.UriUtils;
import com.cloud.utils.script.Script;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
@@ -57,7 +58,7 @@
return "";
}
// raw
- if ((output.contains("x86 boot") || output.contains("DOS/MBR boot sector") || output.contains("data")) && (isCorrectExtension(uripath, "raw") || isCorrectExtension(uripath, "img"))) {
+ if ((output.contains("x86 boot") || output.contains("DOS/MBR boot sector") || output.contains("data")) && isCorrectExtension(uripath, "raw")) {
s_logger.debug("File at path " + path + " looks like a raw image :" + output);
return "";
}
@@ -90,23 +91,20 @@
return output;
}
- private static boolean isCorrectExtension(String path, String ext) {
- if (path.toLowerCase().endsWith(ext)
- || path.toLowerCase().endsWith(ext + ".gz")
- || path.toLowerCase().endsWith(ext + ".bz2")
- || path.toLowerCase().endsWith(ext + ".zip")) {
- return true;
- }
- return false;
+ public static boolean isCorrectExtension(String path, String format) {
+ final String lowerCasePath = path.toLowerCase();
+ return UriUtils.getSupportedExtensions(format)
+ .stream()
+ .filter(ext -> !ext.equals(".metalink"))
+ .anyMatch(lowerCasePath::endsWith);
}
- private static boolean isCompressedExtension(String path) {
- if (path.toLowerCase().endsWith(".gz")
- || path.toLowerCase().endsWith(".bz2")
- || path.toLowerCase().endsWith(".zip")) {
- return true;
- }
- return false;
+ public static boolean isCompressedExtension(String path) {
+ final String lowerCasePath = path.toLowerCase();
+ return UriUtils.COMMPRESSION_FORMATS
+ .stream()
+ .map(extension -> "." + extension)
+ .anyMatch(lowerCasePath::endsWith);
}
}
diff --git a/utils/src/test/java/com/cloud/utils/TestProfiler.java b/utils/src/test/java/com/cloud/utils/TestProfiler.java
index 0e68175..335dff5 100644
--- a/utils/src/test/java/com/cloud/utils/TestProfiler.java
+++ b/utils/src/test/java/com/cloud/utils/TestProfiler.java
@@ -23,14 +23,16 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import com.cloud.utils.testcase.Log4jEnabledTestCase;
@RunWith(PowerMockRunner.class)
-@PrepareForTest({Profiler.class})
+@PowerMockIgnore({ "javax.management.*", "com.sun.org.apache.xerces.*", "javax.xml.*",
+ "org.xml.*", "org.w3c.dom.*", "com.sun.org.apache.xalan.*", "javax.activation.*" })
+@PrepareForTest(Profiler.class)
public class TestProfiler extends Log4jEnabledTestCase {
private static final long SLEEP_TIME_NANO = 1000000000L;
@@ -39,8 +41,6 @@
@Before
public void setUp() {
pf = new Profiler();
- PowerMockito.mockStatic(System.class);
- PowerMockito.when(System.nanoTime()).thenReturn(0L, SLEEP_TIME_NANO);
}
@Test
@@ -50,7 +50,9 @@
//When
pf.start();
+ pf.setStartTick(0); // mock start tick
pf.stop();
+ pf.setStopTick(SLEEP_TIME_NANO); // mock stop tick
//Then
Assert.assertTrue(pf.getDurationInMillis() == sleepTimeMillis);
@@ -63,7 +65,9 @@
//When
pf.start();
+ pf.setStartTick(0); // mock start tick
pf.stop();
+ pf.setStopTick(SLEEP_TIME_NANO); // mock stop tick
//Then
Assert.assertTrue(pf.getDuration() == sleepTimeNano);
@@ -76,6 +80,7 @@
//When
pf.stop();
+ pf.setStopTick(SLEEP_TIME_NANO); // mock stop tick
//Then
Assert.assertTrue(pf.getDurationInMillis() == expectedAnswer);
diff --git a/utils/src/test/java/com/cloud/utils/UriUtilsParametrizedTest.java b/utils/src/test/java/com/cloud/utils/UriUtilsParametrizedTest.java
new file mode 100644
index 0000000..9b29c86
--- /dev/null
+++ b/utils/src/test/java/com/cloud/utils/UriUtilsParametrizedTest.java
@@ -0,0 +1,157 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.utils;
+
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.Set;
+
+import org.apache.cloudstack.utils.imagestore.ImageStoreUtil;
+import org.hamcrest.Matchers;
+import org.hamcrest.core.IsInstanceOf;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import com.google.common.collect.ImmutableSet;
+
+@RunWith(Parameterized.class)
+public class UriUtilsParametrizedTest {
+ @FunctionalInterface
+ public interface ThrowingBlock<E extends Exception> {
+ void execute() throws E;
+ }
+
+ private static final Set<String> COMMPRESSION_FORMATS = ImmutableSet.of("",".zip", ".bz2", ".gz");
+ private static final Set<String> ILLEGAL_COMMPRESSION_FORMATS = ImmutableSet.of(".7z", ".xz");
+ private final static Set<String> FORMATS = ImmutableSet.of(
+ "vhd",
+ "vhdx",
+ "qcow2",
+ "ova",
+ "tar",
+ "raw",
+ "img",
+ "vmdk",
+ "iso"
+ );
+ private final static Set<String> METALINK_FORMATS = ImmutableSet.of(
+ "qcow2",
+ "ova",
+ "iso"
+ );
+
+ private final static Set<String> ILLEGAL_EXTENSIONS = ImmutableSet.of(
+ "rar",
+ "supernova",
+ "straw",
+ "miso",
+ "tartar"
+ );
+
+ private String format;
+ private String url;
+ private boolean expectSuccess;
+ private boolean isMetalink;
+ private boolean isValidCompression;
+
+ private <E extends Exception> void assertThrows(ThrowingBlock<E> consumer, Class<E> exceptionClass) {
+ try {
+ consumer.execute();
+ Assert.fail("Expected " + exceptionClass.getName());
+ } catch(Exception e) {
+ Assert.assertThat(e, new IsInstanceOf(exceptionClass));
+ }
+ }
+
+ public UriUtilsParametrizedTest(String format, String url, boolean expectSuccess, boolean isMetalink, boolean isValidCompression) {
+ this.format = format;
+ this.url = url;
+ this.expectSuccess = expectSuccess;
+ this.isMetalink = isMetalink;
+ this.isValidCompression = isValidCompression;
+ }
+
+ @Parameterized.Parameters(name = "{index}: validateUrl(\"{0}\", \"{1}\") = {2}")
+ public static Collection<Object[]> data() {
+ String validBaseUri = "http://cloudstack.apache.org/images/image.";
+
+ LinkedList<Object[]> data = new LinkedList<>();
+
+ for (String format : FORMATS) {
+ if (format.equals("img")) continue;
+
+ final String realFormat = format;
+
+ for (String extension : FORMATS) {
+ final boolean expectSuccess = format.equals(extension.replace("img", "raw"));
+
+ for (String commpressionFormat : COMMPRESSION_FORMATS) {
+ final String url = validBaseUri + extension + commpressionFormat;
+ data.add(new Object[]{realFormat, url, expectSuccess, false, commpressionFormat.length() > 0});
+ }
+
+ for (String commpressionFormat : ILLEGAL_COMMPRESSION_FORMATS) {
+ final String url = validBaseUri + extension + commpressionFormat;
+ data.add(new Object[]{realFormat, url, false, false, false});
+ }
+ }
+
+ for (String illegalExtension : ILLEGAL_EXTENSIONS) {
+ data.add(new Object[]{format, validBaseUri + illegalExtension, false, false, false});
+
+ for (String commpressionFormat : COMMPRESSION_FORMATS) {
+ final String url = validBaseUri + illegalExtension + commpressionFormat;
+ data.add(new Object[]{realFormat, url, false, false, commpressionFormat.length() > 0});
+ }
+
+ for (String commpressionFormat : ILLEGAL_COMMPRESSION_FORMATS) {
+ final String url = validBaseUri + illegalExtension + commpressionFormat;
+ data.add(new Object[]{realFormat, url, false, false, false});
+ }
+ }
+
+ data.add(new Object[]{realFormat, validBaseUri + "metalink", METALINK_FORMATS.contains(realFormat), true, false});
+
+ }
+
+ return data;
+ }
+
+ @Test
+ public void validateUrl() {
+ if (expectSuccess) {
+ UriUtils.validateUrl(format, url);
+ } else {
+ assertThrows(() -> UriUtils.validateUrl(format, url), IllegalArgumentException.class);
+ }
+ }
+
+ @Test
+ public void isCorrectExtension() {
+ Assert.assertThat(ImageStoreUtil.isCorrectExtension(url, format), Matchers.is(expectSuccess && !isMetalink));
+ }
+
+ @Test
+ public void isCompressedExtension() {
+ Assert.assertThat(ImageStoreUtil.isCompressedExtension(url), Matchers.is(isValidCompression));
+ }
+}
diff --git a/utils/src/test/java/com/cloud/utils/rest/HttpRequestMatcher.java b/utils/src/test/java/com/cloud/utils/rest/HttpRequestMatcher.java
index effec79..cf20a87 100644
--- a/utils/src/test/java/com/cloud/utils/rest/HttpRequestMatcher.java
+++ b/utils/src/test/java/com/cloud/utils/rest/HttpRequestMatcher.java
@@ -34,7 +34,7 @@
import org.hamcrest.SelfDescribing;
import org.mockito.ArgumentMatcher;
-public class HttpRequestMatcher extends ArgumentMatcher<HttpRequest> {
+public class HttpRequestMatcher implements ArgumentMatcher<HttpRequest> {
private final HttpRequest wanted;
public HttpRequestMatcher(final HttpRequest wanted) {
@@ -46,7 +46,7 @@
}
@Override
- public boolean matches(final Object actual) {
+ public boolean matches(HttpRequest actual) {
if (actual instanceof HttpUriRequest) {
final HttpUriRequest converted = (HttpUriRequest) actual;
return checkMethod(converted) && checkUri(converted) && checkPayload(converted);
@@ -99,11 +99,6 @@
return a == b || a != null && a.equals(b);
}
- @Override
- public void describeTo(final Description description) {
- description.appendText(describe(wanted));
- }
-
public String describe(final HttpRequest object) {
final StringBuilder sb = new StringBuilder();
if (object instanceof HttpUriRequest) {
@@ -137,5 +132,4 @@
public boolean typeMatches(final Object object) {
return wanted != null && object != null && object.getClass() == wanted.getClass();
}
-
}
diff --git a/utils/src/test/java/com/cloud/utils/rest/HttpUriRequestMethodMatcher.java b/utils/src/test/java/com/cloud/utils/rest/HttpUriRequestMethodMatcher.java
index f2d091f..ed4bd64 100644
--- a/utils/src/test/java/com/cloud/utils/rest/HttpUriRequestMethodMatcher.java
+++ b/utils/src/test/java/com/cloud/utils/rest/HttpUriRequestMethodMatcher.java
@@ -20,7 +20,7 @@
package com.cloud.utils.rest;
import static org.hamcrest.Matchers.equalTo;
-import static org.mockito.Matchers.argThat;
+import static org.mockito.hamcrest.MockitoHamcrest.argThat;
import org.apache.http.client.methods.HttpUriRequest;
import org.hamcrest.FeatureMatcher;
@@ -40,5 +40,4 @@
protected String featureValueOf(final HttpUriRequest actual) {
return actual.getMethod();
}
-
}
diff --git a/utils/src/test/java/com/cloud/utils/rest/HttpUriRequestPathMatcher.java b/utils/src/test/java/com/cloud/utils/rest/HttpUriRequestPathMatcher.java
index 948e9f6..ce3ae1b 100644
--- a/utils/src/test/java/com/cloud/utils/rest/HttpUriRequestPathMatcher.java
+++ b/utils/src/test/java/com/cloud/utils/rest/HttpUriRequestPathMatcher.java
@@ -20,7 +20,7 @@
package com.cloud.utils.rest;
import static org.hamcrest.Matchers.equalTo;
-import static org.mockito.Matchers.argThat;
+import static org.mockito.hamcrest.MockitoHamcrest.argThat;
import org.apache.http.client.methods.HttpUriRequest;
import org.hamcrest.FeatureMatcher;
diff --git a/utils/src/test/java/com/cloud/utils/rest/HttpUriRequestPayloadMatcher.java b/utils/src/test/java/com/cloud/utils/rest/HttpUriRequestPayloadMatcher.java
index 724f495..a5701b6 100644
--- a/utils/src/test/java/com/cloud/utils/rest/HttpUriRequestPayloadMatcher.java
+++ b/utils/src/test/java/com/cloud/utils/rest/HttpUriRequestPayloadMatcher.java
@@ -20,7 +20,7 @@
package com.cloud.utils.rest;
import static org.hamcrest.Matchers.equalTo;
-import static org.mockito.Matchers.argThat;
+import static org.mockito.hamcrest.MockitoHamcrest.argThat;
import java.io.IOException;
diff --git a/utils/src/test/java/com/cloud/utils/rest/HttpUriRequestQueryMatcher.java b/utils/src/test/java/com/cloud/utils/rest/HttpUriRequestQueryMatcher.java
index e73641b..3f7e35e 100644
--- a/utils/src/test/java/com/cloud/utils/rest/HttpUriRequestQueryMatcher.java
+++ b/utils/src/test/java/com/cloud/utils/rest/HttpUriRequestQueryMatcher.java
@@ -21,7 +21,7 @@
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
-import static org.mockito.Matchers.argThat;
+import static org.mockito.hamcrest.MockitoHamcrest.argThat;
import org.apache.http.client.methods.HttpUriRequest;
import org.hamcrest.FeatureMatcher;
diff --git a/utils/src/test/java/com/cloud/utils/ssh/SshHelperTest.java b/utils/src/test/java/com/cloud/utils/ssh/SshHelperTest.java
index 18e7171..37bd089 100644
--- a/utils/src/test/java/com/cloud/utils/ssh/SshHelperTest.java
+++ b/utils/src/test/java/com/cloud/utils/ssh/SshHelperTest.java
@@ -27,6 +27,7 @@
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
@@ -35,6 +36,8 @@
import com.trilead.ssh2.Session;
@PrepareForTest({ Thread.class, SshHelper.class })
+@PowerMockIgnore({ "javax.management.*", "com.sun.org.apache.xerces.*", "javax.xml.*",
+ "org.xml.*", "org.w3c.dom.*", "com.sun.org.apache.xalan.*", "javax.activation.*" })
@RunWith(PowerMockRunner.class)
public class SshHelperTest {
@@ -49,7 +52,7 @@
SshHelper.canEndTheSshConnection(1, mockedSession, 0);
- PowerMockito.verifyStatic();
+ PowerMockito.verifyStatic(SshHelper.class);
SshHelper.isChannelConditionEof(Mockito.anyInt());
SshHelper.throwSshExceptionIfConditionsTimeout(Mockito.anyInt());
@@ -144,8 +147,5 @@
SshHelper.openConnectionSession(conn);
Mockito.verify(conn).openSession();
-
- PowerMockito.verifyStatic();
-
}
}
diff --git a/vmware-base/pom.xml b/vmware-base/pom.xml
index 2656f89..d44dbce 100644
--- a/vmware-base/pom.xml
+++ b/vmware-base/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId>
- <version>4.13.2.0-SNAPSHOT</version>
+ <version>4.14.1.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -69,5 +69,11 @@
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-ri</artifactId>
+ <version>${cs.jaxws.version}</version>
+ <type>pom</type>
+ </dependency>
</dependencies>
</project>
diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/ClusterMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/ClusterMO.java
index ce9e981..4b37866 100644
--- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/ClusterMO.java
+++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/ClusterMO.java
@@ -217,6 +217,19 @@
}
@Override
+ public synchronized List<VirtualMachineMO> listVmsOnHyperHost(String vmName) throws Exception {
+ List<VirtualMachineMO> vms = new ArrayList<>();
+ List<ManagedObjectReference> hosts = _context.getVimClient().getDynamicProperty(_mor, "host");
+ if (hosts != null && hosts.size() > 0) {
+ for (ManagedObjectReference morHost : hosts) {
+ HostMO hostMo = new HostMO(_context, morHost);
+ vms.addAll(hostMo.listVmsOnHyperHost(vmName));
+ }
+ }
+ return vms;
+ }
+
+ @Override
public VirtualMachineMO findVmOnHyperHost(String name) throws Exception {
int key = getCustomFieldKey("VirtualMachine", CustomFieldConstants.CLOUD_VM_INTERNAL_NAME);
diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatastoreMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatastoreMO.java
index 817320b..fa0c380 100644
--- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatastoreMO.java
+++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatastoreMO.java
@@ -214,7 +214,7 @@
return false;
}
- boolean copyDatastoreFile(String srcFilePath, ManagedObjectReference morSrcDc, ManagedObjectReference morDestDs, String destFilePath,
+ public boolean copyDatastoreFile(String srcFilePath, ManagedObjectReference morSrcDc, ManagedObjectReference morDestDs, String destFilePath,
ManagedObjectReference morDestDc, boolean forceOverwrite) throws Exception {
String srcDsName = getName();
diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DistributedVirtualSwitchMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DistributedVirtualSwitchMO.java
index fbb4265..40a0a64 100644
--- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DistributedVirtualSwitchMO.java
+++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DistributedVirtualSwitchMO.java
@@ -24,6 +24,8 @@
import org.apache.log4j.Logger;
+import com.cloud.hypervisor.vmware.util.VmwareContext;
+import com.cloud.utils.Pair;
import com.vmware.vim25.DVPortgroupConfigSpec;
import com.vmware.vim25.DVSConfigInfo;
import com.vmware.vim25.ManagedObjectReference;
@@ -32,8 +34,6 @@
import com.vmware.vim25.VMwareDVSConfigSpec;
import com.vmware.vim25.VMwareDVSPvlanMapEntry;
-import com.cloud.hypervisor.vmware.util.VmwareContext;
-
public class DistributedVirtualSwitchMO extends BaseMO {
@SuppressWarnings("unused")
private static final Logger s_logger = Logger.getLogger(DistributedVirtualSwitchMO.class);
@@ -169,4 +169,28 @@
return result;
}
+ public Pair<Integer, HypervisorHostHelper.PvlanType> retrieveVlanFromPvlan(int pvlanid, ManagedObjectReference dvSwitchMor) throws Exception {
+ assert (dvSwitchMor != null);
+
+ Pair<Integer, HypervisorHostHelper.PvlanType> result = null;
+
+ VMwareDVSConfigInfo configinfo = (VMwareDVSConfigInfo)_context.getVimClient().getDynamicProperty(dvSwitchMor, "config");
+ List<VMwareDVSPvlanMapEntry> pvlanConfig = null;
+ pvlanConfig = configinfo.getPvlanConfig();
+
+ if (null == pvlanConfig || 0 == pvlanConfig.size()) {
+ return result;
+ }
+
+ // Iterate through the pvlanMapList and check if the specified pvlan id exist. If it does, set the fields in result accordingly.
+ for (VMwareDVSPvlanMapEntry mapEntry : pvlanConfig) {
+ int entryVlanid = mapEntry.getPrimaryVlanId();
+ int entryPvlanid = mapEntry.getSecondaryVlanId();
+ if (pvlanid == entryPvlanid) {
+ result = new Pair<>(entryVlanid, HypervisorHostHelper.PvlanType.valueOf(mapEntry.getPvlanType()));
+ break;
+ }
+ }
+ return result;
+ }
}
diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java
index cc50b3d..7877db9 100644
--- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java
+++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java
@@ -497,6 +497,18 @@
}
@Override
+ public synchronized List<VirtualMachineMO> listVmsOnHyperHost(String vmName) throws Exception {
+ List<VirtualMachineMO> vms = new ArrayList<>();
+ if (vmName != null && !vmName.isEmpty()) {
+ vms.add(findVmOnHyperHost(vmName));
+ } else {
+ loadVmCache();
+ vms.addAll(_vmCache.values());
+ }
+ return vms;
+ }
+
+ @Override
public synchronized VirtualMachineMO findVmOnHyperHost(String vmName) throws Exception {
if (s_logger.isDebugEnabled())
s_logger.debug("find VM " + vmName + " on host");
@@ -1184,4 +1196,17 @@
}
return morNetwork;
}
+
+ public String getProductVersion() throws Exception {
+ return getHostAboutInfo().getVersion();
+ }
+
+ public boolean isUefiLegacySupported() throws Exception {
+ String hostVersion = getProductVersion();
+ if (hostVersion.compareTo(VmwareHelper.MIN_VERSION_UEFI_LEGACY) >= 0) {
+ return true;
+ }
+ return false;
+ }
+
}
diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
index 2eaa55a..7826bb1 100644
--- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
+++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
@@ -38,6 +38,7 @@
import javax.xml.transform.stream.StreamResult;
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
+import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.w3c.dom.Document;
@@ -579,8 +580,9 @@
// First, if both vlan id and pvlan id are provided, we need to
// reconfigure the DVSwitch to have a tuple <vlan id, pvlan id> of
// type isolated.
+ String pvlanType = MapUtils.isNotEmpty(details) ? details.get(NetworkOffering.Detail.pvlanType) : null;
if (vid != null && spvlanid != null) {
- setupPVlanPair(dvSwitchMo, morDvSwitch, vid, spvlanid);
+ setupPVlanPair(dvSwitchMo, morDvSwitch, vid, spvlanid, pvlanType);
}
VMwareDVSPortgroupPolicy portGroupPolicy = null;
@@ -660,7 +662,8 @@
return vCenterApiVersion.compareTo(minVcenterApiVersionForFeature) >= 0 ? true : false;
}
- private static void setupPVlanPair(DistributedVirtualSwitchMO dvSwitchMo, ManagedObjectReference morDvSwitch, Integer vid, Integer spvlanid) throws Exception {
+ private static void setupPVlanPair(DistributedVirtualSwitchMO dvSwitchMo, ManagedObjectReference morDvSwitch, Integer vid, Integer spvlanid, String pvlanType) throws Exception {
+ s_logger.debug(String.format("Setting up PVLAN on dvSwitch %s with the following information: %s %s %s", dvSwitchMo.getName(), vid, spvlanid, pvlanType));
Map<Integer, HypervisorHostHelper.PvlanType> vlanmap = dvSwitchMo.retrieveVlanPvlan(vid, spvlanid, morDvSwitch);
if (!vlanmap.isEmpty()) {
// Then either vid or pvlanid or both are already being used. Check how.
@@ -678,25 +681,20 @@
s_logger.error(msg);
throw new Exception(msg);
}
- } else {
- if (vlanmap.containsKey(spvlanid) && !vlanmap.get(spvlanid).equals(HypervisorHostHelper.PvlanType.isolated)) {
- // This PVLAN ID is already setup as a non-isolated vlan id on the DVS. Throw an exception.
- String msg = "Specified secondary PVLAN ID " + spvlanid + " is already in use as a " + vlanmap.get(spvlanid).toString() + " VLAN in the DVSwitch";
- s_logger.error(msg);
- throw new Exception(msg);
- }
}
}
// First create a DVSconfig spec.
VMwareDVSConfigSpec dvsSpec = new VMwareDVSConfigSpec();
// Next, add the required primary and secondary vlan config specs to the dvs config spec.
+
if (!vlanmap.containsKey(vid)) {
VMwareDVSPvlanConfigSpec ppvlanConfigSpec = createDVPortPvlanConfigSpec(vid, vid, PvlanType.promiscuous, PvlanOperation.add);
dvsSpec.getPvlanConfigSpec().add(ppvlanConfigSpec);
}
if (!vid.equals(spvlanid) && !vlanmap.containsKey(spvlanid)) {
- VMwareDVSPvlanConfigSpec spvlanConfigSpec = createDVPortPvlanConfigSpec(vid, spvlanid, PvlanType.isolated, PvlanOperation.add);
+ PvlanType selectedType = StringUtils.isNotBlank(pvlanType) ? PvlanType.fromStr(pvlanType) : PvlanType.isolated;
+ VMwareDVSPvlanConfigSpec spvlanConfigSpec = createDVPortPvlanConfigSpec(vid, spvlanid, selectedType, PvlanOperation.add);
dvsSpec.getPvlanConfigSpec().add(spvlanConfigSpec);
}
@@ -1046,7 +1044,20 @@
}
public enum PvlanType {
- promiscuous, isolated, community, // We don't use Community
+ promiscuous, isolated, community;
+
+ public static PvlanType fromStr(String val) {
+ if (StringUtils.isBlank(val)) {
+ return null;
+ } else if (val.equalsIgnoreCase("promiscuous")) {
+ return promiscuous;
+ } else if (val.equalsIgnoreCase("community")) {
+ return community;
+ } else if (val.equalsIgnoreCase("isolated")) {
+ return isolated;
+ }
+ return null;
+ }
}
public static VMwareDVSPvlanConfigSpec createDVPortPvlanConfigSpec(int vlanId, int secondaryVlanId, PvlanType pvlantype, PvlanOperation operation) {
diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/NetworkMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/NetworkMO.java
index e2797d3..85006e3 100644
--- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/NetworkMO.java
+++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/NetworkMO.java
@@ -21,6 +21,7 @@
import com.vmware.vim25.ManagedObjectReference;
import com.cloud.hypervisor.vmware.util.VmwareContext;
+import com.vmware.vim25.NetworkSummary;
public class NetworkMO extends BaseMO {
public NetworkMO(VmwareContext context, ManagedObjectReference morCluster) {
@@ -38,4 +39,12 @@
public List<ManagedObjectReference> getVMsOnNetwork() throws Exception {
return _context.getVimClient().getDynamicProperty(_mor, "vm");
}
+
+ public String getName() throws Exception {
+ return _context.getVimClient().getDynamicProperty(_mor, "name");
+ }
+
+ public NetworkSummary getSummary() throws Exception {
+ return _context.getVimClient().getDynamicProperty(_mor, "summary");
+ }
}
diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
index aef9d4f..d5df4b9 100644
--- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
+++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
@@ -492,7 +492,6 @@
public ManagedObjectReference createSnapshotGetReference(String snapshotName, String snapshotDescription, boolean dumpMemory, boolean quiesce) throws Exception {
long apiTimeout = _context.getVimClient().getVcenterSessionTimeout();
ManagedObjectReference morTask = _context.getService().createSnapshotTask(_mor, snapshotName, snapshotDescription, dumpMemory, quiesce);
-
boolean result = _context.getVimClient().waitForTask(morTask);
if (result) {
diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VmwareHypervisorHost.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VmwareHypervisorHost.java
index 6f0cd22..a9ceb5d 100644
--- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VmwareHypervisorHost.java
+++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VmwareHypervisorHost.java
@@ -16,6 +16,8 @@
// under the License.
package com.cloud.hypervisor.vmware.mo;
+import java.util.List;
+
import com.vmware.vim25.ClusterDasConfigInfo;
import com.vmware.vim25.ComputeResourceSummary;
import com.vmware.vim25.ManagedObjectReference;
@@ -51,6 +53,8 @@
String getHyperHostDefaultGateway() throws Exception;
+ List<VirtualMachineMO> listVmsOnHyperHost(String name) throws Exception;
+
VirtualMachineMO findVmOnHyperHost(String name) throws Exception;
VirtualMachineMO findVmOnPeerHyperHost(String name) throws Exception;
diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareClient.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareClient.java
index 3050f0a..3d80ffd 100644
--- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareClient.java
+++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareClient.java
@@ -30,7 +30,10 @@
import javax.xml.ws.WebServiceException;
import javax.xml.ws.handler.MessageContext;
+import org.apache.cloudstack.utils.security.SSLUtils;
+import org.apache.cloudstack.utils.security.SecureSSLSocketFactory;
import org.apache.log4j.Logger;
+import org.w3c.dom.Element;
import com.vmware.vim25.DynamicProperty;
import com.vmware.vim25.InvalidCollectorVersionFaultMsg;
@@ -57,9 +60,7 @@
import com.vmware.vim25.UpdateSet;
import com.vmware.vim25.VimPortType;
import com.vmware.vim25.VimService;
-
-import org.apache.cloudstack.utils.security.SSLUtils;
-import org.apache.cloudstack.utils.security.SecureSSLSocketFactory;
+import com.vmware.vim25.WaitOptions;
/**
* A wrapper class to handle Vmware vsphere connection and disconnection.
@@ -102,7 +103,7 @@
vimService = new VimService();
} catch (Exception e) {
s_logger.info("[ignored]"
- + "failed to trust all certificates blindly: " + e.getLocalizedMessage());
+ + "failed to trust all certificates blindly: ", e);
}
}
@@ -412,12 +413,13 @@
* @throws InvalidPropertyFaultMsg
* @throws InvalidCollectorVersionFaultMsg
*/
- private Object[] waitForValues(ManagedObjectReference objmor, String[] filterProps, String[] endWaitProps, Object[][] expectedVals) throws InvalidPropertyFaultMsg,
+ private synchronized Object[] waitForValues(ManagedObjectReference objmor, String[] filterProps, String[] endWaitProps, Object[][] expectedVals) throws InvalidPropertyFaultMsg,
RuntimeFaultFaultMsg, InvalidCollectorVersionFaultMsg {
// version string is initially null
String version = "";
Object[] endVals = new Object[endWaitProps.length];
Object[] filterVals = new Object[filterProps.length];
+ String stateVal = null;
PropertyFilterSpec spec = new PropertyFilterSpec();
ObjectSpec oSpec = new ObjectSpec();
@@ -440,7 +442,7 @@
List<ObjectUpdate> objupary = null;
List<PropertyChange> propchgary = null;
while (!reached) {
- updateset = vimPort.waitForUpdates(propertyCollector, version);
+ updateset = vimPort.waitForUpdatesEx(propertyCollector, version, new WaitOptions());
if (updateset == null || updateset.getFilterSet() == null) {
continue;
}
@@ -452,7 +454,6 @@
for (PropertyFilterUpdate filtup : filtupary) {
objupary = filtup.getObjectSet();
for (ObjectUpdate objup : objupary) {
- // TODO: Handle all "kind"s of updates.
if (objup.getKind() == ObjectUpdateKind.MODIFY || objup.getKind() == ObjectUpdateKind.ENTER || objup.getKind() == ObjectUpdateKind.LEAVE) {
propchgary = objup.getChangeSet();
for (PropertyChange propchg : propchgary) {
@@ -464,21 +465,38 @@
}
Object expctdval = null;
- // Check if the expected values have been reached and exit the loop
- // if done.
+ // Check if the expected values have been reached and exit the loop if done.
// Also exit the WaitForUpdates loop if this is the case.
for (int chgi = 0; chgi < endVals.length && !reached; chgi++) {
for (int vali = 0; vali < expectedVals[chgi].length && !reached; vali++) {
expctdval = expectedVals[chgi][vali];
- reached = expctdval.equals(endVals[chgi]) || reached;
+ if (endVals[chgi] == null) {
+ // Do nothing
+ } else if (endVals[chgi].toString().contains("val: null")) {
+ // Handle JAX-WS De-serialization issue, by parsing nodes
+ Element stateElement = (Element) endVals[chgi];
+ if (stateElement != null && stateElement.getFirstChild() != null) {
+ stateVal = stateElement.getFirstChild().getTextContent();
+ reached = expctdval.toString().equalsIgnoreCase(stateVal) || reached;
+ }
+ } else {
+ reached = expctdval.equals(endVals[chgi]) || reached;
+ stateVal = "filtervals";
+ }
}
}
}
// Destroy the filter when we are done.
vimPort.destroyPropertyFilter(filterSpecRef);
- return filterVals;
+
+ Object[] retVal = filterVals;
+ if (stateVal != null && stateVal.equalsIgnoreCase("success")) {
+ retVal = new Object[] { TaskInfoState.SUCCESS, null };
+ }
+
+ return retVal;
}
private void updateValues(String[] props, Object[] vals, PropertyChange propchg) {
diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareGuestOsMapper.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareGuestOsMapper.java
deleted file mode 100644
index b50620e..0000000
--- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareGuestOsMapper.java
+++ /dev/null
@@ -1,203 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.hypervisor.vmware.util;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.vmware.vim25.VirtualMachineGuestOsIdentifier;
-
-public class VmwareGuestOsMapper {
- private static Map<String, VirtualMachineGuestOsIdentifier> s_mapper = new HashMap<String, VirtualMachineGuestOsIdentifier>();
- static {
- s_mapper.put("DOS", VirtualMachineGuestOsIdentifier.DOS_GUEST);
- s_mapper.put("OS/2", VirtualMachineGuestOsIdentifier.OS_2_GUEST);
-
- s_mapper.put("Windows 3.1", VirtualMachineGuestOsIdentifier.WIN_31_GUEST);
- s_mapper.put("Windows 95", VirtualMachineGuestOsIdentifier.WIN_95_GUEST);
- s_mapper.put("Windows 98", VirtualMachineGuestOsIdentifier.WIN_98_GUEST);
- s_mapper.put("Windows NT 4", VirtualMachineGuestOsIdentifier.WIN_NT_GUEST);
- s_mapper.put("Windows XP (32-bit)", VirtualMachineGuestOsIdentifier.WIN_XP_PRO_GUEST);
- s_mapper.put("Windows XP (64-bit)", VirtualMachineGuestOsIdentifier.WIN_XP_PRO_64_GUEST);
- s_mapper.put("Windows XP SP2 (32-bit)", VirtualMachineGuestOsIdentifier.WIN_XP_PRO_GUEST);
- s_mapper.put("Windows XP SP3 (32-bit)", VirtualMachineGuestOsIdentifier.WIN_XP_PRO_GUEST);
- s_mapper.put("Windows Vista (32-bit)", VirtualMachineGuestOsIdentifier.WIN_VISTA_GUEST);
- s_mapper.put("Windows Vista (64-bit)", VirtualMachineGuestOsIdentifier.WIN_VISTA_64_GUEST);
- s_mapper.put("Windows 7 (32-bit)", VirtualMachineGuestOsIdentifier.WINDOWS_7_GUEST);
- s_mapper.put("Windows 7 (64-bit)", VirtualMachineGuestOsIdentifier.WINDOWS_7_64_GUEST);
-
- s_mapper.put("Windows 2000 Professional", VirtualMachineGuestOsIdentifier.WIN_2000_PRO_GUEST);
- s_mapper.put("Windows 2000 Server", VirtualMachineGuestOsIdentifier.WIN_2000_SERV_GUEST);
- s_mapper.put("Windows 2000 Server SP4 (32-bit)", VirtualMachineGuestOsIdentifier.WIN_2000_SERV_GUEST);
- s_mapper.put("Windows 2000 Advanced Server", VirtualMachineGuestOsIdentifier.WIN_2000_ADV_SERV_GUEST);
-
- s_mapper.put("Windows Server 2003 Enterprise Edition(32-bit)", VirtualMachineGuestOsIdentifier.WIN_NET_ENTERPRISE_GUEST);
- s_mapper.put("Windows Server 2003 Enterprise Edition(64-bit)", VirtualMachineGuestOsIdentifier.WIN_NET_ENTERPRISE_64_GUEST);
- s_mapper.put("Windows Server 2008 R2 (64-bit)", VirtualMachineGuestOsIdentifier.WIN_LONGHORN_64_GUEST);
- s_mapper.put("Windows Server 2003 DataCenter Edition(32-bit)", VirtualMachineGuestOsIdentifier.WIN_NET_DATACENTER_GUEST);
- s_mapper.put("Windows Server 2003 DataCenter Edition(64-bit)", VirtualMachineGuestOsIdentifier.WIN_NET_DATACENTER_64_GUEST);
- s_mapper.put("Windows Server 2003 Standard Edition(32-bit)", VirtualMachineGuestOsIdentifier.WIN_NET_STANDARD_GUEST);
- s_mapper.put("Windows Server 2003 Standard Edition(64-bit)", VirtualMachineGuestOsIdentifier.WIN_NET_STANDARD_64_GUEST);
- s_mapper.put("Windows Server 2003 Web Edition", VirtualMachineGuestOsIdentifier.WIN_NET_WEB_GUEST);
- s_mapper.put("Microsoft Small Bussiness Server 2003", VirtualMachineGuestOsIdentifier.WIN_NET_BUSINESS_GUEST);
-
- s_mapper.put("Windows Server 2008 (32-bit)", VirtualMachineGuestOsIdentifier.WIN_LONGHORN_GUEST);
- s_mapper.put("Windows Server 2008 (64-bit)", VirtualMachineGuestOsIdentifier.WIN_LONGHORN_64_GUEST);
-
- s_mapper.put("Windows 8 (32-bit)", VirtualMachineGuestOsIdentifier.WINDOWS_8_GUEST);
- s_mapper.put("Windows 8 (64-bit)", VirtualMachineGuestOsIdentifier.WINDOWS_8_64_GUEST);
- s_mapper.put("Windows Server 2012 (64-bit)", VirtualMachineGuestOsIdentifier.WINDOWS_8_SERVER_64_GUEST);
- s_mapper.put("Windows Server 2012 R2 (64-bit)", VirtualMachineGuestOsIdentifier.WINDOWS_8_SERVER_64_GUEST);
-
- s_mapper.put("Apple Mac OS X 10.6 (32-bit)", VirtualMachineGuestOsIdentifier.DARWIN_10_GUEST);
- s_mapper.put("Apple Mac OS X 10.6 (64-bit)", VirtualMachineGuestOsIdentifier.DARWIN_10_64_GUEST);
- s_mapper.put("Apple Mac OS X 10.7 (32-bit)", VirtualMachineGuestOsIdentifier.DARWIN_11_GUEST);
- s_mapper.put("Apple Mac OS X 10.7 (64-bit)", VirtualMachineGuestOsIdentifier.DARWIN_11_64_GUEST);
-
- s_mapper.put("Open Enterprise Server", VirtualMachineGuestOsIdentifier.OES_GUEST);
-
- s_mapper.put("Asianux 3(32-bit)", VirtualMachineGuestOsIdentifier.ASIANUX_3_GUEST);
- s_mapper.put("Asianux 3(64-bit)", VirtualMachineGuestOsIdentifier.ASIANUX_3_64_GUEST);
-
- s_mapper.put("Debian GNU/Linux 5(64-bit)", VirtualMachineGuestOsIdentifier.DEBIAN_5_64_GUEST);
- s_mapper.put("Debian GNU/Linux 5.0 (32-bit)", VirtualMachineGuestOsIdentifier.DEBIAN_5_GUEST);
- s_mapper.put("Debian GNU/Linux 4(32-bit)", VirtualMachineGuestOsIdentifier.DEBIAN_4_GUEST);
- s_mapper.put("Debian GNU/Linux 4(64-bit)", VirtualMachineGuestOsIdentifier.DEBIAN_4_64_GUEST);
-
- s_mapper.put("Novell Netware 6.x", VirtualMachineGuestOsIdentifier.NETWARE_6_GUEST);
- s_mapper.put("Novell Netware 5.1", VirtualMachineGuestOsIdentifier.NETWARE_5_GUEST);
-
- s_mapper.put("Sun Solaris 10(32-bit)", VirtualMachineGuestOsIdentifier.SOLARIS_10_GUEST);
- s_mapper.put("Sun Solaris 10(64-bit)", VirtualMachineGuestOsIdentifier.SOLARIS_10_64_GUEST);
- s_mapper.put("Sun Solaris 9(Experimental)", VirtualMachineGuestOsIdentifier.SOLARIS_9_GUEST);
- s_mapper.put("Sun Solaris 8(Experimental)", VirtualMachineGuestOsIdentifier.SOLARIS_8_GUEST);
-
- s_mapper.put("FreeBSD (32-bit)", VirtualMachineGuestOsIdentifier.FREEBSD_GUEST);
- s_mapper.put("FreeBSD (64-bit)", VirtualMachineGuestOsIdentifier.FREEBSD_64_GUEST);
-
- s_mapper.put("SCO OpenServer 5", VirtualMachineGuestOsIdentifier.OTHER_GUEST);
- s_mapper.put("SCO UnixWare 7", VirtualMachineGuestOsIdentifier.UNIX_WARE_7_GUEST);
-
- s_mapper.put("SUSE Linux Enterprise 8(32-bit)", VirtualMachineGuestOsIdentifier.SUSE_GUEST);
- s_mapper.put("SUSE Linux Enterprise 8(64-bit)", VirtualMachineGuestOsIdentifier.SUSE_64_GUEST);
- s_mapper.put("SUSE Linux Enterprise 9(32-bit)", VirtualMachineGuestOsIdentifier.SUSE_GUEST);
- s_mapper.put("SUSE Linux Enterprise 9(64-bit)", VirtualMachineGuestOsIdentifier.SUSE_64_GUEST);
- s_mapper.put("SUSE Linux Enterprise 10(32-bit)", VirtualMachineGuestOsIdentifier.SUSE_GUEST);
- s_mapper.put("SUSE Linux Enterprise 10(64-bit)", VirtualMachineGuestOsIdentifier.SUSE_64_GUEST);
- s_mapper.put("SUSE Linux Enterprise 10(32-bit)", VirtualMachineGuestOsIdentifier.SUSE_GUEST);
- s_mapper.put("Other SUSE Linux(32-bit)", VirtualMachineGuestOsIdentifier.SUSE_GUEST);
- s_mapper.put("Other SUSE Linux(64-bit)", VirtualMachineGuestOsIdentifier.SUSE_64_GUEST);
-
- s_mapper.put("CentOS 4.5 (32-bit)", VirtualMachineGuestOsIdentifier.CENTOS_GUEST);
- s_mapper.put("CentOS 4.6 (32-bit)", VirtualMachineGuestOsIdentifier.CENTOS_GUEST);
- s_mapper.put("CentOS 4.7 (32-bit)", VirtualMachineGuestOsIdentifier.CENTOS_GUEST);
- s_mapper.put("CentOS 4.8 (32-bit)", VirtualMachineGuestOsIdentifier.CENTOS_GUEST);
- s_mapper.put("CentOS 5.0 (32-bit)", VirtualMachineGuestOsIdentifier.CENTOS_GUEST);
- s_mapper.put("CentOS 5.0 (64-bit)", VirtualMachineGuestOsIdentifier.CENTOS_64_GUEST);
- s_mapper.put("CentOS 5.1 (32-bit)", VirtualMachineGuestOsIdentifier.CENTOS_GUEST);
- s_mapper.put("CentOS 5.1 (64-bit)", VirtualMachineGuestOsIdentifier.CENTOS_64_GUEST);
- s_mapper.put("CentOS 5.2 (32-bit)", VirtualMachineGuestOsIdentifier.CENTOS_GUEST);
- s_mapper.put("CentOS 5.2 (64-bit)", VirtualMachineGuestOsIdentifier.CENTOS_64_GUEST);
- s_mapper.put("CentOS 5.3 (32-bit)", VirtualMachineGuestOsIdentifier.CENTOS_GUEST);
- s_mapper.put("CentOS 5.3 (64-bit)", VirtualMachineGuestOsIdentifier.CENTOS_64_GUEST);
- s_mapper.put("CentOS 5.4 (32-bit)", VirtualMachineGuestOsIdentifier.CENTOS_GUEST);
- s_mapper.put("CentOS 5.4 (64-bit)", VirtualMachineGuestOsIdentifier.CENTOS_64_GUEST);
- s_mapper.put("CentOS 5.5 (32-bit)", VirtualMachineGuestOsIdentifier.CENTOS_GUEST);
- s_mapper.put("CentOS 5.5 (64-bit)", VirtualMachineGuestOsIdentifier.CENTOS_64_GUEST);
- s_mapper.put("CentOS 5.6 (32-bit)", VirtualMachineGuestOsIdentifier.CENTOS_GUEST);
- s_mapper.put("CentOS 5.6 (64-bit)", VirtualMachineGuestOsIdentifier.CENTOS_64_GUEST);
- s_mapper.put("CentOS 6.0 (32-bit)", VirtualMachineGuestOsIdentifier.CENTOS_GUEST);
- s_mapper.put("CentOS 6.0 (64-bit)", VirtualMachineGuestOsIdentifier.CENTOS_64_GUEST);
- s_mapper.put("Other CentOS (32-bit)", VirtualMachineGuestOsIdentifier.CENTOS_GUEST);
- s_mapper.put("Other CentOS (64-bit)", VirtualMachineGuestOsIdentifier.CENTOS_64_GUEST);
-
- s_mapper.put("Red Hat Enterprise Linux 2", VirtualMachineGuestOsIdentifier.RHEL_2_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 3 (32-bit)", VirtualMachineGuestOsIdentifier.RHEL_3_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 3 (64-bit)", VirtualMachineGuestOsIdentifier.RHEL_3_64_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 4 (32-bit)", VirtualMachineGuestOsIdentifier.RHEL_4_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 4 (64-bit)", VirtualMachineGuestOsIdentifier.RHEL_4_64_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 5 (32-bit)", VirtualMachineGuestOsIdentifier.RHEL_5_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 5 (64-bit)", VirtualMachineGuestOsIdentifier.RHEL_5_64_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 6 (32-bit)", VirtualMachineGuestOsIdentifier.RHEL_6_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 6 (64-bit)", VirtualMachineGuestOsIdentifier.RHEL_6_64_GUEST);
-
- s_mapper.put("Red Hat Enterprise Linux 4.5 (32-bit)", VirtualMachineGuestOsIdentifier.RHEL_4_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 4.6 (32-bit)", VirtualMachineGuestOsIdentifier.RHEL_4_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 4.7 (32-bit)", VirtualMachineGuestOsIdentifier.RHEL_4_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 4.8 (32-bit)", VirtualMachineGuestOsIdentifier.RHEL_4_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 5.0 (32-bit)", VirtualMachineGuestOsIdentifier.RHEL_5_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 5.0 (64-bit)", VirtualMachineGuestOsIdentifier.RHEL_5_64_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 5.1 (32-bit)", VirtualMachineGuestOsIdentifier.RHEL_5_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 5.1 (64-bit)", VirtualMachineGuestOsIdentifier.RHEL_5_64_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 5.2 (32-bit)", VirtualMachineGuestOsIdentifier.RHEL_5_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 5.2 (64-bit)", VirtualMachineGuestOsIdentifier.RHEL_5_64_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 5.3 (32-bit)", VirtualMachineGuestOsIdentifier.RHEL_5_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 5.3 (64-bit)", VirtualMachineGuestOsIdentifier.RHEL_5_64_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 5.4 (32-bit)", VirtualMachineGuestOsIdentifier.RHEL_5_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 5.4 (64-bit)", VirtualMachineGuestOsIdentifier.RHEL_5_64_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 5.5 (32-bit)", VirtualMachineGuestOsIdentifier.RHEL_5_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 5.5 (64-bit)", VirtualMachineGuestOsIdentifier.RHEL_5_64_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 5.6 (32-bit)", VirtualMachineGuestOsIdentifier.RHEL_5_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 5.6 (64-bit)", VirtualMachineGuestOsIdentifier.RHEL_5_64_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 5.7 (32-bit)", VirtualMachineGuestOsIdentifier.RHEL_5_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 5.7 (64-bit)", VirtualMachineGuestOsIdentifier.RHEL_5_64_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 5.8 (32-bit)", VirtualMachineGuestOsIdentifier.RHEL_5_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 5.8 (64-bit)", VirtualMachineGuestOsIdentifier.RHEL_5_64_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 5.9 (32-bit)", VirtualMachineGuestOsIdentifier.RHEL_5_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 5.9 (64-bit)", VirtualMachineGuestOsIdentifier.RHEL_5_64_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 6.0 (32-bit)", VirtualMachineGuestOsIdentifier.RHEL_6_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 6.0 (64-bit)", VirtualMachineGuestOsIdentifier.RHEL_6_64_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 6.1 (32-bit)", VirtualMachineGuestOsIdentifier.RHEL_6_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 6.1 (64-bit)", VirtualMachineGuestOsIdentifier.RHEL_6_64_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 6.2 (32-bit)", VirtualMachineGuestOsIdentifier.RHEL_6_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 6.2 (64-bit)", VirtualMachineGuestOsIdentifier.RHEL_6_64_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 6.3 (32-bit)", VirtualMachineGuestOsIdentifier.RHEL_6_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 6.3 (64-bit)", VirtualMachineGuestOsIdentifier.RHEL_6_64_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 6.4 (32-bit)", VirtualMachineGuestOsIdentifier.RHEL_6_GUEST);
- s_mapper.put("Red Hat Enterprise Linux 6.4 (64-bit)", VirtualMachineGuestOsIdentifier.RHEL_6_64_GUEST);
-
- s_mapper.put("Ubuntu 8.04 (32-bit)", VirtualMachineGuestOsIdentifier.UBUNTU_GUEST);
- s_mapper.put("Ubuntu 8.04 (64-bit)", VirtualMachineGuestOsIdentifier.UBUNTU_64_GUEST);
- s_mapper.put("Ubuntu 8.10 (32-bit)", VirtualMachineGuestOsIdentifier.UBUNTU_GUEST);
- s_mapper.put("Ubuntu 8.10 (64-bit)", VirtualMachineGuestOsIdentifier.UBUNTU_64_GUEST);
- s_mapper.put("Ubuntu 9.04 (32-bit)", VirtualMachineGuestOsIdentifier.UBUNTU_GUEST);
- s_mapper.put("Ubuntu 9.04 (64-bit)", VirtualMachineGuestOsIdentifier.UBUNTU_64_GUEST);
- s_mapper.put("Ubuntu 9.10 (32-bit)", VirtualMachineGuestOsIdentifier.UBUNTU_GUEST);
- s_mapper.put("Ubuntu 9.10 (64-bit)", VirtualMachineGuestOsIdentifier.UBUNTU_64_GUEST);
- s_mapper.put("Ubuntu 10.04 (32-bit)", VirtualMachineGuestOsIdentifier.UBUNTU_GUEST);
- s_mapper.put("Ubuntu 10.04 (64-bit)", VirtualMachineGuestOsIdentifier.UBUNTU_64_GUEST);
- s_mapper.put("Ubuntu 10.10 (32-bit)", VirtualMachineGuestOsIdentifier.UBUNTU_GUEST);
- s_mapper.put("Ubuntu 10.10 (64-bit)", VirtualMachineGuestOsIdentifier.UBUNTU_64_GUEST);
- s_mapper.put("Ubuntu 12.04 (32-bit)", VirtualMachineGuestOsIdentifier.UBUNTU_GUEST);
- s_mapper.put("Ubuntu 12.04 (64-bit)", VirtualMachineGuestOsIdentifier.UBUNTU_64_GUEST);
- s_mapper.put("Other Ubuntu (32-bit)", VirtualMachineGuestOsIdentifier.UBUNTU_GUEST);
- s_mapper.put("Other Ubuntu (64-bit)", VirtualMachineGuestOsIdentifier.UBUNTU_64_GUEST);
-
- s_mapper.put("Other 2.6x Linux (32-bit)", VirtualMachineGuestOsIdentifier.OTHER_26_X_LINUX_GUEST);
- s_mapper.put("Other 2.6x Linux (64-bit)", VirtualMachineGuestOsIdentifier.OTHER_26_X_LINUX_64_GUEST);
- s_mapper.put("Other Linux (32-bit)", VirtualMachineGuestOsIdentifier.OTHER_LINUX_GUEST);
- s_mapper.put("Other Linux (64-bit)", VirtualMachineGuestOsIdentifier.OTHER_LINUX_64_GUEST);
-
- s_mapper.put("Other (32-bit)", VirtualMachineGuestOsIdentifier.OTHER_GUEST);
- s_mapper.put("Other (64-bit)", VirtualMachineGuestOsIdentifier.OTHER_GUEST_64);
- }
-
- public static VirtualMachineGuestOsIdentifier getGuestOsIdentifier(String guestOsName) {
- return s_mapper.get(guestOsName);
- }
-
-}
diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareHelper.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareHelper.java
index dd65775..3d209fb 100644
--- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareHelper.java
+++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareHelper.java
@@ -92,6 +92,7 @@
public static final int MAX_IDE_CONTROLLER_COUNT = 2;
public static final int MAX_ALLOWED_DEVICES_IDE_CONTROLLER = 2;
public static final int MAX_ALLOWED_DEVICES_SCSI_CONTROLLER = 15;
+ public static final String MIN_VERSION_UEFI_LEGACY = "5.5";
public static boolean isReservedScsiDeviceNumber(int deviceNumber) {
return deviceNumber == 7;
