diff --git a/.gitignore b/.gitignore index 4dc9354b9a..8a549e71de 100644 --- a/.gitignore +++ b/.gitignore @@ -28,7 +28,7 @@ src/vmm_mad/remotes/lxd/tests/ src/oca/python/pyone/bindings src/oca/python/build/ src/oca/python/dist/ -src/oca/python/opennebula.egg-info/ +src/oca/python/pyone.egg-info/ src/oca/python/doc/ src/docker_machine/pkg diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..e73b1c1b51 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,27 @@ +# -------------------------------------------------------------------------- # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # +# # +# Licensed 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. # +#--------------------------------------------------------------------------- # + +dist: xenial +language: generic +before_install: + - sudo apt-get install -y libsystemd-dev bash-completion bison debhelper default-jdk flex javahelper libmysql++-dev libsqlite3-dev libssl-dev libws-commons-util-java libxml2-dev libxmlrpc3-client-java libxmlrpc3-common-java libxslt1-dev libcurl4-openssl-dev ruby scons libxmlrpc-c++8-dev npm libvncserver-dev + - gem install rubocop + - sudo npm install -g bower + - sudo npm install -g grunt + - sudo npm install -g grunt-cli + - (cd src/sunstone/public && npm install && bower install) +script: + - set -o errexit; source .travis/smoke_tests.sh diff --git a/.travis/README.md b/.travis/README.md new file mode 100644 index 0000000000..2c7562b5a2 --- /dev/null +++ b/.travis/README.md @@ -0,0 +1,10 @@ +## Travis smoke tests + +The `.travis/tests` directory contains scripts for each smoke test. + +The smoke_test.sh script is called which iterates on each script, and it exits and logs on any failure. To add more tests, simply create a new file on `.travis/tests`. + +Each test should: + + - have a number as prefix to define the order. Renaming is allowed, the rule is to execute the less costly tests (in time) first + - return 0 on success, other number on error diff --git a/.travis/smoke_tests.sh b/.travis/smoke_tests.sh new file mode 100755 index 0000000000..b7638830b0 --- /dev/null +++ b/.travis/smoke_tests.sh @@ -0,0 +1,50 @@ +#!/bin/bash + +# -------------------------------------------------------------------------- # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # +# # +# Licensed 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. # +#--------------------------------------------------------------------------- # + +#------------------------------------------------------------------------------- +# Smoke tests for OpenNebula, to be triggered by travis or manually +# It executes all scripts in 'tests' folder and expects 0 exit code +#------------------------------------------------------------------------------- + +# default parameters values + +LOG_FILE='smoke_tests.results' + +check_test() { + local TEST=$1 + + echo "Executing test $TEST" >> ${LOG_FILE} + eval $TEST >> ${LOG_FILE} 2>&1 + RC=$? + echo "RC for $TEST is $RC" + return $RC +} + +for smoke_test in .travis/tests/*.sh; do + check_test "$smoke_test" || break +done + +if [ $RC == 0 ]; then + echo "All tests OK!" +else + echo "Test failed: "$smoke_test + echo "Log follows:" + cat $LOG_FILE +fi + +exit $RC diff --git a/src/vmm_mad/remotes/vcenter/vcenterc b/.travis/tests/01-rubocop.sh old mode 100644 new mode 100755 similarity index 81% rename from src/vmm_mad/remotes/vcenter/vcenterc rename to .travis/tests/01-rubocop.sh index 34d71f79ad..8a85967068 --- a/src/vmm_mad/remotes/vcenter/vcenterc +++ b/.travis/tests/01-rubocop.sh @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -14,7 +14,6 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -# No : VCENTER_IMPORTED attribute will be set on imported images -# this attribute prevents the image to be deleted. -# Yes : You can delete the images using OpenNebula. -:delete_images: No +# lint ruby code + +ln -s share/linters/.rubocop.yml . && rubocop diff --git a/.travis/tests/02-scons.sh b/.travis/tests/02-scons.sh new file mode 100755 index 0000000000..b148eb2372 --- /dev/null +++ b/.travis/tests/02-scons.sh @@ -0,0 +1,19 @@ +# -------------------------------------------------------------------------- # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # +# # +# Licensed 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. # +#--------------------------------------------------------------------------- # + +# check that OpenNebula compiles + +scons sunstone=yes mysql=yes systemd=yes new_xmlrpc=yes diff --git a/.travis/tests/03-oned.sh b/.travis/tests/03-oned.sh new file mode 100755 index 0000000000..54fe1bb7e4 --- /dev/null +++ b/.travis/tests/03-oned.sh @@ -0,0 +1,33 @@ +# -------------------------------------------------------------------------- # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # +# # +# Licensed 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. # +#--------------------------------------------------------------------------- # + +# install oned system wide + +sudo ./install.sh -u travis + +# Set credentials +mkdir $HOME/.one +echo "oneadmin:opennebula" > $HOME/.one/one_auth + +# Install gems +/usr/share/one/install_gems --yes + +# start oned + +one start + +# check it's up +timeout 60 sh -c 'until nc -z $0 $1; do sleep 1; done' localhost 2633 diff --git a/.travis/tests/04-sunstone.sh b/.travis/tests/04-sunstone.sh new file mode 100755 index 0000000000..dc37e263b2 --- /dev/null +++ b/.travis/tests/04-sunstone.sh @@ -0,0 +1,30 @@ +# -------------------------------------------------------------------------- # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # +# # +# Licensed 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. # +#--------------------------------------------------------------------------- # + +# start sunstone +sunstone-server start + +# check it's up +RC=`timeout 60 sh -c 'until nc -z $0 $1; do sleep 1; done' localhost 9869` + +echo "Sunstone log" +cat /var/log/one/sunstone.log +echo +echo "Sunstone error log" +cat /var/log/one/sunstone.error +echo "---------" + +exit $RC diff --git a/README.md b/README.md index b63be32833..155534bc32 100644 --- a/README.md +++ b/README.md @@ -172,7 +172,7 @@ Support: https://opennebula.org/support ## License -Copyright 2002-2018, OpenNebula Project, OpenNebula Systems (formerly C12G Labs) +Copyright 2002-2019, OpenNebula Project, OpenNebula Systems (formerly C12G Labs) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain diff --git a/SConstruct b/SConstruct index f868cec514..f3666dc0bc 100755 --- a/SConstruct +++ b/SConstruct @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/include/AclManager.h b/include/AclManager.h index bd589c506d..9fd449febe 100644 --- a/include/AclManager.h +++ b/include/AclManager.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/AclRule.h b/include/AclRule.h index 0291855ee9..283d5f1dcb 100644 --- a/include/AclRule.h +++ b/include/AclRule.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/ActionManager.h b/include/ActionManager.h index abb7936a7a..60875c1ce3 100644 --- a/include/ActionManager.h +++ b/include/ActionManager.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/ActionSet.h b/include/ActionSet.h index 1088de2b44..ef295dd431 100644 --- a/include/ActionSet.h +++ b/include/ActionSet.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/AddressRange.h b/include/AddressRange.h index 5a9c27c0f4..68846f1d43 100644 --- a/include/AddressRange.h +++ b/include/AddressRange.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/AddressRangeIPAM.h b/include/AddressRangeIPAM.h index 3afb2de6eb..a9683e4337 100644 --- a/include/AddressRangeIPAM.h +++ b/include/AddressRangeIPAM.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/AddressRangeInternal.h b/include/AddressRangeInternal.h index f1af7aeb1b..a8c373a3b1 100644 --- a/include/AddressRangeInternal.h +++ b/include/AddressRangeInternal.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/AddressRangePool.h b/include/AddressRangePool.h index 3a966406f6..9630a9824f 100644 --- a/include/AddressRangePool.h +++ b/include/AddressRangePool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/Attribute.h b/include/Attribute.h index 2254ac3d4a..7a12c7c24b 100644 --- a/include/Attribute.h +++ b/include/Attribute.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -83,7 +83,11 @@ public: * by the calling function. * @return a string (allocated in the heap) holding the attribute value. */ - virtual string * to_xml() const = 0; + virtual void to_xml(std::ostringstream& s) const = 0; + + virtual void to_json(std::ostringstream& s) const = 0; + + virtual void to_token(std::ostringstream& s) const = 0; /** * Builds a new attribute from a string. @@ -158,17 +162,31 @@ public: * * attribute_value * - * The string MUST be freed by the calling function. - * @return a string (allocated in the heap) holding the attribute value. + * @paran s the stream to write the attribute. */ - string * to_xml() const + void to_xml(std::ostringstream& s) const { - string * xml = new string; + s << "<" << attribute_name << ">" << one_util::escape_xml(attribute_value) + << ""; - *xml = "<" + name() + ">" + one_util::escape_xml(attribute_value) + - ""; + } - return xml; + void to_json(std::ostringstream& s) const + { + one_util::escape_json(attribute_value, s); + } + + void to_token(std::ostringstream& s) const + { + if (attribute_name.empty() || attribute_value.empty()) + { + return; + } + + one_util::escape_token(attribute_name, s); + s << "="; + one_util::escape_token(attribute_value, s); + s << std::endl; } /** @@ -350,12 +368,11 @@ public: * The string MUST be freed by the calling function. * @return a string (allocated in the heap) holding the attribute value. */ - string * to_xml() const; + void to_xml(std::ostringstream& s) const; - /** - * Same as above but the attribute is written in an string stream; - */ - void to_xml(ostringstream &oss) const; + void to_json(std::ostringstream& s) const; + + void to_token(std::ostringstream& s) const; /** * Builds a new attribute from a string of the form: diff --git a/include/AuthManager.h b/include/AuthManager.h index 4a276c5a3c..a8fdeb8ca2 100644 --- a/include/AuthManager.h +++ b/include/AuthManager.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/AuthManagerDriver.h b/include/AuthManagerDriver.h index f648eaf993..11596b8603 100644 --- a/include/AuthManagerDriver.h +++ b/include/AuthManagerDriver.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/AuthRequest.h b/include/AuthRequest.h index c5487129cc..5290f44f00 100644 --- a/include/AuthRequest.h +++ b/include/AuthRequest.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/BitMap.h b/include/BitMap.h index ad5f9bf298..7d797064e2 100644 --- a/include/BitMap.h +++ b/include/BitMap.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/CachePool.h b/include/CachePool.h index 1e65e10778..990203cf9b 100644 --- a/include/CachePool.h +++ b/include/CachePool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/Callbackable.h b/include/Callbackable.h index 5405e829a2..cf5262cd26 100644 --- a/include/Callbackable.h +++ b/include/Callbackable.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/Client.h b/include/Client.h index e6fc8c63e6..ad34dcb826 100644 --- a/include/Client.h +++ b/include/Client.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/Cluster.h b/include/Cluster.h index 040684ce80..e2cda2e3d2 100644 --- a/include/Cluster.h +++ b/include/Cluster.h @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/ClusterPool.h b/include/ClusterPool.h index a950507d61..90751af3be 100644 --- a/include/ClusterPool.h +++ b/include/ClusterPool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/ClusterTemplate.h b/include/ClusterTemplate.h index 86fede7733..e1b95dff7f 100644 --- a/include/ClusterTemplate.h +++ b/include/ClusterTemplate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/Clusterable.h b/include/Clusterable.h index 813f9ad197..042eecec59 100644 --- a/include/Clusterable.h +++ b/include/Clusterable.h @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/ClusterableSingle.h b/include/ClusterableSingle.h index a4b841dfde..8f094c5c3b 100644 --- a/include/ClusterableSingle.h +++ b/include/ClusterableSingle.h @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/Datastore.h b/include/Datastore.h index 85b2673d5a..86590ae8c7 100644 --- a/include/Datastore.h +++ b/include/Datastore.h @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/DatastorePool.h b/include/DatastorePool.h index f41c26e4ee..b9cdd32df6 100644 --- a/include/DatastorePool.h +++ b/include/DatastorePool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/DatastoreTemplate.h b/include/DatastoreTemplate.h index c197677273..85d450e88a 100644 --- a/include/DatastoreTemplate.h +++ b/include/DatastoreTemplate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/DefaultQuotas.h b/include/DefaultQuotas.h index ef50f3a0b8..a9d47de2c3 100644 --- a/include/DefaultQuotas.h +++ b/include/DefaultQuotas.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/DispatchManager.h b/include/DispatchManager.h index 254e11af85..16aeac80c8 100644 --- a/include/DispatchManager.h +++ b/include/DispatchManager.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/Document.h b/include/Document.h index 8196c30ad6..0f7acde352 100644 --- a/include/Document.h +++ b/include/Document.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/DocumentPool.h b/include/DocumentPool.h index ccda63229b..3421e897a7 100644 --- a/include/DocumentPool.h +++ b/include/DocumentPool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/ExtendedAttribute.h b/include/ExtendedAttribute.h index ab07401211..447e54bdf9 100644 --- a/include/ExtendedAttribute.h +++ b/include/ExtendedAttribute.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -92,9 +92,19 @@ protected: return va->marshall(_sep); }; - string * to_xml() const + void to_xml(std::ostringstream& s) const { - return va->to_xml(); + return va->to_xml(s); + }; + + void to_json(std::ostringstream& s) const + { + return va->to_json(s); + }; + + void to_token(std::ostringstream& s) const + { + return va->to_token(s); }; void unmarshall(const std::string& sattr, const char * _sep = 0) diff --git a/include/FedReplicaManager.h b/include/FedReplicaManager.h index 8c63c1f99c..e5cf252bcb 100644 --- a/include/FedReplicaManager.h +++ b/include/FedReplicaManager.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/Group.h b/include/Group.h index 191f1ce847..88862c43e0 100644 --- a/include/Group.h +++ b/include/Group.h @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/GroupPool.h b/include/GroupPool.h index 7231f04601..362a315ee4 100644 --- a/include/GroupPool.h +++ b/include/GroupPool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/History.h b/include/History.h index c5f3805ba2..3e45417d50 100644 --- a/include/History.h +++ b/include/History.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -258,6 +258,10 @@ private: */ string& to_xml(string& xml, bool database) const; + string& to_json(string& json) const; + + string& to_token(string& text) const; + /** * Rebuilds the object from an xml node * @param node The xml node pointer diff --git a/include/Hook.h b/include/Hook.h index bdc580b976..e5414d6dbd 100644 --- a/include/Hook.h +++ b/include/Hook.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/HookManager.h b/include/HookManager.h index 125c93d677..f8391682ab 100644 --- a/include/HookManager.h +++ b/include/HookManager.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/HookManagerDriver.h b/include/HookManagerDriver.h index 2316bdec4f..adf35dc380 100644 --- a/include/HookManagerDriver.h +++ b/include/HookManagerDriver.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/Host.h b/include/Host.h index 4e83903725..8cbf1317e3 100644 --- a/include/Host.h +++ b/include/Host.h @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/HostHook.h b/include/HostHook.h index a6799f22c6..31c7cbc275 100644 --- a/include/HostHook.h +++ b/include/HostHook.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/HostPool.h b/include/HostPool.h index 89ed2ca50b..a67857ad21 100644 --- a/include/HostPool.h +++ b/include/HostPool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/HostShare.h b/include/HostShare.h index 3646b85857..f06fd82691 100644 --- a/include/HostShare.h +++ b/include/HostShare.h @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/HostTemplate.h b/include/HostTemplate.h index 80b151c712..507c353199 100644 --- a/include/HostTemplate.h +++ b/include/HostTemplate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/IPAMManager.h b/include/IPAMManager.h index 6cc167bbe4..44c0280478 100644 --- a/include/IPAMManager.h +++ b/include/IPAMManager.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/IPAMManagerDriver.h b/include/IPAMManagerDriver.h index ce4f549861..9c52fc24d7 100644 --- a/include/IPAMManagerDriver.h +++ b/include/IPAMManagerDriver.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/IPAMRequest.h b/include/IPAMRequest.h index 4f1547e6d2..44e70d6fca 100644 --- a/include/IPAMRequest.h +++ b/include/IPAMRequest.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/Image.h b/include/Image.h index 4877e06cf9..b8207c4474 100644 --- a/include/Image.h +++ b/include/Image.h @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -191,6 +191,13 @@ public: return (persistent_img == 1); }; + /** + * @return true if the image is in a locked state + */ + bool is_locked() const + { + return state == LOCKED || state == LOCKED_USED || state == LOCKED_USED_PERS; + }; /** * Check the PERSISTENT attribute in an image Template, if not set the * DEFAULT_IMAGE_PERSISTENT and DEFAULT_IMAGE_PERSISTENT_NEW are check in @@ -549,7 +556,7 @@ public: void revert_snapshot(int snap_id) { - snapshots.active_snapshot(snap_id); + snapshots.active_snapshot(snap_id, true); }; void set_target_snapshot(int snap_id) diff --git a/include/ImageManager.h b/include/ImageManager.h index 6016ea4f63..373c40633c 100644 --- a/include/ImageManager.h +++ b/include/ImageManager.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/ImageManagerDriver.h b/include/ImageManagerDriver.h index b8d1975daf..c21f46e566 100644 --- a/include/ImageManagerDriver.h +++ b/include/ImageManagerDriver.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/ImagePool.h b/include/ImagePool.h index 240620ee4b..49325945ec 100644 --- a/include/ImagePool.h +++ b/include/ImagePool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/ImageTemplate.h b/include/ImageTemplate.h index 8143f26662..838ee4398e 100644 --- a/include/ImageTemplate.h +++ b/include/ImageTemplate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/InformationManager.h b/include/InformationManager.h index 57851112ee..6e9c762ac7 100644 --- a/include/InformationManager.h +++ b/include/InformationManager.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/InformationManagerDriver.h b/include/InformationManagerDriver.h index 5c9b76ac50..8ea475ea0f 100644 --- a/include/InformationManagerDriver.h +++ b/include/InformationManagerDriver.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/LibVirtDriver.h b/include/LibVirtDriver.h index 93354dad20..4fc4234a3b 100644 --- a/include/LibVirtDriver.h +++ b/include/LibVirtDriver.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/LifeCycleManager.h b/include/LifeCycleManager.h index 62bc312b70..5f80676b10 100644 --- a/include/LifeCycleManager.h +++ b/include/LifeCycleManager.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/Log.h b/include/Log.h index f5818fece7..47889bc995 100644 --- a/include/Log.h +++ b/include/Log.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/LogDB.h b/include/LogDB.h index 4353b6ce72..1eb46362ed 100644 --- a/include/LogDB.h +++ b/include/LogDB.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -251,6 +251,11 @@ public: int next_federated(int index); + bool fts_available() + { + return db->fts_available(); + } + protected: int exec(std::ostringstream& cmd, Callbackable* obj, bool quiet) { @@ -416,6 +421,11 @@ public: return _logdb->limit_support(); } + bool fts_available() + { + return _logdb->fts_available(); + } + protected: int exec(std::ostringstream& cmd, Callbackable* obj, bool quiet) { diff --git a/include/LoginToken.h b/include/LoginToken.h index cc58482a45..764aca0cd5 100644 --- a/include/LoginToken.h +++ b/include/LoginToken.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/Mad.h b/include/Mad.h index 755714c20a..18e3c97619 100644 --- a/include/Mad.h +++ b/include/Mad.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/MadManager.h b/include/MadManager.h index 538fec0de0..17fd4dad95 100644 --- a/include/MadManager.h +++ b/include/MadManager.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/MarketPlace.h b/include/MarketPlace.h index ac582ba01d..a21f88af6a 100644 --- a/include/MarketPlace.h +++ b/include/MarketPlace.h @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/MarketPlaceApp.h b/include/MarketPlaceApp.h index 60e9e5ff85..f5a9c575a6 100644 --- a/include/MarketPlaceApp.h +++ b/include/MarketPlaceApp.h @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/MarketPlaceAppPool.h b/include/MarketPlaceAppPool.h index 2ece427901..b8266b767f 100644 --- a/include/MarketPlaceAppPool.h +++ b/include/MarketPlaceAppPool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/MarketPlaceAppTemplate.h b/include/MarketPlaceAppTemplate.h index e619b17a6b..3d859efd23 100644 --- a/include/MarketPlaceAppTemplate.h +++ b/include/MarketPlaceAppTemplate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/MarketPlaceManager.h b/include/MarketPlaceManager.h index eb9f45e885..51f4b0822b 100644 --- a/include/MarketPlaceManager.h +++ b/include/MarketPlaceManager.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/MarketPlaceManagerDriver.h b/include/MarketPlaceManagerDriver.h index f60c55f214..6a1d610fd8 100644 --- a/include/MarketPlaceManagerDriver.h +++ b/include/MarketPlaceManagerDriver.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/MarketPlacePool.h b/include/MarketPlacePool.h index 05cec25ab4..bffc5cf1a3 100644 --- a/include/MarketPlacePool.h +++ b/include/MarketPlacePool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/MarketPlaceTemplate.h b/include/MarketPlaceTemplate.h index 043dc72abd..9984de4ee8 100644 --- a/include/MarketPlaceTemplate.h +++ b/include/MarketPlaceTemplate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/MonitorThread.h b/include/MonitorThread.h index 1118be3fd5..2dedd1c781 100644 --- a/include/MonitorThread.h +++ b/include/MonitorThread.h @@ -1,6 +1,6 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/MySqlDB.h b/include/MySqlDB.h index d71469ca60..87f7ef4a79 100644 --- a/include/MySqlDB.h +++ b/include/MySqlDB.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -84,6 +84,11 @@ public: */ bool limit_support(); + /** + * Return true if the backend allows FTS index + */ + bool fts_available(); + protected: /** * Wraps the mysql_query function call @@ -171,6 +176,8 @@ public: bool limit_support(){return true;}; + bool fts_available(){return false;}; + protected: int exec(ostringstream& cmd, Callbackable* obj, bool quiet){return -1;}; }; diff --git a/include/Nebula.h b/include/Nebula.h index 9ff26ba199..5635b9ebfd 100644 --- a/include/Nebula.h +++ b/include/Nebula.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -362,7 +362,7 @@ public: */ static string code_version() { - return "5.7.80"; // bump version + return "5.7.85"; // bump version } /** @@ -371,7 +371,7 @@ public: */ static string shared_db_version() { - return "5.7.80"; + return "5.6.0"; } /** @@ -578,6 +578,15 @@ public: return nebula_configuration->to_xml(xml); }; + /** + * Gets the database backend type + * @return database backend type + */ + string get_db_backend() const + { + return db_backend_type; + } + // ----------------------------------------------------------------------- // Default Quotas // ----------------------------------------------------------------------- @@ -695,7 +704,7 @@ private: "/DEFAULT_GROUP_QUOTAS/NETWORK_QUOTA", "/DEFAULT_GROUP_QUOTAS/IMAGE_QUOTA", "/DEFAULT_GROUP_QUOTAS/VM_QUOTA"), - system_db(0), logdb(0), fed_logdb(0), + system_db(0), db_backend_type("sqlite"), logdb(0), fed_logdb(0), vmpool(0), hpool(0), vnpool(0), upool(0), ipool(0), gpool(0), tpool(0), dspool(0), clpool(0), docpool(0), zonepool(0), secgrouppool(0), vdcpool(0), vrouterpool(0), marketpool(0), apppool(0), vmgrouppool(0), @@ -819,6 +828,7 @@ private: // --------------------------------------------------------------- SystemDB * system_db; + string db_backend_type; // --------------------------------------------------------------- // Nebula Pools diff --git a/include/NebulaLog.h b/include/NebulaLog.h index 64d4880e44..ac251b66ac 100644 --- a/include/NebulaLog.h +++ b/include/NebulaLog.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/NebulaTemplate.h b/include/NebulaTemplate.h index 201cb62c81..82d8a5d5c8 100644 --- a/include/NebulaTemplate.h +++ b/include/NebulaTemplate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/NebulaUtil.h b/include/NebulaUtil.h index 56c6dddbbe..e350812b50 100644 --- a/include/NebulaUtil.h +++ b/include/NebulaUtil.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -208,6 +208,11 @@ namespace one_util { return escape(v, "'", "'"); } + + void escape_json(const std::string& str, std::ostringstream& s); + + void escape_token(const std::string& str, std::ostringstream& s); + /** * Checks if a strings matches a regular expression * @@ -236,7 +241,8 @@ namespace one_util const std::string& replacement); template - std::set set_intersection(const std::set &first, const std::set &second) + std::set set_intersection(const std::set &first, const std::set + &second) { std::set output; @@ -247,48 +253,48 @@ namespace one_util return output; } - /** + /** * Compress the input string unsing zlib * @param in input string * @param bool64 true to base64 encode output * @return pointer to the compressed sting (must be freed) or 0 in case * of error */ - std::string * zlib_compress(const std::string& in, bool base64); + std::string * zlib_compress(const std::string& in, bool base64); - /** + /** * Decompress the input string unsing zlib * @param in input string * @param base64 true if the input is base64 encoded * @return pointer to the decompressed sting (must be freed) or 0 in case * of error */ - std::string * zlib_decompress(const std::string& in, bool base64); + std::string * zlib_decompress(const std::string& in, bool base64); - extern "C" void sslmutex_lock_callback(int mode, int type, char *file, - int line); + extern "C" void sslmutex_lock_callback(int mode, int type, char *file, + int line); - extern "C" unsigned long sslmutex_id_callback(); + extern "C" unsigned long sslmutex_id_callback(); - class SSLMutex - { - public: - static void initialize(); + class SSLMutex + { + public: + static void initialize(); - static void finalize(); + static void finalize(); - private: - friend void sslmutex_lock_callback(int mode, int type, char *file, - int line); + private: + friend void sslmutex_lock_callback(int mode, int type, char *file, + int line); - SSLMutex(); + SSLMutex(); - ~SSLMutex(); + ~SSLMutex(); - static SSLMutex * ssl_mutex; + static SSLMutex * ssl_mutex; - static std::vector vmutex; - }; + static std::vector vmutex; + }; }; #endif /* _NEBULA_UTIL_H_ */ diff --git a/include/ObjectCollection.h b/include/ObjectCollection.h index aa6a58951c..10904aedc8 100644 --- a/include/ObjectCollection.h +++ b/include/ObjectCollection.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/ObjectSQL.h b/include/ObjectSQL.h index 3bd157c075..540fc9db4e 100644 --- a/include/ObjectSQL.h +++ b/include/ObjectSQL.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/ObjectXML.h b/include/ObjectXML.h index 229a7bc53e..5d453072dc 100644 --- a/include/ObjectXML.h +++ b/include/ObjectXML.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/PoolObjectAuth.h b/include/PoolObjectAuth.h index 2a6185f978..3903e91dbb 100644 --- a/include/PoolObjectAuth.h +++ b/include/PoolObjectAuth.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/PoolObjectSQL.h b/include/PoolObjectSQL.h index a6f1c7f0d7..34a84d162d 100644 --- a/include/PoolObjectSQL.h +++ b/include/PoolObjectSQL.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/PoolSQL.h b/include/PoolSQL.h index e9886ee247..af90515cf1 100644 --- a/include/PoolSQL.h +++ b/include/PoolSQL.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -251,6 +251,35 @@ public: static void oid_filter(int start_id, int end_id, string& filter); + + /** + * This function returns a legal SQL string that can be used in an SQL + * statement. The string is encoded to an escaped SQL string, taking into + * account the current character set of the connection. + * @param str the string to be escaped + * @return a valid SQL string or NULL in case of failure + */ + char * escape_str(const string& str) + { + return db->escape_str(str); + } + + /** + * Frees a previously scaped string + * @param str pointer to the str + */ + void free_str(char * str) + { + db->free_str(str); + } + + /** + * Return true if FTS is available. + */ + bool is_fts_available() + { + return db->fts_available(); + } protected: /** diff --git a/include/PoolSQLCache.h b/include/PoolSQLCache.h index c995861d9b..02762ee252 100644 --- a/include/PoolSQLCache.h +++ b/include/PoolSQLCache.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/Quota.h b/include/Quota.h index 0c299d332f..0401a3e94b 100644 --- a/include/Quota.h +++ b/include/Quota.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/QuotaDatastore.h b/include/QuotaDatastore.h index 9ef30ee1ac..c878382d81 100644 --- a/include/QuotaDatastore.h +++ b/include/QuotaDatastore.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/QuotaImage.h b/include/QuotaImage.h index 57b4c62e78..1b004873f5 100644 --- a/include/QuotaImage.h +++ b/include/QuotaImage.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/QuotaNetwork.h b/include/QuotaNetwork.h index ae7b121a20..903170efa8 100644 --- a/include/QuotaNetwork.h +++ b/include/QuotaNetwork.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/QuotaVirtualMachine.h b/include/QuotaVirtualMachine.h index 19440ecd26..afdb0edda9 100644 --- a/include/QuotaVirtualMachine.h +++ b/include/QuotaVirtualMachine.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/Quotas.h b/include/Quotas.h index 1c75df9543..b6897975bf 100644 --- a/include/Quotas.h +++ b/include/Quotas.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/QuotasSQL.h b/include/QuotasSQL.h index f053fa62c2..018a390d2a 100644 --- a/include/QuotasSQL.h +++ b/include/QuotasSQL.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RaftHook.h b/include/RaftHook.h index 8ed7aa8bba..049e6c56ba 100644 --- a/include/RaftHook.h +++ b/include/RaftHook.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RaftManager.h b/include/RaftManager.h index 0cd2a72aaa..ae8f886b87 100644 --- a/include/RaftManager.h +++ b/include/RaftManager.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RankScheduler.h b/include/RankScheduler.h index 2682e30a43..617245f562 100644 --- a/include/RankScheduler.h +++ b/include/RankScheduler.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/ReplicaManager.h b/include/ReplicaManager.h index 65f47f1ac2..654c75858b 100644 --- a/include/ReplicaManager.h +++ b/include/ReplicaManager.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/ReplicaRequest.h b/include/ReplicaRequest.h index a567413ef0..1545f0c62a 100644 --- a/include/ReplicaRequest.h +++ b/include/ReplicaRequest.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/ReplicaThread.h b/include/ReplicaThread.h index e385f865d0..d90e780cd8 100644 --- a/include/ReplicaThread.h +++ b/include/ReplicaThread.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/Request.h b/include/Request.h index ccd662bc88..d2dc459545 100644 --- a/include/Request.h +++ b/include/Request.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RequestManager.h b/include/RequestManager.h index 9e7fdcca0b..0d1839eaa9 100644 --- a/include/RequestManager.h +++ b/include/RequestManager.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RequestManagerAcl.h b/include/RequestManagerAcl.h index c9b848fbef..1e92bb865c 100644 --- a/include/RequestManagerAcl.h +++ b/include/RequestManagerAcl.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RequestManagerAllocate.h b/include/RequestManagerAllocate.h index 6d8a954ee3..654bad1701 100644 --- a/include/RequestManagerAllocate.h +++ b/include/RequestManagerAllocate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RequestManagerAllocateDB.h b/include/RequestManagerAllocateDB.h index 302d0a7d5a..f47585061b 100644 --- a/include/RequestManagerAllocateDB.h +++ b/include/RequestManagerAllocateDB.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RequestManagerChmod.h b/include/RequestManagerChmod.h index ae7fa0d6d3..53c19a2593 100644 --- a/include/RequestManagerChmod.h +++ b/include/RequestManagerChmod.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -103,7 +103,7 @@ class VirtualNetworkTemplateChmod : public RequestManagerChmod public: VirtualNetworkTemplateChmod(): RequestManagerChmod("one.vntemplate.chmod", "Changes permission bits of a " - "virtual network template", "A:siiiiiiiiiib") + "virtual network template") { Nebula& nd = Nebula::instance(); pool = nd.get_vntpool(); diff --git a/include/RequestManagerChown.h b/include/RequestManagerChown.h index e581285e26..807cef193a 100644 --- a/include/RequestManagerChown.h +++ b/include/RequestManagerChown.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RequestManagerClone.h b/include/RequestManagerClone.h index 5ac1f00963..eccab5a0f2 100644 --- a/include/RequestManagerClone.h +++ b/include/RequestManagerClone.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -132,7 +132,7 @@ class VNTemplateClone : public RequestManagerClone public: VNTemplateClone(): RequestManagerClone("one.vntemplate.clone", - "Clone a virtual network template", "A:sisb") + "Clone a virtual network template", "A:sis") { Nebula& nd = Nebula::instance(); pool = nd.get_vntpool(); @@ -144,9 +144,9 @@ public: ~VNTemplateClone(){}; ErrorCode request_execute(int source_id, const string &name, int &new_id, - bool recursive, const string& s_uattrs, RequestAttributes& att) + const string& s_uattrs, RequestAttributes& att) { - return clone(source_id, name, new_id, recursive, s_uattrs, att); + return clone(source_id, name, new_id, false, s_uattrs, att); }; protected: diff --git a/include/RequestManagerCluster.h b/include/RequestManagerCluster.h index 6d52714cb6..b75102d705 100644 --- a/include/RequestManagerCluster.h +++ b/include/RequestManagerCluster.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RequestManagerConnection.h b/include/RequestManagerConnection.h index cf13eac09c..5b5a087988 100644 --- a/include/RequestManagerConnection.h +++ b/include/RequestManagerConnection.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RequestManagerDatastore.h b/include/RequestManagerDatastore.h index f688e6a1ae..d39a085b6f 100644 --- a/include/RequestManagerDatastore.h +++ b/include/RequestManagerDatastore.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RequestManagerDelete.h b/include/RequestManagerDelete.h index 8598a3f32f..a8efea092e 100644 --- a/include/RequestManagerDelete.h +++ b/include/RequestManagerDelete.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -60,7 +60,7 @@ protected: RequestAttributes& att); ErrorCode delete_object(int oid, bool recursive, - RequestAttributes& att); + RequestAttributes& att, AuthRequest::Operation auth); /* -------------------------------------------------------------------- */ @@ -105,7 +105,7 @@ public: ErrorCode request_execute(int oid, bool recursive, RequestAttributes& att) { - return delete_object(oid, recursive, att); + return delete_object(oid, recursive, att, auth_op); } protected: @@ -121,7 +121,7 @@ class VirtualNetworkTemplateDelete : public RequestManagerDelete public: VirtualNetworkTemplateDelete(): RequestManagerDelete("one.vntemplate.delete", - "A:sib", + "A:si", "Deletes a virtual network template") { Nebula& nd = Nebula::instance(); @@ -133,7 +133,7 @@ public: ErrorCode request_execute(int oid, bool recursive, RequestAttributes& att) { - return delete_object(oid, recursive, att); + return delete_object(oid, false, att, auth_op); } }; @@ -188,9 +188,12 @@ public: ErrorCode request_execute(int oid, RequestAttributes& att) { - return delete_object(oid, false, att); + return delete_object(oid, false, att, auth_op); }; + void request_execute(xmlrpc_c::paramList const& paramList, + RequestAttributes& att); + protected: int drop(PoolObjectSQL * obj, bool resive, RequestAttributes& att); diff --git a/include/RequestManagerDropDB.h b/include/RequestManagerDropDB.h index 010b6ce871..bdbcef3f11 100644 --- a/include/RequestManagerDropDB.h +++ b/include/RequestManagerDropDB.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RequestManagerGroup.h b/include/RequestManagerGroup.h index 8f5a1bab07..f1637d77b2 100644 --- a/include/RequestManagerGroup.h +++ b/include/RequestManagerGroup.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RequestManagerHost.h b/include/RequestManagerHost.h index a763aecc14..350a8d9e9b 100644 --- a/include/RequestManagerHost.h +++ b/include/RequestManagerHost.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RequestManagerImage.h b/include/RequestManagerImage.h index d0d1c660df..e0a4d61755 100644 --- a/include/RequestManagerImage.h +++ b/include/RequestManagerImage.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RequestManagerInfo.h b/include/RequestManagerInfo.h index 3dd9c4e72e..cbdcb8d4bf 100644 --- a/include/RequestManagerInfo.h +++ b/include/RequestManagerInfo.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RequestManagerLock.h b/include/RequestManagerLock.h index 07392c722e..fb231b038f 100644 --- a/include/RequestManagerLock.h +++ b/include/RequestManagerLock.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RequestManagerMarketPlaceApp.h b/include/RequestManagerMarketPlaceApp.h index 1cf7794e2c..12094253f0 100644 --- a/include/RequestManagerMarketPlaceApp.h +++ b/include/RequestManagerMarketPlaceApp.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RequestManagerPoolInfoFilter.h b/include/RequestManagerPoolInfoFilter.h index 19f92120c9..1e30a9eb90 100644 --- a/include/RequestManagerPoolInfoFilter.h +++ b/include/RequestManagerPoolInfoFilter.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -113,7 +113,7 @@ public: VirtualMachinePoolInfo(): RequestManagerPoolInfoFilter("one.vmpool.info", "Returns the virtual machine instances pool", - "A:siiii") + "A:siiiis") { Nebula& nd = Nebula::instance(); pool = nd.get_vmpool(); diff --git a/include/RequestManagerProxy.h b/include/RequestManagerProxy.h index 3b17530046..80d9bd7a1d 100644 --- a/include/RequestManagerProxy.h +++ b/include/RequestManagerProxy.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RequestManagerRename.h b/include/RequestManagerRename.h index 4d7ed3bb1e..273318ad6a 100644 --- a/include/RequestManagerRename.h +++ b/include/RequestManagerRename.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RequestManagerSecurityGroup.h b/include/RequestManagerSecurityGroup.h index 3a1a4f1475..c8ecc067de 100644 --- a/include/RequestManagerSecurityGroup.h +++ b/include/RequestManagerSecurityGroup.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RequestManagerSystem.h b/include/RequestManagerSystem.h index 78fd0c4f64..4d8433ba96 100644 --- a/include/RequestManagerSystem.h +++ b/include/RequestManagerSystem.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RequestManagerUpdateDB.h b/include/RequestManagerUpdateDB.h index 05a1d3a675..975cd965d0 100644 --- a/include/RequestManagerUpdateDB.h +++ b/include/RequestManagerUpdateDB.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RequestManagerUpdateTemplate.h b/include/RequestManagerUpdateTemplate.h index f05fd31314..ad62b25fd4 100644 --- a/include/RequestManagerUpdateTemplate.h +++ b/include/RequestManagerUpdateTemplate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RequestManagerUser.h b/include/RequestManagerUser.h index 3f446e14dd..1d9195e14a 100644 --- a/include/RequestManagerUser.h +++ b/include/RequestManagerUser.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RequestManagerVMTemplate.h b/include/RequestManagerVMTemplate.h index 476d66bb5b..55bfc8c9ee 100644 --- a/include/RequestManagerVMTemplate.h +++ b/include/RequestManagerVMTemplate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RequestManagerVNTemplate.h b/include/RequestManagerVNTemplate.h index 7a8012ea75..2a6ecedcd0 100644 --- a/include/RequestManagerVNTemplate.h +++ b/include/RequestManagerVNTemplate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RequestManagerVdc.h b/include/RequestManagerVdc.h index 3c70c9a48a..6c804ca9fb 100644 --- a/include/RequestManagerVdc.h +++ b/include/RequestManagerVdc.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RequestManagerVirtualMachine.h b/include/RequestManagerVirtualMachine.h index 03af9232b1..e6c5a9ef6e 100644 --- a/include/RequestManagerVirtualMachine.h +++ b/include/RequestManagerVirtualMachine.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RequestManagerVirtualNetwork.h b/include/RequestManagerVirtualNetwork.h index 9510556328..a057175399 100644 --- a/include/RequestManagerVirtualNetwork.h +++ b/include/RequestManagerVirtualNetwork.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RequestManagerVirtualRouter.h b/include/RequestManagerVirtualRouter.h index 935f457c3d..6fda3aab5e 100644 --- a/include/RequestManagerVirtualRouter.h +++ b/include/RequestManagerVirtualRouter.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/RequestManagerZone.h b/include/RequestManagerZone.h index 62738da6d0..c8ca6441d5 100644 --- a/include/RequestManagerZone.h +++ b/include/RequestManagerZone.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/ScheduledAction.h b/include/ScheduledAction.h index 1e898f8b23..3fde13b517 100644 --- a/include/ScheduledAction.h +++ b/include/ScheduledAction.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/SecurityGroup.h b/include/SecurityGroup.h index 2a0d987ed9..031aab0ad6 100644 --- a/include/SecurityGroup.h +++ b/include/SecurityGroup.h @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/SecurityGroupPool.h b/include/SecurityGroupPool.h index 4df536d527..b29d9018a8 100644 --- a/include/SecurityGroupPool.h +++ b/include/SecurityGroupPool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/Snapshots.h b/include/Snapshots.h index 6166a57470..2424b9b187 100644 --- a/include/Snapshots.h +++ b/include/Snapshots.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -45,7 +45,60 @@ class VectorAttribute; class Snapshots { public: - Snapshots(int _disk_id, bool orphans); + + /** + * ALLOW_ORPHANS: Define how child snapshots are handled. + * - ALLOW: Children can be orphan (no parent snapshot) + * |- snap_1 + * |- snap_2 + * |- snap_3 + * + * - DENY: New snapshots are set active and child of the previous one + * |- snap_1 + * |- snap_2 + * |- snap_3 + * + * - MIXED: Snapshots are children of last snapshot reverted to + * |- snap_1 (<--- revert) + * |- snap_2 + * |- snap_3 + */ + enum AllowOrphansMode + { + ALLOW = 0, + DENY = 1, + MIXED = 2 + }; + + static string allow_orphans_mode_to_str(AllowOrphansMode aom) + { + switch (aom) + { + case ALLOW: return "YES"; + case DENY: return "NO"; + case MIXED: return "MIXED"; + } + + return "NO"; + }; + + static AllowOrphansMode str_to_allow_orphans_mode(const string& aom) + { + if (aom == "YES") + { + return ALLOW; + } + else if (aom == "MIXED") + { + return MIXED; + } + else + { + return DENY; + } + }; + + Snapshots(int _disk_id, AllowOrphansMode orphans); Snapshots(const Snapshots& s); @@ -98,8 +151,12 @@ public: /** * Set the given snapshot as active. Updates the values of the current * snapshot + * + * @param id id of the snapshot + * @param revert true if the cause of changing the active snapshot + * is because a revert */ - int active_snapshot(int id); + int active_snapshot(int id, bool revert); /** * Rename the given snapshot by the given name @@ -224,6 +281,19 @@ private: */ void init(); + /** + * Updates children list for the current base snapshot in the tree + * @param snapshot new child to be added + */ + void add_child_mixed(VectorAttribute *snapshot); + + /** + * Updates children list of the active snapshot + * @param snapshot new child to be added + * @return -1 in case of error (current active does not exist) + */ + int add_child_deny(VectorAttribute *snapshot); + /** * Text representation of the snapshot pool. To be stored as part of the * VM or Image Templates @@ -248,12 +318,17 @@ private: /** * Allow to remove parent snapshots and active one */ - bool orphans; + AllowOrphansMode orphans; /** * Snapshot pointer map */ map snapshot_pool; + + /** + * Current snaphsot base for mixed mode + */ + int current_base; }; #endif /*SNAPSHOTS_H_*/ diff --git a/include/SqlDB.h b/include/SqlDB.h index 9a6ca233af..64b8a4b3b8 100644 --- a/include/SqlDB.h +++ b/include/SqlDB.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -96,6 +96,11 @@ public: */ virtual bool limit_support() = 0; + /** + * Return true if the backend allows FTS index + */ + virtual bool fts_available() = 0; + protected: /** * Performs a DB transaction diff --git a/include/SqliteDB.h b/include/SqliteDB.h index 120ee94694..13c2974cca 100644 --- a/include/SqliteDB.h +++ b/include/SqliteDB.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -79,6 +79,10 @@ public: */ bool limit_support(); + bool fts_available() + { + return false; + } protected: /** * Wraps the sqlite3_exec function call, and locks the DB mutex. diff --git a/include/SyncRequest.h b/include/SyncRequest.h index 0c351f90ef..33d65c945c 100644 --- a/include/SyncRequest.h +++ b/include/SyncRequest.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/SystemDB.h b/include/SystemDB.h index 08c00a9033..02580da3b2 100644 --- a/include/SystemDB.h +++ b/include/SystemDB.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/Template.h b/include/Template.h index a747718ccb..aa086d671b 100644 --- a/include/Template.h +++ b/include/Template.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -170,6 +170,10 @@ public: */ string& to_xml(string& xml) const; + string& to_json(string& xml) const; + + string& to_token(string& xml) const; + /** * Writes the template in a plain text string * @param str string that hold the template representation diff --git a/include/TransferManager.h b/include/TransferManager.h index f266045365..4460d1f47d 100644 --- a/include/TransferManager.h +++ b/include/TransferManager.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/TransferManagerDriver.h b/include/TransferManagerDriver.h index c973770daf..36d38de335 100644 --- a/include/TransferManagerDriver.h +++ b/include/TransferManagerDriver.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/User.h b/include/User.h index e03cfd42a1..dbdfb83486 100644 --- a/include/User.h +++ b/include/User.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/UserPool.h b/include/UserPool.h index 5113eaf83b..7177afa4d8 100644 --- a/include/UserPool.h +++ b/include/UserPool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/UserTemplate.h b/include/UserTemplate.h index ee42786d5a..eb05dbde8c 100644 --- a/include/UserTemplate.h +++ b/include/UserTemplate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/VMGroup.h b/include/VMGroup.h index a16527c9ed..3d48b600af 100644 --- a/include/VMGroup.h +++ b/include/VMGroup.h @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/VMGroupPool.h b/include/VMGroupPool.h index d28c226a69..55facc9f86 100644 --- a/include/VMGroupPool.h +++ b/include/VMGroupPool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/VMGroupRole.h b/include/VMGroupRole.h index a3256c1845..90b7a4d45a 100644 --- a/include/VMGroupRole.h +++ b/include/VMGroupRole.h @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/VMGroupRule.h b/include/VMGroupRule.h index e75678e365..9c4793432e 100644 --- a/include/VMGroupRule.h +++ b/include/VMGroupRule.h @@ -1,6 +1,6 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/VMTemplate.h b/include/VMTemplate.h index 5d474898d4..537028756f 100644 --- a/include/VMTemplate.h +++ b/include/VMTemplate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/VMTemplatePool.h b/include/VMTemplatePool.h index 7623304568..61b82fb084 100644 --- a/include/VMTemplatePool.h +++ b/include/VMTemplatePool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/VNTemplate.h b/include/VNTemplate.h index 387d4996b8..6f243ef69d 100644 --- a/include/VNTemplate.h +++ b/include/VNTemplate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/VNTemplatePool.h b/include/VNTemplatePool.h index fcb5010728..d152d51ae8 100644 --- a/include/VNTemplatePool.h +++ b/include/VNTemplatePool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/Vdc.h b/include/Vdc.h index d39706635a..984e62427e 100644 --- a/include/Vdc.h +++ b/include/Vdc.h @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/VdcPool.h b/include/VdcPool.h index 6f05ea77ee..8d61b208e1 100644 --- a/include/VdcPool.h +++ b/include/VdcPool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h index f6f70defbc..75859aeae2 100644 --- a/include/VirtualMachine.h +++ b/include/VirtualMachine.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -1491,11 +1491,13 @@ public: * @param disk_id of the disk * @param snap_id of the snapshot * @param error if any + * @param revert true if the cause of changing the active snapshot + * is because a revert * @return -1 if error */ - int revert_disk_snapshot(int disk_id, int snap_id) + int revert_disk_snapshot(int disk_id, int snap_id, bool revert) { - return disks.revert_snapshot(disk_id, snap_id); + return disks.revert_snapshot(disk_id, snap_id, revert); } /** @@ -1882,6 +1884,10 @@ private: */ string& to_xml_extended(string& xml, int n_history) const; + string& to_json(string& json) const; + + string& to_token(string& text) const; + // ------------------------------------------------------------------------- // Attribute Parser // ------------------------------------------------------------------------- diff --git a/include/VirtualMachineAttribute.h b/include/VirtualMachineAttribute.h index b1d8102b6e..11288851db 100644 --- a/include/VirtualMachineAttribute.h +++ b/include/VirtualMachineAttribute.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/VirtualMachineDisk.h b/include/VirtualMachineDisk.h index 1082f0d741..eb9fb0cccb 100644 --- a/include/VirtualMachineDisk.h +++ b/include/VirtualMachineDisk.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -22,6 +22,7 @@ #include "VirtualMachineAttribute.h" #include "Snapshots.h" +#include "NebulaUtil.h" class AuthRequest; @@ -54,16 +55,16 @@ public: return is_flag("PERSISTENT"); } - bool allow_orphans() const + Snapshots::AllowOrphansMode allow_orphans() const { - bool orphans; + string orphans; if (vector_value("ALLOW_ORPHANS", orphans) == -1) { - orphans = false; + orphans = Snapshots::DENY; } - return orphans; + return Snapshots::str_to_allow_orphans_mode(one_util::toupper(orphans)); } void set_attach() @@ -273,9 +274,11 @@ public: /** * Sets the snap_id as active, the VM will boot from it next time * @param snap_id of the snapshot + * @param revert true if the cause of changing the active snapshot + * is because a revert * @return -1 if error */ - int revert_snapshot(int snap_id); + int revert_snapshot(int snap_id, bool revert); /** * Deletes the snap_id from the list @@ -730,9 +733,11 @@ public: * Sets the snap_id as active, the VM will boot from it next time * @param disk_id of the disk * @param snap_id of the snapshot + * @param revert true if the cause of changing the active snapshot + * is because a revert * @return -1 if error */ - int revert_snapshot(int disk_id, int snap_id); + int revert_snapshot(int disk_id, int snap_id, bool revert); /** * Deletes the snap_id from the list diff --git a/include/VirtualMachineHook.h b/include/VirtualMachineHook.h index 6dcbae68de..0607a728e9 100644 --- a/include/VirtualMachineHook.h +++ b/include/VirtualMachineHook.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/VirtualMachineManager.h b/include/VirtualMachineManager.h index fb1586b935..1a61253d42 100644 --- a/include/VirtualMachineManager.h +++ b/include/VirtualMachineManager.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -188,6 +188,21 @@ public: return vmd->is_keep_snapshots(); } + /** + * Returns a pointer to a Virtual Machine Manager driver. The driver is + * searched by its name. + * @param name the name of the driver + * @return the VM driver owned by uid with attribute name equal to value + * or 0 in not found + */ + const VirtualMachineManagerDriver * get( + const string& name) + { + string _name("NAME"); + return static_cast + (MadManager::get(0,_name,name)); + }; + private: /** * Thread id for the Virtual Machine Manager @@ -256,21 +271,6 @@ private: (MadManager::get(0,name,value)); }; - /** - * Returns a pointer to a Virtual Machine Manager driver. The driver is - * searched by its name. - * @param name the name of the driver - * @return the VM driver owned by uid with attribute name equal to value - * or 0 in not found - */ - const VirtualMachineManagerDriver * get( - const string& name) - { - string _name("NAME"); - return static_cast - (MadManager::get(0,_name,name)); - }; - // ------------------------------------------------------------------------- // Action Listener interface // ------------------------------------------------------------------------- diff --git a/include/VirtualMachineManagerDriver.h b/include/VirtualMachineManagerDriver.h index 2e75f8c0a1..d6f8de6026 100644 --- a/include/VirtualMachineManagerDriver.h +++ b/include/VirtualMachineManagerDriver.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -103,6 +103,14 @@ public: return keep_snapshots; } + /** + * @return true if datastore live migration + */ + bool is_ds_live_migration() const + { + return ds_live_migration; + } + protected: /** * Gets a configuration attr from driver configuration file (single @@ -159,6 +167,11 @@ private: */ bool keep_snapshots; + /** + * Set to true if live migration between datastores is allowed. + */ + bool ds_live_migration; + /** * Pointer to the Virtual Machine Pool, to access VMs */ diff --git a/include/VirtualMachineMonitorInfo.h b/include/VirtualMachineMonitorInfo.h index 487daf90a1..aa50c1a05c 100644 --- a/include/VirtualMachineMonitorInfo.h +++ b/include/VirtualMachineMonitorInfo.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/VirtualMachineNic.h b/include/VirtualMachineNic.h index ebb7d856e1..82a3a580cf 100644 --- a/include/VirtualMachineNic.h +++ b/include/VirtualMachineNic.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/VirtualMachinePool.h b/include/VirtualMachinePool.h index cdee026086..560b0591f7 100644 --- a/include/VirtualMachinePool.h +++ b/include/VirtualMachinePool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/VirtualMachineTemplate.h b/include/VirtualMachineTemplate.h index 639d8948b3..006430c8f6 100644 --- a/include/VirtualMachineTemplate.h +++ b/include/VirtualMachineTemplate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/VirtualNetwork.h b/include/VirtualNetwork.h index 5e4e32a4bc..f89b9e29b7 100644 --- a/include/VirtualNetwork.h +++ b/include/VirtualNetwork.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/VirtualNetworkPool.h b/include/VirtualNetworkPool.h index f0416d3f6c..683bdec87f 100644 --- a/include/VirtualNetworkPool.h +++ b/include/VirtualNetworkPool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/VirtualNetworkTemplate.h b/include/VirtualNetworkTemplate.h index 97dd90fe08..af6f3a15e8 100644 --- a/include/VirtualNetworkTemplate.h +++ b/include/VirtualNetworkTemplate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/VirtualRouter.h b/include/VirtualRouter.h index f56d41b7a2..8591af7931 100644 --- a/include/VirtualRouter.h +++ b/include/VirtualRouter.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/VirtualRouterPool.h b/include/VirtualRouterPool.h index 0dfacc17f8..6182d7da9b 100644 --- a/include/VirtualRouterPool.h +++ b/include/VirtualRouterPool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/XMLDriver.h b/include/XMLDriver.h index fd406cfda6..2a36df8ef4 100644 --- a/include/XMLDriver.h +++ b/include/XMLDriver.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/XenDriver.h b/include/XenDriver.h index ebd03822e3..795809e118 100644 --- a/include/XenDriver.h +++ b/include/XenDriver.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/Zone.h b/include/Zone.h index 40925f43e7..7b7043c88d 100644 --- a/include/Zone.h +++ b/include/Zone.h @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/ZonePool.h b/include/ZonePool.h index bf183b8b7f..74a4f768d1 100644 --- a/include/ZonePool.h +++ b/include/ZonePool.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/ZoneServer.h b/include/ZoneServer.h index 916e720231..9e09418b8b 100644 --- a/include/ZoneServer.h +++ b/include/ZoneServer.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/include/mem_collector.h b/include/mem_collector.h index 6ac9628027..9630e7148f 100644 --- a/include/mem_collector.h +++ b/include/mem_collector.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/install.sh b/install.sh index 9e2ea4aee0..db90ad3df0 100755 --- a/install.sh +++ b/install.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -219,6 +219,7 @@ fi SHARE_DIRS="$SHARE_LOCATION/examples \ $SHARE_LOCATION/websockify \ + $SHARE_LOCATION/websockify/websockify \ $SHARE_LOCATION/esx-fw-vnc \ $SHARE_LOCATION/oneprovision" @@ -477,7 +478,8 @@ INSTALL_FILES=( NETWORK_OVSWITCH_VXLAN_FILES:$VAR_LOCATION/remotes/vnm/ovswitch_vxlan NETWORK_VCENTER_FILES:$VAR_LOCATION/remotes/vnm/vcenter EXAMPLE_SHARE_FILES:$SHARE_LOCATION/examples - WEBSOCKIFY_SHARE_FILES:$SHARE_LOCATION/websockify + WEBSOCKIFY_SHARE_RUN_FILES:$SHARE_LOCATION/websockify + WEBSOCKIFY_SHARE_MODULE_FILES:$SHARE_LOCATION/websockify/websockify ESX_FW_VNC_SHARE_FILES:$SHARE_LOCATION/esx-fw-vnc INSTALL_GEMS_SHARE_FILES:$SHARE_LOCATION ONETOKEN_SHARE_FILE:$SHARE_LOCATION @@ -882,7 +884,7 @@ VMM_EXEC_VCENTER_SCRIPTS="src/vmm_mad/remotes/vcenter/cancel \ # VMM configuration VCENTER scripts, to be installed under $REMOTES_LOCATION/etc/vmm/vcenter #------------------------------------------------------------------------------- -VMM_EXEC_ETC_VCENTER_SCRIPTS="src/vmm_mad/remotes/vcenter/vcenterc" +VMM_EXEC_ETC_VCENTER_SCRIPTS="src/vmm_mad/remotes/vcenter/vcenterrc" #------------------------------------------------------------------------------ # VMM Driver EC2 scripts, to be installed under $REMOTES_LOCATION/vmm/ec2 @@ -998,6 +1000,7 @@ IM_PROBES_LXD_PROBES_FILES="src/im_mad/remotes/lxd-probes.d/lxd.rb \ src/im_mad/remotes/lxd-probes.d/pci.rb \ src/im_mad/remotes/lxd-probes.d/monitor_ds.sh \ src/im_mad/remotes/lxd-probes.d/version.sh \ + src/im_mad/remotes/lxd-probes.d/profiles.sh \ src/im_mad/remotes/lxd-probes.d/collectd-client-shepherd.sh" IM_PROBES_LXD_FILES="src/im_mad/remotes/lxd.d/collectd-client_control.sh \ @@ -1456,8 +1459,7 @@ ONEDB_SHARED_MIGRATOR_FILES="src/onedb/shared/2.0_to_2.9.80.rb \ src/onedb/shared/5.3.80_to_5.4.0.rb \ src/onedb/shared/5.4.0_to_5.4.1.rb \ src/onedb/shared/5.4.1_to_5.5.80.rb \ - src/onedb/shared/5.5.80_to_5.6.0.rb \ - src/onedb/shared/5.6.0_to_5.7.80.rb" + src/onedb/shared/5.5.80_to_5.6.0.rb" ONEDB_LOCAL_MIGRATOR_FILES="src/onedb/local/4.5.80_to_4.7.80.rb \ src/onedb/local/4.7.80_to_4.9.80.rb \ @@ -1493,8 +1495,7 @@ AZ_ETC_FILES="src/vmm_mad/remotes/az/az_driver.conf \ PACKET_ETC_FILES="src/vmm_mad/remotes/packet/packet_driver.default" -VCENTER_ETC_FILES="src/vmm_mad/remotes/lib/vcenter_driver/vcenter_driver.default \ - src/vmm_mad/remotes/lib/vcenter_driver/vcenter_driver.conf" +VCENTER_ETC_FILES="src/vmm_mad/remotes/lib/vcenter_driver/vcenter_driver.default" #------------------------------------------------------------------------------- # Virtualization drivers config. files, to be installed under $ETC_LOCATION @@ -1531,9 +1532,12 @@ EXAMPLE_SHARE_FILES="share/examples/vm.template \ # Files required to interact with the websockify server #------------------------------------------------------------------------------- -WEBSOCKIFY_SHARE_FILES="share/websockify/websocketproxy.py \ - share/websockify/websocket.py \ - share/websockify/websockify" +WEBSOCKIFY_SHARE_RUN_FILES="share/websockify/run" +WEBSOCKIFY_SHARE_MODULE_FILES="share/websockify/websockify/__init__.py \ + share/websockify/websockify/auth_plugins.py \ + share/websockify/websockify/token_plugins.py \ + share/websockify/websockify/websocket.py \ + share/websockify/websockify/websocketproxy.py" #------------------------------------------------------------------------------- # Installation packages for ESX hosts to enable VNC ports diff --git a/share/doc/xsd/acct.xsd b/share/doc/xsd/acct.xsd index b29ffa16c9..0e12713190 100644 --- a/share/doc/xsd/acct.xsd +++ b/share/doc/xsd/acct.xsd @@ -151,6 +151,7 @@ + diff --git a/share/doc/xsd/acl_pool.xsd b/share/doc/xsd/acl_pool.xsd new file mode 100644 index 0000000000..116946c824 --- /dev/null +++ b/share/doc/xsd/acl_pool.xsd @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/share/doc/xsd/datastore.xsd b/share/doc/xsd/datastore.xsd index 5fd2ec29de..837f83b50b 100644 --- a/share/doc/xsd/datastore.xsd +++ b/share/doc/xsd/datastore.xsd @@ -29,6 +29,7 @@ + diff --git a/share/doc/xsd/document.xsd b/share/doc/xsd/document.xsd new file mode 100644 index 0000000000..093aff96f5 --- /dev/null +++ b/share/doc/xsd/document.xsd @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/share/doc/xsd/document_pool.xsd b/share/doc/xsd/document_pool.xsd new file mode 100644 index 0000000000..ee93968e68 --- /dev/null +++ b/share/doc/xsd/document_pool.xsd @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/share/doc/xsd/image.xsd b/share/doc/xsd/image.xsd index 92c446bacc..1a340d7ba9 100644 --- a/share/doc/xsd/image.xsd +++ b/share/doc/xsd/image.xsd @@ -97,6 +97,7 @@ + diff --git a/share/doc/xsd/security_group.xsd b/share/doc/xsd/security_group.xsd new file mode 100644 index 0000000000..c3ef900e13 --- /dev/null +++ b/share/doc/xsd/security_group.xsd @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/share/doc/xsd/security_group_pool.xsd b/share/doc/xsd/security_group_pool.xsd new file mode 100644 index 0000000000..73bb62a53a --- /dev/null +++ b/share/doc/xsd/security_group_pool.xsd @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/share/doc/xsd/test.sh b/share/doc/xsd/test.sh deleted file mode 100755 index 2320e32fd3..0000000000 --- a/share/doc/xsd/test.sh +++ /dev/null @@ -1,320 +0,0 @@ -#!/bin/bash - -# -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # -# # -# Licensed 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. # -#--------------------------------------------------------------------------- # - -mkdir -p samples/cluster samples/cluster_pool -mkdir -p samples/datastore samples/datastore_pool -mkdir -p samples/group samples/group_pool -mkdir -p samples/vdc samples/vdc_pool -mkdir -p samples/host samples/host_pool -mkdir -p samples/image samples/image_pool -mkdir -p samples/vmtemplate samples/vmtemplate_pool -mkdir -p samples/user samples/user_pool -mkdir -p samples/vm samples/vm_pool -mkdir -p samples/vnet samples/vnet_pool -mkdir -p samples/vm_group samples/vm_group_pool -mkdir -p samples/acct -mkdir -p samples/vrouter samples/vrouter_pool -mkdir -p samples/marketplace samples/marketplace_pool -mkdir -p samples/marketplaceapp samples/marketplaceapp_pool -mkdir -p samples/zone samples/zone_pool -touch output.log -cp oned.conf /etc/one/oned.conf - -## VCENTER CONFIGURATION -vcenter="vcenter.vcenter65-1" -vuser="administrator@vsphere.local" -vpass="Pantufl4." -######################## - -echo "Creating new cluster..." >> output.log -onecluster create newcluster -echo "Creating new group..." >> output.log -onegroup create newgroup - -# Host -echo "Creating new hosts..." >> output.log -onehost create host01 --im dummy --vm dummy -onehost create host02 --im dummy --vm dummy -onehost create host03 --im dummy --vm dummy - -#Wait to monitor hosts -sleep 30 - -onecluster addhost newcluster host03 - -echo "Importing defaults hosts from $vcenter" >> output.log -onevcenter hosts --vcenter $vcenter --vuser $vuser --vpass $vpass --use-defaults -sleep 10 - -for i in `onehost list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do - onehost show $i -x > samples/host/$i.xml -done - -onehost list -x > samples/host_pool/0.xml - -# Cluster -echo "Creating new empty cluster..." >> output.log -onecluster create emptycluster - -for i in `onecluster list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do - onecluster show $i -x > samples/cluster/$i.xml -done - -onecluster list -x > samples/cluster_pool/0.xml - -# Image -echo "Creating new images..." >> output.log -oneimage list -x > samples/image_pool/1.xml - -oneimage create test/image.0 -d default -oneimage create test/image.1 -d default - -for i in `oneimage list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do - oneimage show $i -x > samples/image/$i.xml -done - -oneimage list -x > samples/image_pool/3.xml - - -# Datastore -echo "Creating new datastores..." >> output.log -onedatastore create test/datastore.0 -onedatastore create test/datastore.1 - -echo "Adding datastores to cluster..." >> output.log -onecluster adddatastore newcluster 100 -onecluster adddatastore newcluster 101 - -echo "Import datastore from $vcenter" >> output.log -onevcenter import_defaults -o datastores -h 5 -sleep 15 - -for i in `onedatastore list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do - onedatastore show $i -x > samples/datastore/$i.xml -done - -onedatastore list -x > samples/datastore_pool/0.xml - -# User -echo "Creating new users..." >> output.log -oneuser defaultquota test/quota.txt - -oneuser create newuser abc -oneuser chgrp newuser newgroup - -echo "Creating token for an user..." >> output.log -echo "no" | oneuser token-create --user newuser --password abc --time 123 -echo "no" | oneuser token-create --user newuser --password abc --time 456 -echo "no" | oneuser token-create --user newuser --password abc --time 789 - -for i in `oneuser list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do - oneuser show $i -x > samples/user/$i.xml -done - -oneuser list -x > samples/user_pool/0.xml - - -# Group -echo "Creating new empty group..." >> output.log -onegroup defaultquota test/quota.txt - -onegroup create emptygroup - -for i in `onegroup list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do - onegroup show $i -x > samples/group/$i.xml -done - -onegroup list -x > samples/group_pool/0.xml - -# VDC -echo "Creating new empty vdc..." >> output.log -onevdc create emptyvdc - -onevdc create newvdc -echo "Adding group to vnc..." >> output.log -onevdc addgroup newvdc newgroup -echo "Adding host to vnc..." >> output.log -onevdc addhost newvdc 0 host01 -echo "Adding cluster to vnc..." >> output.log -onevdc addcluster newvdc 0 newcluster - -for i in `onevdc list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do - onevdc show $i -x > samples/vdc/$i.xml -done - -onevdc list -x > samples/vdc_pool/0.xml - - -# Template -echo "Creating new template..." >> output.log -onetemplate list -x > samples/vmtemplate_pool/1.xml - -onetemplate create test/template.0 --user newuser --password abc -onetemplate create test/template.1 --user newuser --password abc -onetemplate create test/vr-template.0 - -echo "Import templates from $vcenter" >> output.log -onevcenter import_defaults -o templates 1..3 -h 5 - -for i in `onetemplate list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do - onetemplate show $i -x > samples/vmtemplate/$i.xml -done - -onetemplate list -x > samples/vmtemplate_pool/2.xml - -# VM -echo "Instantiating a template..." >> output.log -onetemplate instantiate 0 -m 2 --user newuser --password abc -onetemplate instantiate 1 -m 2 --user newuser --password abc - -# Virtual Routers -echo "Creating new vrouters..." >> output.log -onevrouter create test/vr.0 -onevrouter instantiate 0 vr-tmpl -m 2 -sleep 10 -for i in `onevrouter list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do - onevrouter show $i -x > samples/vrouter/$i.xml -done - -onevrouter list -x > samples/vrouter_pool/0.xml - -for i in `onevm list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do - onevm deploy $i host01 -done - -sleep 5 - -echo "Executing action with a vm..." >> output.log -onevm migrate --live 0 host02 -onevm terminate --hard 1 -onevm poweroff 2 -onevm poweroff 0 - -sleep 5 - -onevm snapshot-create 0 - -sleep 5 - -onevm resume 0 - -sleep 5 - -onevm disk-attach 0 -i 1 -onevm disk-snapshot-create 0 0 disk_snapshot - -onevm resume 2 - -sleep 5 - -echo "Import wilds from $vcenter" >> output.log -onehost importvm 'Cluster2' 'wild00 - Cluster2' >> output.log -sleep 15 -onehost importvm 'Cluster2' 'wild01 - Cluster2' >> output.log -sleep 15 - -for i in `onevm list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do - onevm show $i -x > samples/vm/$i.xml -done - -onevm list -x > samples/vm_pool/0.xml - -# VNets -echo "Creating new vnets..." >> output.log -onevnet list -x > samples/vnet_pool/1.xml - -onevnet create test/vnet.0 - -onevnet list -x > samples/vnet_pool/2.xml - -onevnet create test/vnet.1 -onevnet create test/vnet.2 - -echo "Adding vnets to cluster..." >> output.log -onecluster addvnet newcluster 0 -onecluster addvnet newcluster 2 - -echo "Reserving vnet..." >> output.log -onevnet reserve 1 --address_range 1 --size 2 --name reserve - -for i in `onevnet list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do - onevnet show $i -x > samples/vnet/$i.xml -done - -onevnet list -x > samples/vnet_pool/3.xml - -echo "Working with markets..." >> output.log -# Marketplace - -for i in `onemarket list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do - onemarket show $i -x > samples/marketplace/$i.xml -done - -onemarket list -x > samples/marketplace_pool/0.xml - -# Marketplace Apps - -for i in `onemarketapp list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do - onemarketapp show $i -x > samples/marketplaceapp/$i.xml -done - -onemarketapp list -x > samples/marketplaceapp_pool/0.xml - -# VMGroups -echo "Creating new vmgroups..." >> output.log -onevmgroup list -x > samples/vm_group_pool/1.xml - -onevmgroup create test/vm_group.0 - -onevmgroup list -x > samples/vm_group_pool/2.xml - -for i in `onevmgroup list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do - onevmgroup show $i -x > samples/vm_group/$i.xml -done - -# VMGroups -echo "Creating new servers into zone 0..." >> output.log -onezone list -x > samples/zone_pool/1.xml - -onezone server-add 0 -n server-0 -r http://localhost:2633/RPC2 - -onevmgroup list -x > samples/vm_group_pool/2.xml - -onezone show 0 -x > samples/zone/1.xml - -echo "Executing xmllint..." >> output.log -for i in cluster datastore group vdc host image vmtemplate user vm vnet vrouter marketplace marketplaceapp vm_group -do - POOL_NAME="$i""_pool" - - sed -i "s%<${i^^}>%<${i^^} xmlns='http://opennebula.org/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://opennebula.org/XMLSchema ../../$i.xsd'>%" samples/$i/*.xml - sed -i "s%<${i^^}_POOL/>%<${i^^}_POOL xmlns='http://opennebula.org/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://opennebula.org/XMLSchema ../../$POOL_NAME.xsd'/>%" samples/$POOL_NAME/*.xml - sed -i "s%<${i^^}_POOL>%<${i^^}_POOL xmlns='http://opennebula.org/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://opennebula.org/XMLSchema ../../$POOL_NAME.xsd'>%" samples/$POOL_NAME/*.xml - - xmllint --noout --schema $i.xsd samples/$i/* >> output.log 2>&1 - xmllint --noout --schema $POOL_NAME.xsd samples/$POOL_NAME/* >> output.log 2>&1 -done - -# Accounting -oneacct -x > samples/acct/0.xml - -sed -i "s%%%" samples/acct/*.xml - -xmllint --noout --schema acct.xsd samples/acct/* >> output.log 2>&1 - -exit 0 diff --git a/share/doc/xsd/test/datastore.0 b/share/doc/xsd/test/datastore.0 deleted file mode 100644 index b36afa8432..0000000000 --- a/share/doc/xsd/test/datastore.0 +++ /dev/null @@ -1,3 +0,0 @@ -NAME = ds0 -DS_MAD = fs -TM_MAD = shared \ No newline at end of file diff --git a/share/doc/xsd/test/datastore.1 b/share/doc/xsd/test/datastore.1 deleted file mode 100644 index 4a40815b15..0000000000 --- a/share/doc/xsd/test/datastore.1 +++ /dev/null @@ -1,5 +0,0 @@ -NAME = ds1 -DS_MAD = fs -TM_MAD = shared -EXTRA = ABC -EXTRA2 = 123 \ No newline at end of file diff --git a/share/doc/xsd/test/image.0 b/share/doc/xsd/test/image.0 deleted file mode 100644 index 0d3f220249..0000000000 --- a/share/doc/xsd/test/image.0 +++ /dev/null @@ -1,4 +0,0 @@ -NAME = "Ubuntu" -PATH = /etc/hosts -TYPE = OS -DESCRIPTION = "Ubuntu 10.04 desktop for students." \ No newline at end of file diff --git a/share/doc/xsd/test/image.1 b/share/doc/xsd/test/image.1 deleted file mode 100644 index 51e2433f34..0000000000 --- a/share/doc/xsd/test/image.1 +++ /dev/null @@ -1,5 +0,0 @@ -NAME = "Experiment results" -TYPE = DATABLOCK -SIZE = 10 -FSTYPE = ext3 -EXTRA = ABC \ No newline at end of file diff --git a/share/doc/xsd/test/quota.txt b/share/doc/xsd/test/quota.txt deleted file mode 100644 index 03b270526a..0000000000 --- a/share/doc/xsd/test/quota.txt +++ /dev/null @@ -1,6 +0,0 @@ -VM=[ - CPU="60.50", - MEMORY="102400", - SYSTEM_DISK_SIZE="204800", - VMS="1000" -] diff --git a/share/doc/xsd/test/template.0 b/share/doc/xsd/test/template.0 deleted file mode 100644 index a9e26f9b25..0000000000 --- a/share/doc/xsd/test/template.0 +++ /dev/null @@ -1,34 +0,0 @@ -NAME = template0 -MEMORY = 128 -CPU = 1 -EXTRA = ABC -EXTRA2 = 123 - -NIC = [ - NETWORK = "Blue LAN", - NETWORK_UID = "0" -] - -NIC = [ - NETWORK = "R", - NETWORK_UID = "0", - AR_ID = 0 -] - -NIC = [ - NETWORK = "R", - NETWORK_UID = "0", - AR_ID = 1 -] - -NIC = [ - NETWORK = "R", - NETWORK_UID = "0", - AR_ID = 2 -] - -NIC = [ - NETWORK = "R", - NETWORK_UID = "0", - AR_ID = 3 -] \ No newline at end of file diff --git a/share/doc/xsd/test/template.1 b/share/doc/xsd/test/template.1 deleted file mode 100644 index fcc3307380..0000000000 --- a/share/doc/xsd/test/template.1 +++ /dev/null @@ -1,45 +0,0 @@ -NAME = template1 -CPU = 0.45 -VCPU = 1 -MEMORY = 512 -CONTEXT = [ - NETWORK = "YES", - PASSWORD = "test", - SSH_PUBLIC_KEY = "$USER[SSH_PUBLIC_KEY]" ] -DISK = [ - DEV_PREFIX = "vd", - DRIVER = "raw", - IMAGE_ID = "0" ] -DISK = [ - DEV_PREFIX = "vd", - FORMAT = "raw", - READONLY = "yes", - SIZE = "1024", - TYPE = "fs" ] -DRIVER = "raw" -FEATURES = [ - ACPI = "yes", - LOCALTIME = "yes" ] -FORMAT = "raw" -GRAPHICS = [ - KEYMAP = "es", - LISTEN = "0.0.0.0", - PASSWD = "test", - TYPE = "VNC" ] -HYPERVISOR = "kvm" -IMAGE_ID = 0 -INPUTS_ORDER = "" -LOGO = "images/logos/debian.png" -MEMORY_UNIT_COST = "MB" -NIC = [ - NETWORK = "vnet_1", - NETWORK_UNAME = "oneadmin", - SECURITY_GROUPS = "0" ] -OS = [ - ARCH = "x86_64", - BOOT = "" ] -READONLY = "yes" -SCHED_DS_REQUIREMENTS = "ID=\"0\"" -SCHED_REQUIREMENTS = "ID=\"0\"" -SIZE = 1 -TYPE = "fs" \ No newline at end of file diff --git a/share/doc/xsd/test/vm_group.0 b/share/doc/xsd/test/vm_group.0 deleted file mode 100644 index 473237140f..0000000000 --- a/share/doc/xsd/test/vm_group.0 +++ /dev/null @@ -1,3 +0,0 @@ -NAME = host-vm -ROLE = [ NAME="aff", HOST_AFFINED="0,4" ] -ROLE = [ NAME="anti", HOST_ANTI_AFFINED="2,3" ] \ No newline at end of file diff --git a/share/doc/xsd/test/vnet.0 b/share/doc/xsd/test/vnet.0 deleted file mode 100644 index 8755602076..0000000000 --- a/share/doc/xsd/test/vnet.0 +++ /dev/null @@ -1,16 +0,0 @@ -NAME = "Blue LAN" - -BRIDGE = vbr1 -VN_MAD = dummy - -AR = [ - IP = 130.10.0.1, - TYPE = IP4, - SIZE = 40 -] - -# Custom Attributes to be used in Context -GATEWAY = 130.10.0.1 -DNS = 130.10.0.1 - -LOAD_BALANCER = 130.10.0.4 \ No newline at end of file diff --git a/share/doc/xsd/test/vnet.1 b/share/doc/xsd/test/vnet.1 deleted file mode 100644 index 317d849f7a..0000000000 --- a/share/doc/xsd/test/vnet.1 +++ /dev/null @@ -1,33 +0,0 @@ -NAME = "R" - -BRIDGE = vbr1 -VN_MAD = dummy - -NETWORK_ADDRESS = 10.10.10.0 -NETWORK_MASK = 255.255.255.0 - -CUSTOM = ABC - -AR = [ - IP = 130.10.0.10, - TYPE = IP4, - SIZE = 20 -] - -AR = [ - IP = 10.10.10.10, - GLOBAL_PREFIX = 2004:a128::, - TYPE = IP4_6, - SIZE = 20 -] - -AR = [ - ULA_PREFIX = fd12:33a:df34:1a::, - TYPE = IP6, - SIZE = 20 -] - -AR = [ - TYPE = ETHER, - SIZE = 20 -] \ No newline at end of file diff --git a/share/doc/xsd/test/vnet.2 b/share/doc/xsd/test/vnet.2 deleted file mode 100644 index 281d70508b..0000000000 --- a/share/doc/xsd/test/vnet.2 +++ /dev/null @@ -1,4 +0,0 @@ -NAME = "Empty" - -BRIDGE = vbr1 -VN_MAD = dummy diff --git a/share/doc/xsd/test/vr-template.0 b/share/doc/xsd/test/vr-template.0 deleted file mode 100644 index 3a9a2f2e89..0000000000 --- a/share/doc/xsd/test/vr-template.0 +++ /dev/null @@ -1,7 +0,0 @@ -NAME = vr-tmpl -VROUTER = YES - -MEMORY = 128 -CPU = 1 -EXTRA = ABC -EXTRA2 = 123 diff --git a/share/doc/xsd/test/vr.0 b/share/doc/xsd/test/vr.0 deleted file mode 100644 index 587f3820b0..0000000000 --- a/share/doc/xsd/test/vr.0 +++ /dev/null @@ -1,24 +0,0 @@ -NAME = vr0 - -KEEPALIVED_ID = 12345 -KEEPALIVED_PASSWORD = abc123456 - -NIC = [ - FLOATING_IP = YES, - NETWORK = "Blue LAN", - NETWORK_UID = "0" -] - -NIC = [ - FLOATING_IP = YES, - NETWORK = "R", - NETWORK_UID = "0", - AR_ID = 0 -] - -NIC = [ - VROUTER_MANAGEMENT = YES, - NETWORK = "R", - NETWORK_UID = "0", - AR_ID = 1 -] diff --git a/share/doc/xsd/vm.xsd b/share/doc/xsd/vm.xsd index db981271a8..f533e34c3c 100644 --- a/share/doc/xsd/vm.xsd +++ b/share/doc/xsd/vm.xsd @@ -216,6 +216,7 @@ + diff --git a/share/doc/xsd/xsd_spec.rb b/share/doc/xsd/xsd_spec.rb deleted file mode 100644 index 921cc1d48d..0000000000 --- a/share/doc/xsd/xsd_spec.rb +++ /dev/null @@ -1,29 +0,0 @@ - -require 'init_functionality' -#------------------------------------------------------------------------------- -#------------------------------------------------------------------------------- -describe "XSD for xml documents test" do - -#--------------------------------------------------------------------------- - # TESTS - #--------------------------------------------------------------------------- - it "Group" do - Dir.chdir("./spec/functionality/xsd") { - `./test.sh` - out = File.read("output.log") - error = "" - if out.include? "error" - out.lines.select{|e| - if e.include?('error') - error = "#{error} #{e}" - end - } - `rm output.log` - `rm -r samples` - fail error - end - `rm output.log` - `rm -r samples` - } - end -end diff --git a/share/doc/xsd/zone.xsd b/share/doc/xsd/zone.xsd index beed84226c..9c398761d8 100644 --- a/share/doc/xsd/zone.xsd +++ b/share/doc/xsd/zone.xsd @@ -6,13 +6,6 @@ - - - - - - - diff --git a/share/doc/xsd/zone_pool.xsd b/share/doc/xsd/zone_pool.xsd index f77c4e460d..76775a77f5 100644 --- a/share/doc/xsd/zone_pool.xsd +++ b/share/doc/xsd/zone_pool.xsd @@ -1,41 +1,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/share/etc/defaultrc b/share/etc/defaultrc index fe580e8c56..cc8e9ff847 100644 --- a/share/etc/defaultrc +++ b/share/etc/defaultrc @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/share/etc/oned.conf b/share/etc/oned.conf index 5a7331439d..6b6c8abe82 100644 --- a/share/etc/oned.conf +++ b/share/etc/oned.conf @@ -566,7 +566,7 @@ VM_MAD = [ ARGUMENTS = "-t 15 -r 0 kvm", DEFAULT = "vmm_exec/vmm_exec_kvm.conf", TYPE = "kvm", - KEEP_SNAPSHOTS = "no", + KEEP_SNAPSHOTS = "yes", IMPORTED_VMS_ACTIONS = "terminate, terminate-hard, hold, release, suspend, resume, delete, reboot, reboot-hard, resched, unresched, disk-attach, disk-detach, nic-attach, nic-detach, snapshot-create, snapshot-delete" @@ -611,13 +611,14 @@ VM_MAD = [ # -w Timeout in seconds to execute external commands (default unlimited) #------------------------------------------------------------------------------- VM_MAD = [ - NAME = "vcenter", - SUNSTONE_NAME = "VMWare vCenter", - EXECUTABLE = "one_vmm_sh", - ARGUMENTS = "-p -t 15 -r 0 vcenter -s sh", - DEFAULT = "vmm_exec/vmm_exec_vcenter.conf", - TYPE = "xml", - KEEP_SNAPSHOTS = "yes", + NAME = "vcenter", + SUNSTONE_NAME = "VMWare vCenter", + EXECUTABLE = "one_vmm_sh", + ARGUMENTS = "-p -t 15 -r 0 vcenter -s sh", + DEFAULT = "vmm_exec/vmm_exec_vcenter.conf", + TYPE = "xml", + KEEP_SNAPSHOTS = "yes", + DS_LIVE_MIGRATION = "yes", IMPORTED_VMS_ACTIONS = "terminate, terminate-hard, hold, release, suspend, resume, delete, reboot, reboot-hard, resched, unresched, poweroff, poweroff-hard, disk-attach, disk-detach, nic-attach, nic-detach, @@ -1068,9 +1069,25 @@ VM_RESTRICTED_ATTR = "NIC/OPENNEBULA_MANAGED" VM_RESTRICTED_ATTR = "NIC/VCENTER_INSTANCE_ID" VM_RESTRICTED_ATTR = "NIC/VCENTER_NET_REF" VM_RESTRICTED_ATTR = "NIC/VCENTER_PORTGROUP_TYPE" +VM_RESTRICTED_ATTR = "NIC/EXTERNAL" +VM_RESTRICTED_ATTR = "NIC_ALIAS/MAC" +VM_RESTRICTED_ATTR = "NIC_ALIAS/VLAN_ID" +VM_RESTRICTED_ATTR = "NIC_ALIAS/BRIDGE" +VM_RESTRICTED_ATTR = "NIC_ALIAS/INBOUND_AVG_BW" +VM_RESTRICTED_ATTR = "NIC_ALIAS/INBOUND_PEAK_BW" +VM_RESTRICTED_ATTR = "NIC_ALIAS/INBOUND_PEAK_KB" +VM_RESTRICTED_ATTR = "NIC_ALIAS/OUTBOUND_AVG_BW" +VM_RESTRICTED_ATTR = "NIC_ALIAS/OUTBOUND_PEAK_BW" +VM_RESTRICTED_ATTR = "NIC_ALIAS/OUTBOUND_PEAK_KB" +VM_RESTRICTED_ATTR = "NIC_ALIAS/OPENNEBULA_MANAGED" +VM_RESTRICTED_ATTR = "NIC_ALIAS/VCENTER_INSTANCE_ID" +VM_RESTRICTED_ATTR = "NIC_ALIAS/VCENTER_NET_REF" +VM_RESTRICTED_ATTR = "NIC_ALIAS/VCENTER_PORTGROUP_TYPE" +VM_RESTRICTED_ATTR = "NIC_ALIAS/EXTERNAL" VM_RESTRICTED_ATTR = "NIC_DEFAULT/MAC" VM_RESTRICTED_ATTR = "NIC_DEFAULT/VLAN_ID" VM_RESTRICTED_ATTR = "NIC_DEFAULT/BRIDGE" +VM_RESTRICTED_ATTR = "NIC_DEFAULT/EXTERNAL" VM_RESTRICTED_ATTR = "DISK/TOTAL_BYTES_SEC" VM_RESTRICTED_ATTR = "DISK/TOTAL_BYTES_SEC_MAX_LENGTH" VM_RESTRICTED_ATTR = "DISK/TOTAL_BYTES_SEC_MAX" @@ -1141,6 +1158,8 @@ VNET_RESTRICTED_ATTR = "AR/FILTER_MAC_SPOOFING" VNET_RESTRICTED_ATTR = "CLUSTER_IDS" +VNET_RESTRICTED_ATTR = "EXTERNAL" + #******************************************************************************* # Inherited Attributes Configuration #******************************************************************************* @@ -1209,6 +1228,7 @@ INHERIT_VNET_ATTR = "CONF" INHERIT_VNET_ATTR = "BRIDGE_CONF" INHERIT_VNET_ATTR = "OVS_BRIDGE_CONF" INHERIT_VNET_ATTR = "IP_LINK_CONF" +INHERIT_VNET_ATTR = "EXTERNAL" INHERIT_VNET_ATTR = "VCENTER_NET_REF" INHERIT_VNET_ATTR = "VCENTER_SWITCH_NAME" @@ -1239,7 +1259,20 @@ INHERIT_VNET_ATTR = "VCENTER_INSTANCE_ID" # among the different hosts or not. Valid values: "yes" or "no" # ds_migrate : The driver allows migrations across datastores. Valid values: # "yes" or "no". Note: THIS ONLY APPLIES TO SYSTEM DS. -# allow_orphans: Snapshots can live without parents +# allow_orphans: Snapshots can live without parents. Suported values: +# YES: Children can be orphan (no parent snapshot) +# |- snap_1 +# |- snap_2 +# |- snap_3 +# NO: New snapshots are set active and child of the previous one +# |- snap_1 +# |- snap_2 +# |- snap_3 +# MIXED: Snapshots are children of last snapshot reverted to +# |- snap_1 (<--- revert) +# |- snap_3 +# |- snap_4 +# |- snap_2 #******************************************************************************* TM_MAD_CONF = [ @@ -1274,8 +1307,8 @@ TM_MAD_CONF = [ TM_MAD_CONF = [ NAME = "ceph", LN_TARGET = "NONE", CLONE_TARGET = "SELF", SHARED = "YES", - DS_MIGRATE = "NO", DRIVER = "raw", ALLOW_ORPHANS="yes", - TM_MAD_SYSTEM = "ssh", LN_TARGET_SSH = "SYSTEM", CLONE_TARGET_SSH = "SYSTEM", + DS_MIGRATE = "NO", DRIVER = "raw", ALLOW_ORPHANS="mixed", + TM_MAD_SYSTEM = "ssh,shared", LN_TARGET_SSH = "SYSTEM", CLONE_TARGET_SSH = "SYSTEM", DISK_TYPE_SSH = "FILE", TM_MAD_SYSTEM = "shared", LN_TARGET_SHARED = "NONE", CLONE_TARGET_SHARED = "SELF", DISK_TYPE_SHARED = "RBD" ] diff --git a/share/hooks/ft/fence_host.sh b/share/hooks/ft/fence_host.sh index 7fad86b8aa..49cc0163aa 100755 --- a/share/hooks/ft/fence_host.sh +++ b/share/hooks/ft/fence_host.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/share/hooks/ft/host_error.rb b/share/hooks/ft/host_error.rb index f383708caf..d516285be1 100755 --- a/share/hooks/ft/host_error.rb +++ b/share/hooks/ft/host_error.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/share/hooks/vcenter/create_vcenter_net.rb b/share/hooks/vcenter/create_vcenter_net.rb index 80ebd3ec34..211fc8fbc3 100755 --- a/share/hooks/vcenter/create_vcenter_net.rb +++ b/share/hooks/vcenter/create_vcenter_net.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/share/hooks/vcenter/delete_vcenter_net.rb b/share/hooks/vcenter/delete_vcenter_net.rb index ceb43daaff..a69ca11870 100755 --- a/share/hooks/vcenter/delete_vcenter_net.rb +++ b/share/hooks/vcenter/delete_vcenter_net.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/share/install_gems/CentOS7/Gemfile.lock b/share/install_gems/CentOS7/Gemfile.lock index 8d9f639072..dc432bd824 100644 --- a/share/install_gems/CentOS7/Gemfile.lock +++ b/share/install_gems/CentOS7/Gemfile.lock @@ -1,23 +1,23 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.10) + activesupport (4.2.11) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) amazon-ec2 (0.9.17) xml-simple (>= 1.0.12) - aws-sdk (2.11.39) - aws-sdk-resources (= 2.11.39) - aws-sdk-core (2.11.39) + aws-sdk (2.11.212) + aws-sdk-resources (= 2.11.212) + aws-sdk-core (2.11.212) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.11.39) - aws-sdk-core (= 2.11.39) - aws-sigv4 (1.0.2) + aws-sdk-resources (2.11.212) + aws-sdk-core (= 2.11.212) + aws-sigv4 (1.0.3) azure (0.7.10) addressable (~> 2.3) azure-core (~> 0.1) @@ -27,46 +27,46 @@ GEM nokogiri (~> 1.6) systemu (~> 2.6) thor (~> 0.19) - azure-core (0.1.14) + azure-core (0.1.15) faraday (~> 0.9) faraday_middleware (~> 0.10) nokogiri (~> 1.6) builder (3.2.3) - concurrent-ruby (1.1.3) + concurrent-ruby (1.1.4) configparser (0.1.7) - curb (0.9.4) - daemons (1.2.6) - eventmachine (1.2.5) - faraday (0.15.0) + curb (0.9.8) + daemons (1.3.1) + eventmachine (1.2.7) + faraday (0.15.4) multipart-post (>= 1.2, < 3) - faraday_middleware (0.12.2) + faraday_middleware (0.13.0) faraday (>= 0.7.4, < 1.0) - hashie (3.5.7) + hashie (3.6.0) highline (1.7.10) i18n (0.9.5) concurrent-ruby (~> 1.0) inflection (1.0.0) jmespath (1.4.0) memcache-client (1.8.5) - mime-types (3.1) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) + mime-types-data (3.2018.0812) mini_portile2 (2.1.0) minitest (5.11.3) multipart-post (2.0.0) - mysql2 (0.5.1) + mysql2 (0.5.2) net-ldap (0.16.1) nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) - ox (2.9.2) + ox (2.10.0) parse-cron (0.1.4) polyglot (0.3.5) public_suffix (2.0.5) - rack (1.6.10) + rack (1.6.11) rack-protection (1.5.5) rack scrub_rb (1.0.1) - sequel (5.7.1) + sequel (5.17.0) sinatra (1.4.8) rack (~> 1.5) rack-protection (~> 1.4) @@ -77,12 +77,12 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (0.20.0) + thor (0.20.3) thread_safe (0.3.6) - tilt (2.0.8) + tilt (2.0.9) treetop (1.6.10) polyglot (~> 0.3) - trollop (2.1.2) + trollop (2.9.9) tzinfo (1.2.5) thread_safe (~> 0.1) uuidtools (2.1.5) @@ -112,7 +112,7 @@ DEPENDENCIES memcache-client mysql2 net-ldap - nokogiri + nokogiri (< 1.7) ox parse-cron public_suffix (< 3.0.0) @@ -128,4 +128,4 @@ DEPENDENCIES zendesk_api BUNDLED WITH - 1.17.1 + 1.11.2 diff --git a/share/install_gems/Debian9/Gemfile.lock b/share/install_gems/Debian9/Gemfile.lock index d7e8260887..4a1f682029 100644 --- a/share/install_gems/Debian9/Gemfile.lock +++ b/share/install_gems/Debian9/Gemfile.lock @@ -1,23 +1,23 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.10) + activesupport (4.2.11) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) amazon-ec2 (0.9.17) xml-simple (>= 1.0.12) - aws-sdk (2.11.39) - aws-sdk-resources (= 2.11.39) - aws-sdk-core (2.11.39) + aws-sdk (2.11.212) + aws-sdk-resources (= 2.11.212) + aws-sdk-core (2.11.212) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.11.39) - aws-sdk-core (= 2.11.39) - aws-sigv4 (1.0.2) + aws-sdk-resources (2.11.212) + aws-sdk-core (= 2.11.212) + aws-sigv4 (1.0.3) azure (0.7.10) addressable (~> 2.3) azure-core (~> 0.1) @@ -27,61 +27,63 @@ GEM nokogiri (~> 1.6) systemu (~> 2.6) thor (~> 0.19) - azure-core (0.1.14) + azure-core (0.1.15) faraday (~> 0.9) faraday_middleware (~> 0.10) nokogiri (~> 1.6) builder (3.2.3) - concurrent-ruby (1.1.3) + concurrent-ruby (1.1.4) configparser (0.1.7) - curb (0.9.4) - daemons (1.2.6) - eventmachine (1.2.5) - faraday (0.15.0) + curb (0.9.8) + daemons (1.3.1) + eventmachine (1.2.7) + faraday (0.15.4) multipart-post (>= 1.2, < 3) - faraday_middleware (0.12.2) + faraday_middleware (0.13.0) faraday (>= 0.7.4, < 1.0) - hashie (3.5.7) + hashie (3.6.0) highline (1.7.10) i18n (0.9.5) concurrent-ruby (~> 1.0) inflection (1.0.0) jmespath (1.4.0) memcache-client (1.8.5) - mime-types (3.1) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_portile2 (2.3.0) + mime-types-data (3.2018.0812) + mini_portile2 (2.4.0) minitest (5.11.3) multipart-post (2.0.0) - mysql2 (0.5.1) + mustermann (1.0.3) + mysql2 (0.5.2) net-ldap (0.16.1) - nokogiri (1.8.2) - mini_portile2 (~> 2.3.0) - ox (2.9.2) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) + ox (2.10.0) parse-cron (0.1.4) polyglot (0.3.5) - public_suffix (3.0.2) - rack (1.6.10) - rack-protection (1.5.5) + public_suffix (3.0.3) + rack (2.0.6) + rack-protection (2.0.5) rack - sequel (5.7.1) - sinatra (1.4.8) - rack (~> 1.5) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) + sequel (5.17.0) + sinatra (2.0.5) + mustermann (~> 1.0) + rack (~> 2.0) + rack-protection (= 2.0.5) + tilt (~> 2.0) sqlite3 (1.3.13) systemu (2.6.5) thin (1.7.2) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (0.20.0) + thor (0.20.3) thread_safe (0.3.6) - tilt (2.0.8) + tilt (2.0.9) treetop (1.6.10) polyglot (~> 0.3) - trollop (2.1.2) + trollop (2.9.9) tzinfo (1.2.5) thread_safe (~> 0.1) uuidtools (2.1.5) @@ -114,7 +116,8 @@ DEPENDENCIES nokogiri ox parse-cron - rack (< 2.0.0) + public_suffix + rack sequel sinatra sqlite3 @@ -125,4 +128,4 @@ DEPENDENCIES zendesk_api BUNDLED WITH - 1.17.1 + 1.11.2 diff --git a/share/install_gems/Gemfile b/share/install_gems/Gemfile index 4890692cf0..e03ab46bb1 100644 --- a/share/install_gems/Gemfile +++ b/share/install_gems/Gemfile @@ -1,17 +1,34 @@ source 'https://rubygems.org' -if RUBY_VERSION < '1.9.0' - gem 'nokogiri', '< 1.6.0' - gem 'net-ldap', '< 0.9' - gem 'zendesk_api', '< 1.5' +if RUBY_VERSION < '2.1.0' + gem 'nokogiri', '< 1.7' +elsif RUBY_VERSION < '2.3.0' + gem 'nokogiri', '< 1.10' else gem 'nokogiri' - gem 'net-ldap' - gem 'zendesk_api' end -if RUBY_VERSION >= '2.0.0' and RUBY_VERSION < '2.1.0' +if RUBY_VERSION < '2.0.0' + gem 'net-ldap', '< 0.13' # auth + gem 'mysql2', '< 0.5.0' # onedb + gem 'mime-types', '< 3.0' # hybrid (azure) +else + gem 'net-ldap' # auth + gem 'mysql2' # onedb +end + +if RUBY_VERSION < '2.0.0' + gem 'public_suffix', '< 1.5.0' +elsif RUBY_VERSION < '2.1.0' gem 'public_suffix', '< 3.0.0' +else + gem 'public_suffix' +end + +if RUBY_VERSION < '2.2.0' + gem 'rack', '< 2.0.0' # sunstone, cloud, oneflow +else + gem 'rack' # sunstone, cloud, oneflow end if RUBY_VERSION >= '2.4.0' @@ -27,8 +44,8 @@ gem 'treetop', '>= 1.6.3' # oneflow gem 'sequel' # quota, oneb gem 'sinatra' # sunstone, cloud, oneflow gem 'thin' # sunstone, cloud -gem 'rack', '< 2.0.0' # sunstone, cloud, oneflow gem 'memcache-client' # sunstone +gem 'zendesk_api' # sunstone gem 'amazon-ec2' # cloud gem 'uuidtools' # cloud gem 'curb' # cloud @@ -39,7 +56,6 @@ gem 'trollop' # vmware gem 'parse-cron' # oneflow gem 'aws-sdk', '~> 2.5' # ec2_hybrid gem 'ox' # oca -gem 'mysql2' # onedb gem 'highline', '~> 1.7' # oneprovision gem 'faraday', '~> 0.15' # packethost gem 'faraday_middleware', '~> 0.12' # packethost diff --git a/share/install_gems/Ubuntu1404/Gemfile.lock b/share/install_gems/Ubuntu1404/Gemfile.lock index ded78f8dbf..f6098aedee 100644 --- a/share/install_gems/Ubuntu1404/Gemfile.lock +++ b/share/install_gems/Ubuntu1404/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.10) + activesupport (4.2.11) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -9,14 +9,14 @@ GEM addressable (2.4.0) amazon-ec2 (0.9.17) xml-simple (>= 1.0.12) - aws-sdk (2.11.39) - aws-sdk-resources (= 2.11.39) - aws-sdk-core (2.11.39) + aws-sdk (2.11.212) + aws-sdk-resources (= 2.11.212) + aws-sdk-core (2.11.212) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.11.39) - aws-sdk-core (= 2.11.39) - aws-sigv4 (1.0.2) + aws-sdk-resources (2.11.212) + aws-sdk-core (= 2.11.212) + aws-sigv4 (1.0.3) azure (0.7.10) addressable (~> 2.3) azure-core (~> 0.1) @@ -26,21 +26,21 @@ GEM nokogiri (~> 1.6) systemu (~> 2.6) thor (~> 0.19) - azure-core (0.1.14) + azure-core (0.1.15) faraday (~> 0.9) faraday_middleware (~> 0.10) nokogiri (~> 1.6) builder (3.2.3) - concurrent-ruby (1.1.3) + concurrent-ruby (1.1.4) configparser (0.1.7) - curb (0.9.4) - daemons (1.2.6) - eventmachine (1.2.5) - faraday (0.15.0) + curb (0.9.8) + daemons (1.3.1) + eventmachine (1.2.7) + faraday (0.15.4) multipart-post (>= 1.2, < 3) - faraday_middleware (0.12.2) + faraday_middleware (0.13.0) faraday (>= 0.7.4, < 1.0) - hashie (3.5.7) + hashie (3.6.0) highline (1.7.10) i18n (0.9.5) concurrent-ruby (~> 1.0) @@ -55,14 +55,15 @@ GEM net-ldap (0.12.1) nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) - ox (2.9.2) + ox (2.10.0) parse-cron (0.1.4) polyglot (0.3.5) - rack (1.6.10) + public_suffix (1.4.6) + rack (1.6.11) rack-protection (1.5.5) rack scrub_rb (1.0.1) - sequel (5.7.1) + sequel (5.17.0) sinatra (1.4.8) rack (~> 1.5) rack-protection (~> 1.4) @@ -73,12 +74,12 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (0.20.0) + thor (0.20.3) thread_safe (0.3.6) - tilt (2.0.8) + tilt (2.0.9) treetop (1.6.10) polyglot (~> 0.3) - trollop (2.1.2) + trollop (2.9.9) tzinfo (1.2.5) thread_safe (~> 0.1) uuidtools (2.1.5) @@ -106,11 +107,13 @@ DEPENDENCIES highline (~> 1.7) i18n (~> 0.9) memcache-client - mysql2 - net-ldap - nokogiri + mime-types (< 3.0) + mysql2 (< 0.5.0) + net-ldap (< 0.13) + nokogiri (< 1.7) ox parse-cron + public_suffix (< 1.5.0) rack (< 2.0.0) scrub_rb sequel @@ -123,4 +126,4 @@ DEPENDENCIES zendesk_api BUNDLED WITH - 1.17.1 + 1.11.2 diff --git a/share/install_gems/Ubuntu1604/Gemfile.lock b/share/install_gems/Ubuntu1604/Gemfile.lock index d7e8260887..4a1f682029 100644 --- a/share/install_gems/Ubuntu1604/Gemfile.lock +++ b/share/install_gems/Ubuntu1604/Gemfile.lock @@ -1,23 +1,23 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.10) + activesupport (4.2.11) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) amazon-ec2 (0.9.17) xml-simple (>= 1.0.12) - aws-sdk (2.11.39) - aws-sdk-resources (= 2.11.39) - aws-sdk-core (2.11.39) + aws-sdk (2.11.212) + aws-sdk-resources (= 2.11.212) + aws-sdk-core (2.11.212) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.11.39) - aws-sdk-core (= 2.11.39) - aws-sigv4 (1.0.2) + aws-sdk-resources (2.11.212) + aws-sdk-core (= 2.11.212) + aws-sigv4 (1.0.3) azure (0.7.10) addressable (~> 2.3) azure-core (~> 0.1) @@ -27,61 +27,63 @@ GEM nokogiri (~> 1.6) systemu (~> 2.6) thor (~> 0.19) - azure-core (0.1.14) + azure-core (0.1.15) faraday (~> 0.9) faraday_middleware (~> 0.10) nokogiri (~> 1.6) builder (3.2.3) - concurrent-ruby (1.1.3) + concurrent-ruby (1.1.4) configparser (0.1.7) - curb (0.9.4) - daemons (1.2.6) - eventmachine (1.2.5) - faraday (0.15.0) + curb (0.9.8) + daemons (1.3.1) + eventmachine (1.2.7) + faraday (0.15.4) multipart-post (>= 1.2, < 3) - faraday_middleware (0.12.2) + faraday_middleware (0.13.0) faraday (>= 0.7.4, < 1.0) - hashie (3.5.7) + hashie (3.6.0) highline (1.7.10) i18n (0.9.5) concurrent-ruby (~> 1.0) inflection (1.0.0) jmespath (1.4.0) memcache-client (1.8.5) - mime-types (3.1) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_portile2 (2.3.0) + mime-types-data (3.2018.0812) + mini_portile2 (2.4.0) minitest (5.11.3) multipart-post (2.0.0) - mysql2 (0.5.1) + mustermann (1.0.3) + mysql2 (0.5.2) net-ldap (0.16.1) - nokogiri (1.8.2) - mini_portile2 (~> 2.3.0) - ox (2.9.2) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) + ox (2.10.0) parse-cron (0.1.4) polyglot (0.3.5) - public_suffix (3.0.2) - rack (1.6.10) - rack-protection (1.5.5) + public_suffix (3.0.3) + rack (2.0.6) + rack-protection (2.0.5) rack - sequel (5.7.1) - sinatra (1.4.8) - rack (~> 1.5) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) + sequel (5.17.0) + sinatra (2.0.5) + mustermann (~> 1.0) + rack (~> 2.0) + rack-protection (= 2.0.5) + tilt (~> 2.0) sqlite3 (1.3.13) systemu (2.6.5) thin (1.7.2) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (0.20.0) + thor (0.20.3) thread_safe (0.3.6) - tilt (2.0.8) + tilt (2.0.9) treetop (1.6.10) polyglot (~> 0.3) - trollop (2.1.2) + trollop (2.9.9) tzinfo (1.2.5) thread_safe (~> 0.1) uuidtools (2.1.5) @@ -114,7 +116,8 @@ DEPENDENCIES nokogiri ox parse-cron - rack (< 2.0.0) + public_suffix + rack sequel sinatra sqlite3 @@ -125,4 +128,4 @@ DEPENDENCIES zendesk_api BUNDLED WITH - 1.17.1 + 1.11.2 diff --git a/share/install_gems/Ubuntu1804/Gemfile.lock b/share/install_gems/Ubuntu1804/Gemfile.lock index ddecc8bbc8..affde1d116 100644 --- a/share/install_gems/Ubuntu1804/Gemfile.lock +++ b/share/install_gems/Ubuntu1804/Gemfile.lock @@ -1,23 +1,23 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.10) + activesupport (4.2.11) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) amazon-ec2 (0.9.17) xml-simple (>= 1.0.12) - aws-sdk (2.11.39) - aws-sdk-resources (= 2.11.39) - aws-sdk-core (2.11.39) + aws-sdk (2.11.212) + aws-sdk-resources (= 2.11.212) + aws-sdk-core (2.11.212) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.11.39) - aws-sdk-core (= 2.11.39) - aws-sigv4 (1.0.2) + aws-sdk-resources (2.11.212) + aws-sdk-core (= 2.11.212) + aws-sigv4 (1.0.3) azure (0.7.10) addressable (~> 2.3) azure-core (~> 0.1) @@ -27,61 +27,63 @@ GEM nokogiri (~> 1.6) systemu (~> 2.6) thor (~> 0.19) - azure-core (0.1.14) + azure-core (0.1.15) faraday (~> 0.9) faraday_middleware (~> 0.10) nokogiri (~> 1.6) builder (3.2.3) - concurrent-ruby (1.1.3) + concurrent-ruby (1.1.4) configparser (0.1.7) - curb (0.9.4) - daemons (1.2.6) - eventmachine (1.2.5) - faraday (0.15.0) + curb (0.9.8) + daemons (1.3.1) + eventmachine (1.2.7) + faraday (0.15.4) multipart-post (>= 1.2, < 3) - faraday_middleware (0.12.2) + faraday_middleware (0.13.0) faraday (>= 0.7.4, < 1.0) - hashie (3.5.7) + hashie (3.6.0) highline (1.7.10) i18n (0.9.5) concurrent-ruby (~> 1.0) inflection (1.0.0) jmespath (1.4.0) memcache-client (1.8.5) - mime-types (3.1) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_portile2 (2.3.0) + mime-types-data (3.2018.0812) + mini_portile2 (2.4.0) minitest (5.11.3) multipart-post (2.0.0) - mysql2 (0.5.1) + mustermann (1.0.3) + mysql2 (0.5.2) net-ldap (0.16.1) - nokogiri (1.8.2) - mini_portile2 (~> 2.3.0) - ox (2.9.2) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) + ox (2.10.0) parse-cron (0.1.4) polyglot (0.3.5) - public_suffix (3.0.2) - rack (1.6.10) - rack-protection (1.5.5) + public_suffix (3.0.3) + rack (2.0.6) + rack-protection (2.0.5) rack - sequel (5.7.1) - sinatra (1.4.8) - rack (~> 1.5) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) + sequel (5.17.0) + sinatra (2.0.5) + mustermann (~> 1.0) + rack (~> 2.0) + rack-protection (= 2.0.5) + tilt (~> 2.0) sqlite3 (1.3.13) systemu (2.6.5) thin (1.7.2) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (0.20.0) + thor (0.20.3) thread_safe (0.3.6) - tilt (2.0.8) + tilt (2.0.9) treetop (1.6.10) polyglot (~> 0.3) - trollop (2.1.2) + trollop (2.9.9) tzinfo (1.2.5) thread_safe (~> 0.1) uuidtools (2.1.5) @@ -115,7 +117,8 @@ DEPENDENCIES nokogiri ox parse-cron - rack (< 2.0.0) + public_suffix + rack sequel sinatra sqlite3 @@ -127,4 +130,4 @@ DEPENDENCIES zendesk_api BUNDLED WITH - 1.17.1 + 1.11.2 diff --git a/share/install_gems/Ubuntu1810/Gemfile.lock b/share/install_gems/Ubuntu1810/Gemfile.lock index 19a28e5bba..affde1d116 100644 --- a/share/install_gems/Ubuntu1810/Gemfile.lock +++ b/share/install_gems/Ubuntu1810/Gemfile.lock @@ -1,22 +1,22 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.10) + activesupport (4.2.11) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) amazon-ec2 (0.9.17) xml-simple (>= 1.0.12) - aws-sdk (2.11.166) - aws-sdk-resources (= 2.11.166) - aws-sdk-core (2.11.166) + aws-sdk (2.11.212) + aws-sdk-resources (= 2.11.212) + aws-sdk-core (2.11.212) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.11.166) - aws-sdk-core (= 2.11.166) + aws-sdk-resources (2.11.212) + aws-sdk-core (= 2.11.212) aws-sigv4 (1.0.3) azure (0.7.10) addressable (~> 2.3) @@ -27,19 +27,19 @@ GEM nokogiri (~> 1.6) systemu (~> 2.6) thor (~> 0.19) - azure-core (0.1.14) + azure-core (0.1.15) faraday (~> 0.9) faraday_middleware (~> 0.10) nokogiri (~> 1.6) builder (3.2.3) - concurrent-ruby (1.1.3) + concurrent-ruby (1.1.4) configparser (0.1.7) - curb (0.9.6) - daemons (1.2.6) + curb (0.9.8) + daemons (1.3.1) eventmachine (1.2.7) - faraday (0.15.3) + faraday (0.15.4) multipart-post (>= 1.2, < 3) - faraday_middleware (0.12.2) + faraday_middleware (0.13.0) faraday (>= 0.7.4, < 1.0) hashie (3.6.0) highline (1.7.10) @@ -51,34 +51,36 @@ GEM mime-types (3.2.2) mime-types-data (~> 3.2015) mime-types-data (3.2018.0812) - mini_portile2 (2.3.0) + mini_portile2 (2.4.0) minitest (5.11.3) multipart-post (2.0.0) + mustermann (1.0.3) mysql2 (0.5.2) net-ldap (0.16.1) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) ox (2.10.0) parse-cron (0.1.4) polyglot (0.3.5) public_suffix (3.0.3) - rack (1.6.11) - rack-protection (1.5.5) + rack (2.0.6) + rack-protection (2.0.5) rack - sequel (5.14.0) - sinatra (1.4.8) - rack (~> 1.5) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) + sequel (5.17.0) + sinatra (2.0.5) + mustermann (~> 1.0) + rack (~> 2.0) + rack-protection (= 2.0.5) + tilt (~> 2.0) sqlite3 (1.3.13) systemu (2.6.5) thin (1.7.2) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (0.20.0) + thor (0.20.3) thread_safe (0.3.6) - tilt (2.0.8) + tilt (2.0.9) treetop (1.6.10) polyglot (~> 0.3) trollop (2.9.9) @@ -115,7 +117,8 @@ DEPENDENCIES nokogiri ox parse-cron - rack (< 2.0.0) + public_suffix + rack sequel sinatra sqlite3 @@ -127,4 +130,4 @@ DEPENDENCIES zendesk_api BUNDLED WITH - 1.17.1 + 1.11.2 diff --git a/share/install_gems/install_gems b/share/install_gems/install_gems index e6c31b17cb..ee4793f514 100755 --- a/share/install_gems/install_gems +++ b/share/install_gems/install_gems @@ -408,9 +408,22 @@ def install_bundler_gem gems = Gem::Dependency.new("bundler") if gems.matching_specs.empty? - rc = system("gem install bundler") + rc = nil + + # Bundler 2.0.x requires Ruby 2.3+ + # https://github.com/OpenNebula/one/issues/2778 + [nil, '~>2', '<2'].each do |version| + if version + rc = system("gem install bundler --version '#{version}'") + else + rc = system("gem install bundler") + end + + break if rc + end + if !rc - STDERR.new("Error installing bundler") + STDERR.puts "Error installing bundler" exit(-1) end end diff --git a/share/linters/.rubocop.yml b/share/linters/.rubocop.yml index 68d291e0bc..a88d22710d 100644 --- a/share/linters/.rubocop.yml +++ b/share/linters/.rubocop.yml @@ -1,11 +1,613 @@ +# -------------------------------------------------------------------------- # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # +# # +# Licensed 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. # +#--------------------------------------------------------------------------- # + # # Configuration file for rubocop linter # Applies to every ruby file on the OpenNebula repository # AllCops: - Include: - - 'src/cli' + Exclude: + - src/sunstone/public/node_modules/**/* + - src/tm_mad + - share/onegate/onegate + - share/scons/get_xmlrpc_config + - share/rubygems/generate + - share/hooks/raft/follower_cleanup + - share/esx-fw-vnc/Vagrantfile + - share/vendor/ruby/gems/rbvmomi/Rakefile + - share/vendor/ruby/gems/packethost/Rakefile + - share/vendor/ruby/gems/packethost/Gemfile + - share/vendor/ruby/gems/packethost/packethost.gemspec + - share/install_gems/Gemfile + - share/install_gems/install_gems + - src/authm_mad/remotes/dummy/authenticate + - src/authm_mad/remotes/plain/authenticate + - src/authm_mad/remotes/ldap/authenticate + - src/authm_mad/remotes/server_x509/authenticate + - src/authm_mad/remotes/server_cipher/authenticate + - src/authm_mad/remotes/x509/authenticate + - src/authm_mad/remotes/ssh/authenticate + - src/sunstone/bin/novnc-server + - src/sunstone/config.ru + - src/pm_mad/remotes/dummy/cancel + - src/pm_mad/remotes/dummy/shutdown + - src/pm_mad/remotes/dummy/reboot + - src/pm_mad/remotes/dummy/deploy + - src/pm_mad/remotes/dummy/reset + - src/pm_mad/remotes/dummy/poll + - src/pm_mad/remotes/packet/cancel + - src/pm_mad/remotes/packet/shutdown + - src/pm_mad/remotes/packet/reboot + - src/pm_mad/remotes/packet/deploy + - src/pm_mad/remotes/packet/reset + - src/pm_mad/remotes/packet/poll + - src/pm_mad/remotes/ec2/cancel + - src/pm_mad/remotes/ec2/shutdown + - src/pm_mad/remotes/ec2/reboot + - src/pm_mad/remotes/ec2/deploy + - src/pm_mad/remotes/ec2/reset + - src/pm_mad/remotes/ec2/poll + - src/onegate/config.ru + - src/datastore_mad/remotes/vcenter/monitor + - src/datastore_mad/remotes/vcenter/mkfs + - src/datastore_mad/remotes/vcenter/stat + - src/datastore_mad/remotes/vcenter/clone + - src/datastore_mad/remotes/vcenter/cp + - src/datastore_mad/remotes/vcenter/export + - src/datastore_mad/remotes/vcenter/rm + - src/im_mad/remotes/lxd-probes.d/pci.rb + - src/im_mad/remotes/kvm-probes.d/pci.rb + - src/im_mad/remotes/kvm.d/collectd-client.rb + - src/im_mad/remotes/lxd.d/collectd-client.rb + - src/im_mad/remotes/vcenter.d/poll + - src/im_mad/remotes/packet.d/poll + - src/im_mad/remotes/ec2.d/poll + - src/im_mad/remotes/one.d/poll + - src/im_mad/remotes/az.d/poll + - src/vnm_mad/remotes/ovswitch/post + - src/vnm_mad/remotes/ovswitch/clean + - src/vnm_mad/remotes/ovswitch/pre + - src/vnm_mad/remotes/802.1Q/post + - src/vnm_mad/remotes/802.1Q/update_sg + - src/vnm_mad/remotes/802.1Q/clean + - src/vnm_mad/remotes/802.1Q/pre + - src/vnm_mad/remotes/ebtables/post + - src/vnm_mad/remotes/ebtables/update_sg + - src/vnm_mad/remotes/ebtables/clean + - src/vnm_mad/remotes/ebtables/pre + - src/vnm_mad/remotes/bridge/clean + - src/vnm_mad/remotes/bridge/pre + - src/vnm_mad/remotes/vxlan/post + - src/vnm_mad/remotes/vxlan/update_sg + - src/vnm_mad/remotes/vxlan/clean + - src/vnm_mad/remotes/vxlan/pre + - src/vnm_mad/remotes/fw/post + - src/vnm_mad/remotes/fw/update_sg + - src/vnm_mad/remotes/fw/clean + - src/vnm_mad/remotes/fw/pre + - src/vnm_mad/remotes/ovswitch_vxlan/post + - src/vnm_mad/remotes/ovswitch_vxlan/clean + - src/vnm_mad/remotes/ovswitch_vxlan/pre + - src/vmm_mad/remotes/vcenter/attach_nic + - src/vmm_mad/remotes/vcenter/cancel + - src/vmm_mad/remotes/vcenter/snapshot_revert + - src/vmm_mad/remotes/vcenter/detach_nic + - src/vmm_mad/remotes/vcenter/snapshot_delete + - src/vmm_mad/remotes/vcenter/detach_disk + - src/vmm_mad/remotes/vcenter/shutdown + - src/vmm_mad/remotes/vcenter/attach_disk + - src/vmm_mad/remotes/vcenter/reboot + - src/vmm_mad/remotes/vcenter/deploy + - src/vmm_mad/remotes/vcenter/reset + - src/vmm_mad/remotes/vcenter/reconfigure + - src/vmm_mad/remotes/vcenter/save + - src/vmm_mad/remotes/vcenter/restore + - src/vmm_mad/remotes/vcenter/snapshot_create + - src/vmm_mad/remotes/vcenter/poll + - src/vmm_mad/remotes/lxd/attach_nic + - src/vmm_mad/remotes/lxd/detach_nic + - src/vmm_mad/remotes/lxd/detach_disk + - src/vmm_mad/remotes/lxd/shutdown + - src/vmm_mad/remotes/lxd/attach_disk + - src/vmm_mad/remotes/lxd/reboot + - src/vmm_mad/remotes/lxd/deploy + - src/vmm_mad/remotes/lxd/prereconfigure + - src/vmm_mad/remotes/lxd/reconfigure + - src/vmm_mad/remotes/lxd/poll + - src/vmm_mad/remotes/one/cancel + - src/vmm_mad/remotes/one/shutdown + - src/vmm_mad/remotes/one/reboot + - src/vmm_mad/remotes/one/deploy + - src/vmm_mad/remotes/one/reset + - src/vmm_mad/remotes/one/save + - src/vmm_mad/remotes/one/restore + - src/vmm_mad/remotes/one/poll + - src/vmm_mad/remotes/kvm/poll + - src/vmm_mad/remotes/az/cancel + - src/vmm_mad/remotes/az/shutdown + - src/vmm_mad/remotes/az/reboot + - src/vmm_mad/remotes/az/deploy + - src/vmm_mad/remotes/az/save + - src/vmm_mad/remotes/az/restore + - src/vmm_mad/remotes/az/poll + - src/vmm_mad/remotes/packet/cancel + - src/vmm_mad/remotes/packet/shutdown + - src/vmm_mad/remotes/packet/reboot + - src/vmm_mad/remotes/packet/deploy + - src/vmm_mad/remotes/packet/reset + - src/vmm_mad/remotes/packet/poll + - src/vmm_mad/remotes/ec2/cancel + - src/vmm_mad/remotes/ec2/shutdown + - src/vmm_mad/remotes/ec2/reboot + - src/vmm_mad/remotes/ec2/deploy + - src/vmm_mad/remotes/ec2/save + - src/vmm_mad/remotes/ec2/restore + - src/vmm_mad/remotes/ec2/poll + - src/cloud/ec2/bin/econe-detach-volume + - src/cloud/ec2/bin/econe-start-instances + - src/cloud/ec2/bin/econe-associate-address + - src/cloud/ec2/bin/econe-create-volume + - src/cloud/ec2/bin/econe-delete-volume + - src/cloud/ec2/bin/econe-attach-volume + - src/cloud/ec2/bin/econe-stop-instances + - src/cloud/ec2/bin/econe-delete-keypair + - src/cloud/ec2/bin/econe-register + - src/cloud/ec2/bin/econe-release-address + - src/cloud/ec2/bin/econe-describe-images + - src/cloud/ec2/bin/econe-terminate-instances + - src/cloud/ec2/bin/econe-describe-keypairs + - src/cloud/ec2/bin/econe-describe-instances + - src/cloud/ec2/bin/econe-reboot-instances + - src/cloud/ec2/bin/econe-allocate-address + - src/cloud/ec2/bin/econe-upload + - src/cloud/ec2/bin/econe-describe-addresses + - src/cloud/ec2/bin/econe-run-instances + - src/cloud/ec2/bin/econe-disassociate-address + - src/cloud/ec2/bin/econe-create-keypair + - src/cloud/ec2/bin/econe-describe-volumes + - src/onedb/onedb + - src/market_mad/remotes/s3/monitor + - src/market_mad/remotes/s3/delete + - src/market_mad/remotes/s3/import + - src/market_mad/remotes/linuxcontainers/monitor + - src/market_mad/remotes/one/monitor + - src/tm_mad/vcenter/monitor + - src/tm_mad/vcenter/delete + - src/tm_mad/vcenter/mvds + - src/tm_mad/vcenter/mkimage + - src/tm_mad/vcenter/cpds + - src/tm_mad/vcenter/clone + - src/tm_mad/vcenter/mv + - src/tm_mad/vcenter/resize + - src/flow/config.ru + - src/flow/Gemfile + - src/cli/oneprovision + - share/scons/po2json.rb + - share/sudoers/sudo_commands.rb + - share/hooks/vcenter/delete_vcenter_net.rb + - share/hooks/vcenter/create_vcenter_net.rb + - share/hooks/ft/host_error.rb + - share/instance_types/ec2-instance-types.rb + - share/instance_types/az-instance-types.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/vim/Datastore.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/vim/DynamicTypeMgrDataTypeInfo.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/vim/HostSystem.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/vim/ManagedObject.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/vim/DynamicTypeMgrManagedTypeInfo.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/vim/ServiceInstance.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/vim/PropertyCollector.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/vim/DynamicTypeMgrAllTypeInfo.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/vim/ObjectUpdate.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/vim/ManagedEntity.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/vim/Folder.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/vim/ReflectManagedMethodExecuter.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/vim/ResourcePool.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/vim/OvfManager.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/vim/Datacenter.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/vim/ObjectContent.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/vim/VirtualMachine.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/vim/ComputeResource.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/vim/PerfCounterInfo.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/vim/PerformanceManager.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/vim/Task.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/sms.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/fault.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/trivial_soap.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/sms/SmsStorageManager.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/deserialization.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/vim.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/connection.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/basic_types.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/utils/perfdump.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/utils/admission_control.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/utils/deploy.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/utils/leases.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/trollop.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/version.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/pbm.rb + - share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/type_loader.rb + - share/vendor/ruby/gems/packethost/spec/spec_helper.rb + - share/vendor/ruby/gems/packethost/spec/support/webmock.rb + - share/vendor/ruby/gems/packethost/spec/support/fake_packet.rb + - share/vendor/ruby/gems/packethost/spec/support/shared/entity.rb + - share/vendor/ruby/gems/packethost/spec/lib/packet_spec.rb + - share/vendor/ruby/gems/packethost/spec/lib/packet/client_spec.rb + - share/vendor/ruby/gems/packethost/spec/lib/packet/project_spec.rb + - share/vendor/ruby/gems/packethost/spec/lib/packet/configuration_spec.rb + - share/vendor/ruby/gems/packethost/spec/lib/packet/device_spec.rb + - share/vendor/ruby/gems/packethost/lib/packet.rb + - share/vendor/ruby/gems/packethost/lib/packet/project.rb + - share/vendor/ruby/gems/packethost/lib/packet/errors.rb + - share/vendor/ruby/gems/packethost/lib/packet/entity/base.rb + - share/vendor/ruby/gems/packethost/lib/packet/entity/serialization.rb + - share/vendor/ruby/gems/packethost/lib/packet/entity/associations.rb + - share/vendor/ruby/gems/packethost/lib/packet/entity/finders.rb + - share/vendor/ruby/gems/packethost/lib/packet/entity/timestamps.rb + - share/vendor/ruby/gems/packethost/lib/packet/entity/persistence.rb + - share/vendor/ruby/gems/packethost/lib/packet/entity.rb + - share/vendor/ruby/gems/packethost/lib/packet/facility.rb + - share/vendor/ruby/gems/packethost/lib/packet/operating_system.rb + - share/vendor/ruby/gems/packethost/lib/packet/device.rb + - share/vendor/ruby/gems/packethost/lib/packet/ip_range.rb + - share/vendor/ruby/gems/packethost/lib/packet/client.rb + - share/vendor/ruby/gems/packethost/lib/packet/version.rb + - share/vendor/ruby/gems/packethost/lib/packet/global_id.rb + - share/vendor/ruby/gems/packethost/lib/packet/configuration.rb + - share/vendor/ruby/gems/packethost/lib/packet/client/devices.rb + - share/vendor/ruby/gems/packethost/lib/packet/client/projects.rb + - share/vendor/ruby/gems/packethost/lib/packet/client/plans.rb + - share/vendor/ruby/gems/packethost/lib/packet/client/facilities.rb + - share/vendor/ruby/gems/packethost/lib/packet/client/ip_ranges.rb + - share/vendor/ruby/gems/packethost/lib/packet/client/ssh_keys.rb + - share/vendor/ruby/gems/packethost/lib/packet/client/users.rb + - share/vendor/ruby/gems/packethost/lib/packet/client/operating_systems.rb + - share/vendor/ruby/gems/packethost/lib/packet/ssh_key.rb + - share/vendor/ruby/gems/packethost/lib/packet/plan.rb + - share/vendor/ruby/gems/packethost/lib/packet/user.rb + - share/vendor/ruby/gems/packethost/lib/packethost.rb + - share/router/vmcontext.rb + - src/authm_mad/one_auth_mad.rb + - src/authm_mad/remotes/ldap/test/ldap_auth_spec.rb + - src/authm_mad/remotes/ldap/ldap_auth.rb + - src/authm_mad/remotes/server_x509/server_x509_auth.rb + - src/authm_mad/remotes/server_cipher/server_cipher_auth.rb + - src/authm_mad/remotes/x509/x509_auth.rb + - src/authm_mad/remotes/ssh/ssh_auth.rb + - src/sunstone/sunstone-server.rb + - src/sunstone/test/spec/spec_helper.rb + - src/sunstone/test/spec/vnet_spec.rb + - src/sunstone/test/spec/image_spec.rb + - src/sunstone/test/spec/vm_spec.rb + - src/sunstone/test/spec/host_spec.rb + - src/sunstone/test/spec/user_spec.rb + - src/sunstone/OpenNebulaAddons.rb + - src/sunstone/OpenNebulaVNC.rb + - src/sunstone/models/OpenNebulaJSON.rb + - src/sunstone/models/SunstoneViews.rb + - src/sunstone/models/SunstoneServer.rb + - src/sunstone/models/OpenNebulaJSON/SecurityGroupJSON.rb + - src/sunstone/models/OpenNebulaJSON/HostJSON.rb + - src/sunstone/models/OpenNebulaJSON/PoolJSON.rb + - src/sunstone/models/OpenNebulaJSON/TemplateJSON.rb + - src/sunstone/models/OpenNebulaJSON/DatastoreJSON.rb + - src/sunstone/models/OpenNebulaJSON/UserJSON.rb + - src/sunstone/models/OpenNebulaJSON/AclJSON.rb + - src/sunstone/models/OpenNebulaJSON/JSONUtils.rb + - src/sunstone/models/OpenNebulaJSON/VirtualMachineJSON.rb + - src/sunstone/models/OpenNebulaJSON/MarketPlaceAppJSON.rb + - src/sunstone/models/OpenNebulaJSON/ImageJSON.rb + - src/sunstone/models/OpenNebulaJSON/ZoneJSON.rb + - src/sunstone/models/OpenNebulaJSON/MarketPlaceJSON.rb + - src/sunstone/models/OpenNebulaJSON/VirtualNetworkJSON.rb + - src/sunstone/models/OpenNebulaJSON/VirtualRouterJSON.rb + - src/sunstone/models/OpenNebulaJSON/VirtualNetworkTemplateJSON.rb + - src/sunstone/models/OpenNebulaJSON/GroupJSON.rb + - src/sunstone/models/OpenNebulaJSON/ClusterJSON.rb + - src/sunstone/models/OpenNebulaJSON/VMGroupJSON.rb + - src/sunstone/models/OpenNebulaJSON/VdcJSON.rb + - src/sunstone/public/config.rb + - src/sunstone/routes/oneflow.rb + - src/sunstone/routes/vcenter.rb + - src/sunstone/routes/support.rb + - src/onegate/onegate-server.rb + - src/datastore_mad/remotes/vcenter_downloader.rb + - src/datastore_mad/remotes/vcenter_uploader.rb + - src/datastore_mad/remotes/xpath.rb + - src/datastore_mad/remotes/url.rb + - src/datastore_mad/one_datastore.rb + - src/im_mad/dummy/one_im_dummy.rb + - src/im_mad/im_exec/one_im_exec.rb + - src/im_mad/remotes/lxd-probes.d/lxd.rb + - src/im_mad/remotes/kvm-probes.d/kvm.rb + - src/im_mad/remotes/kvm-probes.d/machines-models.rb + - src/im_mad/remotes/common.d/collectd-client.rb + - src/im_mad/remotes/node-probes.d/pci.rb + - src/hm_mad/one_hm.rb + - src/vnm_mad/one_vnm.rb + - src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb + - src/vnm_mad/remotes/802.1Q/vlan_tag_driver.rb + - src/vnm_mad/remotes/ebtables/Ebtables.rb + - src/vnm_mad/remotes/vxlan/vxlan.rb + - src/vnm_mad/remotes/vxlan/vxlan_driver.rb + - src/vnm_mad/remotes/ovswitch_vxlan/OpenvSwitchVXLAN.rb + - src/vnm_mad/remotes/lib/no_vlan.rb + - src/vnm_mad/remotes/lib/nic.rb + - src/vnm_mad/remotes/lib/vnmmad.rb + - src/vnm_mad/remotes/lib/security_groups.rb + - src/vnm_mad/remotes/lib/security_groups_iptables.rb + - src/vnm_mad/remotes/lib/vm.rb + - src/vnm_mad/remotes/lib/vnm_driver.rb + - src/vnm_mad/remotes/lib/sg_driver.rb + - src/vnm_mad/remotes/lib/command.rb + - src/vnm_mad/remotes/lib/vlan.rb + - src/vnm_mad/remotes/lib/address.rb + - src/cli/command_parser.rb + - src/cli/cli_helper.rb + - src/cli/one_helper.rb + - src/cli/one_helper/onevmgroup_helper.rb + - src/cli/one_helper/onemarket_helper.rb + - src/cli/one_helper/onesecgroup_helper.rb + - src/cli/one_helper/onezone_helper.rb + - src/cli/one_helper/onetemplate_helper.rb + - src/cli/one_helper/onevm_helper.rb + - src/cli/one_helper/oneacct_helper.rb + - src/cli/one_helper/onequota_helper.rb + - src/cli/one_helper/oneuser_helper.rb + - src/cli/one_helper/oneimage_helper.rb + - src/cli/one_helper/onemarketapp_helper.rb + - src/cli/one_helper/onegroup_helper.rb + - src/cli/one_helper/onevnet_helper.rb + - src/cli/one_helper/oneacl_helper.rb + - src/cli/one_helper/onevcenter_helper.rb + - src/cli/one_helper/onecluster_helper.rb + - src/cli/one_helper/onevntemplate_helper.rb + - src/cli/one_helper/onevrouter_helper.rb + - src/cli/one_helper/oneprovision_helpers/host_helper.rb + - src/cli/one_helper/oneprovision_helpers/provision_helper.rb + - src/cli/one_helper/oneprovision_helpers/cluster_helper.rb + - src/cli/one_helper/oneprovision_helpers/common_helper.rb + - src/cli/one_helper/oneprovision_helpers/datastore_helper.rb + - src/cli/one_helper/oneprovision_helpers/vnet_helper.rb + - src/cli/one_helper/oneprovision_helpers/ansible_helper.rb + - src/cli/one_helper/onevdc_helper.rb + - src/cli/one_helper/onedatastore_helper.rb + - src/oca/ruby/test/VirtualMachine_spec.rb + - src/oca/ruby/test/VirtualMachinePool_spec.rb + - src/oca/ruby/test/XMLUtils_spec.rb + - src/oca/ruby/test/UserPool_spec.rb + - src/oca/ruby/test/Host_spec.rb + - src/oca/ruby/test/User_spec.rb + - src/oca/ruby/test/helpers/MockClient.rb + - src/oca/ruby/test/VirtualNetwork_spec.rb + - src/oca/ruby/test/HostPool_spec.rb + - src/oca/ruby/test/VirtualNetworkPool_spec.rb + - src/oca/ruby/opennebula.rb + - src/oca/ruby/opennebula/image.rb + - src/oca/ruby/opennebula/datastore.rb + - src/oca/ruby/opennebula/group_pool.rb + - src/oca/ruby/opennebula/template_pool.rb + - src/oca/ruby/opennebula/marketplaceapp_pool.rb + - src/oca/ruby/opennebula/acl_pool.rb + - src/oca/ruby/opennebula/virtual_machine_pool.rb + - src/oca/ruby/opennebula/pool.rb + - src/oca/ruby/opennebula/host_pool.rb + - src/oca/ruby/opennebula/security_group.rb + - src/oca/ruby/opennebula/cluster_pool.rb + - src/oca/ruby/opennebula/document.rb + - src/oca/ruby/opennebula/zone.rb + - src/oca/ruby/opennebula/virtual_router_pool.rb + - src/oca/ruby/opennebula/user_pool.rb + - src/oca/ruby/opennebula/xml_utils.rb + - src/oca/ruby/opennebula/virtual_router.rb + - src/oca/ruby/opennebula/document_json.rb + - src/oca/ruby/opennebula/marketplace.rb + - src/oca/ruby/opennebula/virtual_machine.rb + - src/oca/ruby/opennebula/xml_element.rb + - src/oca/ruby/opennebula/template.rb + - src/oca/ruby/opennebula/group.rb + - src/oca/ruby/opennebula/virtual_network.rb + - src/oca/ruby/opennebula/security_group_pool.rb + - src/oca/ruby/opennebula/pool_element.rb + - src/oca/ruby/opennebula/document_pool.rb + - src/oca/ruby/opennebula/vm_group_pool.rb + - src/oca/ruby/opennebula/vntemplate_pool.rb + - src/oca/ruby/opennebula/vdc_pool.rb + - src/oca/ruby/opennebula/datastore_pool.rb + - src/oca/ruby/opennebula/cluster.rb + - src/oca/ruby/opennebula/utils.rb + - src/oca/ruby/opennebula/acl.rb + - src/oca/ruby/opennebula/vntemplate.rb + - src/oca/ruby/opennebula/oneflow_client.rb + - src/oca/ruby/opennebula/host.rb + - src/oca/ruby/opennebula/vm_group.rb + - src/oca/ruby/opennebula/xml_pool.rb + - src/oca/ruby/opennebula/client.rb + - src/oca/ruby/opennebula/document_pool_json.rb + - src/oca/ruby/opennebula/zone_pool.rb + - src/oca/ruby/opennebula/error.rb + - src/oca/ruby/opennebula/image_pool.rb + - src/oca/ruby/opennebula/virtual_network_pool.rb + - src/oca/ruby/opennebula/system.rb + - src/oca/ruby/opennebula/marketplaceapp.rb + - src/oca/ruby/opennebula/marketplace_pool.rb + - src/oca/ruby/opennebula/vdc.rb + - src/oca/ruby/opennebula/user.rb + - src/oca/ruby/deprecated/OpenNebula.rb + - src/vmm_mad/dummy/one_vmm_dummy.rb + - src/vmm_mad/remotes/vcenter/vcenter_driver.rb + - src/vmm_mad/remotes/one/opennebula_driver.rb + - src/vmm_mad/remotes/lib/vcenter_driver/datastore.rb + - src/vmm_mad/remotes/lib/vcenter_driver/vcenter_importer.rb + - src/vmm_mad/remotes/lib/vcenter_driver/vi_helper.rb + - src/vmm_mad/remotes/lib/vcenter_driver/network.rb + - src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb + - src/vmm_mad/remotes/lib/vcenter_driver/vm_template.rb + - src/vmm_mad/remotes/lib/vcenter_driver/file_helper.rb + - src/vmm_mad/remotes/lib/vcenter_driver/vi_client.rb + - src/vmm_mad/remotes/lib/vcenter_driver/host.rb + - src/vmm_mad/remotes/lib/vcenter_driver/datacenter.rb + - src/vmm_mad/remotes/lib/vcenter_driver/memoize.rb + - src/vmm_mad/remotes/lib/lxd/mapper/qcow2.rb + - src/vmm_mad/remotes/lib/lxd/mapper/mapper.rb + - src/vmm_mad/remotes/lib/lxd/mapper/rbd.rb + - src/vmm_mad/remotes/lib/lxd/mapper/raw.rb + - src/vmm_mad/remotes/lib/lxd/container.rb + - src/vmm_mad/remotes/lib/lxd/client.rb + - src/vmm_mad/remotes/lib/lxd/opennebula_vm.rb + - src/vmm_mad/remotes/lib/lxd/command.rb + - src/vmm_mad/remotes/lib/poll_common.rb + - src/vmm_mad/remotes/az/az_driver.rb + - src/vmm_mad/remotes/packet/packet_driver.rb + - src/vmm_mad/remotes/ec2/ec2_driver.rb + - src/vmm_mad/exec/one_vmm_exec.rb + - src/mad/ruby/ssh_stream.rb + - src/mad/ruby/test/MonkeyPatcher.rb + - src/mad/ruby/test/OpenNebulaDriver_spec.rb + - src/mad/ruby/VirtualMachineDriver.rb + - src/mad/ruby/ActionManager.rb + - src/mad/ruby/DriverExecHelper.rb + - src/mad/ruby/CommandManager.rb + - src/mad/ruby/test_mad.rb + - src/mad/ruby/OpenNebulaDriver.rb + - src/mad/ruby/scripts_common.rb + - src/ipamm_mad/one_ipam.rb + - src/cloud/common/CloudClient.rb + - src/cloud/common/CloudServer.rb + - src/cloud/common/CloudAuth.rb + - src/cloud/common/CloudAuth/RemoteCloudAuth.rb + - src/cloud/common/CloudAuth/X509CloudAuth.rb + - src/cloud/common/CloudAuth/EC2CloudAuth.rb + - src/cloud/common/CloudAuth/SunstoneCloudAuth.rb + - src/cloud/common/CloudAuth/OneGateCloudAuth.rb + - src/cloud/common/CloudAuth/OpenNebulaCloudAuth.rb + - src/cloud/ec2/lib/ebs.rb + - src/cloud/ec2/lib/elastic_ip.rb + - src/cloud/ec2/lib/ImageEC2.rb + - src/cloud/ec2/lib/net_ssh_replacement.rb + - src/cloud/ec2/lib/keypair.rb + - src/cloud/ec2/lib/EC2QueryServer.rb + - src/cloud/ec2/lib/econe-server.rb + - src/cloud/ec2/lib/EC2QueryClient.rb + - src/cloud/ec2/lib/tags.rb + - src/cloud/ec2/lib/instance.rb + - src/cloud/ec2/lib/econe_application.rb + - src/onedb/database_schema.rb + - src/onedb/fsck/image.rb + - src/onedb/fsck/datastore.rb + - src/onedb/fsck/quotas.rb + - src/onedb/fsck/history.rb + - src/onedb/fsck/vrouter.rb + - src/onedb/fsck/pool_control.rb + - src/onedb/fsck/marketplace.rb + - src/onedb/fsck/network.rb + - src/onedb/fsck/template.rb + - src/onedb/fsck/group.rb + - src/onedb/fsck/cluster.rb + - src/onedb/fsck/cluster_vnc_bitmap.rb + - src/onedb/fsck/host.rb + - src/onedb/fsck/vm.rb + - src/onedb/fsck/marketplaceapp.rb + - src/onedb/fsck/user.rb + - src/onedb/fsck.rb + - src/onedb/patches/ip4_ip6_static.rb + - src/onedb/patches/history_times.rb + - src/onedb/patches/marketapps_clean.rb + - src/onedb/patches/4.14_monitoring.rb + - src/onedb/patches/next_snapshot.rb + - src/onedb/vcenter_one54_pre.rb + - src/onedb/vcenter_one54.rb + - src/onedb/onedb.rb + - src/onedb/shared/4.2.0_to_4.3.80.rb + - src/onedb/shared/5.3.80_to_5.4.0.rb + - src/onedb/shared/3.0.0_to_3.1.0.rb + - src/onedb/shared/3.2.0_to_3.2.1.rb + - src/onedb/shared/3.6.0_to_3.7.80.rb + - src/onedb/shared/3.5.80_to_3.6.0.rb + - src/onedb/shared/5.6.0_to_5.7.80.rb + - src/onedb/shared/4.4.1_to_4.5.80.rb + - src/onedb/shared/3.1.0_to_3.1.80.rb + - src/onedb/shared/3.8.0_to_3.8.1.rb + - src/onedb/shared/2.0_to_2.9.80.rb + - src/onedb/shared/3.8.5_to_3.9.80.rb + - src/onedb/shared/4.5.80_to_4.6.0.rb + - src/onedb/shared/3.8.2_to_3.8.3.rb + - src/onedb/shared/4.0.1_to_4.1.80.rb + - src/onedb/shared/4.11.80_to_4.90.0.rb + - src/onedb/shared/3.9.80_to_3.9.90.rb + - src/onedb/shared/4.90.0_to_5.2.0.rb + - src/onedb/shared/4.6.0_to_4.11.80.rb + - src/onedb/shared/3.3.0_to_3.3.80.rb + - src/onedb/shared/3.4.1_to_3.5.80.rb + - src/onedb/shared/5.4.1_to_5.5.80.rb + - src/onedb/shared/4.3.85_to_4.3.90.rb + - src/onedb/shared/4.4.0_to_4.4.1.rb + - src/onedb/shared/3.8.1_to_3.8.2.rb + - src/onedb/shared/2.9.90_to_3.0.0.rb + - src/onedb/shared/3.8.3_to_3.8.4.rb + - src/onedb/shared/2.9.80_to_2.9.85.rb + - src/onedb/shared/5.2.0_to_5.3.80.rb + - src/onedb/shared/3.4.0_to_3.4.1.rb + - src/onedb/shared/5.4.0_to_5.4.1.rb + - src/onedb/shared/4.3.80_to_4.3.85.rb + - src/onedb/shared/3.2.1_to_3.3.0.rb + - src/onedb/shared/2.9.85_to_2.9.90.rb + - src/onedb/shared/3.8.4_to_3.8.5.rb + - src/onedb/shared/3.7.80_to_3.8.0.rb + - src/onedb/shared/3.1.80_to_3.2.0.rb + - src/onedb/shared/5.5.80_to_5.6.0.rb + - src/onedb/shared/3.3.80_to_3.4.0.rb + - src/onedb/shared/4.3.90_to_4.4.0.rb + - src/onedb/shared/3.9.90_to_4.0.0.rb + - src/onedb/shared/4.0.0_to_4.0.1.rb + - src/onedb/shared/4.1.80_to_4.2.0.rb + - src/onedb/local/5.3.80_to_5.4.0.rb + - src/onedb/local/4.13.80_to_4.13.85.rb + - src/onedb/local/5.6.0_to_5.7.80.rb + - src/onedb/local/5.4.1_to_5.5.80.rb + - src/onedb/local/4.13.85_to_4.90.0.rb + - src/onedb/local/5.4.0_to_5.4.1.rb + - src/onedb/local/4.11.80_to_4.13.80.rb + - src/onedb/local/4.10.3_to_4.11.80.rb + - src/onedb/local/4.90.0_to_5.3.80.rb + - src/onedb/local/4.5.80_to_4.7.80.rb + - src/onedb/local/4.9.80_to_4.10.3.rb + - src/onedb/local/5.5.80_to_5.6.0.rb + - src/onedb/local/4.7.80_to_4.9.80.rb + - src/onedb/onedb_live.rb + - src/onedb/onedb_backend.rb + - src/onedb/sqlite2mysql.rb + - src/market_mad/remotes/s3/S3.rb + - src/market_mad/one_market.rb + - src/tm_mad/one_tm.rb + - src/flow/lib/models/service_template_pool.rb + - src/flow/lib/models/service_pool.rb + - src/flow/lib/models/service_template.rb + - src/flow/lib/models/role.rb + - src/flow/lib/models/service.rb + - src/flow/lib/strategy.rb + - src/flow/lib/grammar.rb + - src/flow/lib/LifeCycleManager.rb + - src/flow/lib/log.rb + - src/flow/lib/models.rb + - src/flow/lib/validator.rb + - src/flow/lib/strategy/straight.rb + - src/flow/oneflow-server.rb + ######## # LAYOUT @@ -169,6 +771,12 @@ Metrics/BlockLength: Metrics/LineLength: Max: 80 +Metrics/ModuleLength: + Enabled: False + +Metrics/ClassLength: + Enabled: False + # Parameter list config: Metrics/ParameterLists: Max: 5 diff --git a/share/man/build.sh b/share/man/build.sh index 8a31a2c8a5..d152f5ad6b 100755 --- a/share/man/build.sh +++ b/share/man/build.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/share/onegate/onegate b/share/onegate/onegate index 4111b54630..938c8706c7 100755 --- a/share/onegate/onegate +++ b/share/onegate/onegate @@ -13,7 +13,7 @@ require 'pp' module CloudClient # OpenNebula version - VERSION = '5.7.80' + VERSION = '5.7.85' # ######################################################################### # Default location for the authentication file diff --git a/share/router/vmcontext.rb b/share/router/vmcontext.rb index c604661c87..e53cd41b8c 100644 --- a/share/router/vmcontext.rb +++ b/share/router/vmcontext.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/share/rubygems/SConstruct b/share/rubygems/SConstruct index ed663f6649..b3e3d8e148 100644 --- a/share/rubygems/SConstruct +++ b/share/rubygems/SConstruct @@ -1,7 +1,7 @@ # SConstruct for share/scripts/rubygems # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/share/rubygems/generate b/share/rubygems/generate index 2cf099cb38..cb814c6474 100755 --- a/share/rubygems/generate +++ b/share/rubygems/generate @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -19,7 +19,7 @@ require 'fileutils' require 'tmpdir' -VERSION = "5.7.80" +VERSION = "5.7.85" def version v = VERSION diff --git a/share/scons/get_xmlrpc_config b/share/scons/get_xmlrpc_config index bab4bbbeb6..36a65a7aef 100755 --- a/share/scons/get_xmlrpc_config +++ b/share/scons/get_xmlrpc_config @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/share/scons/lex_bison.py b/share/scons/lex_bison.py index dbe1a67863..3ce5e6c73c 100644 --- a/share/scons/lex_bison.py +++ b/share/scons/lex_bison.py @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/share/scons/po2json.rb b/share/scons/po2json.rb index 62e24be0b0..16435b9489 100755 --- a/share/scons/po2json.rb +++ b/share/scons/po2json.rb @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/share/scripts/centos-5/context/init.sh b/share/scripts/centos-5/context/init.sh index 958e854444..fe0f0ae89c 100644 --- a/share/scripts/centos-5/context/init.sh +++ b/share/scripts/centos-5/context/init.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/share/scripts/centos-5/net-vmcontext/vmcontext b/share/scripts/centos-5/net-vmcontext/vmcontext index b3580ebd82..6d11745726 100755 --- a/share/scripts/centos-5/net-vmcontext/vmcontext +++ b/share/scripts/centos-5/net-vmcontext/vmcontext @@ -4,7 +4,7 @@ # description: network reconfigure # # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/share/scripts/debian/context/init.sh b/share/scripts/debian/context/init.sh index 7e3bf25718..9ab4ab49ac 100644 --- a/share/scripts/debian/context/init.sh +++ b/share/scripts/debian/context/init.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/share/scripts/debian/net-vmcontext/vmcontext b/share/scripts/debian/net-vmcontext/vmcontext index c0ee15dc2a..447ecb08b8 100755 --- a/share/scripts/debian/net-vmcontext/vmcontext +++ b/share/scripts/debian/net-vmcontext/vmcontext @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/share/scripts/one b/share/scripts/one index cff2aebd25..7284c3b9e1 100755 --- a/share/scripts/one +++ b/share/scripts/one @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/share/scripts/onegate_metrics.sh b/share/scripts/onegate_metrics.sh index 5cd7442ab1..11e90b1973 100755 --- a/share/scripts/onegate_metrics.sh +++ b/share/scripts/onegate_metrics.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/share/scripts/openSUSE/context/init.sh b/share/scripts/openSUSE/context/init.sh index db70c91b5d..7fa774c9e3 100644 --- a/share/scripts/openSUSE/context/init.sh +++ b/share/scripts/openSUSE/context/init.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/share/scripts/openSUSE/net-vmcontext/vmcontext b/share/scripts/openSUSE/net-vmcontext/vmcontext index 74bca8fc76..0c8a4862e2 100755 --- a/share/scripts/openSUSE/net-vmcontext/vmcontext +++ b/share/scripts/openSUSE/net-vmcontext/vmcontext @@ -4,7 +4,7 @@ # description: network reconfigure # # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/share/scripts/ttylinux/context/init.sh b/share/scripts/ttylinux/context/init.sh index da88ef3fe0..cfc35b378c 100644 --- a/share/scripts/ttylinux/context/init.sh +++ b/share/scripts/ttylinux/context/init.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/share/scripts/ttylinux/net-vmcontext/vmcontexttty b/share/scripts/ttylinux/net-vmcontext/vmcontexttty index 6256a36ff2..61bdb58d00 100755 --- a/share/scripts/ttylinux/net-vmcontext/vmcontexttty +++ b/share/scripts/ttylinux/net-vmcontext/vmcontexttty @@ -4,7 +4,7 @@ # description: network reconfigure # # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/share/scripts/ubuntu/context/init.sh b/share/scripts/ubuntu/context/init.sh index 251ba98a2e..a41c49ab42 100644 --- a/share/scripts/ubuntu/context/init.sh +++ b/share/scripts/ubuntu/context/init.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/share/scripts/ubuntu/net-vmcontext/README b/share/scripts/ubuntu/net-vmcontext/README index 8bdd7f2f61..f323435cbe 100755 --- a/share/scripts/ubuntu/net-vmcontext/README +++ b/share/scripts/ubuntu/net-vmcontext/README @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/share/scripts/ubuntu/net-vmcontext/vmcontext b/share/scripts/ubuntu/net-vmcontext/vmcontext index c0ee15dc2a..447ecb08b8 100755 --- a/share/scripts/ubuntu/net-vmcontext/vmcontext +++ b/share/scripts/ubuntu/net-vmcontext/vmcontext @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/share/scripts/vmcontext.sh b/share/scripts/vmcontext.sh index aee8f79000..c1a5008263 100755 --- a/share/scripts/vmcontext.sh +++ b/share/scripts/vmcontext.sh @@ -14,7 +14,7 @@ ### END INIT INFO # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/share/sudoers/sudo_commands.rb b/share/sudoers/sudo_commands.rb index ac6d4aefed..ad62fd5c5e 100755 --- a/share/sudoers/sudo_commands.rb +++ b/share/sudoers/sudo_commands.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/share/vendor/ruby/gems/packethost/.rubocop.yml b/share/vendor/ruby/gems/packethost/.rubocop.yml deleted file mode 100644 index 854e769306..0000000000 --- a/share/vendor/ruby/gems/packethost/.rubocop.yml +++ /dev/null @@ -1,18 +0,0 @@ -AllCops: - Include: - - '**/Rakefile' - - lib/**/* - -Documentation: - Enabled: false - -LineLength: - Enabled: false - -Style/PredicateName: - NamePrefix: - - is_ - - have_ - -Style/MethodMissing: - Enabled: false diff --git a/share/websockify/run b/share/websockify/run new file mode 100755 index 0000000000..9ad217c04c --- /dev/null +++ b/share/websockify/run @@ -0,0 +1,5 @@ +#!/usr/bin/env python + +import websockify + +websockify.websocketproxy.websockify_init() diff --git a/share/websockify/websockify b/share/websockify/websockify deleted file mode 120000 index 9558147b09..0000000000 --- a/share/websockify/websockify +++ /dev/null @@ -1 +0,0 @@ -websocketproxy.py \ No newline at end of file diff --git a/share/websockify/websockify/__init__.py b/share/websockify/websockify/__init__.py new file mode 100644 index 0000000000..37a6f47b45 --- /dev/null +++ b/share/websockify/websockify/__init__.py @@ -0,0 +1,2 @@ +from websockify.websocket import * +from websockify.websocketproxy import * diff --git a/share/websockify/websockify/auth_plugins.py b/share/websockify/websockify/auth_plugins.py new file mode 100644 index 0000000000..93f1385504 --- /dev/null +++ b/share/websockify/websockify/auth_plugins.py @@ -0,0 +1,83 @@ +class BasePlugin(object): + def __init__(self, src=None): + self.source = src + + def authenticate(self, headers, target_host, target_port): + pass + + +class AuthenticationError(Exception): + def __init__(self, log_msg=None, response_code=403, response_headers={}, response_msg=None): + self.code = response_code + self.headers = response_headers + self.msg = response_msg + + if log_msg is None: + log_msg = response_msg + + super(AuthenticationError, self).__init__('%s %s' % (self.code, log_msg)) + + +class InvalidOriginError(AuthenticationError): + def __init__(self, expected, actual): + self.expected_origin = expected + self.actual_origin = actual + + super(InvalidOriginError, self).__init__( + response_msg='Invalid Origin', + log_msg="Invalid Origin Header: Expected one of " + "%s, got '%s'" % (expected, actual)) + + +class BasicHTTPAuth(object): + """Verifies Basic Auth headers. Specify src as username:password""" + + def __init__(self, src=None): + self.src = src + + def authenticate(self, headers, target_host, target_port): + import base64 + auth_header = headers.get('Authorization') + if auth_header: + if not auth_header.startswith('Basic '): + raise AuthenticationError(response_code=403) + + try: + user_pass_raw = base64.b64decode(auth_header[6:]) + except TypeError: + raise AuthenticationError(response_code=403) + + try: + # http://stackoverflow.com/questions/7242316/what-encoding-should-i-use-for-http-basic-authentication + user_pass_as_text = user_pass_raw.decode('ISO-8859-1') + except UnicodeDecodeError: + raise AuthenticationError(response_code=403) + + user_pass = user_pass_as_text.split(':', 1) + if len(user_pass) != 2: + raise AuthenticationError(response_code=403) + + if not self.validate_creds(*user_pass): + raise AuthenticationError(response_code=403) + + else: + raise AuthenticationError(response_code=401, + response_headers={'WWW-Authenticate': 'Basic realm="Websockify"'}) + + def validate_creds(self, username, password): + if '%s:%s' % (username, password) == self.src: + return True + else: + return False + +class ExpectOrigin(object): + def __init__(self, src=None): + if src is None: + self.source = [] + else: + self.source = src.split() + + def authenticate(self, headers, target_host, target_port): + origin = headers.get('Origin', None) + if origin is None or origin not in self.source: + raise InvalidOriginError(expected=self.source, actual=origin) diff --git a/share/websockify/websockify/token_plugins.py b/share/websockify/websockify/token_plugins.py new file mode 100644 index 0000000000..92494eb03f --- /dev/null +++ b/share/websockify/websockify/token_plugins.py @@ -0,0 +1,83 @@ +import os + +class BasePlugin(object): + def __init__(self, src): + self.source = src + + def lookup(self, token): + return None + + +class ReadOnlyTokenFile(BasePlugin): + # source is a token file with lines like + # token: host:port + # or a directory of such files + def __init__(self, *args, **kwargs): + super(ReadOnlyTokenFile, self).__init__(*args, **kwargs) + self._targets = None + + def _load_targets(self): + if os.path.isdir(self.source): + cfg_files = [os.path.join(self.source, f) for + f in os.listdir(self.source)] + else: + cfg_files = [self.source] + + self._targets = {} + for f in cfg_files: + for line in [l.strip() for l in open(f).readlines()]: + if line and not line.startswith('#'): + tok, target = line.split(': ') + self._targets[tok] = target.strip().rsplit(':', 1) + + def lookup(self, token): + if self._targets is None: + self._load_targets() + + if token in self._targets: + return self._targets[token] + else: + return None + + +# the above one is probably more efficient, but this one is +# more backwards compatible (although in most cases +# ReadOnlyTokenFile should suffice) +class TokenFile(ReadOnlyTokenFile): + # source is a token file with lines like + # token: host:port + # or a directory of such files + def lookup(self, token): + self._load_targets() + + return super(TokenFile, self).lookup(token) + + +class BaseTokenAPI(BasePlugin): + # source is a url with a '%s' in it where the token + # should go + + # we import things on demand so that other plugins + # in this file can be used w/o unecessary dependencies + + def process_result(self, resp): + return resp.text.split(':') + + def lookup(self, token): + import requests + + resp = requests.get(self.source % token) + + if resp.ok: + return self.process_result(resp) + else: + return None + + +class JSONTokenApi(BaseTokenAPI): + # source is a url with a '%s' in it where the token + # should go + + def process_result(self, resp): + resp_json = resp.json() + return (resp_json['host'], resp_json['port']) diff --git a/share/websockify/websocket.py b/share/websockify/websockify/websocket.py similarity index 89% rename from share/websockify/websocket.py rename to share/websockify/websockify/websocket.py index d161f648c5..274a0047fc 100644 --- a/share/websockify/websocket.py +++ b/share/websockify/websockify/websocket.py @@ -104,6 +104,8 @@ class WebSocketRequestHandler(SimpleHTTPRequestHandler): self.handler_id = getattr(server, "handler_id", False) self.file_only = getattr(server, "file_only", False) self.traffic = getattr(server, "traffic", False) + self.auto_pong = getattr(server, "auto_pong", False) + self.strict_mode = getattr(server, "strict_mode", True) self.logger = getattr(server, "logger", None) if self.logger is None: @@ -111,6 +113,9 @@ class WebSocketRequestHandler(SimpleHTTPRequestHandler): SimpleHTTPRequestHandler.__init__(self, req, addr, server) + def log_message(self, format, *args): + self.logger.info("%s - - [%s] %s" % (self.address_string(), self.log_date_time_string(), format % args)) + @staticmethod def unmask(buf, hlen, plen): pstart = hlen + 4 @@ -118,20 +123,24 @@ class WebSocketRequestHandler(SimpleHTTPRequestHandler): if numpy: b = c = s2b('') if plen >= 4: - mask = numpy.frombuffer(buf, dtype=numpy.dtype('') + mask = numpy.frombuffer(buf, dtype, offset=hlen, count=1) + data = numpy.frombuffer(buf, dtype, offset=pstart, + count=int(plen / 4)) #b = numpy.bitwise_xor(data, mask).data b = numpy.bitwise_xor(data, mask).tostring() if plen % 4: #self.msg("Partial unmask") - mask = numpy.frombuffer(buf, dtype=numpy.dtype('B'), - offset=hlen, count=(plen % 4)) - data = numpy.frombuffer(buf, dtype=numpy.dtype('B'), - offset=pend - (plen % 4), + dtype=numpy.dtype('B') + if sys.byteorder == 'big': + dtype = dtype.newbyteorder('>') + mask = numpy.frombuffer(buf, dtype, offset=hlen, count=(plen % 4)) + data = numpy.frombuffer(buf, dtype, + offset=pend - (plen % 4), count=(plen % 4)) c = numpy.bitwise_xor(data, mask).tostring() return b + c else: @@ -172,7 +181,7 @@ class WebSocketRequestHandler(SimpleHTTPRequestHandler): return header + buf, len(header), 0 @staticmethod - def decode_hybi(buf, base64=False, logger=None): + def decode_hybi(buf, base64=False, logger=None, strict=True): """ Decode HyBi style WebSocket packets. Returns: {'fin' : 0_or_1, @@ -238,6 +247,10 @@ class WebSocketRequestHandler(SimpleHTTPRequestHandler): f['length']) else: logger.debug("Unmasked frame: %s" % repr(buf)) + + if strict: + raise WebSocketRequestHandler.CClose(1002, "The client sent an unmasked frame.") + f['payload'] = buf[(f['hlen'] + f['masked'] * 4):full_len] if base64 and f['opcode'] in [1, 2]: @@ -346,7 +359,8 @@ class WebSocketRequestHandler(SimpleHTTPRequestHandler): while buf: frame = self.decode_hybi(buf, base64=self.base64, - logger=self.logger) + logger=self.logger, + strict=self.strict_mode) #self.msg("Received buf: %s, frame: %s", repr(buf), frame) if frame['payload'] == None: @@ -360,6 +374,15 @@ class WebSocketRequestHandler(SimpleHTTPRequestHandler): closed = {'code': frame['close_code'], 'reason': frame['close_reason']} break + elif self.auto_pong and frame['opcode'] == 0x9: # ping + self.print_traffic("} ping %s\n" % + repr(frame['payload'])) + self.send_pong(frame['payload']) + return [], False + elif frame['opcode'] == 0xA: # pong + self.print_traffic("} pong %s\n" % + repr(frame['payload'])) + return [], False self.print_traffic("}") @@ -388,10 +411,20 @@ class WebSocketRequestHandler(SimpleHTTPRequestHandler): def send_close(self, code=1000, reason=''): """ Send a WebSocket orderly close frame. """ - msg = pack(">H%ds" % len(reason), code, reason) + msg = pack(">H%ds" % len(reason), code, s2b(reason)) buf, h, t = self.encode_hybi(msg, opcode=0x08, base64=False) self.request.send(buf) + def send_pong(self, data=''): + """ Send a WebSocket pong frame. """ + buf, h, t = self.encode_hybi(s2b(data), opcode=0x0A, base64=False) + self.request.send(buf) + + def send_ping(self, data=''): + """ Send a WebSocket ping frame. """ + buf, h, t = self.encode_hybi(s2b(data), opcode=0x09, base64=False) + self.request.send(buf) + def do_websocket_handshake(self): h = self.headers @@ -444,9 +477,13 @@ class WebSocketRequestHandler(SimpleHTTPRequestHandler): """Upgrade a connection to Websocket, if requested. If this succeeds, new_websocket_client() will be called. Otherwise, False is returned. """ + if (self.headers.get('upgrade') and self.headers.get('upgrade').lower() == 'websocket'): + # ensure connection is authorized, and determine the target + self.validate_connection() + if not self.do_websocket_handshake(): return False @@ -519,6 +556,10 @@ class WebSocketRequestHandler(SimpleHTTPRequestHandler): """ Do something with a WebSockets client connection. """ raise Exception("WebSocketRequestHandler.new_websocket_client() must be overloaded") + def validate_connection(self): + """ Ensure that the connection is a valid connection, and set the target. """ + pass + def do_HEAD(self): if self.only_upgrade: self.send_error(405, "Method Not Allowed") @@ -567,7 +608,7 @@ class WebSocketServer(object): file_only=False, run_once=False, timeout=0, idle_timeout=0, traffic=False, tcp_keepalive=True, tcp_keepcnt=None, tcp_keepidle=None, - tcp_keepintvl=None): + tcp_keepintvl=None, auto_pong=False, strict_mode=True): # settings self.RequestHandlerClass = RequestHandlerClass @@ -581,6 +622,8 @@ class WebSocketServer(object): self.timeout = timeout self.idle_timeout = idle_timeout self.traffic = traffic + self.file_only = file_only + self.strict_mode = strict_mode self.launch_time = time.time() self.ws_connection = False @@ -592,6 +635,7 @@ class WebSocketServer(object): self.tcp_keepidle = tcp_keepidle self.tcp_keepintvl = tcp_keepintvl + self.auto_pong = auto_pong # Make paths settings absolute self.cert = os.path.abspath(cert) self.key = self.web = self.record = '' @@ -618,7 +662,10 @@ class WebSocketServer(object): self.listen_host, self.listen_port) self.msg(" - Flash security policy server") if self.web: - self.msg(" - Web server. Web root: %s", self.web) + if self.file_only: + self.msg(" - Web server (no directory listings). Web root: %s", self.web) + else: + self.msg(" - Web server. Web root: %s", self.web) if ssl: if os.path.exists(self.cert): self.msg(" - SSL/TLS support") @@ -701,6 +748,10 @@ class WebSocketServer(object): @staticmethod def daemonize(keepfd=None, chdir='/'): + + if keepfd is None: + keepfd = [] + os.umask(0) if chdir: os.chdir(chdir) @@ -723,7 +774,7 @@ class WebSocketServer(object): if maxfd == resource.RLIM_INFINITY: maxfd = 256 for fd in reversed(range(maxfd)): try: - if fd != keepfd: + if fd not in keepfd: os.close(fd) except OSError: _, exc, _ = sys.exc_info() @@ -753,7 +804,7 @@ class WebSocketServer(object): """ ready = select.select([sock], [], [], 3)[0] - + if not ready: raise self.EClose("ignoring socket not ready") # Peek, but do not read the data so that we have a opportunity @@ -761,7 +812,7 @@ class WebSocketServer(object): handshake = sock.recv(1024, socket.MSG_PEEK) #self.msg("Handshake [%s]" % handshake) - if handshake == "": + if not handshake: raise self.EClose("ignoring empty handshake") elif handshake.startswith(s2b("")): @@ -844,11 +895,14 @@ class WebSocketServer(object): raise self.Terminate() def multiprocessing_SIGCHLD(self, sig, stack): - self.vmsg('Reaping zombies, active child count is %s', len(multiprocessing.active_children())) + # TODO: figure out a way to actually log this information without + # calling `log` in the signal handlers + multiprocessing.active_children() def fallback_SIGCHLD(self, sig, stack): # Reap zombies when using os.fork() (python 2.4) - self.vmsg("Got SIGCHLD, reaping zombies") + # TODO: figure out a way to actually log this information without + # calling `log` in the signal handlers try: result = os.waitpid(-1, os.WNOHANG) while result[0]: @@ -858,16 +912,18 @@ class WebSocketServer(object): pass def do_SIGINT(self, sig, stack): - self.msg("Got SIGINT, exiting") + # TODO: figure out a way to actually log this information without + # calling `log` in the signal handlers self.terminate() def do_SIGTERM(self, sig, stack): - self.msg("Got SIGTERM, exiting") + # TODO: figure out a way to actually log this information without + # calling `log` in the signal handlers self.terminate() def top_new_client(self, startsock, address): """ Do something with a WebSockets client connection. """ - # handler process + # handler process client = None try: try: @@ -890,6 +946,18 @@ class WebSocketServer(object): # Original socket closed by caller client.close() + def get_log_fd(self): + """ + Get file descriptors for the loggers. + They should not be closed when the process is forked. + """ + descriptors = [] + for handler in self.logger.parent.handlers: + if isinstance(handler, logging.FileHandler): + descriptors.append(handler.stream.fileno()) + + return descriptors + def start_server(self): """ Daemonize if requested. Listen for for connections. Run @@ -905,7 +973,9 @@ class WebSocketServer(object): tcp_keepintvl=self.tcp_keepintvl) if self.daemon: - self.daemonize(keepfd=lsock.fileno(), chdir=self.web) + keepfd = self.get_log_fd() + keepfd.append(lsock.fileno()) + self.daemonize(keepfd=keepfd, chdir=self.web) self.started() # Some things need to happen after daemonizing @@ -1009,8 +1079,17 @@ class WebSocketServer(object): except (self.Terminate, SystemExit, KeyboardInterrupt): self.msg("In exit") + # terminate all child processes + if multiprocessing and not self.run_once: + children = multiprocessing.active_children() + + for child in children: + self.msg("Terminating child %s" % child.pid) + child.terminate() + break except Exception: + exc = sys.exc_info()[1] self.msg("handler exception: %s", str(exc)) self.vmsg("exception", exc_info=True) diff --git a/share/websockify/websocketproxy.py b/share/websockify/websockify/websocketproxy.py old mode 100644 new mode 100755 similarity index 72% rename from share/websockify/websocketproxy.py rename to share/websockify/websockify/websocketproxy.py index 7b3ec111df..81e2248f21 --- a/share/websockify/websocketproxy.py +++ b/share/websockify/websockify/websocketproxy.py @@ -11,13 +11,14 @@ as taken from http://docs.python.org/dev/library/ssl.html#certificates ''' -import signal, socket, optparse, time, os, sys, subprocess, logging +import signal, socket, optparse, time, os, sys, subprocess, logging, errno try: from socketserver import ForkingMixIn except: from SocketServer import ForkingMixIn try: from http.server import HTTPServer except: from BaseHTTPServer import HTTPServer -from select import select -import websocket +import select +from websockify import websocket +from websockify import auth_plugins as auth try: from urllib.parse import parse_qs, urlparse except: @@ -38,14 +39,33 @@ Traffic Legend: <. - Client send partial """ + def send_auth_error(self, ex): + self.send_response(ex.code, ex.msg) + self.send_header('Content-Type', 'text/html') + for name, val in ex.headers.items(): + self.send_header(name, val) + + self.end_headers() + + def validate_connection(self): + if self.server.token_plugin: + (self.server.target_host, self.server.target_port) = self.get_target(self.server.token_plugin, self.path) + + if self.server.auth_plugin: + try: + self.server.auth_plugin.authenticate( + headers=self.headers, target_host=self.server.target_host, + target_port=self.server.target_port) + except auth.AuthenticationError: + ex = sys.exc_info()[1] + self.send_auth_error(ex) + raise + def new_websocket_client(self): """ Called after a new WebSocket connection has been established. """ - # Checks if we receive a token, and look - # for a valid target for it then - if self.server.target_cfg: - (self.server.target_host, self.server.target_port) = self.get_target(self.server.target_cfg, self.path) + # Checking for a token is done in validate_connection() # Connect to the target if self.server.wrap_cmd: @@ -73,15 +93,15 @@ Traffic Legend: if tsock: tsock.shutdown(socket.SHUT_RDWR) tsock.close() - if self.verbose: + if self.verbose: self.log_message("%s:%s: Closed target", self.server.target_host, self.server.target_port) raise - def get_target(self, target_cfg, path): + def get_target(self, target_plugin, path): """ - Parses the path, extracts a token, and looks for a valid - target for that token in the configuration file(s). Sets + Parses the path, extracts a token, and looks up a target + for that token using the token plugin. Sets target_host and target_port if successful """ # The files in targets contain the lines @@ -90,32 +110,17 @@ Traffic Legend: # Extract the token parameter from url args = parse_qs(urlparse(path)[4]) # 4 is the query from url - if not args.has_key('token') or not len(args['token']): - raise self.EClose("Token not present") + if not 'token' in args or not len(args['token']): + raise self.server.EClose("Token not present") token = args['token'][0].rstrip('\n') - # target_cfg can be a single config file or directory of - # config files - if os.path.isdir(target_cfg): - cfg_files = [os.path.join(target_cfg, f) - for f in os.listdir(target_cfg)] + result_pair = target_plugin.lookup(token) + + if result_pair is not None: + return result_pair else: - cfg_files = [target_cfg] - - targets = {} - for f in cfg_files: - for line in [l.strip() for l in file(f).readlines()]: - if line and not line.startswith('#'): - ttoken, target = line.split(': ') - targets[ttoken] = target.strip() - - self.vmsg("Target config: %s" % repr(targets)) - - if targets.has_key(token): - return targets[token].split(':') - else: - raise self.EClose("Token '%s' not found" % token) + raise self.server.EClose("Token '%s' not found" % token) def do_proxy(self, target): """ @@ -126,12 +131,37 @@ Traffic Legend: tqueue = [] rlist = [self.request, target] + if self.server.heartbeat: + now = time.time() + self.heartbeat = now + self.server.heartbeat + else: + self.heartbeat = None + while True: wlist = [] + if self.heartbeat is not None: + now = time.time() + if now > self.heartbeat: + self.heartbeat = now + self.server.heartbeat + self.send_ping() + if tqueue: wlist.append(target) if cqueue or c_pend: wlist.append(self.request) - ins, outs, excepts = select(rlist, wlist, [], 1) + try: + ins, outs, excepts = select.select(rlist, wlist, [], 1) + except (select.error, OSError): + exc = sys.exc_info()[1] + if hasattr(exc, 'errno'): + err = exc.errno + else: + err = exc[0] + + if err != errno.EINTR: + raise + else: + continue + if excepts: raise Exception("Socket exception") if self.request in outs: @@ -147,7 +177,7 @@ Traffic Legend: if closed: # TODO: What about blocking on client socket? - if self.verbose: + if self.verbose: self.log_message("%s:%s: Client closed connection", self.server.target_host, self.server.target_port) raise self.CClose(closed['code'], closed['reason']) @@ -195,7 +225,11 @@ class WebSocketProxy(websocket.WebSocketServer): self.wrap_mode = kwargs.pop('wrap_mode', None) self.unix_target = kwargs.pop('unix_target', None) self.ssl_target = kwargs.pop('ssl_target', None) - self.target_cfg = kwargs.pop('target_cfg', None) + self.heartbeat = kwargs.pop('heartbeat', None) + + self.token_plugin = kwargs.pop('token_plugin', None) + self.auth_plugin = kwargs.pop('auth_plugin', None) + # Last 3 timestamps command was run self.wrap_times = [0, 0, 0] @@ -251,9 +285,9 @@ class WebSocketProxy(websocket.WebSocketServer): else: dst_string = "%s:%s" % (self.target_host, self.target_port) - if self.target_cfg: - msg = " - proxying from %s:%s to targets in %s" % ( - self.listen_host, self.listen_port, self.target_cfg) + if self.token_plugin: + msg = " - proxying from %s:%s to targets generated by %s" % ( + self.listen_host, self.listen_port, type(self.token_plugin).__name__) else: msg = " - proxying from %s:%s to %s" % ( self.listen_host, self.listen_port, dst_string) @@ -352,20 +386,69 @@ def websockify_init(): parser.add_option("--prefer-ipv6", "-6", action="store_true", dest="source_is_ipv6", help="prefer IPv6 when resolving source_addr") + parser.add_option("--libserver", action="store_true", + help="use Python library SocketServer engine") parser.add_option("--target-config", metavar="FILE", dest="target_cfg", help="Configuration file containing valid targets " "in the form 'token: host:port' or, alternatively, a " - "directory containing configuration files of this form") - parser.add_option("--libserver", action="store_true", - help="use Python library SocketServer engine") + "directory containing configuration files of this form " + "(DEPRECATED: use `--token-plugin TokenFile --token-source " + " path/to/token/file` instead)") + parser.add_option("--token-plugin", default=None, metavar="PLUGIN", + help="use the given Python class to process tokens " + "into host:port pairs") + parser.add_option("--token-source", default=None, metavar="ARG", + help="an argument to be passed to the token plugin" + "on instantiation") + parser.add_option("--auth-plugin", default=None, metavar="PLUGIN", + help="use the given Python class to determine if " + "a connection is allowed") + parser.add_option("--auth-source", default=None, metavar="ARG", + help="an argument to be passed to the auth plugin" + "on instantiation") + parser.add_option("--auto-pong", action="store_true", + help="Automatically respond to ping frames with a pong") + parser.add_option("--heartbeat", type=int, default=0, + help="send a ping to the client every HEARTBEAT seconds") + parser.add_option("--log-file", metavar="FILE", + dest="log_file", + help="File where logs will be saved") + + (opts, args) = parser.parse_args() + if opts.log_file: + opts.log_file = os.path.abspath(opts.log_file) + handler = logging.FileHandler(opts.log_file) + handler.setLevel(logging.DEBUG) + handler.setFormatter(logging.Formatter("%(message)s")) + logging.getLogger(WebSocketProxy.log_prefix).addHandler(handler) + + del opts.log_file + if opts.verbose: logging.getLogger(WebSocketProxy.log_prefix).setLevel(logging.DEBUG) + if opts.token_source and not opts.token_plugin: + parser.error("You must use --token-plugin to use --token-source") + + if opts.auth_source and not opts.auth_plugin: + parser.error("You must use --auth-plugin to use --auth-source") + + + # Transform to absolute path as daemon may chdir + if opts.target_cfg: + opts.target_cfg = os.path.abspath(opts.target_cfg) + + if opts.target_cfg: + opts.token_plugin = 'TokenFile' + opts.token_source = opts.target_cfg + + del opts.target_cfg + # Sanity checks - if len(args) < 2 and not (opts.target_cfg or opts.unix_target): + if len(args) < 2 and not (opts.token_plugin or opts.unix_target): parser.error("Too few arguments") if sys.argv.count('--'): opts.wrap_cmd = args[1:] @@ -390,7 +473,7 @@ def websockify_init(): try: opts.listen_port = int(opts.listen_port) except: parser.error("Error parsing listen port") - if opts.wrap_cmd or opts.unix_target or opts.target_cfg: + if opts.wrap_cmd or opts.unix_target or opts.token_plugin: opts.target_host = None opts.target_port = None else: @@ -402,9 +485,32 @@ def websockify_init(): try: opts.target_port = int(opts.target_port) except: parser.error("Error parsing target port") - # Transform to absolute path as daemon may chdir - if opts.target_cfg: - opts.target_cfg = os.path.abspath(opts.target_cfg) + if opts.token_plugin is not None: + if '.' not in opts.token_plugin: + opts.token_plugin = ( + 'websockify.token_plugins.%s' % opts.token_plugin) + + token_plugin_module, token_plugin_cls = opts.token_plugin.rsplit('.', 1) + + __import__(token_plugin_module) + token_plugin_cls = getattr(sys.modules[token_plugin_module], token_plugin_cls) + + opts.token_plugin = token_plugin_cls(opts.token_source) + + del opts.token_source + + if opts.auth_plugin is not None: + if '.' not in opts.auth_plugin: + opts.auth_plugin = 'websockify.auth_plugins.%s' % opts.auth_plugin + + auth_plugin_module, auth_plugin_cls = opts.auth_plugin.rsplit('.', 1) + + __import__(auth_plugin_module) + auth_plugin_cls = getattr(sys.modules[auth_plugin_module], auth_plugin_cls) + + opts.auth_plugin = auth_plugin_cls(opts.auth_source) + + del opts.auth_source # Create and start the WebSockets proxy libserver = opts.libserver @@ -433,9 +539,13 @@ class LibProxyServer(ForkingMixIn, HTTPServer): self.wrap_mode = kwargs.pop('wrap_mode', None) self.unix_target = kwargs.pop('unix_target', None) self.ssl_target = kwargs.pop('ssl_target', None) - self.target_cfg = kwargs.pop('target_cfg', None) + self.token_plugin = kwargs.pop('token_plugin', None) + self.auth_plugin = kwargs.pop('auth_plugin', None) + self.heartbeat = kwargs.pop('heartbeat', None) + + self.token_plugin = None + self.auth_plugin = None self.daemon = False - self.target_cfg = None # Server configuration listen_host = kwargs.pop('listen_host', '') @@ -456,8 +566,8 @@ class LibProxyServer(ForkingMixIn, HTTPServer): if web: os.chdir(web) - - HTTPServer.__init__(self, (listen_host, listen_port), + + HTTPServer.__init__(self, (listen_host, listen_port), RequestHandlerClass) diff --git a/src/acl/AclManager.cc b/src/acl/AclManager.cc index ddc6d492cf..77a9c5d487 100644 --- a/src/acl/AclManager.cc +++ b/src/acl/AclManager.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/acl/AclRule.cc b/src/acl/AclRule.cc index 7661ddeef1..961213977f 100644 --- a/src/acl/AclRule.cc +++ b/src/acl/AclRule.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/acl/SConstruct b/src/acl/SConstruct index e41190e591..6c181571ce 100644 --- a/src/acl/SConstruct +++ b/src/acl/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/authm # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/authm/AuthManager.cc b/src/authm/AuthManager.cc index 3afa69d2d4..b0ce9c6e12 100644 --- a/src/authm/AuthManager.cc +++ b/src/authm/AuthManager.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/authm/AuthManagerDriver.cc b/src/authm/AuthManagerDriver.cc index 0327cc19ac..4727b15816 100644 --- a/src/authm/AuthManagerDriver.cc +++ b/src/authm/AuthManagerDriver.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/authm/SConstruct b/src/authm/SConstruct index fa3f22d9b1..eeb9dfe818 100644 --- a/src/authm/SConstruct +++ b/src/authm/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/authm # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/authm_mad/one_auth_mad b/src/authm_mad/one_auth_mad index 9d103e6065..d4a3334f31 100755 --- a/src/authm_mad/one_auth_mad +++ b/src/authm_mad/one_auth_mad @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/authm_mad/one_auth_mad.rb b/src/authm_mad/one_auth_mad.rb index 2df3f394ef..5ac12d6ced 100755 --- a/src/authm_mad/one_auth_mad.rb +++ b/src/authm_mad/one_auth_mad.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/authm_mad/remotes/dummy/authenticate b/src/authm_mad/remotes/dummy/authenticate index b49bf02189..8abc63a002 100755 --- a/src/authm_mad/remotes/dummy/authenticate +++ b/src/authm_mad/remotes/dummy/authenticate @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/authm_mad/remotes/ldap/authenticate b/src/authm_mad/remotes/ldap/authenticate index 7ba956c815..88e5f283ad 100755 --- a/src/authm_mad/remotes/ldap/authenticate +++ b/src/authm_mad/remotes/ldap/authenticate @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/authm_mad/remotes/ldap/ldap_auth.conf b/src/authm_mad/remotes/ldap/ldap_auth.conf index 9b3b8a7480..00ddee463f 100644 --- a/src/authm_mad/remotes/ldap/ldap_auth.conf +++ b/src/authm_mad/remotes/ldap/ldap_auth.conf @@ -1,5 +1,5 @@ # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -31,7 +31,7 @@ server 1: # Connection and authentication timeout #:timeout: 15 - # Uncomment this line for tls connections + # Uncomment this line for tls connections, use :simple_tls or :start_tls #:encryption: :simple_tls # base hierarchy where to search for users and groups diff --git a/src/authm_mad/remotes/ldap/ldap_auth.rb b/src/authm_mad/remotes/ldap/ldap_auth.rb index 163f1efd8c..454c82f530 100644 --- a/src/authm_mad/remotes/ldap/ldap_auth.rb +++ b/src/authm_mad/remotes/ldap/ldap_auth.rb @@ -1,5 +1,5 @@ # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/authm_mad/remotes/ldap/test/ldap_auth_spec.rb b/src/authm_mad/remotes/ldap/test/ldap_auth_spec.rb index 11905ee6c6..bfebbe145b 100644 --- a/src/authm_mad/remotes/ldap/test/ldap_auth_spec.rb +++ b/src/authm_mad/remotes/ldap/test/ldap_auth_spec.rb @@ -1,5 +1,5 @@ # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/authm_mad/remotes/plain/authenticate b/src/authm_mad/remotes/plain/authenticate index 8d3d4d9012..126cb11d4d 100755 --- a/src/authm_mad/remotes/plain/authenticate +++ b/src/authm_mad/remotes/plain/authenticate @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/authm_mad/remotes/server_cipher/authenticate b/src/authm_mad/remotes/server_cipher/authenticate index c06dd66bf2..48fe786471 100755 --- a/src/authm_mad/remotes/server_cipher/authenticate +++ b/src/authm_mad/remotes/server_cipher/authenticate @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/authm_mad/remotes/server_cipher/server_cipher_auth.rb b/src/authm_mad/remotes/server_cipher/server_cipher_auth.rb index 6141c08219..ff07f453c0 100644 --- a/src/authm_mad/remotes/server_cipher/server_cipher_auth.rb +++ b/src/authm_mad/remotes/server_cipher/server_cipher_auth.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/authm_mad/remotes/server_x509/authenticate b/src/authm_mad/remotes/server_x509/authenticate index e731a9f7c2..799873bf3d 100755 --- a/src/authm_mad/remotes/server_x509/authenticate +++ b/src/authm_mad/remotes/server_x509/authenticate @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/authm_mad/remotes/server_x509/server_x509_auth.rb b/src/authm_mad/remotes/server_x509/server_x509_auth.rb index d9c03be613..66e5048d19 100644 --- a/src/authm_mad/remotes/server_x509/server_x509_auth.rb +++ b/src/authm_mad/remotes/server_x509/server_x509_auth.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/authm_mad/remotes/ssh/authenticate b/src/authm_mad/remotes/ssh/authenticate index d80013fb6c..f1f44fcb5c 100755 --- a/src/authm_mad/remotes/ssh/authenticate +++ b/src/authm_mad/remotes/ssh/authenticate @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/authm_mad/remotes/ssh/ssh_auth.rb b/src/authm_mad/remotes/ssh/ssh_auth.rb index 21ff9ca85e..bbe111ba7c 100644 --- a/src/authm_mad/remotes/ssh/ssh_auth.rb +++ b/src/authm_mad/remotes/ssh/ssh_auth.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/authm_mad/remotes/x509/authenticate b/src/authm_mad/remotes/x509/authenticate index 5fffe376a1..dc8f985b02 100755 --- a/src/authm_mad/remotes/x509/authenticate +++ b/src/authm_mad/remotes/x509/authenticate @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/authm_mad/remotes/x509/x509_auth.rb b/src/authm_mad/remotes/x509/x509_auth.rb index 412bd0dbfb..d2624ac313 100644 --- a/src/authm_mad/remotes/x509/x509_auth.rb +++ b/src/authm_mad/remotes/x509/x509_auth.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/cli_helper.rb b/src/cli/cli_helper.rb index b298599492..213442fbdd 100644 --- a/src/cli/cli_helper.rb +++ b/src/cli/cli_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -71,8 +71,18 @@ module CLIHelper :description => "Sets the delay in seconds for top command" } + NO_PAGER = { + :name => "no_pager", + :large => "--no-pager", + :format => String, + :description => "Disable pagination", + :proc => lambda { |o, options| + ENV['ONE_PAGER'] = 'cat' if File.exists?('/bin/cat') + } + } + #OPTIONS = [LIST, ORDER, FILTER, HEADER, DELAY] - OPTIONS = [LIST, LISTCONF, DELAY, FILTER, CSV_OPT] + OPTIONS = [LIST, LISTCONF, DELAY, FILTER, CSV_OPT, NO_PAGER] # Sets bold font def CLIHelper.scr_bold @@ -293,7 +303,7 @@ module CLIHelper begin if options[:csv] - puts CSV.generate_line(@default_columns) + puts CSV.generate_line(@default_columns) if !options[:noheader] res_data.each {|l| puts CSV.generate_line(l) } else res_data.each{|l| diff --git a/src/cli/command_parser.rb b/src/cli/command_parser.rb index 18ecaa1d7d..b5fbfeecbb 100644 --- a/src/cli/command_parser.rb +++ b/src/cli/command_parser.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/one_helper.rb b/src/cli/one_helper.rb index 0cd676fe50..42faae4134 100644 --- a/src/cli/one_helper.rb +++ b/src/cli/one_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -30,7 +30,7 @@ include OpenNebula module OpenNebulaHelper ONE_VERSION=<<-EOT OpenNebula #{OpenNebula::VERSION} -Copyright 2002-2018, OpenNebula Project, OpenNebula Systems +Copyright 2002-2019, OpenNebula Project, OpenNebula Systems Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain @@ -516,11 +516,13 @@ EOT # List pool functions #----------------------------------------------------------------------- def start_pager - pager = ENV['ONE_PAGER'] || 'less' + pager = ENV['ONE_PAGER'] || 'more' # Start pager, defaults to less p_r, p_w = IO.pipe + Signal.trap('PIPE', 'SIG_IGN') + lpid = fork do $stdin.reopen(p_r) @@ -531,7 +533,7 @@ EOT exec([pager, pager]) end - + # Send listing to pager pipe $stdout.close $stdout = p_w.dup @@ -547,6 +549,9 @@ EOT begin Process.wait(lpid) + rescue Interrupt + Process.kill("TERM", lpid) + Process.wait(lpid) rescue Errno::ECHILD end end @@ -558,12 +563,11 @@ EOT elements = 0 page = "" - pool.each {|e| - elements += 1 + pool.each {|e| + elements += 1 page << e.to_xml(true) << "\n" } else - pname = pool.pool_name ename = pool.element_name @@ -585,8 +589,8 @@ EOT # output #----------------------------------------------------------------------- def list_pool_table(table, pool, options, filter_flag) - if $stdout.isatty and (!options.key?:no_pager) - size = $stdout.winsize[0] - 1 + if $stdout.isatty and (!options.key?:no_pager) + size = $stdout.winsize[0] - 1 # ----------- First page, check if pager is needed ------------- rc = pool.get_page(size, 0) @@ -662,8 +666,8 @@ EOT # List pool in XML format, pagination is used in interactive output #----------------------------------------------------------------------- def list_pool_xml(pool, options, filter_flag) - if $stdout.isatty - size = $stdout.winsize[0] - 1 + if $stdout.isatty + size = $stdout.winsize[0] - 1 # ----------- First page, check if pager is needed ------------- rc = pool.get_page(size, 0) diff --git a/src/cli/one_helper/oneacct_helper.rb b/src/cli/one_helper/oneacct_helper.rb index 874f39bd72..0aa756130b 100644 --- a/src/cli/one_helper/oneacct_helper.rb +++ b/src/cli/one_helper/oneacct_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/one_helper/oneacl_helper.rb b/src/cli/one_helper/oneacl_helper.rb index 5edad741c6..fae07d256a 100644 --- a/src/cli/one_helper/oneacl_helper.rb +++ b/src/cli/one_helper/oneacl_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/one_helper/onecluster_helper.rb b/src/cli/one_helper/onecluster_helper.rb index f2bd454ed6..1748e3161d 100644 --- a/src/cli/one_helper/onecluster_helper.rb +++ b/src/cli/one_helper/onecluster_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/one_helper/onedatastore_helper.rb b/src/cli/one_helper/onedatastore_helper.rb index c0aab3a001..207b4d920d 100644 --- a/src/cli/one_helper/onedatastore_helper.rb +++ b/src/cli/one_helper/onedatastore_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/one_helper/onegroup_helper.rb b/src/cli/one_helper/onegroup_helper.rb index 0e83a34ec2..4ca73fc71a 100644 --- a/src/cli/one_helper/onegroup_helper.rb +++ b/src/cli/one_helper/onegroup_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/one_helper/onehost_helper.rb b/src/cli/one_helper/onehost_helper.rb index 5f0f0a4c67..bedba047b7 100644 --- a/src/cli/one_helper/onehost_helper.rb +++ b/src/cli/one_helper/onehost_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -18,8 +18,10 @@ require 'one_helper' require 'one_helper/onevm_helper' require 'rubygems' +# implements onehost command class OneHostHelper < OpenNebulaHelper::OneHelper - TEMPLATE_XPATH = '//HOST/TEMPLATE' + + TEMPLATE_XPATH = '//HOST/TEMPLATE' HYBRID = { :ec2 => { :help => <<-EOT.unindent, @@ -41,7 +43,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper # See your ec2_driver.conf for more information # #----------------------------------------------------------------------- - EOT + EOT }, :az => { :help => <<-EOT.unindent, @@ -67,110 +69,112 @@ class OneHostHelper < OpenNebulaHelper::OneHelper # AZ_ENDPOINT = # #----------------------------------------------------------------------- - EOT + EOT } } - - VERSION_XPATH = "#{TEMPLATE_XPATH}/VERSION" + VERSION_XPATH = "#{TEMPLATE_XPATH}/VERSION" def self.rname - "HOST" + 'HOST' end def self.conf_file - "onehost.yaml" + 'onehost.yaml' end def self.state_to_str(id) id = id.to_i state_str = Host::HOST_STATES[id] - return Host::SHORT_HOST_STATES[state_str] + Host::SHORT_HOST_STATES[state_str] end def format_pool(options) config_file = self.class.table_conf table = CLIHelper::ShowTable.new(config_file, self) do - column :ID, "ONE identifier for Host", :size=>4 do |d| - d["ID"] + column :ID, 'ONE identifier for Host', :size => 4 do |d| + d['ID'] end - column :NAME, "Name of the Host", :left, :size=>15 do |d| - d["NAME"] + column :NAME, 'Name of the Host', :left, :size => 15 do |d| + d['NAME'] end - column :CLUSTER, "Name of the Cluster", :left, :size=>9 do |d| - OpenNebulaHelper.cluster_str(d["CLUSTER"]) + column :CLUSTER, 'Name of the Cluster', :left, :size => 9 do |d| + OpenNebulaHelper.cluster_str(d['CLUSTER']) end - column :TVM, "Total Virtual Machines allocated to the Host", :size=>3 do |d| - d["HOST_SHARE"]["RUNNING_VMS"] || 0 + column :TVM, 'Total Virtual Machines allocated to the Host', + :size => 3 do |d| + d['HOST_SHARE']['RUNNING_VMS'] || 0 end - column :ZVM, "Number of Virtual Machine zombies", :size=>3 do |d| - d["TEMPLATE"]["TOTAL_ZOMBIES"] || 0 + column :ZVM, 'Number of Virtual Machine zombies', :size => 3 do |d| + d['TEMPLATE']['TOTAL_ZOMBIES'] || 0 end - column :TCPU, "Total CPU percentage", :size=>4 do |d| - d["HOST_SHARE"]["MAX_CPU"] || 0 + column :TCPU, 'Total CPU percentage', :size => 4 do |d| + d['HOST_SHARE']['MAX_CPU'] || 0 end - column :FCPU, "Free CPU percentage", :size=>4 do |d| - d["HOST_SHARE"]["MAX_CPU"].to_i- - d["HOST_SHARE"]["USED_CPU"].to_i rescue "-" + column :FCPU, 'Free CPU percentage', :size => 4 do |d| + d['HOST_SHARE']['MAX_CPU'].to_i - + d['HOST_SHARE']['USED_CPU'].to_i rescue '-' end - column :ACPU, "Available cpu percentage (not reserved by VMs)", - :size=>4 do |d| - max_cpu=d["HOST_SHARE"]["MAX_CPU"].to_i - max_cpu=100 if max_cpu==0 - max_cpu-d["HOST_SHARE"]["CPU_USAGE"].to_i + column :ACPU, 'Available cpu percentage (not reserved by VMs)', + :size => 4 do |d| + max_cpu = d['HOST_SHARE']['MAX_CPU'].to_i + max_cpu = 100 if max_cpu.zero? + max_cpu - d['HOST_SHARE']['CPU_USAGE'].to_i end - column :TMEM, "Total Memory", :size=>7 do |d| + column :TMEM, 'Total Memory', :size => 7 do |d| OpenNebulaHelper.unit_to_str( - d["HOST_SHARE"]["MAX_MEM"].to_i, - options) rescue "-" + d['HOST_SHARE']['MAX_MEM'].to_i, + options + ) rescue '-' end - column :FMEM, "Free Memory", :size=>7 do |d| + column :FMEM, 'Free Memory', :size => 7 do |d| OpenNebulaHelper.unit_to_str( - d["HOST_SHARE"]["FREE_MEM"].to_i, - options) rescue "-" + d['HOST_SHARE']['FREE_MEM'].to_i, + options + ) rescue '-' end - column :AMEM, "Available Memory (not reserved by VMs)", - :size=>7 do |d| - acpu=d["HOST_SHARE"]["MAX_MEM"].to_i- - d["HOST_SHARE"]["MEM_USAGE"].to_i - OpenNebulaHelper.unit_to_str(acpu,options) + column :AMEM, 'Available Memory (not reserved by VMs)', + :size => 7 do |d| + acpu = d['HOST_SHARE']['MAX_MEM'].to_i - + d['HOST_SHARE']['MEM_USAGE'].to_i + OpenNebulaHelper.unit_to_str(acpu, options) end - column :REAL_CPU, "Real CPU", :size=>18 do |d| - max_cpu = d["HOST_SHARE"]["MAX_CPU"].to_i + column :REAL_CPU, 'Real CPU', :size => 18 do |d| + max_cpu = d['HOST_SHARE']['MAX_CPU'].to_i if max_cpu != 0 - used_cpu = d["HOST_SHARE"]["USED_CPU"].to_i - ratio = (used_cpu*100) / max_cpu + used_cpu = d['HOST_SHARE']['USED_CPU'].to_i + ratio = (used_cpu * 100) / max_cpu "#{used_cpu} / #{max_cpu} (#{ratio}%)" else '-' end end - column :ALLOCATED_CPU, "Allocated CPU)", :size=>18 do |d| - max_cpu = d["HOST_SHARE"]["MAX_CPU"].to_i - cpu_usage = d["HOST_SHARE"]["CPU_USAGE"].to_i + column :ALLOCATED_CPU, 'Allocated CPU)', :size => 18 do |d| + max_cpu = d['HOST_SHARE']['MAX_CPU'].to_i + cpu_usage = d['HOST_SHARE']['CPU_USAGE'].to_i - if max_cpu == 0 && cpu_usage == 0 + if max_cpu.zero? && cpu_usage.zero? '-' else - cpu_usage = d["HOST_SHARE"]["CPU_USAGE"].to_i + cpu_usage = d['HOST_SHARE']['CPU_USAGE'].to_i if max_cpu != 0 - ratio = (cpu_usage*100) / max_cpu + ratio = (cpu_usage * 100) / max_cpu "#{cpu_usage} / #{max_cpu} (#{ratio}%)" else "#{cpu_usage} / -" @@ -178,39 +182,42 @@ class OneHostHelper < OpenNebulaHelper::OneHelper end end - column :REAL_MEM, "Real MEM", :size=>18 do |d| - max_mem = d["HOST_SHARE"]["MAX_MEM"].to_i + column :REAL_MEM, 'Real MEM', :size => 18 do |d| + max_mem = d['HOST_SHARE']['MAX_MEM'].to_i if max_mem != 0 - used_mem = d["HOST_SHARE"]["USED_MEM"].to_i - ratio = (used_mem*100) / max_mem - "#{OpenNebulaHelper.unit_to_str(used_mem,options)} / #{OpenNebulaHelper.unit_to_str(max_mem,options)} (#{ratio}%)" + used_mem = d['HOST_SHARE']['USED_MEM'].to_i + ratio = (used_mem * 100) / max_mem + "#{OpenNebulaHelper.unit_to_str(used_mem, options)} / "\ + "#{OpenNebulaHelper.unit_to_str(max_mem, options)} "\ + "(#{ratio}%)" else '-' end end - column :ALLOCATED_MEM, "Allocated MEM", :size=>18 do |d| - max_mem = d["HOST_SHARE"]["MAX_MEM"].to_i - mem_usage = d["HOST_SHARE"]["MEM_USAGE"].to_i + column :ALLOCATED_MEM, 'Allocated MEM', :size => 18 do |d| + max_mem = d['HOST_SHARE']['MAX_MEM'].to_i + mem_usage = d['HOST_SHARE']['MEM_USAGE'].to_i - if max_mem == 0 && mem_usage == 0 + if max_mem.zero? && mem_usage.zero? '-' + elsif max_mem != 0 + ratio = (mem_usage * 100) / max_mem + "#{OpenNebulaHelper.unit_to_str(mem_usage, options)} / "\ + "#{OpenNebulaHelper.unit_to_str(max_mem, options)} "\ + "(#{ratio}%)" else - if max_mem != 0 - ratio = (mem_usage*100) / max_mem - "#{OpenNebulaHelper.unit_to_str(mem_usage,options)} / #{OpenNebulaHelper.unit_to_str(max_mem,options)} (#{ratio}%)" - else - "#{OpenNebulaHelper.unit_to_str(mem_usage,options)} / -" - end + "#{OpenNebulaHelper.unit_to_str(mem_usage, options)} / -" end end - column :STAT, "Host status", :left, :size=>6 do |d| - OneHostHelper.state_to_str(d["STATE"]) + column :STAT, 'Host status', :left, :size => 6 do |d| + OneHostHelper.state_to_str(d['STATE']) end - default :ID, :NAME, :CLUSTER, :TVM, :ALLOCATED_CPU, :ALLOCATED_MEM, :STAT + default :ID, :NAME, :CLUSTER, :TVM, + :ALLOCATED_CPU, :ALLOCATED_MEM, :STAT end table @@ -218,34 +225,37 @@ class OneHostHelper < OpenNebulaHelper::OneHelper def set_hybrid(type, path) k = type.to_sym - if HYBRID.key?(k) - str = path.nil? ? OpenNebulaHelper.editor_input(HYBRID[k][:help]): File.read(path) - end + + return unless HYBRID.key?(k) + + return OpenNebulaHelper.editor_input(HYBRID[k][:help]) if path.nil? + + File.read(path) end NUM_THREADS = 15 def sync(host_ids, options) - if `id -u`.to_i == 0 || `id -G`.split.collect{|e| e.to_i}.include?(0) + if Process.uid.zero? || Process.gid.zero? STDERR.puts("Cannot run 'onehost sync' as root") - exit -1 + exit(-1) end begin - current_version = File.read(REMOTES_LOCATION+'/VERSION').strip - rescue + current_version = File.read(REMOTES_LOCATION + '/VERSION').strip + rescue StandardError STDERR.puts("Could not read #{REMOTES_LOCATION}/VERSION") exit(-1) end if current_version.empty? - STDERR.puts "Remotes version can not be empty" + STDERR.puts 'Remotes version can not be empty' exit(-1) end begin current_version = Gem::Version.new(current_version) - rescue - STDERR.puts "VERSION file is malformed, use semantic versioning." + rescue StandardError + STDERR.puts 'VERSION file is malformed, use semantic versioning.' end cluster_id = options[:cluster] @@ -259,13 +269,13 @@ class OneHostHelper < OpenNebulaHelper::OneHelper # Verify the existence of REMOTES_LOCATION if !File.directory? REMOTES_LOCATION - error_msg = "'#{REMOTES_LOCATION}' does not exist. " << - "This command must be run in the frontend." - return -1,error_msg + error_msg = "'#{REMOTES_LOCATION}' does not exist. " \ + 'This command must be run in the frontend.' + return -1, error_msg end # Touch the update file - FileUtils.touch(File.join(REMOTES_LOCATION,'.update')) + FileUtils.touch(File.join(REMOTES_LOCATION, '.update')) # Get the Host pool filter_flag ||= OpenNebula::Pool::INFO_ALL @@ -276,18 +286,16 @@ class OneHostHelper < OpenNebulaHelper::OneHelper return -1, rc.message if OpenNebula.is_error?(rc) # Assign hosts to threads - i = 0 - queue = Array.new + queue = [] pool.each do |host| if host_ids - next if !host_ids.include?(host['ID'].to_i) + next unless host_ids.include?(host['ID'].to_i) elsif cluster_id next if host['CLUSTER_ID'].to_i != cluster_id end vm_mad = host['VM_MAD'].downcase - remote_remotes = host['TEMPLATE/REMOTE_REMOTES'] state = host['STATE'] # Skip this host from remote syncing if it's a PUBLIC_CLOUD host @@ -297,20 +305,22 @@ class OneHostHelper < OpenNebulaHelper::OneHelper next if Host::HOST_STATES[state.to_i] == 'OFFLINE' # Skip this host if it is a vCenter cluster - next if vm_mad == "vcenter" + next if vm_mad == 'vcenter' - host_version=host['TEMPLATE/VERSION'] + host_version = host['TEMPLATE/VERSION'] begin host_version = Gem::Version.new(host_version) - rescue + rescue StandardError + nil end if !options[:force] begin next if host_version && host_version >= current_version - rescue - STDERR.puts "Error comparing versions for host #{host['NAME']}." + rescue StandardError + STDERR.puts 'Error comparing versions '\ + " for host #{host['NAME']}." end end @@ -320,45 +330,45 @@ class OneHostHelper < OpenNebulaHelper::OneHelper end # Run the jobs in threads - host_errors = Array.new + host_errors = [] queue_lock = Mutex.new error_lock = Mutex.new total = queue.length - if total==0 - puts "No hosts are going to be updated." + if total.zero? + puts 'No hosts are going to be updated.' exit(0) end - ts = (1..NUM_THREADS).map do |t| + ts = (1..NUM_THREADS).map do |_t| Thread.new do - while true do + loop do host = nil size = 0 queue_lock.synchronize do - host=queue.shift - size=queue.length + host = queue.shift + size = queue.length end - break if !host + break unless host - print_update_info(total-size, total, host['NAME']) + print_update_info(total - size, total, host['NAME']) if options[:rsync] - sync_cmd = "rsync -Laz --delete #{REMOTES_LOCATION}" << - " #{host['NAME']}:#{remote_dir}" + sync_cmd = "rsync -Laz --delete #{REMOTES_LOCATION}" \ + " #{host['NAME']}:#{remote_dir}" else - sync_cmd = "scp -rp #{REMOTES_LOCATION}/. " << - "#{host['NAME']}:#{remote_dir} 2> /dev/null" + sync_cmd = "scp -rp #{REMOTES_LOCATION}/. " \ + "#{host['NAME']}:#{remote_dir} 2> /dev/null" end `#{sync_cmd} 2>/dev/null` - if !$?.success? - error_lock.synchronize { + if !$CHILD_STATUS.success? + error_lock.synchronize do host_errors << host['NAME'] - } + end else update_version(host, current_version) end @@ -367,16 +377,108 @@ class OneHostHelper < OpenNebulaHelper::OneHelper end # Wait for threads to finish - ts.each{|t| t.join} + ts.each {|t| t.join } puts if host_errors.empty? - puts "All hosts updated successfully." + puts 'All hosts updated successfully.' 0 else - STDERR.puts "Failed to update the following hosts:" - host_errors.each{|h| STDERR.puts "* #{h}"} + STDERR.puts 'Failed to update the following hosts:' + host_errors.each {|h| STDERR.puts "* #{h}" } + -1 + end + end + + def forceupdate(host_ids, options) + if Process.uid.zero? || Process.gid.zero? + STDERR.puts("Cannot run 'onehost forceupdate' as root") + exit(-1) + end + + cluster_id = options[:cluster] + + # Get the Host pool + filter_flag ||= OpenNebula::Pool::INFO_ALL + + pool = factory_pool(filter_flag) + + rc = pool.info + return -1, rc.message if OpenNebula.is_error?(rc) + + # Assign hosts to threads + queue = [] + + pool.each do |host| + if host_ids + next unless host_ids.include?(host['ID'].to_i) + elsif cluster_id + next if host['CLUSTER_ID'].to_i != cluster_id + end + + vm_mad = host['VM_MAD'].downcase + state = host['STATE'] + + # Skip this host from remote syncing if it's a PUBLIC_CLOUD host + next if host['TEMPLATE/PUBLIC_CLOUD'] == 'YES' + + # Skip this host from remote syncing if it's OFFLINE + next if Host::HOST_STATES[state.to_i] == 'OFFLINE' + + # Skip this host if it is a vCenter cluster + next if vm_mad == 'vcenter' + + queue << host + end + + # Run the jobs in threads + host_errors = [] + queue_lock = Mutex.new + error_lock = Mutex.new + total = queue.length + + if total.zero? + puts 'No hosts are going to be forced.' + exit(0) + end + + ts = (1..NUM_THREADS).map do |_t| + Thread.new do + loop do + host = nil + size = 0 + + queue_lock.synchronize do + host = queue.shift + size = queue.length + end + + break unless host + + cmd = 'cat /tmp/one-collectd-client.pid | xargs kill -HUP' + system("ssh #{host['NAME']} \"#{cmd}\" 2>/dev/null") + + if !$CHILD_STATUS.success? + error_lock.synchronize do + host_errors << host['NAME'] + end + else + puts "#{host['NAME']} monitoring forced" + end + end + end + end + + # Wait for threads to finish + ts.each {|t| t.join } + + if host_errors.empty? + puts 'All hosts updated successfully.' + 0 + else + STDERR.puts 'Failed to update the following hosts:' + host_errors.each {|h| STDERR.puts "* #{h}" } -1 end end @@ -384,22 +486,22 @@ class OneHostHelper < OpenNebulaHelper::OneHelper private def print_update_info(current, total, host) - bar_length=40 + bar_length = 40 - percentage=current.to_f/total.to_f - done=(percentage*bar_length).floor + percentage = current.to_f / total.to_f + done = (percentage * bar_length).floor - bar="[" - bar+="="*done - bar+="-"*(bar_length-done) - bar+="]" + bar = '[' + bar += '=' * done + bar += '-' * (bar_length - done) + bar += ']' - info="#{current}/#{total}" + info = "#{current}/#{total}" - str="#{bar} #{info} " - name=host[0..(79-str.length)] - str=str+name - str=str+" "*(80-str.length) + str = "#{bar} #{info} " + name = host[0..(79 - str.length)] + str += name + str += ' ' * (80 - str.length) print "#{str}\r" STDOUT.flush @@ -412,54 +514,65 @@ class OneHostHelper < OpenNebulaHelper::OneHelper host.add_element(TEMPLATE_XPATH, 'VERSION' => version) - template=host.template_str + template = host.template_str host.update(template) end - def factory(id=nil) + def factory(id = nil) if id OpenNebula::Host.new_with_id(id, @client) else - xml=OpenNebula::Host.build_xml + xml = OpenNebula::Host.build_xml OpenNebula::Host.new(xml, @client) end end - def factory_pool(user_flag=-2) - #TBD OpenNebula::HostPool.new(@client, user_flag) + def factory_pool(_user_flag = -2) + # TBD OpenNebula::HostPool.new(@client, user_flag) OpenNebula::HostPool.new(@client) end - def format_resource(host, options = {}) - str = "%-22s: %-20s" - str_h1 = "%-80s" + def format_resource(host, _options = {}) + str = '%-22s: %-20s' + str_h1 = '%-80s' CLIHelper.print_header( - str_h1 % "HOST #{host.id.to_s} INFORMATION", true) + str_h1 % "HOST #{host.id} INFORMATION", true + ) - puts str % ["ID", host.id.to_s] - puts str % ["NAME", host.name] - puts str % ["CLUSTER", OpenNebulaHelper.cluster_str(host['CLUSTER'])] - puts str % ["STATE", host.state_str] - puts str % ["IM_MAD", host['IM_MAD']] - puts str % ["VM_MAD", host['VM_MAD']] - puts str % ["LAST MONITORING TIME", OpenNebulaHelper.time_to_str(host['LAST_MON_TIME'])] + puts format(str, 'ID', host.id.to_s) + puts format(str, 'NAME', host.name) + puts format(str, 'CLUSTER', + OpenNebulaHelper.cluster_str(host['CLUSTER'])) + puts format(str, 'STATE', host.state_str) + puts format(str, 'IM_MAD', host['IM_MAD']) + puts format(str, 'VM_MAD', host['VM_MAD']) + puts format(str, 'LAST MONITORING TIME', + OpenNebulaHelper.time_to_str(host['LAST_MON_TIME'])) puts - CLIHelper.print_header(str_h1 % "HOST SHARES", false) - puts str % ["RUNNING VMS", host['HOST_SHARE/RUNNING_VMS']] + CLIHelper.print_header(str_h1 % 'HOST SHARES', false) + puts format(str, 'RUNNING VMS', host['HOST_SHARE/RUNNING_VMS']) - CLIHelper.print_header(str_h1 % "MEMORY", false) - puts str % [" TOTAL", OpenNebulaHelper.unit_to_str(host['HOST_SHARE/TOTAL_MEM'].to_i, {})] - puts str % [" TOTAL +/- RESERVED", OpenNebulaHelper.unit_to_str(host['HOST_SHARE/MAX_MEM'].to_i, {})] - puts str % [" USED (REAL)", OpenNebulaHelper.unit_to_str(host['HOST_SHARE/USED_MEM'].to_i, {})] - puts str % [" USED (ALLOCATED)", OpenNebulaHelper.unit_to_str(host['HOST_SHARE/MEM_USAGE'].to_i, {})] + CLIHelper.print_header(str_h1 % 'MEMORY', false) + puts format(str, ' TOTAL', + OpenNebulaHelper.unit_to_str(host['HOST_SHARE/TOTAL_MEM'] + .to_i, {})) + puts format(str, ' TOTAL +/- RESERVED', + OpenNebulaHelper.unit_to_str(host['HOST_SHARE/MAX_MEM'] + .to_i, {})) + puts format(str, ' USED (REAL)', + OpenNebulaHelper.unit_to_str(host['HOST_SHARE/USED_MEM'] + .to_i, {})) + puts format(str, ' USED (ALLOCATED)', + OpenNebulaHelper.unit_to_str(host['HOST_SHARE/MEM_USAGE'] + .to_i, {})) - CLIHelper.print_header(str_h1 % "CPU", false) - puts str % [" TOTAL", host['HOST_SHARE/TOTAL_CPU']] - puts str % [" TOTAL +/- RESERVED", host['HOST_SHARE/MAX_CPU']] - puts str % [" USED (REAL)", host['HOST_SHARE/USED_CPU']] - puts str % [" USED (ALLOCATED)", host['HOST_SHARE/CPU_USAGE']] + CLIHelper.print_header(str_h1 % 'CPU', false) + puts format(str, ' TOTAL', host['HOST_SHARE/TOTAL_CPU']) + puts format(str, ' TOTAL +/- RESERVED', host['HOST_SHARE/MAX_CPU']) + puts format(str, ' USED (REAL)', host['HOST_SHARE/USED_CPU']) + puts format(str, ' USED (ALLOCATED)', host['HOST_SHARE/CPU_USAGE']) puts datastores = host.to_hash['HOST']['HOST_SHARE']['DATASTORES']['DS'] @@ -471,26 +584,34 @@ class OneHostHelper < OpenNebulaHelper::OneHelper end datastores.each do |datastore| - CLIHelper.print_header(str_h1 % "LOCAL SYSTEM DATASTORE ##{datastore['ID']} CAPACITY", false) - puts str % ["TOTAL:", OpenNebulaHelper.unit_to_str(datastore['TOTAL_MB'].to_i, {},'M')] - puts str % ["USED: ", OpenNebulaHelper.unit_to_str(datastore['USED_MB'].to_i, {},'M')] - puts str % ["FREE:", OpenNebulaHelper.unit_to_str(datastore['FREE_MB'].to_i, {},'M')] + CLIHelper.print_header(str_h1 % + 'LOCAL SYSTEM DATASTORE '\ + "##{datastore['ID']} CAPACITY", false) + puts format(str, 'TOTAL:', + OpenNebulaHelper.unit_to_str(datastore['TOTAL_MB'] + .to_i, {}, 'M')) + puts format(str, 'USED: ', + OpenNebulaHelper.unit_to_str(datastore['USED_MB'] + .to_i, {}, 'M')) + puts format(str, 'FREE:', + OpenNebulaHelper.unit_to_str(datastore['FREE_MB'] + .to_i, {}, 'M')) puts end - CLIHelper.print_header(str_h1 % "MONITORING INFORMATION", false) + CLIHelper.print_header(str_h1 % 'MONITORING INFORMATION', false) wilds = host.wilds begin pcis = [host.to_hash['HOST']['HOST_SHARE']['PCI_DEVICES']['PCI']] pcis = pcis.flatten.compact - rescue + rescue StandardError pcis = nil end - host.delete_element("TEMPLATE/VM") - host.delete_element("TEMPLATE_WILDS") + host.delete_element('TEMPLATE/VM') + host.delete_element('TEMPLATE_WILDS') puts host.template_str @@ -499,81 +620,85 @@ class OneHostHelper < OpenNebulaHelper::OneHelper end puts - CLIHelper.print_header("WILD VIRTUAL MACHINES", false) + CLIHelper.print_header('WILD VIRTUAL MACHINES', false) puts - format = "%-30.30s %36s %4s %10s" - CLIHelper.print_header(format % ["NAME", "IMPORT_ID", "CPU", "MEMORY"], + format = '%-30.30s %36s %4s %10s' + CLIHelper.print_header(format(format, 'NAME', + 'IMPORT_ID', 'CPU', 'MEMORY'), true) wilds.each do |wild| - if wild['IMPORT_TEMPLATE'] - wild_tmplt = Base64::decode64(wild['IMPORT_TEMPLATE']).split("\n") - name = wild['VM_NAME'] - import = wild_tmplt.select { |line| - line[/^IMPORT_VM_ID/] - }[0].split("=")[1].gsub("\"", " ").strip - memory = wild_tmplt.select { |line| - line[/^MEMORY/] - }[0].split("=")[1].gsub("\"", " ").strip - cpu = wild_tmplt.select { |line| - line[/^CPU/] - }[0].split("=")[1].gsub("\"", " ").strip - else - name = wild['DEPLOY_ID'] - import = memory = cpu = "-" - end + if wild['IMPORT_TEMPLATE'] + wild_tmplt = Base64.decode64(wild['IMPORT_TEMPLATE']) + .split("\n") + name = wild['VM_NAME'] + import = wild_tmplt.select do |line| + line[/^IMPORT_VM_ID/] + end[0].split('=')[1].tr('"', ' ').strip + memory = wild_tmplt.select do |line| + line[/^MEMORY/] + end[0].split('=')[1].tr('"', ' ').strip + cpu = wild_tmplt.select do |line| + line[/^CPU/] + end[0].split('=')[1].tr('"', ' ').strip + else + name = wild['DEPLOY_ID'] + import = memory = cpu = '-' + end - puts format % [name, import, cpu, memory] + puts format(format, name, import, cpu, memory) end puts - CLIHelper.print_header("VIRTUAL MACHINES", false) + CLIHelper.print_header('VIRTUAL MACHINES', false) puts - onevm_helper=OneVMHelper.new - onevm_helper.client=@client - onevm_helper.list_pool({:filter=>["HOST=#{host.name}"], :no_pager => true}, false) + onevm_helper = OneVMHelper.new + onevm_helper.client = @client + onevm_helper.list_pool({ :filter => ["HOST=#{host.name}"], + :no_pager => true }, + false) end def print_pcis(pcis) puts - CLIHelper.print_header("PCI DEVICES", false) + CLIHelper.print_header('PCI DEVICES', false) puts - table=CLIHelper::ShowTable.new(nil, self) do - column :VM, "Used by VM", :size => 5, :left => false do |d| - if d["VMID"] == "-1" - "" + table = CLIHelper::ShowTable.new(nil, self) do + column :VM, 'Used by VM', :size => 5, :left => false do |d| + if d['VMID'] == '-1' + '' else - d["VMID"] + d['VMID'] end end - column :ADDR, "PCI Address", :size => 7, :left => true do |d| - d["SHORT_ADDRESS"] + column :ADDR, 'PCI Address', :size => 7, :left => true do |d| + d['SHORT_ADDRESS'] end - column :TYPE, "Type", :size => 14, :left => true do |d| - d["TYPE"] + column :TYPE, 'Type', :size => 14, :left => true do |d| + d['TYPE'] end - column :CLASS, "Class", :size => 12, :left => true do |d| - d["CLASS_NAME"] + column :CLASS, 'Class', :size => 12, :left => true do |d| + d['CLASS_NAME'] end - column :NAME, "Name", :size => 50, :left => true do |d| - d["DEVICE_NAME"] + column :NAME, 'Name', :size => 50, :left => true do |d| + d['DEVICE_NAME'] end - column :VENDOR, "Vendor", :size => 8, :left => true do |d| - d["VENDOR_NAME"] + column :VENDOR, 'Vendor', :size => 8, :left => true do |d| + d['VENDOR_NAME'] end default :VM, :ADDR, :TYPE, :NAME - end table.show(pcis) end + end diff --git a/src/cli/one_helper/oneimage_helper.rb b/src/cli/one_helper/oneimage_helper.rb index 4b4cc80579..ca7394a805 100644 --- a/src/cli/one_helper/oneimage_helper.rb +++ b/src/cli/one_helper/oneimage_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/one_helper/onemarket_helper.rb b/src/cli/one_helper/onemarket_helper.rb index 0e2f3ac6fe..1bc8a1521d 100644 --- a/src/cli/one_helper/onemarket_helper.rb +++ b/src/cli/one_helper/onemarket_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/one_helper/onemarketapp_helper.rb b/src/cli/one_helper/onemarketapp_helper.rb index e0fbacfdde..ef609f55fa 100644 --- a/src/cli/one_helper/onemarketapp_helper.rb +++ b/src/cli/one_helper/onemarketapp_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/one_helper/oneprovision_helpers/ansible_helper.rb b/src/cli/one_helper/oneprovision_helpers/ansible_helper.rb index 820a50f06c..eb76de92ac 100644 --- a/src/cli/one_helper/oneprovision_helpers/ansible_helper.rb +++ b/src/cli/one_helper/oneprovision_helpers/ansible_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/one_helper/oneprovision_helpers/cluster_helper.rb b/src/cli/one_helper/oneprovision_helpers/cluster_helper.rb index b38c42d2ab..06b92030b8 100644 --- a/src/cli/one_helper/oneprovision_helpers/cluster_helper.rb +++ b/src/cli/one_helper/oneprovision_helpers/cluster_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/one_helper/oneprovision_helpers/common_helper.rb b/src/cli/one_helper/oneprovision_helpers/common_helper.rb index 3b5336b6a6..8455ac95d7 100644 --- a/src/cli/one_helper/oneprovision_helpers/common_helper.rb +++ b/src/cli/one_helper/oneprovision_helpers/common_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/one_helper/oneprovision_helpers/datastore_helper.rb b/src/cli/one_helper/oneprovision_helpers/datastore_helper.rb index 979c9905a5..329ed873c1 100644 --- a/src/cli/one_helper/oneprovision_helpers/datastore_helper.rb +++ b/src/cli/one_helper/oneprovision_helpers/datastore_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/one_helper/oneprovision_helpers/host_helper.rb b/src/cli/one_helper/oneprovision_helpers/host_helper.rb index d855d24966..b73ad32d3f 100644 --- a/src/cli/one_helper/oneprovision_helpers/host_helper.rb +++ b/src/cli/one_helper/oneprovision_helpers/host_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/one_helper/oneprovision_helpers/provision_helper.rb b/src/cli/one_helper/oneprovision_helpers/provision_helper.rb index 5edcc21919..63cead2416 100644 --- a/src/cli/one_helper/oneprovision_helpers/provision_helper.rb +++ b/src/cli/one_helper/oneprovision_helpers/provision_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/one_helper/oneprovision_helpers/vnet_helper.rb b/src/cli/one_helper/oneprovision_helpers/vnet_helper.rb index 3266621030..22874dcdfb 100644 --- a/src/cli/one_helper/oneprovision_helpers/vnet_helper.rb +++ b/src/cli/one_helper/oneprovision_helpers/vnet_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/one_helper/onequota_helper.rb b/src/cli/one_helper/onequota_helper.rb index 118b2cf16b..eb2e521f31 100644 --- a/src/cli/one_helper/onequota_helper.rb +++ b/src/cli/one_helper/onequota_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/one_helper/onesecgroup_helper.rb b/src/cli/one_helper/onesecgroup_helper.rb index f7524fb560..fea83e20cd 100644 --- a/src/cli/one_helper/onesecgroup_helper.rb +++ b/src/cli/one_helper/onesecgroup_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/one_helper/onetemplate_helper.rb b/src/cli/one_helper/onetemplate_helper.rb index f5ceb4426c..6e7f791c60 100644 --- a/src/cli/one_helper/onetemplate_helper.rb +++ b/src/cli/one_helper/onetemplate_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/one_helper/oneuser_helper.rb b/src/cli/one_helper/oneuser_helper.rb index b0ecdc2449..efaea94379 100644 --- a/src/cli/one_helper/oneuser_helper.rb +++ b/src/cli/one_helper/oneuser_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/one_helper/onevcenter_helper.rb b/src/cli/one_helper/onevcenter_helper.rb index d6c42c35b1..ea36489486 100644 --- a/src/cli/one_helper/onevcenter_helper.rb +++ b/src/cli/one_helper/onevcenter_helper.rb @@ -1,6 +1,6 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/one_helper/onevdc_helper.rb b/src/cli/one_helper/onevdc_helper.rb index a00721abeb..1e5e9d0012 100644 --- a/src/cli/one_helper/onevdc_helper.rb +++ b/src/cli/one_helper/onevdc_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb index aafff9c1fb..e66fcf7c37 100644 --- a/src/cli/one_helper/onevm_helper.rb +++ b/src/cli/one_helper/onevm_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -198,6 +198,13 @@ class OneVMHelper < OpenNebulaHelper::OneHelper :format => String } + SEARCH = { + :name => "search", + :large => "--search search", + :description=> "query in KEY=VALUE format", + :format => String + } + def self.rname "VM" end diff --git a/src/cli/one_helper/onevmgroup_helper.rb b/src/cli/one_helper/onevmgroup_helper.rb index d094ddcf7c..55606c7829 100644 --- a/src/cli/one_helper/onevmgroup_helper.rb +++ b/src/cli/one_helper/onevmgroup_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/one_helper/onevnet_helper.rb b/src/cli/one_helper/onevnet_helper.rb index 3db360f110..11dbca8175 100644 --- a/src/cli/one_helper/onevnet_helper.rb +++ b/src/cli/one_helper/onevnet_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/one_helper/onevntemplate_helper.rb b/src/cli/one_helper/onevntemplate_helper.rb index 0203559807..ff23e313cf 100644 --- a/src/cli/one_helper/onevntemplate_helper.rb +++ b/src/cli/one_helper/onevntemplate_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/one_helper/onevrouter_helper.rb b/src/cli/one_helper/onevrouter_helper.rb index 34a1f1f446..ea8bb0d069 100644 --- a/src/cli/one_helper/onevrouter_helper.rb +++ b/src/cli/one_helper/onevrouter_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/one_helper/onezone_helper.rb b/src/cli/one_helper/onezone_helper.rb index 5126b16b51..fcf19076c9 100644 --- a/src/cli/one_helper/onezone_helper.rb +++ b/src/cli/one_helper/onezone_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/oneacct b/src/cli/oneacct index b7cf5dcec2..69b715e0b9 100755 --- a/src/cli/oneacct +++ b/src/cli/oneacct @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/oneacl b/src/cli/oneacl index 3002978672..84cd80c3de 100755 --- a/src/cli/oneacl +++ b/src/cli/oneacl @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/onecluster b/src/cli/onecluster index f901978766..e93209c344 100755 --- a/src/cli/onecluster +++ b/src/cli/onecluster @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/onedatastore b/src/cli/onedatastore index aef974a85a..381dfaa916 100755 --- a/src/cli/onedatastore +++ b/src/cli/onedatastore @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/oneflow b/src/cli/oneflow index 5ceea86c50..751fdb7230 100755 --- a/src/cli/oneflow +++ b/src/cli/oneflow @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/oneflow-template b/src/cli/oneflow-template index d3f87fc816..559d424f89 100755 --- a/src/cli/oneflow-template +++ b/src/cli/oneflow-template @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/onegroup b/src/cli/onegroup index 4748954f22..42ba01bccc 100755 --- a/src/cli/onegroup +++ b/src/cli/onegroup @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/onehost b/src/cli/onehost index 1b1a916aa6..3ab77000d1 100755 --- a/src/cli/onehost +++ b/src/cli/onehost @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -285,4 +285,17 @@ CommandParser::CmdParser.new(ARGV) do o.import_wild(args[1]) end end + + forceupdate_desc = <<-EOT.unindent + Forces host monitoring update + Examples: + onehost forceupdate host01 + onehost forceupdate host01,host02,host03 + onehost forceupdate -c myCluster + EOT + + command :forceupdate, forceupdate_desc, [:range, :hostid_list, nil], + :options => [OneClusterHelper::CLUSTER] do + helper.forceupdate(args[0], options) + end end diff --git a/src/cli/oneimage b/src/cli/oneimage index 0acd57bb6e..804a1e9c86 100755 --- a/src/cli/oneimage +++ b/src/cli/oneimage @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/onemarket b/src/cli/onemarket index ec4fab5bd1..f52b7d4487 100755 --- a/src/cli/onemarket +++ b/src/cli/onemarket @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/onemarketapp b/src/cli/onemarketapp index 64ebb9840b..2e920c539d 100755 --- a/src/cli/onemarketapp +++ b/src/cli/onemarketapp @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/oneprovision b/src/cli/oneprovision index da3e3f1ea5..29b2e5dfeb 100755 --- a/src/cli/oneprovision +++ b/src/cli/oneprovision @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -16,28 +16,28 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -ONE_LOCATION=ENV["ONE_LOCATION"] +ONE_LOCATION = ENV['ONE_LOCATION'] if !ONE_LOCATION - RUBY_LIB_LOCATION="/usr/lib/one/ruby" - REMOTES_LOCATION="/var/lib/one/remotes" - ANSIBLE_LOCATION="/usr/share/one/oneprovision/ansible" + RUBY_LIB_LOCATION = '/usr/lib/one/ruby' + REMOTES_LOCATION = '/var/lib/one/remotes' + ANSIBLE_LOCATION = '/usr/share/one/oneprovision/ansible' else - RUBY_LIB_LOCATION=ONE_LOCATION+"/lib/ruby" - REMOTES_LOCATION=ONE_LOCATION+"/var/remotes" - ANSIBLE_LOCATION=ONE_LOCATION+"/usr/share/oneprovision/ansible" + RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby' + REMOTES_LOCATION = ONE_LOCATION + '/var/remotes' + ANSIBLE_LOCATION = ONE_LOCATION + '/usr/share/oneprovision/ansible' end -$: << RUBY_LIB_LOCATION -$: << RUBY_LIB_LOCATION+"/cli" +$LOAD_PATH << RUBY_LIB_LOCATION +$LOAD_PATH << RUBY_LIB_LOCATION + '/cli' -$PING_TIMEOUT = 20 -$PING_RETRIES = 10 -$MAX_RETRIES = 3 -$RUN_MODE = :interactive -$FAIL_CHOICE = :quit -$CLEANUP = false -$THREADS = 3 +PING_TIMEOUT_DEFAULT = 20 +PING_RETRIES_DEFAULT = 10 +MAX_RETRIES_DEFAULT = 3 +RUN_MODE_DEFAULT = :interactive +FAIL_CHOICE_DEFAULT = :quit +CLEANUP_DEFAULT = false +THREADS_DEFAULT = 3 require 'command_parser' require 'one_helper' @@ -52,27 +52,27 @@ require 'tempfile' require 'base64' CommandParser::CmdParser.new(ARGV) do - usage "`oneprovision` [] [] [] []" + usage '`oneprovision` [] [] [] []' version OpenNebulaHelper::ONE_VERSION - $common_helper = CommonHelper.new - $host_helper = OneProvisionHostHelper.new - $ansible_helper = OneProvisionAnsibleHelper.new - $provision_helper = OneProvisionProvisionHelper.new - $cluster_helper = OneProvisionClusterHelper.new - $datastore_helper = OneProvisionDatastoreHelper.new - $vnet_helper = OneProvisionVnetHelper.new + @common_helper = CommonHelper.new + @host_helper = OneProvisionHostHelper.new + @ansible_helper = OneProvisionAnsibleHelper.new + @provision_helper = OneProvisionProvisionHelper.new + @cluster_helper = OneProvisionClusterHelper.new + @datastore_helper = OneProvisionDatastoreHelper.new + @vnet_helper = OneProvisionVnetHelper.new - $mutex = Mutex.new + @mutex = Mutex.new before_proc do - $common_helper.set_client(options) - $host_helper.set_client(options) - $ansible_helper.set_client(options) - $provision_helper.set_client(options) - $cluster_helper.set_client(options) - $datastore_helper.set_client(options) - $vnet_helper.set_client(options) + @common_helper.set_client(options) + @host_helper.set_client(options) + @ansible_helper.set_client(options) + @provision_helper.set_client(options) + @cluster_helper.set_client(options) + @datastore_helper.set_client(options) + @vnet_helper.set_client(options) end ######################################################################## @@ -80,125 +80,130 @@ CommandParser::CmdParser.new(ARGV) do ######################################################################## VERBOSE = { - :name => "verbose", - :short => "-d", - :large => "--verbose", - :description => "Set verbose logging mode", + :name => 'verbose', + :short => '-d', + :large => '--verbose', + :description => 'Set verbose logging mode' } DEBUG = { - :name => "debug", - :short => "-D", - :large => "--debug" , - :description => "Set debug logging mode", + :name => 'debug', + :short => '-D', + :large => '--debug', + :description => 'Set debug logging mode', :format => String } BATCH = { - :name => "batch", - :short => "-b", - :large => "--batch", - :description => "Run in non-interactive mode (no questions)", - :format => String, + :name => 'batch', + :short => '-b', + :large => '--batch', + :description => 'Run in non-interactive mode (no questions)', + :format => String } FAIL_RETRY = { - :name => "fail_retry", - :large => "--fail-retry number", - :description => "Set batch failover mode to number of retries", + :name => 'fail_retry', + :large => '--fail-retry number', + :description => 'Set batch failover mode to number of retries', :format => Integer } FAIL_CLEANUP = { - :name => "fail_cleanup", - :large => "--fail-cleanup", - :description => "Set batch failover mode to clean up and quit", + :name => 'fail_cleanup', + :large => '--fail-cleanup', + :description => 'Set batch failover mode to clean up and quit' } FAIL_SKIP = { - :name => "fail_skip", - :large => "--fail-skip", - :description => "Set batch failover mode to skip failing part", + :name => 'fail_skip', + :large => '--fail-skip', + :description => 'Set batch failover mode to skip failing part' } FAIL_QUIT = { - :name => "fail_quit", - :large => "--fail-quit", - :description => "Set batch failover mode to quit (default)", + :name => 'fail_quit', + :large => '--fail-quit', + :description => 'Set batch failover mode to quit (default)' } FORCE = { - :name => "force", - :short => "-F", - :large => "--force", - :description => "Force configure to execute", + :name => 'force', + :short => '-F', + :large => '--force', + :description => 'Force configure to execute', :format => String } HARD = { - :name => "hard", - :short => "-H", - :large => "--hard", - :description => "Reset the host", + :name => 'hard', + :short => '-H', + :large => '--hard', + :description => 'Reset the host', :format => String } PING_TIMEOUT = { - :name => "ping_timeout", - :large => "--ping-timeout seconds", - :description => "Set timeout for ping (default: #{$PING_TIMEOUT} secs)", + :name => 'ping_timeout', + :large => '--ping-timeout seconds', + :description => "Set timeout for ping (default: \ + #{PING_TIMEOUT_DEFAULT} secs)", :format => Integer } PING_RETRIES = { - :name => "ping_retries", - :large => "--ping-retries number", - :description => "Set retries for ping (default: #{$PING_RETRIES})", + :name => 'ping_retries', + :large => '--ping-retries number', + :description => "Set retries for ping (default: \ + #{PING_RETRIES_DEFAULT})", :format => Integer } THREADS = { - :name => "threads", - :short => "-t threads", - :large => "--threads threads", - :description => "Set threads for create (default: #{$THREADS})", + :name => 'threads', + :short => '-t threads', + :large => '--threads threads', + :description => "Set threads for create (default: #{THREADS_DEFAULT})", :format => Integer } DELETE_ALL = { - :name => "delete_all", - :large => "--delete-all", - :description => "Delete all vms and images first, then delete the resources." + :name => 'delete_all', + :large => '--delete-all', + :description => 'Delete all vms and images first, then delete the\ + resources.' } INCREMENTAL = { - :name => "incremental", - :large => "--incremental", - :description => "Configure just new hosts, default is configure the whole provision." + :name => 'incremental', + :large => '--incremental', + :description => 'Configure just new hosts, default is configure \ + the whole provision.' } DUMP = { - :name => "dump", - :large => "--dump", - :description => "Dump the configuration file result." + :name => 'dump', + :large => '--dump', + :description => 'Dump the configuration file result.' } - MODES = CommandParser::OPTIONS - [ CommandParser::VERBOSE ] + [ + MODES = CommandParser::OPTIONS - [CommandParser::VERBOSE] + [ VERBOSE, DEBUG, BATCH, - FAIL_RETRY, FAIL_CLEANUP, FAIL_SKIP, FAIL_QUIT ] + FAIL_RETRY, FAIL_CLEANUP, FAIL_SKIP, FAIL_QUIT + ] - CREATE_OPTIONS = [ THREADS, MODES, PING_TIMEOUT, PING_RETRIES] + CREATE_OPTIONS = [THREADS, MODES, PING_TIMEOUT, PING_RETRIES] ######################################################################## # Formatters for arguments ######################################################################## set :format, :hostid, CommonHelper.to_id_desc do |arg| - $host_helper.to_id(arg) + @host_helper.to_id(arg) end set :format, :hostid_list, CommonHelper.list_to_id_desc do |arg| - $host_helper.list_to_id(arg) + @host_helper.list_to_id(arg) end ######################################################################## @@ -209,10 +214,10 @@ CommandParser::CmdParser.new(ARGV) do Provision a new cluster via bare metal provider EOT - command :create, create_desc, :config, :options=>CREATE_OPTIONS do - $common_helper.get_mode(options) + command :create, create_desc, :config, :options => CREATE_OPTIONS do + @common_helper.get_mode(options) - $provision_helper.create(args[0], options) + @provision_helper.create(args[0], options) 0 end @@ -223,8 +228,8 @@ CommandParser::CmdParser.new(ARGV) do Validate configuration file EOT - command :validate, validate_desc, [:config_file], :options=>DUMP do - $common_helper.validate_configuration(args[0], options) + command :validate, validate_desc, [:config_file], :options => DUMP do + @common_helper.validate_configuration(args[0], options) 0 end @@ -235,11 +240,14 @@ CommandParser::CmdParser.new(ARGV) do List all avaliable provisions EOT - #TODO add xml option - command :list, provision_list_desc, :options=>CommandParser::OPTIONS+CLIHelper::OPTIONS do - columns = ['clusters', 'hosts', 'networks', 'datastores'] + # TODO: add xml option + command :list, provision_list_desc, + :options => CommandParser::OPTIONS + CLIHelper::OPTIONS do + columns = %w[clusters hosts networks datastores] - $provision_helper.format_pool(options).show($provision_helper.get_list(columns, true), options) + @provision_helper.format_pool(options) + .show(@provision_helper.get_list(columns, true), + options) 0 end @@ -250,8 +258,9 @@ CommandParser::CmdParser.new(ARGV) do Show provision details EOT - command :show, provision_show_desc, [:provisionid], :options=>CommandParser::OPTIONS do - $provision_helper.show(args[0], options) + command :show, provision_show_desc, + [:provisionid], :options => CommandParser::OPTIONS do + @provision_helper.show(args[0], options) 0 end @@ -262,43 +271,27 @@ CommandParser::CmdParser.new(ARGV) do Run configuration in all provision hosts EOT - command :configure, provision_configure_desc, :provisionid, :options=>[MODES,FORCE] do - $common_helper.get_mode(options) + command :configure, provision_configure_desc, + :provisionid, :options => [MODES, FORCE] do + @common_helper.get_mode(options) - $provision_helper.configure(args[0], options) + @provision_helper.configure(args[0], options) 0 end - ### - -=begin - provision_update_desc = <<-EOT - Update the provision, adding more resources - EOT - - command :update, provision_update_desc, :provisionid, :config, :options=>[CREATE_OPTIONS, INCREMENTAL] do - $common_helper.get_mode(options) - - $provision_helper.update(args[0], args[1], options) - - 0 - end -=end - - ### - provision_delete_desc = <<-EOT Deletes and unprovisions all the resources EOT - command :delete, provision_delete_desc, :provisionid, :options=>[MODES,THREADS,DELETE_ALL] do - $common_helper.get_mode(options) + command :delete, provision_delete_desc, :provisionid, + :options => [MODES, THREADS, DELETE_ALL] do + @common_helper.get_mode(options) provision = Provision.new(args[0]) provision.refresh - provision.delete((options.has_key? :delete_all)) + provision.delete((options.key? :delete_all)) 0 end @@ -311,10 +304,15 @@ CommandParser::CmdParser.new(ARGV) do List all availables clusters EOT - command [:cluster, :list], cluster_list_desc, :options=>CommandParser::OPTIONS+CLIHelper::OPTIONS+OpenNebulaHelper::OPTIONS + [OpenNebulaHelper::DESCRIBE] do - columns = ['hosts', 'networks', 'datastores'] + command [:cluster, :list], cluster_list_desc, + :options => CommandParser::OPTIONS + CLIHelper::OPTIONS + + OpenNebulaHelper::OPTIONS + + [OpenNebulaHelper::DESCRIBE] do + columns = %w[hosts networks datastores] - $cluster_helper.format_pool(options).show($provision_helper.get_list(columns, false), options) + @cluster_helper.format_pool(options) + .show(@provision_helper.get_list(columns, false), + options) 0 end @@ -325,14 +323,17 @@ CommandParser::CmdParser.new(ARGV) do Deletes and unprovisions the given cluster EOT - command [:cluster, :delete], cluster_delete_desc, [:range,:clusterid_list], :options=>[MODES,FORCE] do - $common_helper.get_mode(options) + command [:cluster, :delete], cluster_delete_desc, + [:range, :clusterid_list], :options => [MODES, FORCE] do + @common_helper.get_mode(options) - $cluster_helper.perform_actions(args[0],options,"deleted") do |cluster| + @cluster_helper.perform_actions(args[0], + options, + 'deleted') do |cluster| rc = cluster.delete if OpenNebula.is_error?(rc) - $common_helper.fail(rc.message) + @common_helper.fail(rc.message) end end @@ -343,31 +344,16 @@ CommandParser::CmdParser.new(ARGV) do # Host Commands ######################################################################## -=begin - host_create_desc = <<-EOT.unindent - Create a single host - EOT - - command [:host, :create], create_desc, :config, :options=>CREATE_OPTIONS do - $common_helper.get_mode(options) - - $provision_helper.create(args[0], options) - - 0 - end -=end - - ### - host_resume_desc = <<-EOT.unindent Resume the host EOT - command [:host, :resume], host_resume_desc, [:range,:hostid_list], :options=>MODES do - $common_helper.get_mode(options) + command [:host, :resume], host_resume_desc, + [:range, :hostid_list], :options => MODES do + @common_helper.get_mode(options) - $host_helper.perform_actions(args[0],options,"enabled") do |host| - $host_helper.resume_host(host) + @host_helper.perform_actions(args[0], options, 'enabled') do |host| + @host_helper.resume_host(host) end end @@ -377,11 +363,12 @@ CommandParser::CmdParser.new(ARGV) do Power off the host EOT - command [:host, :poweroff], host_poweroff_desc, [:range,:hostid_list], :options=>MODES do - $common_helper.get_mode(options) + command [:host, :poweroff], host_poweroff_desc, + [:range, :hostid_list], :options => MODES do + @common_helper.get_mode(options) - $host_helper.perform_actions(args[0],options,"disabled") do |host| - $host_helper.poweroff_host(host) + @host_helper.perform_actions(args[0], options, 'disabled') do |host| + @host_helper.poweroff_host(host) end end @@ -391,11 +378,12 @@ CommandParser::CmdParser.new(ARGV) do Reboot the host EOT - command [:host, :reboot], host_reboot_desc, [:range,:hostid_list], :options=>[MODES, HARD] do - $common_helper.get_mode(options) + command [:host, :reboot], host_reboot_desc, + [:range, :hostid_list], :options => [MODES, HARD] do + @common_helper.get_mode(options) - $host_helper.perform_actions(args[0],options,"enabled") do |host| - $host_helper.reboot_host(host, options) + @host_helper.perform_actions(args[0], options, 'enabled') do |host| + @host_helper.reboot_host(host, options) end end @@ -405,16 +393,17 @@ CommandParser::CmdParser.new(ARGV) do Unprovisions and deletes the given Host EOT - command [:host, :delete], host_delete_desc, [:range,:hostid_list], :options=>MODES do - $common_helper.get_mode(options) + command [:host, :delete], host_delete_desc, + [:range, :hostid_list], :options => MODES do + @common_helper.get_mode(options) - $host_helper.perform_actions(args[0],options,"deleted") do |host| + @host_helper.perform_actions(args[0], options, 'deleted') do |host| host.info begin - $host_helper.delete_host(host) - rescue => e - $common_helper.fail("Delete failed on exception: #{e.to_s}") + @host_helper.delete_host(host) + rescue StandardError => e + @common_helper.fail("Delete failed on exception: #{e}") end end end @@ -425,11 +414,12 @@ CommandParser::CmdParser.new(ARGV) do Run configuration on the host EOT - command [:host, :configure], host_configure_desc, [:range,:hostid_list], :options=>[MODES,FORCE] do - $common_helper.get_mode(options) + command [:host, :configure], host_configure_desc, + [:range, :hostid_list], :options => [MODES, FORCE] do + @common_helper.get_mode(options) - $host_helper.perform_actions(args[0],options,"configured") do |host| - $host_helper.configure_host([host], options) + @host_helper.perform_actions(args[0], options, 'configured') do |host| + @host_helper.configure_host([host], options) end end @@ -439,9 +429,10 @@ CommandParser::CmdParser.new(ARGV) do Establish SSH conection to the host EOT - command [:host, :ssh], host_ssh_desc, :hostid, [:command, nil], :options=>CommandParser::OPTIONS do - $host_helper.perform_action(args[0],options,"") do |host| - $host_helper.ssh_host(host, args) + command [:host, :ssh], host_ssh_desc, :hostid, [:command, nil], + :options => CommandParser::OPTIONS do + @host_helper.perform_action(args[0], options, '') do |host| + @host_helper.ssh_host(host, args) end end @@ -451,12 +442,15 @@ CommandParser::CmdParser.new(ARGV) do Lists bare metal Hosts in the pool EOT - command [:host, :list], host_list_desc, :options=>CommandParser::OPTIONS+CLIHelper::OPTIONS+OpenNebulaHelper::OPTIONS + [OpenNebulaHelper::DESCRIBE] do - if !options.has_key? :filter - options.merge!(filter: ["PROVIDER!=-"]) + command [:host, :list], host_list_desc, + :options => CommandParser::OPTIONS + CLIHelper::OPTIONS + + OpenNebulaHelper::OPTIONS + + [OpenNebulaHelper::DESCRIBE] do + if !options.key? :filter + options[:filter] = ['PROVIDER!=-'] end - $host_helper.list_pool(options) + @host_helper.list_pool(options) end ### @@ -465,12 +459,14 @@ CommandParser::CmdParser.new(ARGV) do Lists bare metal Hosts continuously EOT - command [:host, :top], host_top_desc, :options=>CommandParser::OPTIONS+CLIHelper::OPTIONS+OpenNebulaHelper::OPTIONS do - if !options.has_key? :filter - options.merge!(filter: ["PROVIDER!=-"]) + command [:host, :top], host_top_desc, + :options => CommandParser::OPTIONS + + CLIHelper::OPTIONS + OpenNebulaHelper::OPTIONS do + if !options.key? :filter + options[:filter] = ['PROVIDER!=-'] end - $host_helper.list_pool(options, true) + @host_helper.list_pool(options, true) end ######################################################################## @@ -481,8 +477,15 @@ CommandParser::CmdParser.new(ARGV) do List all availables datastores EOT - command [:datastore, :list], datastore_list_desc, :options=>CommandParser::OPTIONS+CLIHelper::OPTIONS+OpenNebulaHelper::OPTIONS + [OpenNebulaHelper::DESCRIBE] do - $datastore_helper.format_pool(options).show($provision_helper.get_provision_resources(['datastores']), options) + command [:datastore, :list], datastore_list_desc, + :options => CommandParser::OPTIONS + + CLIHelper::OPTIONS + + OpenNebulaHelper::OPTIONS + + [OpenNebulaHelper::DESCRIBE] do + @datastore_helper.format_pool(options) + .show(@provision_helper + .get_provision_resources(['datastores']), + options) 0 end @@ -493,11 +496,13 @@ CommandParser::CmdParser.new(ARGV) do Deletes and unprovisions the given datastore EOT - command [:datastore, :delete], datastore_delete_desc, [:range,:datastoreid_list], :options=>[MODES,FORCE] do - $common_helper.get_mode(options) + command [:datastore, :delete], datastore_delete_desc, + [:range, :datastoreid_list], :options => [MODES, FORCE] do + @common_helper.get_mode(options) - $datastore_helper.perform_actions(args[0],options,"deleted") do |datastore| - $logger.info("Deleting datastore #{datastore['ID']}") + @datastore_helper + .perform_actions(args[0], options, 'deleted') do |datastore| + @logger.info("Deleting datastore #{datastore['ID']}") datastore.delete end @@ -513,8 +518,15 @@ CommandParser::CmdParser.new(ARGV) do List all availables virtual networks EOT - command [:vnet, :list], vnet_list_desc, :options=>CommandParser::OPTIONS+CLIHelper::OPTIONS+OpenNebulaHelper::OPTIONS + [OpenNebulaHelper::DESCRIBE] do - $vnet_helper.format_pool(options).show($provision_helper.get_provision_resources(['networks']), options) + command [:vnet, :list], vnet_list_desc, + :options => CommandParser::OPTIONS + + CLIHelper::OPTIONS + + OpenNebulaHelper::OPTIONS + + [OpenNebulaHelper::DESCRIBE] do + @vnet_helper.format_pool(options) + .show(@provision_helper + .get_provision_resources(['networks']), + options) 0 end @@ -525,11 +537,12 @@ CommandParser::CmdParser.new(ARGV) do Deletes and unprovisions the given virtual network EOT - command [:vnet, :delete], vnet_delete_desc, [:range,:vnetid_list], :options=>[MODES,FORCE] do - $common_helper.get_mode(options) + command [:vnet, :delete], vnet_delete_desc, + [:range, :vnetid_list], :options => [MODES, FORCE] do + @common_helper.get_mode(options) - $vnet_helper.perform_actions(args[0],options,"deleted") do |vnet| - $logger.info("Deleting vnet #{vnet['ID']}") + @vnet_helper.perform_actions(args[0], options, 'deleted') do |vnet| + @logger.info("Deleting vnet #{vnet['ID']}") vnet.delete end diff --git a/src/cli/onesecgroup b/src/cli/onesecgroup index bf487fe24e..b2d05c70a1 100755 --- a/src/cli/onesecgroup +++ b/src/cli/onesecgroup @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/oneshowback b/src/cli/oneshowback index d8a7b5ca5a..3dfc2ab4ef 100755 --- a/src/cli/oneshowback +++ b/src/cli/oneshowback @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/onetemplate b/src/cli/onetemplate index bbb254a427..2f5031705b 100755 --- a/src/cli/onetemplate +++ b/src/cli/onetemplate @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -259,6 +259,8 @@ CommandParser::CmdParser.new(ARGV) do extra_template << "\n#{user_inputs}" + extra_template.strip! + persistent = !options[:persistent].nil? res = t.instantiate(name, on_hold, extra_template, persistent) diff --git a/src/cli/oneuser b/src/cli/oneuser index a6d1066369..fd3bd2de53 100755 --- a/src/cli/oneuser +++ b/src/cli/oneuser @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/onevcenter b/src/cli/onevcenter index 26ef0e6bc8..b3b7126cfd 100755 --- a/src/cli/onevcenter +++ b/src/cli/onevcenter @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/onevdc b/src/cli/onevdc index 01d994ae89..26d16862af 100755 --- a/src/cli/onevdc +++ b/src/cli/onevdc @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/onevm b/src/cli/onevm index 397b878353..ed23765ad7 100755 --- a/src/cli/onevm +++ b/src/cli/onevm @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -557,8 +557,10 @@ CommandParser::CmdParser.new(ARGV) do EOT command :migrate, migrate_desc, [:range, :vmid_list], :hostid, - [:datastoreid, nil], :options => [ENFORCE, OneVMHelper::LIVE, - OneVMHelper::POFF, OneVMHelper::POFFHARD] do + [:datastoreid, nil], :options => [ENFORCE, + OneVMHelper::LIVE, + OneVMHelper::POFF, + OneVMHelper::POFFHARD] do host_id = args[1] verbose = "migrating to #{host_id}" @@ -795,7 +797,8 @@ CommandParser::CmdParser.new(ARGV) do if ip if !nic_alias && !nic_name - template = "NIC = [ NETWORK_ID = #{network_id}, IP = #{ip} ]" + template = "NIC = [ NETWORK_ID = #{network_id},\ + IP = #{ip} ]" elsif !nic_alias && nic_name template = "NIC = [ NETWORK_ID = #{network_id}, IP = #{ip}, @@ -1044,8 +1047,28 @@ CommandParser::CmdParser.new(ARGV) do command :list, list_desc, [:filterflag, nil], :options => CLIHelper::OPTIONS + OpenNebulaHelper::OPTIONS + - [OpenNebulaHelper::DESCRIBE] do - helper.list_pool(options, false, args[0]) + [OpenNebulaHelper::DESCRIBE] + [OneVMHelper::SEARCH] do + if !options[:search] + helper.list_pool(options, false, args[0]) + else + table = helper.format_pool(options) + pool = OpenNebula::VirtualMachinePool.new(OneVMHelper.get_client) + + rc = pool.info_search(:query => options[:search]) + + if !rc.nil? + puts rc.message + exit(-1) + end + + if options[:xml] + puts pool.to_xml + else + table.show(pool.to_hash, options) + end + + 0 + end end show_desc = <<-EOT.unindent @@ -1125,14 +1148,15 @@ CommandParser::CmdParser.new(ARGV) do state, valid states are: pending, failure, poweroff, undeploy, hold or cloning. - This command accepts a template file or opens an editor, the full list of - configuration attributes are: + This command accepts a template file or opens an editor, the full list + of configuration attributes are: - OS = ["ARCH", "MACHINE", "KERNEL", "INITRD", "BOOTLOADER", "BOOT"] - FEATURES = ["ACPI", "PAE", "APIC", "LOCALTIME", "HYPERV", "GUEST_AGENT"] - INPUT = ["TYPE", "BUS"] - GRAPHICS = ["TYPE", "LISTEN", "PASSWD", "KEYMAP" ] - RAW = ["DATA", "DATA_VMX", "TYPE"] + OS = ["ARCH", "MACHINE", "KERNEL", "INITRD", "BOOTLOADER", "BOOT"] + FEATURES = ["ACPI", "PAE", "APIC", "LOCALTIME", "HYPERV", "GUEST_AGENT"] + INPUT = ["TYPE", "BUS"] + GRAPHICS = ["TYPE", "LISTEN", "PASSWD", "KEYMAP" ] + RAW = ["DATA", "DATA_VMX", "TYPE"] + CPU_MODEL = ["MODEL"] CONTEXT (any value, **variable substitution will be made**) EOT @@ -1153,7 +1177,8 @@ CommandParser::CmdParser.new(ARGV) do template = vm.template_like_str('TEMPLATE', true, 'OS | FEATURES | INPUT | '\ - 'GRAPHICS | RAW | CONTEXT') + 'GRAPHICS | RAW | CONTEXT | '\ + 'CPU_MODEL') template = OpenNebulaHelper.editor_input(template) end @@ -1162,8 +1187,8 @@ CommandParser::CmdParser.new(ARGV) do end lock_desc = <<-EOT.unindent - Locks a VM with differents levels for lock any actions with this VM, show and - monitoring never will be locked. + Locks a VM with differents levels for lock any actions with this VM, + show and monitoring never will be locked. Aalid states are: All. EOT diff --git a/src/cli/onevmgroup b/src/cli/onevmgroup index 9aa5ab207d..53d0a602a3 100755 --- a/src/cli/onevmgroup +++ b/src/cli/onevmgroup @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/onevnet b/src/cli/onevnet index a52ac9f7c7..f9e2eba8b5 100755 --- a/src/cli/onevnet +++ b/src/cli/onevnet @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/onevntemplate b/src/cli/onevntemplate index fa878326c2..647320d78e 100755 --- a/src/cli/onevntemplate +++ b/src/cli/onevntemplate @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -30,7 +30,6 @@ $LOAD_PATH << RUBY_LIB_LOCATION + '/cli' require 'command_parser' require 'one_helper/onevntemplate_helper' require 'one_helper/onevnet_helper' -require 'pry' CommandParser::CmdParser.new(ARGV) do usage '`onevntemplate` [] []' diff --git a/src/cli/onevrouter b/src/cli/onevrouter index 9e1ab23af3..32017fcfca 100755 --- a/src/cli/onevrouter +++ b/src/cli/onevrouter @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cli/onezone b/src/cli/onezone index 8d89d03755..09291b6771 100755 --- a/src/cli/onezone +++ b/src/cli/onezone @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/client/Client.cc b/src/client/Client.cc index 18b7d0a2ca..86c63a2897 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/client/SConstruct b/src/client/SConstruct index f310e56f3f..6f231f28a5 100644 --- a/src/client/SConstruct +++ b/src/client/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/pool # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cloud/common/CloudAuth.rb b/src/cloud/common/CloudAuth.rb index bbd1a4e13c..51b723d34c 100644 --- a/src/cloud/common/CloudAuth.rb +++ b/src/cloud/common/CloudAuth.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cloud/common/CloudAuth/EC2CloudAuth.rb b/src/cloud/common/CloudAuth/EC2CloudAuth.rb index 5b0ac0dded..f13b68da57 100644 --- a/src/cloud/common/CloudAuth/EC2CloudAuth.rb +++ b/src/cloud/common/CloudAuth/EC2CloudAuth.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cloud/common/CloudAuth/OneGateCloudAuth.rb b/src/cloud/common/CloudAuth/OneGateCloudAuth.rb index 34237ea1c0..70c7a9bb32 100644 --- a/src/cloud/common/CloudAuth/OneGateCloudAuth.rb +++ b/src/cloud/common/CloudAuth/OneGateCloudAuth.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cloud/common/CloudAuth/OpenNebulaCloudAuth.rb b/src/cloud/common/CloudAuth/OpenNebulaCloudAuth.rb index ed246d9d2a..92433c44eb 100644 --- a/src/cloud/common/CloudAuth/OpenNebulaCloudAuth.rb +++ b/src/cloud/common/CloudAuth/OpenNebulaCloudAuth.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cloud/common/CloudAuth/RemoteCloudAuth.rb b/src/cloud/common/CloudAuth/RemoteCloudAuth.rb index e0b20a2d33..641c9a0a2a 100644 --- a/src/cloud/common/CloudAuth/RemoteCloudAuth.rb +++ b/src/cloud/common/CloudAuth/RemoteCloudAuth.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2019, OpenNebula Project (OpenNebula.org), C12G Labs # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cloud/common/CloudAuth/SunstoneCloudAuth.rb b/src/cloud/common/CloudAuth/SunstoneCloudAuth.rb index 6cfdf31084..440eb5f251 100644 --- a/src/cloud/common/CloudAuth/SunstoneCloudAuth.rb +++ b/src/cloud/common/CloudAuth/SunstoneCloudAuth.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cloud/common/CloudAuth/X509CloudAuth.rb b/src/cloud/common/CloudAuth/X509CloudAuth.rb index 89492f4d3b..f10f47827e 100644 --- a/src/cloud/common/CloudAuth/X509CloudAuth.rb +++ b/src/cloud/common/CloudAuth/X509CloudAuth.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/cloud/common/CloudClient.rb b/src/cloud/common/CloudClient.rb index abe553ee8f..ce53022955 100644 --- a/src/cloud/common/CloudClient.rb +++ b/src/cloud/common/CloudClient.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -50,7 +50,7 @@ end module CloudClient # OpenNebula version - VERSION = '5.7.80' + VERSION = '5.7.85' # ######################################################################### # Default location for the authentication file @@ -207,7 +207,7 @@ module CloudCLI def version_text version=<::const_iterator it; + map::const_iterator it; oss << "<" << name() << ">"; @@ -102,6 +86,60 @@ void VectorAttribute::to_xml(ostringstream &oss) const oss << ""; } +void VectorAttribute::to_json(std::ostringstream& s) const +{ + if ( attribute_value.empty() ) + { + s << "{}"; + return; + } + + map::const_iterator it = attribute_value.begin(); + bool is_first = true; + + s << "{"; + + for (++it; it!=attribute_value.end(); it++) + { + if ( it->first.empty() ) + { + continue; + } + + if ( !is_first ) + { + s << ","; + } + else + { + is_first = false; + } + + s << "\"" << it->first << "\": "; + one_util::escape_json(it->second, s); + } + + s << "}"; +} + +void VectorAttribute::to_token(std::ostringstream& s) const +{ + map::const_iterator it; + + for (it=attribute_value.begin(); it!=attribute_value.end(); it++) + { + if (it->first.empty() || it->second.empty()) + { + continue; + } + + one_util::escape_token(it->first, s); + s << "="; + one_util::escape_token(it->second, s); + s << std::endl; + } +} + /* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */ diff --git a/src/common/ExtendedAttribute.cc b/src/common/ExtendedAttribute.cc index 3b0f8cb673..10f5d44768 100644 --- a/src/common/ExtendedAttribute.cc +++ b/src/common/ExtendedAttribute.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/common/NebulaUtil.cc b/src/common/NebulaUtil.cc index 6d85cdcf46..39ad93fdf7 100644 --- a/src/common/NebulaUtil.cc +++ b/src/common/NebulaUtil.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -380,6 +380,57 @@ std::string one_util::gsub(const std::string& st, const std::string& sfind, /* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */ +void one_util::escape_json(const std::string& str, std::ostringstream& s) +{ + std::string::const_iterator it; + + s << "\""; + + for (it = str.begin(); it != str.end(); ++it) + { + switch (*it) + { + case '\\': s << "\\\\"; break; + case '"' : s << "\\\""; break; + case '/' : s << "\\/"; break; + case '\b': s << "\\b"; break; + case '\f': s << "\\f"; break; + case '\n': s << "\\n"; break; + case '\r': s << "\\r"; break; + case '\t': s << "\\t"; break; + default : s << *it; + } + } + + s << "\""; +} + +/* -------------------------------------------------------------------------- */ +/* -------------------------------------------------------------------------- */ + +void one_util::escape_token(const std::string& str, std::ostringstream& s) +{ + std::string::const_iterator it; + + for (it = str.begin(); it != str.end(); ++it) + { + switch (*it) + { + case '-': + case '_': + case '.': + case ':': + s << '_'; + break; + default : + s << *it; + } + } +} + +/* -------------------------------------------------------------------------- */ +/* -------------------------------------------------------------------------- */ + namespace one_util { template<> diff --git a/src/common/SConstruct b/src/common/SConstruct index fdf064a0aa..54eca5926c 100644 --- a/src/common/SConstruct +++ b/src/common/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/common # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/datastore/Datastore.cc b/src/datastore/Datastore.cc index 0b5429b2b3..27a269f380 100644 --- a/src/datastore/Datastore.cc +++ b/src/datastore/Datastore.cc @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -326,6 +326,8 @@ int Datastore::set_tm_mad(string &tm_mad, string &error_str) ostringstream oss; std::stringstream ss; + string orph; + if ( Nebula::instance().get_tm_conf_attribute(tm_mad, vatt) != 0 ) { goto error_conf; @@ -443,11 +445,9 @@ int Datastore::set_tm_mad(string &tm_mad, string &error_str) remove_template_attribute("SHARED"); } - bool orph; - if ( vatt->vector_value("ALLOW_ORPHANS", orph) == -1 ) { - orph = false; + orph = "NO"; } replace_template_attribute("ALLOW_ORPHANS", orph); diff --git a/src/datastore/DatastorePool.cc b/src/datastore/DatastorePool.cc index d90a1b9622..45b028f874 100644 --- a/src/datastore/DatastorePool.cc +++ b/src/datastore/DatastorePool.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/datastore/SConstruct b/src/datastore/SConstruct index 144903bf69..f3056f430d 100644 --- a/src/datastore/SConstruct +++ b/src/datastore/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/datastore # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/datastore_mad/one_datastore b/src/datastore_mad/one_datastore index 75e17a25a1..53c008ed0d 100755 --- a/src/datastore_mad/one_datastore +++ b/src/datastore_mad/one_datastore @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/datastore_mad/one_datastore.rb b/src/datastore_mad/one_datastore.rb index 313b37910d..7f3b2e0a56 100755 --- a/src/datastore_mad/one_datastore.rb +++ b/src/datastore_mad/one_datastore.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- */ -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # Licensed 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 */ diff --git a/src/datastore_mad/remotes/ceph/ceph.conf b/src/datastore_mad/remotes/ceph/ceph.conf index 2f5350d31c..e2587f2adc 100644 --- a/src/datastore_mad/remotes/ceph/ceph.conf +++ b/src/datastore_mad/remotes/ceph/ceph.conf @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/datastore_mad/remotes/ceph/ceph_utils.sh b/src/datastore_mad/remotes/ceph/ceph_utils.sh index e4f1edc83e..68533e89c1 100644 --- a/src/datastore_mad/remotes/ceph/ceph_utils.sh +++ b/src/datastore_mad/remotes/ceph/ceph_utils.sh @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2019, OpenNebula Project (OpenNebula.org), C12G Labs # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/datastore_mad/remotes/ceph/clone b/src/datastore_mad/remotes/ceph/clone index fa09222003..1d73e27f5e 100755 --- a/src/datastore_mad/remotes/ceph/clone +++ b/src/datastore_mad/remotes/ceph/clone @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/datastore_mad/remotes/ceph/cp b/src/datastore_mad/remotes/ceph/cp index 60d93f25e8..61f207ba70 100755 --- a/src/datastore_mad/remotes/ceph/cp +++ b/src/datastore_mad/remotes/ceph/cp @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/datastore_mad/remotes/ceph/export b/src/datastore_mad/remotes/ceph/export index 10c4f1908d..577f9dca73 100755 --- a/src/datastore_mad/remotes/ceph/export +++ b/src/datastore_mad/remotes/ceph/export @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/datastore_mad/remotes/ceph/mkfs b/src/datastore_mad/remotes/ceph/mkfs index 90a141578a..56a6d8e933 100755 --- a/src/datastore_mad/remotes/ceph/mkfs +++ b/src/datastore_mad/remotes/ceph/mkfs @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/datastore_mad/remotes/ceph/monitor b/src/datastore_mad/remotes/ceph/monitor index e62a75187c..f7cd30a64c 100755 --- a/src/datastore_mad/remotes/ceph/monitor +++ b/src/datastore_mad/remotes/ceph/monitor @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/datastore_mad/remotes/ceph/rm b/src/datastore_mad/remotes/ceph/rm index bdbfb89246..47cba0c4d1 100755 --- a/src/datastore_mad/remotes/ceph/rm +++ b/src/datastore_mad/remotes/ceph/rm @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/datastore_mad/remotes/ceph/snap_delete b/src/datastore_mad/remotes/ceph/snap_delete index 0147e1884b..ffa5147b70 100755 --- a/src/datastore_mad/remotes/ceph/snap_delete +++ b/src/datastore_mad/remotes/ceph/snap_delete @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/datastore_mad/remotes/ceph/snap_flatten b/src/datastore_mad/remotes/ceph/snap_flatten index b4a102b13a..357b5fb54d 100755 --- a/src/datastore_mad/remotes/ceph/snap_flatten +++ b/src/datastore_mad/remotes/ceph/snap_flatten @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/datastore_mad/remotes/ceph/snap_revert b/src/datastore_mad/remotes/ceph/snap_revert index ffedded537..432adbced2 100755 --- a/src/datastore_mad/remotes/ceph/snap_revert +++ b/src/datastore_mad/remotes/ceph/snap_revert @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -49,6 +49,7 @@ while IFS= read -r -d '' element; do XPATH_ELEMENTS[i++]="$element" done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/POOL_NAME \ + /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/EC_POOL_NAME \ /DS_DRIVER_ACTION_DATA/IMAGE/SOURCE \ /DS_DRIVER_ACTION_DATA/IMAGE/TARGET_SNAPSHOT \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/CEPH_USER \ @@ -59,6 +60,7 @@ unset i BRIDGE_LIST="${XPATH_ELEMENTS[i++]}" POOL_NAME="${XPATH_ELEMENTS[i++]:-$POOL_NAME}" +EC_POOL_NAME="${XPATH_ELEMENTS[i++]}" RBD_SRC="${XPATH_ELEMENTS[i++]}" SNAP_ID="${XPATH_ELEMENTS[i++]}" CEPH_USER="${XPATH_ELEMENTS[i++]}" @@ -84,6 +86,10 @@ if [ -n "$CEPH_CONF" ]; then RBD="$RBD --conf ${CEPH_CONF}" fi +if [ -n "$EC_POOL_NAME" ]; then + EC_POOL_OPT="--data-pool ${EC_POOL_NAME}" +fi + SNAP_REVERT_CMD=$(cat </dev/null) + + if [ $? -eq 0 ]; then + OFF_HOSTS_ARRAY=($( echo "$OFF_HOSTS_STR" | awk -F, '{ if (NR>1) print $1 }')) + for HOST in "${ALL_HOSTS_ARRAY[@]}"; do + OFF=false + for OFF_HOST in "${OFF_HOSTS_ARRAY[@]}"; do + [ $HOST = $OFF_HOST ] && { OFF=true; break; } + done + $OFF || echo -ne "$HOST " + done + else + # onehost cmd failed, can't filter anything, better return unchanged + echo $1 + return 1 + fi +} + #------------------------------------------------------------------------------- # Gets the host to be used as bridge to talk to the storage system # Implements a round robin for the bridges @@ -458,7 +485,14 @@ function check_restricted { # @return host to be used as bridge #------------------------------------------------------------------------------- function get_destination_host { - HOSTS_ARRAY=($BRIDGE_LIST) + REDUCED_LIST=$(remove_off_hosts "$BRIDGE_LIST") + + if [ -z "$REDUCED_LIST" -a -n "$BRIDGE_LIST" ]; then + error_message "All hosts from 'BRIDGE_LIST' are offline, error or disabled" + exit -1 + fi + + HOSTS_ARRAY=($REDUCED_LIST) N_HOSTS=${#HOSTS_ARRAY[@]} if [ -n "$1" ]; then diff --git a/src/datastore_mad/remotes/lxd_downloader.sh b/src/datastore_mad/remotes/lxd_downloader.sh index 6dca305115..d81f5a5bf9 100755 --- a/src/datastore_mad/remotes/lxd_downloader.sh +++ b/src/datastore_mad/remotes/lxd_downloader.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/datastore_mad/remotes/url.rb b/src/datastore_mad/remotes/url.rb index 0fe1eab412..f186f91921 100755 --- a/src/datastore_mad/remotes/url.rb +++ b/src/datastore_mad/remotes/url.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- */ -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # Licensed 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 */ diff --git a/src/datastore_mad/remotes/vcenter/clone b/src/datastore_mad/remotes/vcenter/clone index e537e6c37a..762e98db82 100755 --- a/src/datastore_mad/remotes/vcenter/clone +++ b/src/datastore_mad/remotes/vcenter/clone @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -73,7 +73,9 @@ begin rescue Exception => e message = "Error cloning img #{src_path} to #{target_ds_name}"\ " Reason: \"#{e.message}\"\n#{e.backtrace}" - STDERR.puts error_message(message) + OpenNebula.log_error(message) + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit -1 ensure vi_client.close_connection if vi_client diff --git a/src/datastore_mad/remotes/vcenter/cp b/src/datastore_mad/remotes/vcenter/cp index 32c675fbd0..9ec3fd4830 100755 --- a/src/datastore_mad/remotes/vcenter/cp +++ b/src/datastore_mad/remotes/vcenter/cp @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/datastore_mad/remotes/vcenter/export b/src/datastore_mad/remotes/vcenter/export index 348a51e268..a3b581e47f 100755 --- a/src/datastore_mad/remotes/vcenter/export +++ b/src/datastore_mad/remotes/vcenter/export @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/datastore_mad/remotes/vcenter/mkfs b/src/datastore_mad/remotes/vcenter/mkfs index 92ef69df48..09e48c441f 100755 --- a/src/datastore_mad/remotes/vcenter/mkfs +++ b/src/datastore_mad/remotes/vcenter/mkfs @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -75,7 +75,9 @@ begin rescue Exception => e message = "Error creating virtual disk #{img_name}."\ " Reason: \"#{e.message}\"\n#{e.backtrace}" - STDERR.puts error_message(message) + OpenNebula.log_error(message) + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit -1 ensure vi_client.close_connection if vi_client diff --git a/src/datastore_mad/remotes/vcenter/monitor b/src/datastore_mad/remotes/vcenter/monitor index 4752df01dd..ad2eec3b5c 100755 --- a/src/datastore_mad/remotes/vcenter/monitor +++ b/src/datastore_mad/remotes/vcenter/monitor @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -61,7 +61,9 @@ begin rescue Exception => e message = "Error monitoring datastore #{id}."\ " Reason: \"#{e.message}\"\n#{e.backtrace}" - STDERR.puts error_message(message) + OpenNebula.log_error(message) + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit -1 ensure vi_client.close_connection if vi_client diff --git a/src/datastore_mad/remotes/vcenter/rm b/src/datastore_mad/remotes/vcenter/rm index d43b8da9cc..8e849adb73 100755 --- a/src/datastore_mad/remotes/vcenter/rm +++ b/src/datastore_mad/remotes/vcenter/rm @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -88,7 +88,9 @@ rescue Exception => e if !e.message.start_with?('FileNotFound') message = "Error deleting virtual disk #{img_src}."\ " Reason: \"#{e.message}\"\n#{e.backtrace}" - STDERR.puts error_message(message) + OpenNebula.log_error(message) + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit -1 end ensure diff --git a/src/datastore_mad/remotes/vcenter/stat b/src/datastore_mad/remotes/vcenter/stat index 7996aa1ed3..8cdd28ef33 100755 --- a/src/datastore_mad/remotes/vcenter/stat +++ b/src/datastore_mad/remotes/vcenter/stat @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/datastore_mad/remotes/vcenter_downloader.rb b/src/datastore_mad/remotes/vcenter_downloader.rb index 18b23be0a1..da3dbb32d1 100755 --- a/src/datastore_mad/remotes/vcenter_downloader.rb +++ b/src/datastore_mad/remotes/vcenter_downloader.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/datastore_mad/remotes/vcenter_uploader.rb b/src/datastore_mad/remotes/vcenter_uploader.rb index 1e0a84db59..f1129ea11b 100755 --- a/src/datastore_mad/remotes/vcenter_uploader.rb +++ b/src/datastore_mad/remotes/vcenter_uploader.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/datastore_mad/remotes/xpath.rb b/src/datastore_mad/remotes/xpath.rb index 2d4ceaba6b..9fcf28b987 100755 --- a/src/datastore_mad/remotes/xpath.rb +++ b/src/datastore_mad/remotes/xpath.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- */ -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # Licensed 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 */ diff --git a/src/dm/DispatchManager.cc b/src/dm/DispatchManager.cc index 8b568a4135..ce54cefb44 100644 --- a/src/dm/DispatchManager.cc +++ b/src/dm/DispatchManager.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/dm/DispatchManagerActions.cc b/src/dm/DispatchManagerActions.cc index 82b791d28e..34314abefa 100644 --- a/src/dm/DispatchManagerActions.cc +++ b/src/dm/DispatchManagerActions.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/dm/DispatchManagerStates.cc b/src/dm/DispatchManagerStates.cc index 7a03e4c311..cb6f33edb0 100644 --- a/src/dm/DispatchManagerStates.cc +++ b/src/dm/DispatchManagerStates.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -314,6 +314,8 @@ void DispatchManager::resubmit_action(int vid) vm->set_state(VirtualMachine::PENDING); + vm->set_deploy_id(""); //reset the deploy-id + vmpool->update(vm); vm->unlock(); diff --git a/src/dm/SConstruct b/src/dm/SConstruct index a41bb33fb9..5f25894982 100644 --- a/src/dm/SConstruct +++ b/src/dm/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/vm # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/docker_machine/SConstruct b/src/docker_machine/SConstruct index bb3d98d60d..6027a5cc3c 100644 --- a/src/docker_machine/SConstruct +++ b/src/docker_machine/SConstruct @@ -1,7 +1,7 @@ # SConstruct for share/scripts/rubygems # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/document/Document.cc b/src/document/Document.cc index a932509109..d7e6fa4e4e 100644 --- a/src/document/Document.cc +++ b/src/document/Document.cc @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/document/SConstruct b/src/document/SConstruct index 095cb9e19d..0bc37943fb 100644 --- a/src/document/SConstruct +++ b/src/document/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/document # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/flow/bin/oneflow-server b/src/flow/bin/oneflow-server index fcee08ed36..2e479894f6 100755 --- a/src/flow/bin/oneflow-server +++ b/src/flow/bin/oneflow-server @@ -1,7 +1,7 @@ #! /bin/sh # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/flow/config.ru b/src/flow/config.ru index c8ae5a04b0..9a13360b66 100644 --- a/src/flow/config.ru +++ b/src/flow/config.ru @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/flow/etc/oneflow-server.conf b/src/flow/etc/oneflow-server.conf index b86fc9f09b..5cc9e7ad14 100644 --- a/src/flow/etc/oneflow-server.conf +++ b/src/flow/etc/oneflow-server.conf @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/flow/lib/LifeCycleManager.rb b/src/flow/lib/LifeCycleManager.rb index 2961d0971e..6bc015cd03 100644 --- a/src/flow/lib/LifeCycleManager.rb +++ b/src/flow/lib/LifeCycleManager.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/flow/lib/grammar.rb b/src/flow/lib/grammar.rb index 1a2edb1662..29ce6a97e8 100644 --- a/src/flow/lib/grammar.rb +++ b/src/flow/lib/grammar.rb @@ -2,7 +2,7 @@ # Autogenerated from a Treetop grammar. Edits may be lost. -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/flow/lib/grammar.treetop b/src/flow/lib/grammar.treetop index 9fcb9d0333..4f02f6ba81 100644 --- a/src/flow/lib/grammar.treetop +++ b/src/flow/lib/grammar.treetop @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/flow/lib/log.rb b/src/flow/lib/log.rb index 9b7bc80c8b..3659bc3815 100644 --- a/src/flow/lib/log.rb +++ b/src/flow/lib/log.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/flow/lib/models.rb b/src/flow/lib/models.rb index 92c61d987a..1a05536a78 100644 --- a/src/flow/lib/models.rb +++ b/src/flow/lib/models.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/flow/lib/models/role.rb b/src/flow/lib/models/role.rb index 78b6b4f5e3..437899f52c 100644 --- a/src/flow/lib/models/role.rb +++ b/src/flow/lib/models/role.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/flow/lib/models/service.rb b/src/flow/lib/models/service.rb index c85fabf058..524213ca96 100644 --- a/src/flow/lib/models/service.rb +++ b/src/flow/lib/models/service.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/flow/lib/models/service_pool.rb b/src/flow/lib/models/service_pool.rb index 3f4d14fe56..c65dc93829 100644 --- a/src/flow/lib/models/service_pool.rb +++ b/src/flow/lib/models/service_pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/flow/lib/models/service_template.rb b/src/flow/lib/models/service_template.rb index 29a6ed6d54..d257895280 100644 --- a/src/flow/lib/models/service_template.rb +++ b/src/flow/lib/models/service_template.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/flow/lib/models/service_template_pool.rb b/src/flow/lib/models/service_template_pool.rb index c531c2cf25..d194fffa21 100644 --- a/src/flow/lib/models/service_template_pool.rb +++ b/src/flow/lib/models/service_template_pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/flow/lib/strategy.rb b/src/flow/lib/strategy.rb index 64b4f70b3e..6784224abc 100644 --- a/src/flow/lib/strategy.rb +++ b/src/flow/lib/strategy.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/flow/lib/strategy/straight.rb b/src/flow/lib/strategy/straight.rb index 4ae0600786..350201d756 100644 --- a/src/flow/lib/strategy/straight.rb +++ b/src/flow/lib/strategy/straight.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/flow/lib/validator.rb b/src/flow/lib/validator.rb index 0cbcf9ce77..ec17dba119 100644 --- a/src/flow/lib/validator.rb +++ b/src/flow/lib/validator.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/flow/oneflow-server.rb b/src/flow/oneflow-server.rb index 44da6ab188..c48f7644b0 100644 --- a/src/flow/oneflow-server.rb +++ b/src/flow/oneflow-server.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/group/Group.cc b/src/group/Group.cc index a853463ad7..4e98786bdd 100644 --- a/src/group/Group.cc +++ b/src/group/Group.cc @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/group/GroupPool.cc b/src/group/GroupPool.cc index 4e79f46956..29a5edaf38 100644 --- a/src/group/GroupPool.cc +++ b/src/group/GroupPool.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/group/SConstruct b/src/group/SConstruct index eecbaf1950..8fca4c4b09 100644 --- a/src/group/SConstruct +++ b/src/group/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/group # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/hm/Hook.cc b/src/hm/Hook.cc index cea1572617..dd6fe93f80 100644 --- a/src/hm/Hook.cc +++ b/src/hm/Hook.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/hm/HookManager.cc b/src/hm/HookManager.cc index 1439df3925..8f4e27111a 100644 --- a/src/hm/HookManager.cc +++ b/src/hm/HookManager.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/hm/HookManagerDriver.cc b/src/hm/HookManagerDriver.cc index 94d0d10be1..c598d0c8b5 100644 --- a/src/hm/HookManagerDriver.cc +++ b/src/hm/HookManagerDriver.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/hm/SConstruct b/src/hm/SConstruct index ac049bd9a0..e9178b7d4c 100755 --- a/src/hm/SConstruct +++ b/src/hm/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/hm # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/hm_mad/hmrc b/src/hm_mad/hmrc index 13cb65f72b..0783c85e6f 100644 --- a/src/hm_mad/hmrc +++ b/src/hm_mad/hmrc @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/hm_mad/one_hm b/src/hm_mad/one_hm index 64fd6cccb2..642cfcd6d0 100755 --- a/src/hm_mad/one_hm +++ b/src/hm_mad/one_hm @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/hm_mad/one_hm.rb b/src/hm_mad/one_hm.rb index 9576696cd6..930be783d9 100755 --- a/src/hm_mad/one_hm.rb +++ b/src/hm_mad/one_hm.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/hm_mad/test/dummy b/src/hm_mad/test/dummy index e0aaf100bb..c627a46645 100755 --- a/src/hm_mad/test/dummy +++ b/src/hm_mad/test/dummy @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/host/Host.cc b/src/host/Host.cc index 0a668c0165..0941813733 100644 --- a/src/host/Host.cc +++ b/src/host/Host.cc @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/host/HostHook.cc b/src/host/HostHook.cc index 8265bcf37e..355a9e8efa 100644 --- a/src/host/HostHook.cc +++ b/src/host/HostHook.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/host/HostPool.cc b/src/host/HostPool.cc index fc3da5e2f7..b5a21f2d2f 100644 --- a/src/host/HostPool.cc +++ b/src/host/HostPool.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/host/HostShare.cc b/src/host/HostShare.cc index 3b8aa94316..8887f51a95 100644 --- a/src/host/HostShare.cc +++ b/src/host/HostShare.cc @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------*/ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/host/SConstruct b/src/host/SConstruct index 90c19a83b6..e7e007a423 100644 --- a/src/host/SConstruct +++ b/src/host/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/vm # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/im/InformationManager.cc b/src/im/InformationManager.cc index 731e360b38..bf84ab1127 100644 --- a/src/im/InformationManager.cc +++ b/src/im/InformationManager.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/im/InformationManagerDriver.cc b/src/im/InformationManagerDriver.cc index b8ca1ea987..043c4a30f8 100644 --- a/src/im/InformationManagerDriver.cc +++ b/src/im/InformationManagerDriver.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/im/MonitorThread.cc b/src/im/MonitorThread.cc index 88c1e65c37..e8cd870ece 100644 --- a/src/im/MonitorThread.cc +++ b/src/im/MonitorThread.cc @@ -1,6 +1,6 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/im/SConstruct b/src/im/SConstruct index 6018962874..f09e32d9ac 100755 --- a/src/im/SConstruct +++ b/src/im/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/im # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/im_mad/collectd/ListenerThread.cc b/src/im_mad/collectd/ListenerThread.cc index f296f2c58e..17cbc1996b 100644 --- a/src/im_mad/collectd/ListenerThread.cc +++ b/src/im_mad/collectd/ListenerThread.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/im_mad/collectd/ListenerThread.h b/src/im_mad/collectd/ListenerThread.h index d18771b3ab..d112519d61 100644 --- a/src/im_mad/collectd/ListenerThread.h +++ b/src/im_mad/collectd/ListenerThread.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/im_mad/collectd/OpenNebulaDriver.cc b/src/im_mad/collectd/OpenNebulaDriver.cc index 25ed1a000f..29645860c3 100644 --- a/src/im_mad/collectd/OpenNebulaDriver.cc +++ b/src/im_mad/collectd/OpenNebulaDriver.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/im_mad/collectd/OpenNebulaDriver.h b/src/im_mad/collectd/OpenNebulaDriver.h index 9350f02e88..224dcce573 100644 --- a/src/im_mad/collectd/OpenNebulaDriver.h +++ b/src/im_mad/collectd/OpenNebulaDriver.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/im_mad/collectd/SConstruct b/src/im_mad/collectd/SConstruct index 83585c0231..6e3786bfea 100644 --- a/src/im_mad/collectd/SConstruct +++ b/src/im_mad/collectd/SConstruct @@ -1,5 +1,5 @@ # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/im_mad/collectd/collectd.cc b/src/im_mad/collectd/collectd.cc index 57712d9a22..9c21f877ee 100644 --- a/src/im_mad/collectd/collectd.cc +++ b/src/im_mad/collectd/collectd.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/im_mad/dummy/one_im_dummy b/src/im_mad/dummy/one_im_dummy index 56122e5dde..12a4af87cb 100755 --- a/src/im_mad/dummy/one_im_dummy +++ b/src/im_mad/dummy/one_im_dummy @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/im_mad/dummy/one_im_dummy.rb b/src/im_mad/dummy/one_im_dummy.rb index 58117faa32..6989ac6d59 100755 --- a/src/im_mad/dummy/one_im_dummy.rb +++ b/src/im_mad/dummy/one_im_dummy.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/im_mad/im_exec/one_im_exec b/src/im_mad/im_exec/one_im_exec index 1ac5f8fdca..363be6ef26 100755 --- a/src/im_mad/im_exec/one_im_exec +++ b/src/im_mad/im_exec/one_im_exec @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/im_mad/im_exec/one_im_exec.rb b/src/im_mad/im_exec/one_im_exec.rb index 11028dc184..d624f85397 100755 --- a/src/im_mad/im_exec/one_im_exec.rb +++ b/src/im_mad/im_exec/one_im_exec.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/im_mad/im_exec/one_im_sh b/src/im_mad/im_exec/one_im_sh index db0c06ace7..70d3c32086 100755 --- a/src/im_mad/im_exec/one_im_sh +++ b/src/im_mad/im_exec/one_im_sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/im_mad/im_exec/one_im_ssh b/src/im_mad/im_exec/one_im_ssh index d9823f6a69..58e91f8fa4 100755 --- a/src/im_mad/im_exec/one_im_ssh +++ b/src/im_mad/im_exec/one_im_ssh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/im_mad/remotes/VERSION b/src/im_mad/remotes/VERSION index ae6a3fad3a..2837ff5135 100644 --- a/src/im_mad/remotes/VERSION +++ b/src/im_mad/remotes/VERSION @@ -1 +1 @@ -5.7.80 \ No newline at end of file +5.7.85 \ No newline at end of file diff --git a/src/im_mad/remotes/az.d/poll b/src/im_mad/remotes/az.d/poll index 4bae48ca7a..61ae3a1d17 100755 --- a/src/im_mad/remotes/az.d/poll +++ b/src/im_mad/remotes/az.d/poll @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/im_mad/remotes/common.d/collectd-client-shepherd.sh b/src/im_mad/remotes/common.d/collectd-client-shepherd.sh index 5582709a7e..28f7288160 100755 --- a/src/im_mad/remotes/common.d/collectd-client-shepherd.sh +++ b/src/im_mad/remotes/common.d/collectd-client-shepherd.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/im_mad/remotes/common.d/collectd-client.rb b/src/im_mad/remotes/common.d/collectd-client.rb index cb3efbb735..b2d218f35c 100644 --- a/src/im_mad/remotes/common.d/collectd-client.rb +++ b/src/im_mad/remotes/common.d/collectd-client.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -88,13 +88,12 @@ class CollectdClient # Collect the Data ts = Time.now - data = run_probes + + # Send signal to itself to run probes and send the data + Process.kill('HUP', $$) run_probes_time = (Time.now - ts).to_i - # Send the Data - send data - # Sleep during the Cycle sleep_time = @monitor_push_period - run_probes_time sleep_time = 0 if sleep_time < 0 @@ -130,4 +129,16 @@ sleep rand monitor_push_period # Start push monitorization client = CollectdClient.new(hypervisor, number, host, port, probes_args, monitor_push_period) + +Signal.trap('HUP') do + # ignore another HUP until we handle this one + this_handler = Signal.trap('HUP', 'IGNORE') + + data = client.run_probes + client.send data + + # set the handler back + Signal.trap('HUP', this_handler) +end + client.monitor diff --git a/src/im_mad/remotes/common.d/collectd-client_control.sh b/src/im_mad/remotes/common.d/collectd-client_control.sh index 1d0d0a1a2c..0a19e93465 100755 --- a/src/im_mad/remotes/common.d/collectd-client_control.sh +++ b/src/im_mad/remotes/common.d/collectd-client_control.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/im_mad/remotes/common.d/monitor_ds.sh b/src/im_mad/remotes/common.d/monitor_ds.sh index 210cce75bf..7c3c4fabd8 100755 --- a/src/im_mad/remotes/common.d/monitor_ds.sh +++ b/src/im_mad/remotes/common.d/monitor_ds.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/im_mad/remotes/common.d/version.sh b/src/im_mad/remotes/common.d/version.sh index 12c7e18dd8..2e496aacc1 100755 --- a/src/im_mad/remotes/common.d/version.sh +++ b/src/im_mad/remotes/common.d/version.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/im_mad/remotes/ec2.d/poll b/src/im_mad/remotes/ec2.d/poll index 2e247a6803..430cae87f1 100755 --- a/src/im_mad/remotes/ec2.d/poll +++ b/src/im_mad/remotes/ec2.d/poll @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/im_mad/remotes/kvm-probes.d/kvm.rb b/src/im_mad/remotes/kvm-probes.d/kvm.rb index bc6129560d..d698c7f5f3 100755 --- a/src/im_mad/remotes/kvm-probes.d/kvm.rb +++ b/src/im_mad/remotes/kvm-probes.d/kvm.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/im_mad/remotes/kvm-probes.d/machines-models.rb b/src/im_mad/remotes/kvm-probes.d/machines-models.rb index ae54428fd2..ad559b565f 100755 --- a/src/im_mad/remotes/kvm-probes.d/machines-models.rb +++ b/src/im_mad/remotes/kvm-probes.d/machines-models.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -30,14 +30,9 @@ begin machines = [] models = [] - Open3.popen3("virsh -r -c qemu:///system capabilities") {|i, o, e, t| - if t.value.exitstatus != 0 - exit -1 - end - - capabilities = o.read - } - + cmd = 'virsh -r -c qemu:///system capabilities' + capabilities, e, s = Open3.capture3(cmd) + exit(-1) unless s.success? cap_xml = REXML::Document.new(capabilities) cap_xml = cap_xml.root @@ -94,12 +89,9 @@ begin end } - cpu_models = "" - Open3.popen3("virsh -r -c qemu:///system cpu-models #{a}") {|i, o, e, t| - break if t.value.exitstatus != 0 - - cpu_models = o.read - } + cmd = "virsh -r -c qemu:///system cpu-models #{a}" + cpu_models, e, s = Open3.capture3(cmd) + break unless s.success? cpu_models.each_line { |l| l.chomp! diff --git a/src/im_mad/remotes/kvm-probes.d/poll.sh b/src/im_mad/remotes/kvm-probes.d/poll.sh index cfc78c1432..2167154876 100755 --- a/src/im_mad/remotes/kvm-probes.d/poll.sh +++ b/src/im_mad/remotes/kvm-probes.d/poll.sh @@ -1,7 +1,7 @@ #!/bin/sh # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/im_mad/remotes/lxd-probes.d/lxd.rb b/src/im_mad/remotes/lxd-probes.d/lxd.rb index dc76bf5460..e7193077d1 100755 --- a/src/im_mad/remotes/lxd-probes.d/lxd.rb +++ b/src/im_mad/remotes/lxd-probes.d/lxd.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/im_mad/remotes/lxd-probes.d/poll.sh b/src/im_mad/remotes/lxd-probes.d/poll.sh index 67aabc65db..d10f2ec459 100755 --- a/src/im_mad/remotes/lxd-probes.d/poll.sh +++ b/src/im_mad/remotes/lxd-probes.d/poll.sh @@ -1,7 +1,7 @@ #!/bin/sh # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/im_mad/remotes/lxd-probes.d/profiles.sh b/src/im_mad/remotes/lxd-probes.d/profiles.sh new file mode 100755 index 0000000000..860b0b8819 --- /dev/null +++ b/src/im_mad/remotes/lxd-probes.d/profiles.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +cmd='lxc profile list' + +profiles=$($cmd | grep -v -- -+- | grep -v NAME | grep -v default | awk '{print $2}') + +if [ "$?" -ne "0" ]; then + profiles=$(sudo $cmd | grep -v -- -+- | grep -v NAME | grep -v default | awk '{print $2}') +fi + +tmpfile=$(mktemp /tmp/lxd_probe.XXXXXX) + +echo "$profiles" > "$tmpfile" +out=$(tr '\n' ' ' < "$tmpfile") +out=${out::-1} + +echo -e LXD_PROFILES=\""$out"\" + +rm "$tmpfile" diff --git a/src/im_mad/remotes/node-probes.d/architecture.sh b/src/im_mad/remotes/node-probes.d/architecture.sh index 572112e00d..2f2b6720de 100755 --- a/src/im_mad/remotes/node-probes.d/architecture.sh +++ b/src/im_mad/remotes/node-probes.d/architecture.sh @@ -1,7 +1,7 @@ #!/bin/sh # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/im_mad/remotes/node-probes.d/cpu.sh b/src/im_mad/remotes/node-probes.d/cpu.sh index 7e1f23ab90..0cdbf0706a 100755 --- a/src/im_mad/remotes/node-probes.d/cpu.sh +++ b/src/im_mad/remotes/node-probes.d/cpu.sh @@ -1,7 +1,7 @@ #!/bin/sh # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/im_mad/remotes/node-probes.d/name.sh b/src/im_mad/remotes/node-probes.d/name.sh index 9feaa2d414..14f260412d 100755 --- a/src/im_mad/remotes/node-probes.d/name.sh +++ b/src/im_mad/remotes/node-probes.d/name.sh @@ -1,7 +1,7 @@ #!/bin/sh # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/im_mad/remotes/node-probes.d/pci.conf b/src/im_mad/remotes/node-probes.d/pci.conf index e36881c3ee..63d2599772 100644 --- a/src/im_mad/remotes/node-probes.d/pci.conf +++ b/src/im_mad/remotes/node-probes.d/pci.conf @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/im_mad/remotes/node-probes.d/pci.rb b/src/im_mad/remotes/node-probes.d/pci.rb index 5d37d31ded..443d1682b0 100755 --- a/src/im_mad/remotes/node-probes.d/pci.rb +++ b/src/im_mad/remotes/node-probes.d/pci.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/im_mad/remotes/one.d/poll b/src/im_mad/remotes/one.d/poll index ef342bf18c..a730029ace 100755 --- a/src/im_mad/remotes/one.d/poll +++ b/src/im_mad/remotes/one.d/poll @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/im_mad/remotes/packet.d/poll b/src/im_mad/remotes/packet.d/poll index 066fbcd336..64e83b7901 100755 --- a/src/im_mad/remotes/packet.d/poll +++ b/src/im_mad/remotes/packet.d/poll @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/im_mad/remotes/packet.d/version.sh b/src/im_mad/remotes/packet.d/version.sh index 12c7e18dd8..2e496aacc1 100755 --- a/src/im_mad/remotes/packet.d/version.sh +++ b/src/im_mad/remotes/packet.d/version.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/im_mad/remotes/run_probes b/src/im_mad/remotes/run_probes index 1720a5c4be..239546b1b0 100755 --- a/src/im_mad/remotes/run_probes +++ b/src/im_mad/remotes/run_probes @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/im_mad/remotes/stop_probes b/src/im_mad/remotes/stop_probes index bfb24bd813..873fb3d39a 100755 --- a/src/im_mad/remotes/stop_probes +++ b/src/im_mad/remotes/stop_probes @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/im_mad/remotes/vcenter.d/poll b/src/im_mad/remotes/vcenter.d/poll index b4ad6037aa..b19ee97810 100755 --- a/src/im_mad/remotes/vcenter.d/poll +++ b/src/im_mad/remotes/vcenter.d/poll @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/image/Image.cc b/src/image/Image.cc index 84f4f34865..749121bc5c 100644 --- a/src/image/Image.cc +++ b/src/image/Image.cc @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -60,7 +60,7 @@ Image::Image(int _uid, vm_collection("VMS"), img_clone_collection("CLONES"), app_clone_collection("APP_CLONES"), - snapshots(-1, false), + snapshots(-1, Snapshots::DENY), target_snapshot(-1) { if (_image_template != 0) @@ -223,7 +223,6 @@ int Image::insert(SqlDB *db, string& error_str) } state = LOCKED; //LOCKED till the ImageManager copies it to the Repository - lock_db(-1,-1, PoolObjectSQL::LockStates::ST_USE); //-------------------------------------------------------------------------- // Insert the Image diff --git a/src/image/ImageManager.cc b/src/image/ImageManager.cc index 883cb3cd22..0c65467e4a 100644 --- a/src/image/ImageManager.cc +++ b/src/image/ImageManager.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/image/ImageManagerActions.cc b/src/image/ImageManagerActions.cc index 88c6893fc7..d8e14ae89d 100644 --- a/src/image/ImageManagerActions.cc +++ b/src/image/ImageManagerActions.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -1064,7 +1064,7 @@ void ImageManager::set_image_snapshots(int iid, const Snapshots& s) void ImageManager::clear_image_snapshots(int iid) { - Snapshots _snaps(-1, false); + Snapshots _snaps(-1, Snapshots::DENY); set_image_snapshots(iid, _snaps); } diff --git a/src/image/ImageManagerDriver.cc b/src/image/ImageManagerDriver.cc index a29d1a112f..6a4b460fe8 100644 --- a/src/image/ImageManagerDriver.cc +++ b/src/image/ImageManagerDriver.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/image/ImagePool.cc b/src/image/ImagePool.cc index 0a097e8345..f30c508460 100644 --- a/src/image/ImagePool.cc +++ b/src/image/ImagePool.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/image/ImageTemplate.cc b/src/image/ImageTemplate.cc index a3d99e9508..27575a25e6 100644 --- a/src/image/ImageTemplate.cc +++ b/src/image/ImageTemplate.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/image/SConstruct b/src/image/SConstruct index d9b54ce438..0ef9e95c6f 100644 --- a/src/image/SConstruct +++ b/src/image/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/vm # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/ipamm/IPAMManager.cc b/src/ipamm/IPAMManager.cc index b66daba2d1..f558620b0d 100644 --- a/src/ipamm/IPAMManager.cc +++ b/src/ipamm/IPAMManager.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/ipamm/IPAMManagerDriver.cc b/src/ipamm/IPAMManagerDriver.cc index 2286a57eb6..96d2948859 100644 --- a/src/ipamm/IPAMManagerDriver.cc +++ b/src/ipamm/IPAMManagerDriver.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/ipamm/SConstruct b/src/ipamm/SConstruct index 5ef8c05476..950ce85927 100644 --- a/src/ipamm/SConstruct +++ b/src/ipamm/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/vnm # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/ipamm_mad/one_ipam b/src/ipamm_mad/one_ipam index cb0242bb52..58ff6f31eb 100755 --- a/src/ipamm_mad/one_ipam +++ b/src/ipamm_mad/one_ipam @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/ipamm_mad/one_ipam.rb b/src/ipamm_mad/one_ipam.rb index ee895635bf..9e3dcf91cc 100755 --- a/src/ipamm_mad/one_ipam.rb +++ b/src/ipamm_mad/one_ipam.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/ipamm_mad/remotes/dummy/allocate_address b/src/ipamm_mad/remotes/dummy/allocate_address index aabbe9f20e..9c269a37e5 100755 --- a/src/ipamm_mad/remotes/dummy/allocate_address +++ b/src/ipamm_mad/remotes/dummy/allocate_address @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/ipamm_mad/remotes/dummy/free_address b/src/ipamm_mad/remotes/dummy/free_address index 9533a2d721..ba02f0e385 100755 --- a/src/ipamm_mad/remotes/dummy/free_address +++ b/src/ipamm_mad/remotes/dummy/free_address @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/ipamm_mad/remotes/dummy/get_address b/src/ipamm_mad/remotes/dummy/get_address index 4ca5977a43..69447ee735 100755 --- a/src/ipamm_mad/remotes/dummy/get_address +++ b/src/ipamm_mad/remotes/dummy/get_address @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/ipamm_mad/remotes/dummy/register_address_range b/src/ipamm_mad/remotes/dummy/register_address_range index 41ca7a7df2..7396095446 100755 --- a/src/ipamm_mad/remotes/dummy/register_address_range +++ b/src/ipamm_mad/remotes/dummy/register_address_range @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/ipamm_mad/remotes/dummy/unregister_address_range b/src/ipamm_mad/remotes/dummy/unregister_address_range index 0f3df1c738..840a1a253b 100755 --- a/src/ipamm_mad/remotes/dummy/unregister_address_range +++ b/src/ipamm_mad/remotes/dummy/unregister_address_range @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/lcm/LifeCycleActions.cc b/src/lcm/LifeCycleActions.cc index e9c2c0fdcf..4637332202 100644 --- a/src/lcm/LifeCycleActions.cc +++ b/src/lcm/LifeCycleActions.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/lcm/LifeCycleManager.cc b/src/lcm/LifeCycleManager.cc index 841c0c0aa1..d40bcbf830 100644 --- a/src/lcm/LifeCycleManager.cc +++ b/src/lcm/LifeCycleManager.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/lcm/LifeCycleStates.cc b/src/lcm/LifeCycleStates.cc index 715a1c8b1e..e56fd8b05d 100644 --- a/src/lcm/LifeCycleStates.cc +++ b/src/lcm/LifeCycleStates.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -1893,7 +1893,7 @@ void LifeCycleManager::disk_snapshot_success(int vid) bool img_owner, vm_owner; const VirtualMachineDisk * disk; - Snapshots snaps(-1, false); + Snapshots snaps(-1, Snapshots::DENY); const Snapshots* tmp_snaps; string error_str; @@ -1924,10 +1924,14 @@ void LifeCycleManager::disk_snapshot_success(int vid) vm->set_state(VirtualMachine::RUNNING); case VirtualMachine::DISK_SNAPSHOT_POWEROFF: case VirtualMachine::DISK_SNAPSHOT_SUSPENDED: + vm->log("LCM", Log::INFO, "VM disk snapshot operation completed."); + vm->revert_disk_snapshot(disk_id, snap_id, false); + break; + case VirtualMachine::DISK_SNAPSHOT_REVERT_POWEROFF: case VirtualMachine::DISK_SNAPSHOT_REVERT_SUSPENDED: vm->log("LCM", Log::INFO, "VM disk snapshot operation completed."); - vm->revert_disk_snapshot(disk_id, snap_id); + vm->revert_disk_snapshot(disk_id, snap_id, true); break; case VirtualMachine::DISK_SNAPSHOT_DELETE: @@ -2036,7 +2040,7 @@ void LifeCycleManager::disk_snapshot_failure(int vid) Template *vm_quotas = 0; const VirtualMachineDisk* disk; - Snapshots snaps(-1, false); + Snapshots snaps(-1, Snapshots::DENY); const Snapshots* tmp_snaps; string error_str; diff --git a/src/lcm/SConstruct b/src/lcm/SConstruct index 0683c19943..f5b62655f4 100644 --- a/src/lcm/SConstruct +++ b/src/lcm/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/vm # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/log/Log.cc b/src/log/Log.cc index 183efd350d..4e280c2fe1 100644 --- a/src/log/Log.cc +++ b/src/log/Log.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/log/NebulaLog.cc b/src/log/NebulaLog.cc index d6ce6c422b..171839be8e 100644 --- a/src/log/NebulaLog.cc +++ b/src/log/NebulaLog.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/log/SConstruct b/src/log/SConstruct index 0ca2d623a8..5b7e3477b8 100644 --- a/src/log/SConstruct +++ b/src/log/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/log # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/mad/Mad.cc b/src/mad/Mad.cc index 9bb86c2ec6..adf6e48898 100644 --- a/src/mad/Mad.cc +++ b/src/mad/Mad.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/mad/MadManager.cc b/src/mad/MadManager.cc index 0d33ce6cd8..02741b005c 100644 --- a/src/mad/MadManager.cc +++ b/src/mad/MadManager.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/mad/SConstruct b/src/mad/SConstruct index 80ef47e004..90c500543d 100644 --- a/src/mad/SConstruct +++ b/src/mad/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/mad # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/mad/ruby/ActionManager.rb b/src/mad/ruby/ActionManager.rb index aaccf28abb..cd189d698b 100644 --- a/src/mad/ruby/ActionManager.rb +++ b/src/mad/ruby/ActionManager.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- */ -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # Licensed 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 */ diff --git a/src/mad/ruby/CommandManager.rb b/src/mad/ruby/CommandManager.rb index 930f2a6334..94f2d612f0 100644 --- a/src/mad/ruby/CommandManager.rb +++ b/src/mad/ruby/CommandManager.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain diff --git a/src/mad/ruby/DriverExecHelper.rb b/src/mad/ruby/DriverExecHelper.rb index ebe8eced70..35f51515f9 100644 --- a/src/mad/ruby/DriverExecHelper.rb +++ b/src/mad/ruby/DriverExecHelper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/mad/ruby/OpenNebulaDriver.rb b/src/mad/ruby/OpenNebulaDriver.rb index 02ad9e93aa..3c79fdbfff 100644 --- a/src/mad/ruby/OpenNebulaDriver.rb +++ b/src/mad/ruby/OpenNebulaDriver.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/mad/ruby/VirtualMachineDriver.rb b/src/mad/ruby/VirtualMachineDriver.rb index 5c792c81d1..e78a8867ae 100644 --- a/src/mad/ruby/VirtualMachineDriver.rb +++ b/src/mad/ruby/VirtualMachineDriver.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/mad/ruby/scripts_common.rb b/src/mad/ruby/scripts_common.rb index 9a07ce2348..4381299a9b 100644 --- a/src/mad/ruby/scripts_common.rb +++ b/src/mad/ruby/scripts_common.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -75,11 +75,11 @@ module OpenNebula # Executes a command, if it fails returns error message and exits # If a second parameter is present it is used as the error message when # the command fails - def self.exec_and_log(command, message=nil) + def self.exec_and_log(command, message=nil, allowed_return_code=0) output=`#{command} 2>&1 1>/dev/null` code=$?.exitstatus - if code!=0 + if code!=0 && code!=allowed_return_code log_error "Command \"#{command}\" failed." log_error output if !message diff --git a/src/mad/ruby/ssh_stream.rb b/src/mad/ruby/ssh_stream.rb index 22e1a9bef8..4473eb7267 100644 --- a/src/mad/ruby/ssh_stream.rb +++ b/src/mad/ruby/ssh_stream.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/mad/sh/create_container_image.sh b/src/mad/sh/create_container_image.sh index 56ad19232b..4c02be0f50 100755 --- a/src/mad/sh/create_container_image.sh +++ b/src/mad/sh/create_container_image.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/mad/sh/madcommon.sh b/src/mad/sh/madcommon.sh index 15eda2d59d..c81d2af4aa 100644 --- a/src/mad/sh/madcommon.sh +++ b/src/mad/sh/madcommon.sh @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/mad/sh/scripts_common.sh b/src/mad/sh/scripts_common.sh index c9cca2340b..2124ea5383 100644 --- a/src/mad/sh/scripts_common.sh +++ b/src/mad/sh/scripts_common.sh @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -460,12 +460,23 @@ function ssh_make_path { SSH_EXEC_ERR=`$SSH $1 bash -s 2>&1 1>/dev/null < "\$(dirname $2)/.monitor" - fi +if [ ! -d $2 ]; then + mkdir -p $2 +fi + +# create or update .monitor content +if [ -n "$3" ]; then + MONITOR_FN="\$(dirname $2)/.monitor" + + MONITOR='' + if [ -f "\\${MONITOR_FN}" ]; then + MONITOR="\\$(cat "\\${MONITOR_FN}" 2>/dev/null)" + fi + + if [ "x\\${MONITOR}" != "x$3" ]; then + echo "$3" > "\\${MONITOR_FN}" + fi fi EOF` SSH_EXEC_RC=$? @@ -994,3 +1005,9 @@ function get_nic_information { OUTBOUND_PEAK_KB="${XPATH_ELEMENTS[j++]}" ORDER="${XPATH_ELEMENTS[j++]}" } + +function hup_collectd +{ + SEND_HUP='kill -HUP `cat /tmp/one-collectd-client.pid` || true' + ssh_exec_and_log_no_error $1 "$SEND_HUP" +} diff --git a/src/mad/test/dummy b/src/mad/test/dummy index 58f8d6e447..07daebb7ad 100755 --- a/src/mad/test/dummy +++ b/src/mad/test/dummy @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/mad/utils/SConstruct b/src/mad/utils/SConstruct index d240307612..367354fbc3 100644 --- a/src/mad/utils/SConstruct +++ b/src/mad/utils/SConstruct @@ -1,5 +1,5 @@ # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/mad/utils/tty_expect.c b/src/mad/utils/tty_expect.c index 21af8e1534..b18d007408 100644 --- a/src/mad/utils/tty_expect.c +++ b/src/mad/utils/tty_expect.c @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/market/MarketPlace.cc b/src/market/MarketPlace.cc index 0be22df82f..64f4d8f86f 100644 --- a/src/market/MarketPlace.cc +++ b/src/market/MarketPlace.cc @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/market/MarketPlaceApp.cc b/src/market/MarketPlaceApp.cc index 7f55dd7253..59db265763 100644 --- a/src/market/MarketPlaceApp.cc +++ b/src/market/MarketPlaceApp.cc @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/market/MarketPlaceAppPool.cc b/src/market/MarketPlaceAppPool.cc index 59cf9c346b..d67e1a981e 100644 --- a/src/market/MarketPlaceAppPool.cc +++ b/src/market/MarketPlaceAppPool.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/market/MarketPlaceManager.cc b/src/market/MarketPlaceManager.cc index 919a0e277c..4e4d952ff2 100644 --- a/src/market/MarketPlaceManager.cc +++ b/src/market/MarketPlaceManager.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/market/MarketPlaceManagerActions.cc b/src/market/MarketPlaceManagerActions.cc index 8ed377afff..8ef1290c3a 100644 --- a/src/market/MarketPlaceManagerActions.cc +++ b/src/market/MarketPlaceManagerActions.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/market/MarketPlaceManagerDriver.cc b/src/market/MarketPlaceManagerDriver.cc index e0c4719b69..55ce5e0d21 100644 --- a/src/market/MarketPlaceManagerDriver.cc +++ b/src/market/MarketPlaceManagerDriver.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/market/MarketPlacePool.cc b/src/market/MarketPlacePool.cc index 66e6853ad2..4f57f4ef00 100644 --- a/src/market/MarketPlacePool.cc +++ b/src/market/MarketPlacePool.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -33,12 +33,18 @@ MarketPlacePool::MarketPlacePool(SqlDB * db, bool is_federation_slave) //lastOID is set in PoolSQL::init_cb if (get_lastOID() == -1) { - // Build the default default security group + // Build the template for the OpenNebula Systems MarketPlace string default_market = "NAME=\"OpenNebula Public\"\n" "MARKET_MAD=one\n" "DESCRIPTION=\"OpenNebula Systems MarketPlace\""; + string lxc_market = + "NAME=\"Linux Containers\"\n" + "MARKET_MAD=linuxcontainers\n" + "DESCRIPTION=\"MarketPlace for the public image server fo LXC &" + " LXD hosted at linuxcontainers.org\""; + Nebula& nd = Nebula::instance(); UserPool * upool = nd.get_upool(); User * oneadmin = upool->get_ro(0); @@ -46,9 +52,12 @@ MarketPlacePool::MarketPlacePool(SqlDB * db, bool is_federation_slave) string error; MarketPlaceTemplate * default_tmpl = new MarketPlaceTemplate; + MarketPlaceTemplate * lxc_tmpl = new MarketPlaceTemplate; + char * error_parse; default_tmpl->parse(default_market, &error_parse); + lxc_tmpl->parse(lxc_market, &error_parse); MarketPlace * marketplace = new MarketPlace( oneadmin->get_uid(), @@ -58,19 +67,33 @@ MarketPlacePool::MarketPlacePool(SqlDB * db, bool is_federation_slave) oneadmin->get_umask(), default_tmpl); + MarketPlace * lxc_marketplace = new MarketPlace( + oneadmin->get_uid(), + oneadmin->get_gid(), + oneadmin->get_uname(), + oneadmin->get_gname(), + oneadmin->get_umask(), + lxc_tmpl); + oneadmin->unlock(); marketplace->set_permissions(1,1,1, 1,0,0, 1,0,0, error); + lxc_marketplace->set_permissions(1,1,1, 1,0,0, 1,0,0, error); marketplace->zone_id = Nebula::instance().get_zone_id(); + lxc_marketplace->zone_id = Nebula::instance().get_zone_id(); marketplace->parse_template(error); + lxc_marketplace->parse_template(error); - if (PoolSQL::allocate(marketplace, error) < 0) + int rc = PoolSQL::allocate(marketplace, error); + + rc += PoolSQL::allocate(lxc_marketplace, error); + + if (rc < 0) { ostringstream oss; - oss << "Error trying to create default " - << "OpenNebula Systems MarketPlace: " << error; + oss << "Error trying to create default marketplaces: " << error; NebulaLog::log("MKP", Log::ERROR, oss); throw runtime_error(oss.str()); diff --git a/src/market/SConstruct b/src/market/SConstruct index 9c7b97a83f..5eaa3a40f5 100644 --- a/src/market/SConstruct +++ b/src/market/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/datastore # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/market_mad/one_market b/src/market_mad/one_market index 75e17a25a1..53c008ed0d 100755 --- a/src/market_mad/one_market +++ b/src/market_mad/one_market @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/market_mad/one_market.rb b/src/market_mad/one_market.rb index 7f3bb7875f..f2e1818fef 100755 --- a/src/market_mad/one_market.rb +++ b/src/market_mad/one_market.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # Licensed 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 diff --git a/src/market_mad/remotes/http/delete b/src/market_mad/remotes/http/delete index 883c57caae..1af22d57ed 100755 --- a/src/market_mad/remotes/http/delete +++ b/src/market_mad/remotes/http/delete @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/market_mad/remotes/http/import b/src/market_mad/remotes/http/import index 712c840e82..93b9f6c652 100755 --- a/src/market_mad/remotes/http/import +++ b/src/market_mad/remotes/http/import @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/market_mad/remotes/http/monitor b/src/market_mad/remotes/http/monitor index 9257eb51e0..62e3aabeef 100755 --- a/src/market_mad/remotes/http/monitor +++ b/src/market_mad/remotes/http/monitor @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/market_mad/remotes/linuxcontainers/delete b/src/market_mad/remotes/linuxcontainers/delete index 5f965a7aed..bc4e443b70 100755 --- a/src/market_mad/remotes/linuxcontainers/delete +++ b/src/market_mad/remotes/linuxcontainers/delete @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/market_mad/remotes/linuxcontainers/import b/src/market_mad/remotes/linuxcontainers/import index 5f4a1d2341..e4eae18b90 100755 --- a/src/market_mad/remotes/linuxcontainers/import +++ b/src/market_mad/remotes/linuxcontainers/import @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/market_mad/remotes/linuxcontainers/monitor b/src/market_mad/remotes/linuxcontainers/monitor index e082bd6b6f..0d86f378a8 100755 --- a/src/market_mad/remotes/linuxcontainers/monitor +++ b/src/market_mad/remotes/linuxcontainers/monitor @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -31,7 +31,7 @@ class LinuxContainersMarket #--------------------------------------------------------------------------- DEFAULTS = { :url => 'https://images.linuxcontainers.org', - :sizemb => 5120, + :sizemb => 2560, :fs => 'ext4', :format => 'raw', :agent => 'OpenNebula' diff --git a/src/market_mad/remotes/one/delete b/src/market_mad/remotes/one/delete index 2a25b8db90..1119b8d243 100755 --- a/src/market_mad/remotes/one/delete +++ b/src/market_mad/remotes/one/delete @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/market_mad/remotes/one/import b/src/market_mad/remotes/one/import index 6fa577916e..d973f0a70a 100755 --- a/src/market_mad/remotes/one/import +++ b/src/market_mad/remotes/one/import @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/market_mad/remotes/one/monitor b/src/market_mad/remotes/one/monitor index 29ebe95ad8..20f4eea19e 100755 --- a/src/market_mad/remotes/one/monitor +++ b/src/market_mad/remotes/one/monitor @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/market_mad/remotes/s3/S3.rb b/src/market_mad/remotes/s3/S3.rb index 352eb23cab..f738b55c32 100644 --- a/src/market_mad/remotes/s3/S3.rb +++ b/src/market_mad/remotes/s3/S3.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/market_mad/remotes/s3/delete b/src/market_mad/remotes/s3/delete index 4b89f1ff62..9751fc6327 100755 --- a/src/market_mad/remotes/s3/delete +++ b/src/market_mad/remotes/s3/delete @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/market_mad/remotes/s3/import b/src/market_mad/remotes/s3/import index f9ba32e408..d6cfc771ef 100755 --- a/src/market_mad/remotes/s3/import +++ b/src/market_mad/remotes/s3/import @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/market_mad/remotes/s3/monitor b/src/market_mad/remotes/s3/monitor index 68c76bfbf5..5d3aefd268 100755 --- a/src/market_mad/remotes/s3/monitor +++ b/src/market_mad/remotes/s3/monitor @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/nebula/Nebula.cc b/src/nebula/Nebula.cc index 694a62198e..291d42a52f 100644 --- a/src/nebula/Nebula.cc +++ b/src/nebula/Nebula.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -252,8 +252,6 @@ void Nebula::start(bool bootstrap_only) // ----------------------------------------------------------- try { - bool db_is_sqlite = true; - string server; int port; string user; @@ -265,12 +263,7 @@ void Nebula::start(bool bootstrap_only) if ( _db != 0 ) { - string value = _db->vector_value("BACKEND"); - - if (value == "mysql") - { - db_is_sqlite = false; - } + db_backend_type = _db->vector_value("BACKEND"); if (_db->vector_value("SERVER", server) == -1) { @@ -303,7 +296,7 @@ void Nebula::start(bool bootstrap_only) } } - if ( db_is_sqlite ) + if ( db_backend_type == "sqlite" ) { db_backend = new SqliteDB(var_location + "one.db"); } diff --git a/src/nebula/NebulaTemplate.cc b/src/nebula/NebulaTemplate.cc index 415b093610..4a3f4d012b 100644 --- a/src/nebula/NebulaTemplate.cc +++ b/src/nebula/NebulaTemplate.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -157,8 +157,8 @@ void OpenNebulaTemplate::set_multiple_conf_default() set_conf_ds("ssh", "", "NO"); set_conf_ds("vmfs", "BRIDGE_LIST", "NO"); set_conf_ds("vcenter", - "VCENTER_INSTANCE_ID, VCENTER_DS_REF, VCENTER_DC_REF, VCENTER_HOST, VCENTER_USER, VCENTER_PASSWORD", - "NO"); + "VCENTER_INSTANCE_ID, VCENTER_DS_REF, VCENTER_DC_REF, VCENTER_HOST, VCENTER_USER, VCENTER_PASSWORD", + "NO"); set_conf_ds("ceph", "DISK_TYPE,BRIDGE_LIST,CEPH_HOST,CEPH_USER,CEPH_SECRET", "NO"); diff --git a/src/nebula/SConstruct b/src/nebula/SConstruct index eb6d51106d..1219ce8303 100644 --- a/src/nebula/SConstruct +++ b/src/nebula/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/nebula # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/nebula/SystemDB.cc b/src/nebula/SystemDB.cc index 4e435cefc7..e9ac1fd641 100644 --- a/src/nebula/SystemDB.cc +++ b/src/nebula/SystemDB.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/nebula/oned.cc b/src/nebula/oned.cc index 608abaea03..8b014ba2a7 100644 --- a/src/nebula/oned.cc +++ b/src/nebula/oned.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -31,7 +31,7 @@ using namespace std; static void print_license() { - cout<< "Copyright 2002-2018, OpenNebula Project, OpenNebula Systems \n\n" + cout<< "Copyright 2002-2019, OpenNebula Project, OpenNebula Systems \n\n" << Nebula::version() << " is distributed and licensed for use under the" << " terms of the\nApache License, Version 2.0 " << "(http://www.apache.org/licenses/LICENSE-2.0).\n"; diff --git a/src/oca/go/src/goca/errors.go b/src/oca/go/src/goca/errors.go new file mode 100644 index 0000000000..8d2be2270e --- /dev/null +++ b/src/oca/go/src/goca/errors.go @@ -0,0 +1,153 @@ +package goca + +import ( + "fmt" + "net/http" +) + +// Client errors + +/* +The OpenNebula server use the library xmlrpc-c. + +List of xmlrpc fault codes: + XMLRPC_INTERNAL_ERROR -500 + XMLRPC_TYPE_ERROR -501 + XMLRPC_INDEX_ERROR -502 + XMLRPC_PARSE_ERROR -503 + XMLRPC_NETWORK_ERROR -504 + XMLRPC_TIMEOUT_ERROR -505 + XMLRPC_NO_SUCH_METHOD_ERROR -506 + XMLRPC_REQUEST_REFUSED_ERROR -507 + XMLRPC_INTROSPECTION_DISABLED_ERROR -508 + XMLRPC_LIMIT_EXCEEDED_ERROR -509 + XMLRPC_INVALID_UTF8_ERROR -510 +*/ + +// ClientErrCode is used by ClientError to give more accurate information +type ClientErrCode int + +const ( + // ClientReqBuild if we can't build the xmlrpc request, ie. http or xml error + ClientReqBuild ClientErrCode = iota + + // ClientReqHTTP if we can't do a request, ie. connectivity, redirection problems... + ClientReqHTTP + + // ClientRespHTTP if we have an http response error or if we can't have a full response + ClientRespHTTP + + // ClientRespXMLRPCFault if the response is an xmlrpc fault + ClientRespXMLRPCFault + + // ClientRespXMLRPCParse if we can't parse the xmlrpc from the response + ClientRespXMLRPCParse + + // ClientRespONeParse if we can't parse a correct OpenNebula response + ClientRespONeParse +) + +func (s ClientErrCode) String() string { + switch s { + case ClientReqBuild: + return "REQUEST_BUILD" + case ClientReqHTTP: + return "REQUEST_HTTP" + case ClientRespHTTP: + return "RESPONSE_HTTP" + case ClientRespXMLRPCFault: + return "RESPONSE_XMLRPC_FAULT" + case ClientRespXMLRPCParse: + return "RESPONSE_XMLRPC_PARSE" + case ClientRespONeParse: + return "RESPONSE_ONE_PARSE" + default: + return "" + } +} + +// ClientError is returned when we can't have a complete and well formed response from the client +type ClientError struct { + Code ClientErrCode + msg string + + // Provide more informations to the user + httpResp *http.Response + err error +} + +// Cause allow to get the underlying error +func (e *ClientError) Cause() error { + return e.err +} + +// GetHTTPResponse return the http response for the codes ClientRespXMLRPCFault, ClientRespXMLRPCParse, ClientRespONeParse +func (e *ClientError) GetHTTPResponse() *http.Response { + return e.httpResp +} + +func (e *ClientError) Error() string { + if e.err != nil { + return fmt.Sprintf("GOCA client error [%s]: %s: %s", e.Code.String(), e.msg, e.Cause()) + } + return fmt.Sprintf("GOCA client error [%s]: %s", e.Code.String(), e.msg) +} + +// OpenNebula errors + +// OneErrCode is the error code from an OpenNebula error response +type OneErrCode int + +const ( + // OneSuccess code for a successful response + OneSuccess = 0x0000 + + // OneAuthenticationError code if the user could not be authenticated + OneAuthenticationError = 0x0100 + + // OneAuthorizationError code if the user is not authorized to perform the requested action + OneAuthorizationError = 0x0200 + + // OneNoExistsError code if the requested resource does not exist + OneNoExistsError = 0x0400 + + // OneActionError code if the state is wrong to perform the action + OneActionError = 0x0800 + + // OneXMLRPCAPIError code if there is wrong parameter passed, e.g. param should be -1 or -2, but -3 was received + OneXMLRPCAPIError = 0x1000 + + // OneInternalError code if there is an internal error, e.g. the resource could not be loaded from the DB + OneInternalError = 0x2000 +) + +func (s OneErrCode) String() string { + switch s { + case OneSuccess: + return "SUCCESS" + case OneAuthenticationError: + return "AUTHENTICATION" + case OneAuthorizationError: + return "AUTHORIZATION" + case OneNoExistsError: + return "NO_EXISTS" + case OneActionError: + return "ACTION" + case OneXMLRPCAPIError: + return "XML_RPC_API" + case OneInternalError: + return "INTERNAL" + default: + return "" + } +} + +// ResponseError is a complete well formed OpenNebula response error +type ResponseError struct { + Code OneErrCode + msg string +} + +func (e *ResponseError) Error() string { + return fmt.Sprintf("OpenNebula error [%s]: %s", e.Code.String(), e.msg) +} diff --git a/src/oca/go/src/goca/goca.go b/src/oca/go/src/goca/goca.go index 4c293a19fe..222ab5a8cc 100644 --- a/src/oca/go/src/goca/goca.go +++ b/src/oca/go/src/goca/goca.go @@ -1,8 +1,10 @@ package goca import ( + "bytes" "fmt" "io/ioutil" + "net/http" "os" "strings" @@ -13,53 +15,6 @@ var ( client *oneClient ) -// OneClientErrCode is the error code from the OpenNebula response -type OneClientErrCode int - -const ( - // OneSuccess code for a successful response - OneSuccess = 0x0000 - - // OneAuthenticationError code if the user could not be authenticated - OneAuthenticationError = 0x0100 - - // OneAuthorizationError code if the user is not authorized to perform the requested action - OneAuthorizationError = 0x0200 - - // OneNoExistsError code if the requested resource does not exist - OneNoExistsError = 0x0400 - - // OneActionError code if the state is wrong to perform the action - OneActionError = 0x0800 - - // OneXmlRpcApiError code if there is wrong parameter passed, e.g. param should be -1 or -2, but -3 was received - OneXMLRPCAPIError = 0x1000 - - // OneInteralError code if there is an internal error, e.g. the resource could not be loaded from the DB - OneInteralError = 0x2000 -) - -func (s OneClientErrCode) String() string { - switch s { - case OneSuccess: - return "SUCCESS" - case OneAuthenticationError: - return "AUTHENTICATION" - case OneAuthorizationError: - return "AUTHORIZATION" - case OneNoExistsError: - return "NO_EXISTS" - case OneActionError: - return "ACTION" - case OneXMLRPCAPIError: - return "XML_RPC_API" - case OneInteralError: - return "INTERNAL" - default: - return "" - } -} - // OneConfig contains the information to communicate with OpenNebula type OneConfig struct { // Token is the authentication string. In the format of : @@ -71,36 +26,9 @@ type OneConfig struct { } type oneClient struct { + url string token string - xmlrpcClient *xmlrpc.Client - xmlrpcClientError error -} - -type InitError struct { - token string - xmlRpcErr error -} - -func (r *InitError) Error() string { - return fmt.Sprintf("Unitialized client. Token: '%s', xmlrpcClientError: '%s'", r.token, r.xmlRpcErr) -} - -type BadResponseError struct { - expectedType string -} - -func (r *BadResponseError) Error() string { - return fmt.Sprintf("Unexpected XML-RPC response, Expected: %s", r.expectedType) -} - -// ResponseError contains the error datas from an OpenNebula error reponse -type ResponseError struct { - Code OneClientErrCode - msg string -} - -func (e *ResponseError) Error() string { - return fmt.Sprintf("%s (%s)", e.msg, e.Code.String()) + httpClient *http.Client } type response struct { @@ -166,12 +94,10 @@ func NewConfig(user string, password string, xmlrpcURL string) OneConfig { // SetClient assigns a value to the client variable func SetClient(conf OneConfig) { - xmlrpcClient, xmlrpcClientError := xmlrpc.NewClient(conf.XmlrpcURL, nil) - client = &oneClient{ + url: conf.XmlrpcURL, token: conf.Token, - xmlrpcClient: xmlrpcClient, - xmlrpcClientError: xmlrpcClientError, + httpClient: &http.Client{}, } } @@ -207,25 +133,67 @@ func (c *oneClient) Call(method string, args ...interface{}) (*response, error) errCode int64 ) - if c.xmlrpcClientError != nil { - return nil, &InitError{token: c.token, xmlRpcErr: c.xmlrpcClientError} - } - - result := []interface{}{} - xmlArgs := make([]interface{}, len(args)+1) xmlArgs[0] = c.token copy(xmlArgs[1:], args[:]) - err := c.xmlrpcClient.Call(method, xmlArgs, &result) + buf, err := xmlrpc.EncodeMethodCall(method, xmlArgs...) if err != nil { - return nil, err + return nil, + &ClientError{Code: ClientReqBuild, msg: "xmlrpc request encoding", err: err} } + req, err := http.NewRequest("POST", c.url, bytes.NewBuffer(buf)) + if err != nil { + return nil, + &ClientError{Code: ClientReqBuild, msg: "http request build", err: err} + } + + resp, err := c.httpClient.Do(req) + if err != nil { + return nil, + &ClientError{Code: ClientReqHTTP, msg: "http make request", err: err} + } + + if resp.StatusCode/100 != 2 { + return nil, &ClientError{ + Code: ClientRespHTTP, + msg: fmt.Sprintf("http status code: %d", resp.StatusCode), + httpResp: resp, + } + } + + respData, err := ioutil.ReadAll(resp.Body) + resp.Body.Close() + if err != nil { + return nil, + &ClientError{Code: ClientRespHTTP, msg: "read http response body", err: err} + } + + // Server side XML-RPC library: xmlrpc-c + xmlrpcResp := xmlrpc.NewResponse(respData) + + // Handle the tag in the xml server response + if xmlrpcResp.Failed() { + err = xmlrpcResp.Err() + return nil, + &ClientError{ClientRespXMLRPCFault, "server response", resp, err} + } + + result := []interface{}{} + + // Unmarshall the XML-RPC response + if err := xmlrpcResp.Unmarshal(&result); err != nil { + return nil, + &ClientError{ClientRespXMLRPCParse, "unmarshal xmlrpc", resp, err} + } + + // Parse according the XML-RPC OpenNebula API documentation status, ok = result[0].(bool) if ok == false { - return nil, &BadResponseError{expectedType: "Index 0: Boolean"} + return nil, + &ClientError{ClientRespONeParse, "index 0: boolean expected", resp, err} } body, ok = result[1].(string) @@ -234,18 +202,23 @@ func (c *oneClient) Call(method string, args ...interface{}) (*response, error) if ok == false { bodyBool, ok = result[1].(bool) if ok == false { - return nil, &BadResponseError{expectedType: "Index 1: Int or String"} + return nil, + &ClientError{ClientRespONeParse, "index 1: boolean expected", resp, err} } } } errCode, ok = result[2].(int64) if ok == false { - return nil, &BadResponseError{expectedType: "Index 2: Int"} + return nil, + &ClientError{ClientRespONeParse, "index 2: boolean expected", resp, err} } if status == false { - return nil, &ResponseError{Code: OneClientErrCode(errCode), msg: body} + return nil, &ResponseError{ + Code: OneErrCode(errCode), + msg: body, + } } r := &response{status, body, int(bodyInt), bodyBool} diff --git a/src/oca/go/src/goca/host.go b/src/oca/go/src/goca/host.go index 9f7268a194..9c67dcfe65 100644 --- a/src/oca/go/src/goca/host.go +++ b/src/oca/go/src/goca/host.go @@ -1,5 +1,10 @@ package goca +import ( + "errors" + "strconv" +) + // Host represents an OpenNebula Host type Host struct { XMLResource @@ -150,3 +155,24 @@ func (host *Host) Monitoring() error { _, err := client.Call("one.host.monitoring", host.ID) return err } + +// State returns the HostState +func (host *Host) State() (HostState, error) { + stateString, ok := host.XPath("/HOST/STATE") + if ok != true { + return -1, errors.New("Unable to parse host State") + } + + state, _ := strconv.Atoi(stateString) + + return HostState(state), nil +} + +// StateString returns the HostState as string +func (host *Host) StateString() (string, error) { + state, err := host.State() + if err != nil { + return "", err + } + return HostState(state).String(), nil +} diff --git a/src/oca/go/src/goca/image.go b/src/oca/go/src/goca/image.go index 914beb3cef..f1af00f876 100644 --- a/src/oca/go/src/goca/image.go +++ b/src/oca/go/src/goca/image.go @@ -138,8 +138,11 @@ func NewImageFromName(name string) (*Image, error) { // Info connects to OpenNebula and fetches the information of the Image func (image *Image) Info() error { response, err := client.Call("one.image.info", image.ID) + if err != nil { + return err + } image.body = response.Body() - return err + return nil } // State looks up the state of the image and returns the ImageState diff --git a/src/oca/go/src/goca/image_test.go b/src/oca/go/src/goca/image_test.go index 3b321b2e31..184305b5c2 100644 --- a/src/oca/go/src/goca/image_test.go +++ b/src/oca/go/src/goca/image_test.go @@ -71,7 +71,7 @@ func TestImage(t *testing.T) { image, err = NewImageFromName(name) if err != nil { - t.Error(err) + t.Fatal(err) } err = image.Info() diff --git a/src/oca/go/src/goca/marketplace.go b/src/oca/go/src/goca/marketplace.go index 2a667449ed..17548f42f1 100644 --- a/src/oca/go/src/goca/marketplace.go +++ b/src/oca/go/src/goca/marketplace.go @@ -126,6 +126,9 @@ func (market *MarketPlace) Rename(newName string) error { // Info retrieves information for the marketplace. func (market *MarketPlace) Info() error { response, err := client.Call("one.market.info", market.ID) + if err != nil { + return err + } market.body = response.Body() - return err + return nil } diff --git a/src/oca/go/src/goca/marketplace_test.go b/src/oca/go/src/goca/marketplace_test.go index ac077b1f2d..8563ae1be2 100644 --- a/src/oca/go/src/goca/marketplace_test.go +++ b/src/oca/go/src/goca/marketplace_test.go @@ -2,14 +2,13 @@ package goca import ( "testing" - "goca" ) func TestMarketplace(t *testing.T){ var mkt_name string = "marketplace_test_go" - var market *goca.MarketPlace + var market *MarketPlace var mkt_template string = "NAME = \"" + mkt_name + "\"\n" + "MARKET_MAD = \"http\"\n" + @@ -17,13 +16,13 @@ func TestMarketplace(t *testing.T){ "PUBLIC_DIR = \"/var/loca/market-http\"" //Create Marketpkace - market_id, err := goca.CreateMarketPlace(mkt_template) + market_id, err := CreateMarketPlace(mkt_template) if err != nil { t.Errorf("Test failed:\n" + err.Error()) } - market = goca.NewMarketPlace(market_id) + market = NewMarketPlace(market_id) market.Info() actual, _:= market.XMLResource.XPath("/MARKETPLACE/NAME") diff --git a/src/oca/go/src/goca/marketplaceapp.go b/src/oca/go/src/goca/marketplaceapp.go index 3baac110f7..b003227dec 100644 --- a/src/oca/go/src/goca/marketplaceapp.go +++ b/src/oca/go/src/goca/marketplaceapp.go @@ -134,8 +134,11 @@ func (marketApp *MarketPlaceApp) Rename(newName string) error { // Info retrieves information for the marketplace app. func (marketApp *MarketPlaceApp) Info() error { response, err := client.Call("one.marketapp.info", marketApp.ID) + if err != nil { + return err + } marketApp.body = response.Body() - return err + return nil } // Lock locks the marketplace app depending on blocking level. diff --git a/src/oca/go/src/goca/marketplaceapp_test.go b/src/oca/go/src/goca/marketplaceapp_test.go index 1c1b227f24..62093a0cff 100644 --- a/src/oca/go/src/goca/marketplaceapp_test.go +++ b/src/oca/go/src/goca/marketplaceapp_test.go @@ -2,13 +2,12 @@ package goca import ( "testing" - "goca" "strconv" ) func TestMarketplaceApp(t *testing.T){ var mkt_app_name string = "new_mkt_app" - var mkt_app *goca.MarketPlaceApp + var mkt_app *MarketPlaceApp var mkt_app_tmpl string var mkt_img_id uint var market_id uint @@ -19,9 +18,10 @@ func TestMarketplaceApp(t *testing.T){ //Create an image img_tmpl := "NAME = \"test_img_go" + "\"\n" + - "PATH = /etc/hosts\n" + "TYPE = DATABLOCK\n" + + "SIZE = 1\n" - mkt_img_id, err = goca.CreateImage(img_tmpl, 1) + mkt_img_id, err = CreateImage(img_tmpl, 1) if err != nil { t.Errorf("Test failed:\n" + err.Error()) @@ -35,7 +35,7 @@ func TestMarketplaceApp(t *testing.T){ "BASE_URL = \"http://url/\"\n" + "PUBLIC_DIR = \"/var/loca/market-http\"\n" - market_id, err = goca.CreateMarketPlace(mkt_tmpl) + market_id, err = CreateMarketPlace(mkt_tmpl) if err != nil { t.Errorf("Test failed:\n" + err.Error()) @@ -44,13 +44,13 @@ func TestMarketplaceApp(t *testing.T){ mkt_app_tmpl += "MARKETPLACE_ID=\"" + strconv.Itoa(int(market_id)) + "\"\n" //Create MarketplaceApp - app_id, err := goca.CreateMarketPlaceApp(mkt_app_tmpl, int(market_id)) + app_id, err := CreateMarketPlaceApp(mkt_app_tmpl, int(market_id)) if err != nil { t.Errorf("Test failed:\n" + err.Error()) } - mkt_app = goca.NewMarketPlaceApp(app_id) + mkt_app = NewMarketPlaceApp(app_id) mkt_app.Info() actual, _:= mkt_app.XMLResource.XPath("/MARKETPLACEAPP/NAME") @@ -67,7 +67,7 @@ func TestMarketplaceApp(t *testing.T){ } //delete image - img := goca.NewImage(mkt_img_id) + img := NewImage(mkt_img_id) err = img.Delete() if err != nil { @@ -75,7 +75,7 @@ func TestMarketplaceApp(t *testing.T){ } //delete marketplace - market := goca.NewMarketPlace(market_id) + market := NewMarketPlace(market_id) err = market.Delete() if err != nil { diff --git a/src/oca/go/src/goca/securitygroup.go b/src/oca/go/src/goca/securitygroup.go index f1ac0556bb..fedb6ebf68 100644 --- a/src/oca/go/src/goca/securitygroup.go +++ b/src/oca/go/src/goca/securitygroup.go @@ -143,6 +143,9 @@ func (sg *SecurityGroup) Rename(newName string) error { // Info retrieves information for the security group. func (sg *SecurityGroup) Info() error { response, err := client.Call("one.secgroup.info", sg.ID) + if err != nil { + return err + } sg.body = response.Body() - return err + return nil } diff --git a/src/oca/go/src/goca/securitygroup_test.go b/src/oca/go/src/goca/securitygroup_test.go index df2234d5f5..b1f3cbde06 100644 --- a/src/oca/go/src/goca/securitygroup_test.go +++ b/src/oca/go/src/goca/securitygroup_test.go @@ -2,25 +2,24 @@ package goca import ( "testing" - "goca" ) func TestSGAllocate(t *testing.T){ var sg_name string = "new_test_sg" - var sg *goca.SecurityGroup + var sg *SecurityGroup var sg_template string = "NAME = \"" + sg_name + "\"\n" + "DESCRIPTION = \"test security group\"\n"+ "ATT1 = \"VAL1\"\n" + "ATT2 = \"VAL2\"" //Create SG - sg_id, err := goca.CreateSecurityGroup(sg_template) + sg_id, err := CreateSecurityGroup(sg_template) if err != nil { t.Errorf("Test failed:\n" + err.Error()) } - sg = goca.NewSecurityGroup(sg_id) + sg = NewSecurityGroup(sg_id) sg.Info() actual, _:= sg.XMLResource.XPath("/SECURITY_GROUP/NAME") @@ -60,7 +59,7 @@ func TestSGAllocate(t *testing.T){ t.Errorf("Test failed:\n" + err.Error()) } - clone := goca.NewSecurityGroup(clone_id) + clone := NewSecurityGroup(clone_id) clone.Info() actual, _ = clone.XMLResource.XPath("/SECURITY_GROUP/NAME") diff --git a/src/oca/go/src/goca/template.go b/src/oca/go/src/goca/template.go index 33a11654aa..1972ff049f 100644 --- a/src/oca/go/src/goca/template.go +++ b/src/oca/go/src/goca/template.go @@ -80,8 +80,11 @@ func CreateTemplate(template string) (uint, error) { // Info connects to OpenNebula and fetches the information of the Template func (template *Template) Info() error { response, err := client.Call("one.template.info", template.ID) + if err != nil { + return err + } template.body = response.Body() - return err + return nil } // Update will modify the template. If appendTemplate is 0, it will diff --git a/src/oca/go/src/goca/template_test.go b/src/oca/go/src/goca/template_test.go index a52ad94038..58b1471399 100644 --- a/src/oca/go/src/goca/template_test.go +++ b/src/oca/go/src/goca/template_test.go @@ -51,7 +51,7 @@ func TestTemplateCreateAndDelete(t *testing.T) { template, err = NewTemplateFromName(templateName) if err != nil { - t.Error(err) + t.Fatal(err) } err = template.Info() diff --git a/src/oca/go/src/goca/virtualnetwork_test.go b/src/oca/go/src/goca/virtualnetwork_test.go index 75d454e759..cf475f4bcc 100644 --- a/src/oca/go/src/goca/virtualnetwork_test.go +++ b/src/oca/go/src/goca/virtualnetwork_test.go @@ -52,7 +52,7 @@ func TestVirtualNetwork(t *testing.T) { vnet, err = NewVirtualNetworkFromName(name) if err != nil { - t.Error(err) + t.Fatal(err) } err = vnet.Info() diff --git a/src/oca/go/src/goca/virtualrouter.go b/src/oca/go/src/goca/virtualrouter.go index 75cfa8e4b4..c21ac33752 100644 --- a/src/oca/go/src/goca/virtualrouter.go +++ b/src/oca/go/src/goca/virtualrouter.go @@ -81,8 +81,11 @@ func CreateVirtualRouter(tpl string) (uint, error) { // Info connects to OpenNebula and fetches the information of the VirtualRouter func (vr *VirtualRouter) Info() error { response, err := client.Call("one.vrouter.info", vr.ID) + if err != nil { + return err + } vr.body = response.Body() - return err + return nil } // Update will modify the virtual router. If appendVirtualRouter is 0, it will diff --git a/src/oca/go/src/goca/virtualrouter_test.go b/src/oca/go/src/goca/virtualrouter_test.go index 01f096c727..209f065d4a 100644 --- a/src/oca/go/src/goca/virtualrouter_test.go +++ b/src/oca/go/src/goca/virtualrouter_test.go @@ -2,27 +2,26 @@ package goca import ( "testing" - "goca" ) func TestVirtualRouter(t *testing.T){ var vr_name string = "new_vr" - var vr *goca.VirtualRouter + var vr *VirtualRouter var vr_template string = "NAME = \"" + vr_name + "\"\n" + "VROUTER = YES\n" + "ATT1 = \"VAL1\"\n" + "ATT2 = \"VAL2\"" //Create VirtualRouter - vr_id, err := goca.CreateVirtualRouter(vr_template) + vr_id, err := CreateVirtualRouter(vr_template) if err != nil { t.Errorf("Test failed:\n" + err.Error()) } - vr = goca.NewVirtualRouter(vr_id) + vr = NewVirtualRouter(vr_id) vr.Info() actual, _:= vr.XMLResource.XPath("/VROUTER/NAME") @@ -113,7 +112,7 @@ func TestVirtualRouter(t *testing.T){ "VROUTER = YES\n"+ "MEMORY = 64\n" - tmpl_id, err := goca.CreateTemplate(tmpl) + tmpl_id, err := CreateTemplate(tmpl) if err != nil { t.Errorf("Test failed:\n" + err.Error()) @@ -122,14 +121,14 @@ func TestVirtualRouter(t *testing.T){ //Instantiate VirtualRouter vr.Instantiate(1, int(tmpl_id), "vr_test_go", false, "") - vm, err := goca.NewVMFromName("vr_test_go") + vm, err := NewVMFromName("vr_test_go") if err != nil { - t.Errorf("Test failed:\n" + err.Error()) + t.Fatal("Test failed:\n" + err.Error()) } vm.TerminateHard() - template := goca.NewTemplate(tmpl_id) + template := NewTemplate(tmpl_id) template.Delete() @@ -137,7 +136,7 @@ func TestVirtualRouter(t *testing.T){ "BRIDGE = vbr0\n" + "VN_MAD = dummy\n" - vnet_id, _ := goca.CreateVirtualNetwork(vn_tmpl, 0) + vnet_id, _ := CreateVirtualNetwork(vn_tmpl, 0) nic_tmpl := "NIC = [ NETWORK=\"go-net\" ]" @@ -156,7 +155,7 @@ func TestVirtualRouter(t *testing.T){ t.Errorf("Test failed, expected: '%s', got: '%s'", "go-net", actual) } - vnet := goca.NewVirtualNetwork(vnet_id) + vnet := NewVirtualNetwork(vnet_id) vnet.Delete() //Detach nic from VirtualRouter diff --git a/src/oca/go/src/goca/vm.go b/src/oca/go/src/goca/vm.go index 55efce13fb..94c20034ce 100644 --- a/src/oca/go/src/goca/vm.go +++ b/src/oca/go/src/goca/vm.go @@ -585,8 +585,11 @@ func (vm *VM) Action(action string) error { // Info connects to OpenNebula and fetches the information of the VM func (vm *VM) Info() error { response, err := client.Call("one.vm.info", vm.ID) + if err != nil { + return err + } vm.body = response.Body() - return err + return nil } // Update will modify the VM's template. If appendTemplate is 0, it will diff --git a/src/oca/java/build.sh b/src/oca/java/build.sh index f06dace074..09b09c1f69 100755 --- a/src/oca/java/build.sh +++ b/src/oca/java/build.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -85,7 +85,7 @@ do_documentation() -doctitle 'OpenNebula Cloud API Specification' \ -header 'OpenNebula
Cloud API' \ -bottom 'Visit OpenNebula.org
Copyright 2002-2018 © +href="http://opennebula.org/">OpenNebula.org
Copyright 2002-2019 © OpenNebula Project, OpenNebula Systems.' } diff --git a/src/oca/java/share/examples/SessionInit.java b/src/oca/java/share/examples/SessionInit.java index 1436b37d5e..595dbf5859 100644 --- a/src/oca/java/share/examples/SessionInit.java +++ b/src/oca/java/share/examples/SessionInit.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/share/examples/UserSample.java b/src/oca/java/share/examples/UserSample.java index c0f7549e51..3362f80f06 100644 --- a/src/oca/java/share/examples/UserSample.java +++ b/src/oca/java/share/examples/UserSample.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/share/examples/VMachineSample.java b/src/oca/java/share/examples/VMachineSample.java index dd0b3c1d40..ce334f38da 100644 --- a/src/oca/java/share/examples/VMachineSample.java +++ b/src/oca/java/share/examples/VMachineSample.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/Client.java b/src/oca/java/src/org/opennebula/client/Client.java index 7391961b1e..da7ed571b8 100644 --- a/src/oca/java/src/org/opennebula/client/Client.java +++ b/src/oca/java/src/org/opennebula/client/Client.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/ClientConfigurationException.java b/src/oca/java/src/org/opennebula/client/ClientConfigurationException.java index d6b2f63641..e786e654b0 100644 --- a/src/oca/java/src/org/opennebula/client/ClientConfigurationException.java +++ b/src/oca/java/src/org/opennebula/client/ClientConfigurationException.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/OneException.java b/src/oca/java/src/org/opennebula/client/OneException.java index 233341a453..eb5055f0ac 100644 --- a/src/oca/java/src/org/opennebula/client/OneException.java +++ b/src/oca/java/src/org/opennebula/client/OneException.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/OneResponse.java b/src/oca/java/src/org/opennebula/client/OneResponse.java index 2c8e848636..fe1a560812 100644 --- a/src/oca/java/src/org/opennebula/client/OneResponse.java +++ b/src/oca/java/src/org/opennebula/client/OneResponse.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/OneSystem.java b/src/oca/java/src/org/opennebula/client/OneSystem.java index e908229f31..87770200a0 100644 --- a/src/oca/java/src/org/opennebula/client/OneSystem.java +++ b/src/oca/java/src/org/opennebula/client/OneSystem.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ public class OneSystem private static final String GROUP_QUOTA_INFO = "groupquota.info"; private static final String GROUP_QUOTA_UPDATE = "groupquota.update"; - public static final String VERSION = "5.7.80"; + public static final String VERSION = "5.7.85"; public OneSystem(Client client) { diff --git a/src/oca/java/src/org/opennebula/client/Pool.java b/src/oca/java/src/org/opennebula/client/Pool.java index ec13fe9e5c..5079c0e1aa 100644 --- a/src/oca/java/src/org/opennebula/client/Pool.java +++ b/src/oca/java/src/org/opennebula/client/Pool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/PoolElement.java b/src/oca/java/src/org/opennebula/client/PoolElement.java index 38093e8380..609390adb2 100644 --- a/src/oca/java/src/org/opennebula/client/PoolElement.java +++ b/src/oca/java/src/org/opennebula/client/PoolElement.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/acl/Acl.java b/src/oca/java/src/org/opennebula/client/acl/Acl.java index 657ffd120b..7fc68c5404 100644 --- a/src/oca/java/src/org/opennebula/client/acl/Acl.java +++ b/src/oca/java/src/org/opennebula/client/acl/Acl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/acl/AclPool.java b/src/oca/java/src/org/opennebula/client/acl/AclPool.java index aa8599c884..411d670374 100644 --- a/src/oca/java/src/org/opennebula/client/acl/AclPool.java +++ b/src/oca/java/src/org/opennebula/client/acl/AclPool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/acl/RuleParseException.java b/src/oca/java/src/org/opennebula/client/acl/RuleParseException.java index 9038ceb97a..402183e102 100644 --- a/src/oca/java/src/org/opennebula/client/acl/RuleParseException.java +++ b/src/oca/java/src/org/opennebula/client/acl/RuleParseException.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/cluster/Cluster.java b/src/oca/java/src/org/opennebula/client/cluster/Cluster.java index 8b135be584..279f1f9f78 100644 --- a/src/oca/java/src/org/opennebula/client/cluster/Cluster.java +++ b/src/oca/java/src/org/opennebula/client/cluster/Cluster.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/cluster/ClusterPool.java b/src/oca/java/src/org/opennebula/client/cluster/ClusterPool.java index f94c587f39..49f44800f5 100644 --- a/src/oca/java/src/org/opennebula/client/cluster/ClusterPool.java +++ b/src/oca/java/src/org/opennebula/client/cluster/ClusterPool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/datastore/Datastore.java b/src/oca/java/src/org/opennebula/client/datastore/Datastore.java index 51493903a6..756731ddfb 100644 --- a/src/oca/java/src/org/opennebula/client/datastore/Datastore.java +++ b/src/oca/java/src/org/opennebula/client/datastore/Datastore.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/datastore/DatastorePool.java b/src/oca/java/src/org/opennebula/client/datastore/DatastorePool.java index 30b4540e19..38f045c16b 100644 --- a/src/oca/java/src/org/opennebula/client/datastore/DatastorePool.java +++ b/src/oca/java/src/org/opennebula/client/datastore/DatastorePool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/document/Document.java b/src/oca/java/src/org/opennebula/client/document/Document.java index 7b51ae73e2..8d264c0ebe 100644 --- a/src/oca/java/src/org/opennebula/client/document/Document.java +++ b/src/oca/java/src/org/opennebula/client/document/Document.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/document/DocumentPool.java b/src/oca/java/src/org/opennebula/client/document/DocumentPool.java index b9704863e0..0449240f46 100644 --- a/src/oca/java/src/org/opennebula/client/document/DocumentPool.java +++ b/src/oca/java/src/org/opennebula/client/document/DocumentPool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/group/Group.java b/src/oca/java/src/org/opennebula/client/group/Group.java index 17f83cab8c..f2f8cd6414 100644 --- a/src/oca/java/src/org/opennebula/client/group/Group.java +++ b/src/oca/java/src/org/opennebula/client/group/Group.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/group/GroupPool.java b/src/oca/java/src/org/opennebula/client/group/GroupPool.java index 0675f3775a..02ae3986d9 100644 --- a/src/oca/java/src/org/opennebula/client/group/GroupPool.java +++ b/src/oca/java/src/org/opennebula/client/group/GroupPool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/host/Host.java b/src/oca/java/src/org/opennebula/client/host/Host.java index aae82060a6..57f878649c 100644 --- a/src/oca/java/src/org/opennebula/client/host/Host.java +++ b/src/oca/java/src/org/opennebula/client/host/Host.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/host/HostPool.java b/src/oca/java/src/org/opennebula/client/host/HostPool.java index 55cddb838e..91188dad00 100644 --- a/src/oca/java/src/org/opennebula/client/host/HostPool.java +++ b/src/oca/java/src/org/opennebula/client/host/HostPool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/image/Image.java b/src/oca/java/src/org/opennebula/client/image/Image.java index 84ae4ba967..21b880498d 100644 --- a/src/oca/java/src/org/opennebula/client/image/Image.java +++ b/src/oca/java/src/org/opennebula/client/image/Image.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/image/ImagePool.java b/src/oca/java/src/org/opennebula/client/image/ImagePool.java index 7b14e7338f..1b55c98376 100644 --- a/src/oca/java/src/org/opennebula/client/image/ImagePool.java +++ b/src/oca/java/src/org/opennebula/client/image/ImagePool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/marketplace/MarketPlace.java b/src/oca/java/src/org/opennebula/client/marketplace/MarketPlace.java index 303aa006d1..e6e1758323 100644 --- a/src/oca/java/src/org/opennebula/client/marketplace/MarketPlace.java +++ b/src/oca/java/src/org/opennebula/client/marketplace/MarketPlace.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/marketplace/MarketPlacePool.java b/src/oca/java/src/org/opennebula/client/marketplace/MarketPlacePool.java index 95cc866c03..d3972628a3 100644 --- a/src/oca/java/src/org/opennebula/client/marketplace/MarketPlacePool.java +++ b/src/oca/java/src/org/opennebula/client/marketplace/MarketPlacePool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/marketplaceapp/MarketPlaceApp.java b/src/oca/java/src/org/opennebula/client/marketplaceapp/MarketPlaceApp.java index 487495b97f..16ac730f57 100644 --- a/src/oca/java/src/org/opennebula/client/marketplaceapp/MarketPlaceApp.java +++ b/src/oca/java/src/org/opennebula/client/marketplaceapp/MarketPlaceApp.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/marketplaceapp/MarketPlaceAppPool.java b/src/oca/java/src/org/opennebula/client/marketplaceapp/MarketPlaceAppPool.java index 85a6c2ba09..8aacdcc65e 100644 --- a/src/oca/java/src/org/opennebula/client/marketplaceapp/MarketPlaceAppPool.java +++ b/src/oca/java/src/org/opennebula/client/marketplaceapp/MarketPlaceAppPool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/secgroup/SecurityGroup.java b/src/oca/java/src/org/opennebula/client/secgroup/SecurityGroup.java index 9c64ebb3d5..b0d771e6e4 100644 --- a/src/oca/java/src/org/opennebula/client/secgroup/SecurityGroup.java +++ b/src/oca/java/src/org/opennebula/client/secgroup/SecurityGroup.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/secgroup/SecurityGroupPool.java b/src/oca/java/src/org/opennebula/client/secgroup/SecurityGroupPool.java index e48acd5710..3e4e5a6263 100644 --- a/src/oca/java/src/org/opennebula/client/secgroup/SecurityGroupPool.java +++ b/src/oca/java/src/org/opennebula/client/secgroup/SecurityGroupPool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/template/Template.java b/src/oca/java/src/org/opennebula/client/template/Template.java index 12df417aa4..014235194a 100644 --- a/src/oca/java/src/org/opennebula/client/template/Template.java +++ b/src/oca/java/src/org/opennebula/client/template/Template.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/template/TemplatePool.java b/src/oca/java/src/org/opennebula/client/template/TemplatePool.java index 7fda470a9c..3cde9950af 100644 --- a/src/oca/java/src/org/opennebula/client/template/TemplatePool.java +++ b/src/oca/java/src/org/opennebula/client/template/TemplatePool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/user/User.java b/src/oca/java/src/org/opennebula/client/user/User.java index 6b753dfc8c..fc8469a6de 100644 --- a/src/oca/java/src/org/opennebula/client/user/User.java +++ b/src/oca/java/src/org/opennebula/client/user/User.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/user/UserPool.java b/src/oca/java/src/org/opennebula/client/user/UserPool.java index 99aa5faa9c..a5b371b752 100644 --- a/src/oca/java/src/org/opennebula/client/user/UserPool.java +++ b/src/oca/java/src/org/opennebula/client/user/UserPool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/vdc/Vdc.java b/src/oca/java/src/org/opennebula/client/vdc/Vdc.java index aefa988d55..c355c17d10 100644 --- a/src/oca/java/src/org/opennebula/client/vdc/Vdc.java +++ b/src/oca/java/src/org/opennebula/client/vdc/Vdc.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/vdc/VdcPool.java b/src/oca/java/src/org/opennebula/client/vdc/VdcPool.java index d784f93b03..c8f74d72b4 100644 --- a/src/oca/java/src/org/opennebula/client/vdc/VdcPool.java +++ b/src/oca/java/src/org/opennebula/client/vdc/VdcPool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java b/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java index 40e13f1e59..a795d77900 100644 --- a/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java +++ b/src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/vm/VirtualMachinePool.java b/src/oca/java/src/org/opennebula/client/vm/VirtualMachinePool.java index cf865ae4c4..a0491ebbde 100644 --- a/src/oca/java/src/org/opennebula/client/vm/VirtualMachinePool.java +++ b/src/oca/java/src/org/opennebula/client/vm/VirtualMachinePool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -177,6 +177,36 @@ public class VirtualMachinePool extends Pool implements Iterable return client.call(INFO_METHOD, filter, startId, endId, state); } + /** + * Retrieves all or part of the Virtual Machines in the pool. The + * Virtual Machines to retrieve can be also filtered by Id, specifying the + * first and last Id to include; and by state. + * + * @param client XML-RPC Client. + * @param filter Filter flag to use. Possible values: + *
    + *
  • {@link Pool#ALL}: All Virtual Machines
    • + *
  • {@link Pool#MINE}: Connected user's Virtual Machines
    • + *
  • {@link Pool#MINE_GROUP}: Connected user's Virtual Machines, and the ones in + * his group
    • + *
  • {@link Pool#GROUP}: User's primary group Virtual Machines
    • + *
  • >= 0 UID User's Virtual Machines
    • + *
+ * @param startId Lowest Id to retrieve + * @param endId Biggest Id to retrieve + * @param state Numeric state of the Virtual Machines wanted, or one + * of {@link VirtualMachinePool#ALL_VM} or + * {@link VirtualMachinePool#NOT_DONE} + * @param query query for FTS + * @return If successful the message contains the string + * with the information returned by OpenNebula. + */ + public static OneResponse info_search(Client client, int filter, + int startId, int endId, int state, String query) + { + return client.call(INFO_METHOD, filter, startId, endId, state, query); + } + /** * Retrieves the monitoring data for all or part of the Virtual * Machines in the pool. diff --git a/src/oca/java/src/org/opennebula/client/vmgroup/VMGroup.java b/src/oca/java/src/org/opennebula/client/vmgroup/VMGroup.java index 729ccb7067..0ab4207322 100644 --- a/src/oca/java/src/org/opennebula/client/vmgroup/VMGroup.java +++ b/src/oca/java/src/org/opennebula/client/vmgroup/VMGroup.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/vmgroup/VMGroupPool.java b/src/oca/java/src/org/opennebula/client/vmgroup/VMGroupPool.java index 180d9737e1..580ae0309a 100644 --- a/src/oca/java/src/org/opennebula/client/vmgroup/VMGroupPool.java +++ b/src/oca/java/src/org/opennebula/client/vmgroup/VMGroupPool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/vnet/VirtualNetwork.java b/src/oca/java/src/org/opennebula/client/vnet/VirtualNetwork.java index 26ff835b68..5a75af0752 100644 --- a/src/oca/java/src/org/opennebula/client/vnet/VirtualNetwork.java +++ b/src/oca/java/src/org/opennebula/client/vnet/VirtualNetwork.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/vnet/VirtualNetworkPool.java b/src/oca/java/src/org/opennebula/client/vnet/VirtualNetworkPool.java index f4ef44b6df..44bf6d469a 100644 --- a/src/oca/java/src/org/opennebula/client/vnet/VirtualNetworkPool.java +++ b/src/oca/java/src/org/opennebula/client/vnet/VirtualNetworkPool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/vntemplate/VirtualNetworkTemplate.java b/src/oca/java/src/org/opennebula/client/vntemplate/VirtualNetworkTemplate.java index ffce293aed..2c71327306 100644 --- a/src/oca/java/src/org/opennebula/client/vntemplate/VirtualNetworkTemplate.java +++ b/src/oca/java/src/org/opennebula/client/vntemplate/VirtualNetworkTemplate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/vntemplate/VirtualNetworkTemplatePool.java b/src/oca/java/src/org/opennebula/client/vntemplate/VirtualNetworkTemplatePool.java index 3c38f10d00..ccdbab4cc3 100644 --- a/src/oca/java/src/org/opennebula/client/vntemplate/VirtualNetworkTemplatePool.java +++ b/src/oca/java/src/org/opennebula/client/vntemplate/VirtualNetworkTemplatePool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/vrouter/VirtualRouter.java b/src/oca/java/src/org/opennebula/client/vrouter/VirtualRouter.java index ccd696634e..dc10a4203f 100644 --- a/src/oca/java/src/org/opennebula/client/vrouter/VirtualRouter.java +++ b/src/oca/java/src/org/opennebula/client/vrouter/VirtualRouter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/vrouter/VirtualRouterPool.java b/src/oca/java/src/org/opennebula/client/vrouter/VirtualRouterPool.java index 475f7c8b96..571626372d 100644 --- a/src/oca/java/src/org/opennebula/client/vrouter/VirtualRouterPool.java +++ b/src/oca/java/src/org/opennebula/client/vrouter/VirtualRouterPool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/zone/Zone.java b/src/oca/java/src/org/opennebula/client/zone/Zone.java index 44aca126fa..20ad079e49 100644 --- a/src/oca/java/src/org/opennebula/client/zone/Zone.java +++ b/src/oca/java/src/org/opennebula/client/zone/Zone.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/java/src/org/opennebula/client/zone/ZonePool.java b/src/oca/java/src/org/opennebula/client/zone/ZonePool.java index 225e81c97b..f72a033bf8 100644 --- a/src/oca/java/src/org/opennebula/client/zone/ZonePool.java +++ b/src/oca/java/src/org/opennebula/client/zone/ZonePool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + * Copyright 2002-2019, OpenNebula Project, OpenNebula Systems * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/oca/python/Makefile b/src/oca/python/Makefile index b6dd2ade0e..23bedb6816 100644 --- a/src/oca/python/Makefile +++ b/src/oca/python/Makefile @@ -1,5 +1,5 @@ # Copyright 2018 www.privaz.io Valletech AB -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ # limitations under the License. # Use full path to ensure virtualenv compatibility -PYTHON = $(shell which python) +PYTHON = $(shell which python) GDS = $(shell which generateDS) PWD = $(shell pwd) @@ -35,7 +35,7 @@ pyone/bindings/__init__.py pyone/bindings/supbind.py: $(schemas) sed -i "s/import sys/import sys\nfrom pyone.util import TemplatedType/" pyone/bindings/__init__.py sed -i "s/(supermod\./(TemplatedType, supermod\./g" pyone/bindings/__init__.py -.PHONY: clean +.PHONY: clean dist clean: rm -rf build dist pyone/bindings *.egg-info doc diff --git a/src/oca/python/pyone/__init__.py b/src/oca/python/pyone/__init__.py index e412c89ca5..6c636ed7aa 100644 --- a/src/oca/python/pyone/__init__.py +++ b/src/oca/python/pyone/__init__.py @@ -1,5 +1,5 @@ # Copyright 2018 www.privaz.io Valletech AB -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/oca/python/pyone/helpers.py b/src/oca/python/pyone/helpers.py index cd6c7dd252..a508858a00 100644 --- a/src/oca/python/pyone/helpers.py +++ b/src/oca/python/pyone/helpers.py @@ -1,5 +1,5 @@ # Copyright 2018 www.privaz.io Valletech AB -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/oca/python/pyone/server.py b/src/oca/python/pyone/server.py index 9f18f35e97..f86852c626 100644 --- a/src/oca/python/pyone/server.py +++ b/src/oca/python/pyone/server.py @@ -1,5 +1,5 @@ # Copyright 2018 www.privaz.io Valletech AB -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/oca/python/pyone/tester.py b/src/oca/python/pyone/tester.py index 00ae9527d4..962b85541d 100644 --- a/src/oca/python/pyone/tester.py +++ b/src/oca/python/pyone/tester.py @@ -1,5 +1,5 @@ # Copyright 2018 www.privaz.io Valletech AB -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/oca/python/pyone/util.py b/src/oca/python/pyone/util.py index 64859c8e29..09fe460a04 100644 --- a/src/oca/python/pyone/util.py +++ b/src/oca/python/pyone/util.py @@ -1,6 +1,6 @@ # Copyright 2018 www.privaz.io Valletech AB -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems -# +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems +# # Licensed 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 @@ -46,7 +46,8 @@ def cast2one(param): root = list(param.values())[0] if isinstance(root, dict): # We return this dictionary as XML - return dicttoxml.dicttoxml(param, root=False, attr_type=False).decode('utf8') + return dicttoxml.dicttoxml(param, root=False, attr_type=False, + cdata=True).decode('utf8') else: # We return this dictionary as attribute=value vector ret = u"" @@ -72,6 +73,14 @@ def one2dict(element): return element._root +def none2emptystr(d): + for k,v in d.items(): + if type(v) == OrderedDict: + none2emptystr(v) + elif v == None: + d[k] = "" + + def child2dict(element): ''' Creates a dictionary from the documentTree obtained from a binding Element. @@ -93,6 +102,9 @@ def child2dict(element): if ret[tagName] == None: ret[tagName] = OrderedDict() + # Replace 'None' values returned by xmltodict by "" + none2emptystr(ret) + # return the contents dictionary, but save a reference ret[tagName]._root = ret return ret[tagName] diff --git a/src/oca/python/setup.py b/src/oca/python/setup.py index 3a5c01e810..bddf09694c 100644 --- a/src/oca/python/setup.py +++ b/src/oca/python/setup.py @@ -1,5 +1,5 @@ # Copyright 2018 www.privaz.io Valletech AB -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -40,7 +40,7 @@ if sys.version_info[0] < 3: install_requires.append('future') setup( - name='opennebula', + name='pyone', version='5.7.80', description='Python Bindings for OpenNebula XML-RPC API', long_description=long_description, diff --git a/src/oca/ruby/deprecated/OpenNebula.rb b/src/oca/ruby/deprecated/OpenNebula.rb index dff0eb0e48..9de1770767 100644 --- a/src/oca/ruby/deprecated/OpenNebula.rb +++ b/src/oca/ruby/deprecated/OpenNebula.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula.rb b/src/oca/ruby/opennebula.rb index da14337e66..b12bfed5bf 100644 --- a/src/oca/ruby/opennebula.rb +++ b/src/oca/ruby/opennebula.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -71,5 +71,5 @@ require 'opennebula/vntemplate_pool' module OpenNebula # OpenNebula version - VERSION = '5.7.80' + VERSION = '5.7.85' end diff --git a/src/oca/ruby/opennebula/acl.rb b/src/oca/ruby/opennebula/acl.rb index f6d27a9a37..e21b61d024 100644 --- a/src/oca/ruby/opennebula/acl.rb +++ b/src/oca/ruby/opennebula/acl.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/acl_pool.rb b/src/oca/ruby/opennebula/acl_pool.rb index fa2cf18c3c..42514a8f5c 100644 --- a/src/oca/ruby/opennebula/acl_pool.rb +++ b/src/oca/ruby/opennebula/acl_pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/client.rb b/src/oca/ruby/opennebula/client.rb index 81843a09b8..7de6531d9a 100644 --- a/src/oca/ruby/opennebula/client.rb +++ b/src/oca/ruby/opennebula/client.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/cluster.rb b/src/oca/ruby/opennebula/cluster.rb index 049f02a2e7..1e3e5b019e 100644 --- a/src/oca/ruby/opennebula/cluster.rb +++ b/src/oca/ruby/opennebula/cluster.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/cluster_pool.rb b/src/oca/ruby/opennebula/cluster_pool.rb index 237c9f1b27..bf7e277883 100644 --- a/src/oca/ruby/opennebula/cluster_pool.rb +++ b/src/oca/ruby/opennebula/cluster_pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/datastore.rb b/src/oca/ruby/opennebula/datastore.rb index 8a0ea011fe..7670b5a6d5 100644 --- a/src/oca/ruby/opennebula/datastore.rb +++ b/src/oca/ruby/opennebula/datastore.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/datastore_pool.rb b/src/oca/ruby/opennebula/datastore_pool.rb index f9cb03cdfd..f485e42675 100644 --- a/src/oca/ruby/opennebula/datastore_pool.rb +++ b/src/oca/ruby/opennebula/datastore_pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/document.rb b/src/oca/ruby/opennebula/document.rb index 772fbf72ec..73a0693615 100644 --- a/src/oca/ruby/opennebula/document.rb +++ b/src/oca/ruby/opennebula/document.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/document_json.rb b/src/oca/ruby/opennebula/document_json.rb index 246c6fa7ed..3fd35e506b 100644 --- a/src/oca/ruby/opennebula/document_json.rb +++ b/src/oca/ruby/opennebula/document_json.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/document_pool.rb b/src/oca/ruby/opennebula/document_pool.rb index 498f350998..97b638f154 100644 --- a/src/oca/ruby/opennebula/document_pool.rb +++ b/src/oca/ruby/opennebula/document_pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/document_pool_json.rb b/src/oca/ruby/opennebula/document_pool_json.rb index 738f916a39..f3a58cb4a1 100644 --- a/src/oca/ruby/opennebula/document_pool_json.rb +++ b/src/oca/ruby/opennebula/document_pool_json.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/error.rb b/src/oca/ruby/opennebula/error.rb index 848594321f..b1a606673e 100644 --- a/src/oca/ruby/opennebula/error.rb +++ b/src/oca/ruby/opennebula/error.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/group.rb b/src/oca/ruby/opennebula/group.rb index 7ba8cc7a08..dac844b662 100644 --- a/src/oca/ruby/opennebula/group.rb +++ b/src/oca/ruby/opennebula/group.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/group_pool.rb b/src/oca/ruby/opennebula/group_pool.rb index dc81300958..116c813ff6 100644 --- a/src/oca/ruby/opennebula/group_pool.rb +++ b/src/oca/ruby/opennebula/group_pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/host.rb b/src/oca/ruby/opennebula/host.rb index b52fda6805..fb63e0dd47 100644 --- a/src/oca/ruby/opennebula/host.rb +++ b/src/oca/ruby/opennebula/host.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/host_pool.rb b/src/oca/ruby/opennebula/host_pool.rb index bf021e0fd5..d1d1f1616e 100644 --- a/src/oca/ruby/opennebula/host_pool.rb +++ b/src/oca/ruby/opennebula/host_pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/image.rb b/src/oca/ruby/opennebula/image.rb index 37fe180ef9..e3319e95fe 100644 --- a/src/oca/ruby/opennebula/image.rb +++ b/src/oca/ruby/opennebula/image.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/image_pool.rb b/src/oca/ruby/opennebula/image_pool.rb index aec62a769d..b6ca1e57f8 100644 --- a/src/oca/ruby/opennebula/image_pool.rb +++ b/src/oca/ruby/opennebula/image_pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/marketplace.rb b/src/oca/ruby/opennebula/marketplace.rb index dac1e7da69..03e9609eb2 100644 --- a/src/oca/ruby/opennebula/marketplace.rb +++ b/src/oca/ruby/opennebula/marketplace.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/marketplace_pool.rb b/src/oca/ruby/opennebula/marketplace_pool.rb index 571143ba47..1d65917187 100644 --- a/src/oca/ruby/opennebula/marketplace_pool.rb +++ b/src/oca/ruby/opennebula/marketplace_pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/marketplaceapp.rb b/src/oca/ruby/opennebula/marketplaceapp.rb index a0b1c48121..36352cc2bb 100644 --- a/src/oca/ruby/opennebula/marketplaceapp.rb +++ b/src/oca/ruby/opennebula/marketplaceapp.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -193,6 +193,17 @@ module OpenNebula image = Image.new(Image.build_xml, @client) rc = image.allocate(tmpl, options[:dsid]) + ds = OpenNebula::Datastore.new_with_id(options[:dsid], @client) + image.info + ds.info + + xpath = 'TEMPLATE/DRIVER' + if ds[xpath] == 'vcenter' && self['FORMAT'] != 'iso' && self['FORMAT'] != 'vmdk' + image.replace({'FORMAT' => 'vmdk'}) + elsif ds[xpath] && ds[xpath] != 'vcenter' && self['FORMAT'] == 'vmdk' + image.replace({'FORMAT' => ds[xpath] }) + end + return { :image => [rc] } if OpenNebula.is_error?(rc) image_id = image.id diff --git a/src/oca/ruby/opennebula/marketplaceapp_pool.rb b/src/oca/ruby/opennebula/marketplaceapp_pool.rb index 2410599e28..0974c782e0 100644 --- a/src/oca/ruby/opennebula/marketplaceapp_pool.rb +++ b/src/oca/ruby/opennebula/marketplaceapp_pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/oneflow_client.rb b/src/oca/ruby/opennebula/oneflow_client.rb index c416f70ac3..98a0532eb2 100644 --- a/src/oca/ruby/opennebula/oneflow_client.rb +++ b/src/oca/ruby/opennebula/oneflow_client.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/pool.rb b/src/oca/ruby/opennebula/pool.rb index 9af0c5b857..a36e4dce04 100644 --- a/src/oca/ruby/opennebula/pool.rb +++ b/src/oca/ruby/opennebula/pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/pool_element.rb b/src/oca/ruby/opennebula/pool_element.rb index b512b8e14d..c033f5591d 100644 --- a/src/oca/ruby/opennebula/pool_element.rb +++ b/src/oca/ruby/opennebula/pool_element.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/security_group.rb b/src/oca/ruby/opennebula/security_group.rb index d9b1026e6a..fbb758bc3f 100644 --- a/src/oca/ruby/opennebula/security_group.rb +++ b/src/oca/ruby/opennebula/security_group.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/security_group_pool.rb b/src/oca/ruby/opennebula/security_group_pool.rb index 4e5a0ab0f1..cb4cd0c6bd 100644 --- a/src/oca/ruby/opennebula/security_group_pool.rb +++ b/src/oca/ruby/opennebula/security_group_pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/system.rb b/src/oca/ruby/opennebula/system.rb index a6f2aa2e7a..5bdacd7833 100644 --- a/src/oca/ruby/opennebula/system.rb +++ b/src/oca/ruby/opennebula/system.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/template.rb b/src/oca/ruby/opennebula/template.rb index cde90349b6..16457ee2ba 100644 --- a/src/oca/ruby/opennebula/template.rb +++ b/src/oca/ruby/opennebula/template.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/template_pool.rb b/src/oca/ruby/opennebula/template_pool.rb index ef819d1f98..23e9747f20 100644 --- a/src/oca/ruby/opennebula/template_pool.rb +++ b/src/oca/ruby/opennebula/template_pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/user.rb b/src/oca/ruby/opennebula/user.rb index 25a14f3bc7..fa1ca5f076 100644 --- a/src/oca/ruby/opennebula/user.rb +++ b/src/oca/ruby/opennebula/user.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/user_pool.rb b/src/oca/ruby/opennebula/user_pool.rb index 61d711e98c..8b00fc6a4f 100644 --- a/src/oca/ruby/opennebula/user_pool.rb +++ b/src/oca/ruby/opennebula/user_pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/utils.rb b/src/oca/ruby/opennebula/utils.rb index ed66e38849..3c238c78bb 100644 --- a/src/oca/ruby/opennebula/utils.rb +++ b/src/oca/ruby/opennebula/utils.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/vdc.rb b/src/oca/ruby/opennebula/vdc.rb index 8c621ac719..b3c7a1f31a 100644 --- a/src/oca/ruby/opennebula/vdc.rb +++ b/src/oca/ruby/opennebula/vdc.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/vdc_pool.rb b/src/oca/ruby/opennebula/vdc_pool.rb index d603482859..398789d271 100644 --- a/src/oca/ruby/opennebula/vdc_pool.rb +++ b/src/oca/ruby/opennebula/vdc_pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/virtual_machine.rb b/src/oca/ruby/opennebula/virtual_machine.rb index 29085634fc..c330baa109 100644 --- a/src/oca/ruby/opennebula/virtual_machine.rb +++ b/src/oca/ruby/opennebula/virtual_machine.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/virtual_machine_pool.rb b/src/oca/ruby/opennebula/virtual_machine_pool.rb index 3ac90f1f03..aba1228e4f 100644 --- a/src/oca/ruby/opennebula/virtual_machine_pool.rb +++ b/src/oca/ruby/opennebula/virtual_machine_pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -115,6 +115,23 @@ module OpenNebula INFO_NOT_DONE) end + def info_search(args = {}) + default_args = { + :who => INFO_ALL, + :start_id => -1, + :end_id => -1, + :state => INFO_NOT_DONE, + :query => "" + }.merge!(args) + + return info_filter(VM_POOL_METHODS[:info], + default_args[:who], + default_args[:start_id], + default_args[:end_id], + default_args[:state], + default_args[:query]) + end + alias_method :info!, :info alias_method :info_all!, :info_all alias_method :info_mine!, :info_mine @@ -458,8 +475,8 @@ module OpenNebula data_hash end - def info_filter(xml_method, who, start_id, end_id, state) - return xmlrpc_info(xml_method, who, start_id, end_id, state) + def info_filter(xml_method, who, start_id, end_id, state, query="") + return xmlrpc_info(xml_method, who, start_id, end_id, state, query) end end end diff --git a/src/oca/ruby/opennebula/virtual_network.rb b/src/oca/ruby/opennebula/virtual_network.rb index 57aa62ca41..197a8d975d 100644 --- a/src/oca/ruby/opennebula/virtual_network.rb +++ b/src/oca/ruby/opennebula/virtual_network.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/virtual_network_pool.rb b/src/oca/ruby/opennebula/virtual_network_pool.rb index cda7875e37..6e87af5a4e 100644 --- a/src/oca/ruby/opennebula/virtual_network_pool.rb +++ b/src/oca/ruby/opennebula/virtual_network_pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/virtual_router.rb b/src/oca/ruby/opennebula/virtual_router.rb index 4a6dfcdf2b..09a5bb835c 100644 --- a/src/oca/ruby/opennebula/virtual_router.rb +++ b/src/oca/ruby/opennebula/virtual_router.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/virtual_router_pool.rb b/src/oca/ruby/opennebula/virtual_router_pool.rb index c4389649f6..8aa624715c 100644 --- a/src/oca/ruby/opennebula/virtual_router_pool.rb +++ b/src/oca/ruby/opennebula/virtual_router_pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/vm_group.rb b/src/oca/ruby/opennebula/vm_group.rb index 59c0da3812..d4b1282c23 100644 --- a/src/oca/ruby/opennebula/vm_group.rb +++ b/src/oca/ruby/opennebula/vm_group.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/vm_group_pool.rb b/src/oca/ruby/opennebula/vm_group_pool.rb index 5d3d4ca515..d08713987d 100644 --- a/src/oca/ruby/opennebula/vm_group_pool.rb +++ b/src/oca/ruby/opennebula/vm_group_pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/vntemplate.rb b/src/oca/ruby/opennebula/vntemplate.rb index f81e3073d9..a8de76b678 100644 --- a/src/oca/ruby/opennebula/vntemplate.rb +++ b/src/oca/ruby/opennebula/vntemplate.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/vntemplate_pool.rb b/src/oca/ruby/opennebula/vntemplate_pool.rb index 148dbeabf1..6e7a94f9d8 100644 --- a/src/oca/ruby/opennebula/vntemplate_pool.rb +++ b/src/oca/ruby/opennebula/vntemplate_pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/xml_element.rb b/src/oca/ruby/opennebula/xml_element.rb index e2e7c02776..a94d621ce2 100644 --- a/src/oca/ruby/opennebula/xml_element.rb +++ b/src/oca/ruby/opennebula/xml_element.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/xml_pool.rb b/src/oca/ruby/opennebula/xml_pool.rb index c02cb56cb6..1edd95fd61 100644 --- a/src/oca/ruby/opennebula/xml_pool.rb +++ b/src/oca/ruby/opennebula/xml_pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/xml_utils.rb b/src/oca/ruby/opennebula/xml_utils.rb index ee9bea0d2e..7682564bee 100644 --- a/src/oca/ruby/opennebula/xml_utils.rb +++ b/src/oca/ruby/opennebula/xml_utils.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/zone.rb b/src/oca/ruby/opennebula/zone.rb index c303ad0f72..42fcb516ff 100644 --- a/src/oca/ruby/opennebula/zone.rb +++ b/src/oca/ruby/opennebula/zone.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/oca/ruby/opennebula/zone_pool.rb b/src/oca/ruby/opennebula/zone_pool.rb index e734d6d124..556a135bf5 100644 --- a/src/oca/ruby/opennebula/zone_pool.rb +++ b/src/oca/ruby/opennebula/zone_pool.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/database_schema.rb b/src/onedb/database_schema.rb index bc5d207e6e..2c9f8649a3 100644 --- a/src/onedb/database_schema.rb +++ b/src/onedb/database_schema.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -91,8 +91,15 @@ class OneDBBacKEnd vm_pool: "oid INTEGER PRIMARY KEY, name VARCHAR(128), " << "body MEDIUMTEXT, uid INTEGER, gid INTEGER, " << "last_poll INTEGER, state INTEGER, lcm_state INTEGER, " << - "owner_u INTEGER, group_u INTEGER, other_u INTEGER, short_body MEDIUMTEXT", - + "owner_u INTEGER, group_u INTEGER, other_u INTEGER, short_body MEDIUMTEXT, " << + "search_token MEDIUMTEXT, FULLTEXT ftidx(search_token)", + + vm_pool_sqlite: "oid INTEGER PRIMARY KEY, name VARCHAR(128), " << + "body MEDIUMTEXT, uid INTEGER, gid INTEGER, " << + "last_poll INTEGER, state INTEGER, lcm_state INTEGER, " << + "owner_u INTEGER, group_u INTEGER, other_u INTEGER, short_body MEDIUMTEXT, " << + "search_token MEDIUMTEXT", + vn_template_pool: "oid INTEGER PRIMARY KEY, name VARCHAR(128), " << "body MEDIUMTEXT, uid INTEGER, gid INTEGER," << "owner_u INTEGER, group_u INTEGER, other_u INTEGER" diff --git a/src/onedb/fsck.rb b/src/onedb/fsck.rb index f7d2923c09..d366be2e11 100644 --- a/src/onedb/fsck.rb +++ b/src/onedb/fsck.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -52,7 +52,7 @@ require 'fsck/template' require 'fsck/quotas' module OneDBFsck - VERSION = "5.7.80" + VERSION = "5.6.0" LOCAL_VERSION = "5.7.80" def db_version diff --git a/src/onedb/local/4.10.3_to_4.11.80.rb b/src/onedb/local/4.10.3_to_4.11.80.rb index b152db4c3f..4581bce4e2 100644 --- a/src/onedb/local/4.10.3_to_4.11.80.rb +++ b/src/onedb/local/4.10.3_to_4.11.80.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/local/4.11.80_to_4.13.80.rb b/src/onedb/local/4.11.80_to_4.13.80.rb index d336b15823..abc408a3fa 100644 --- a/src/onedb/local/4.11.80_to_4.13.80.rb +++ b/src/onedb/local/4.11.80_to_4.13.80.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/local/4.13.80_to_4.13.85.rb b/src/onedb/local/4.13.80_to_4.13.85.rb index b6b53b7592..e442c51b8e 100644 --- a/src/onedb/local/4.13.80_to_4.13.85.rb +++ b/src/onedb/local/4.13.80_to_4.13.85.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/local/4.13.85_to_4.90.0.rb b/src/onedb/local/4.13.85_to_4.90.0.rb index 15c4ed23fd..a0d08fdc15 100644 --- a/src/onedb/local/4.13.85_to_4.90.0.rb +++ b/src/onedb/local/4.13.85_to_4.90.0.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/local/4.5.80_to_4.7.80.rb b/src/onedb/local/4.5.80_to_4.7.80.rb index b4318bb046..d309c8324f 100644 --- a/src/onedb/local/4.5.80_to_4.7.80.rb +++ b/src/onedb/local/4.5.80_to_4.7.80.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/local/4.7.80_to_4.9.80.rb b/src/onedb/local/4.7.80_to_4.9.80.rb index 24537041a2..532fa6ce67 100644 --- a/src/onedb/local/4.7.80_to_4.9.80.rb +++ b/src/onedb/local/4.7.80_to_4.9.80.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/local/4.9.80_to_4.10.3.rb b/src/onedb/local/4.9.80_to_4.10.3.rb index 3006bd1e40..f98ba3678b 100644 --- a/src/onedb/local/4.9.80_to_4.10.3.rb +++ b/src/onedb/local/4.9.80_to_4.10.3.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/local/4.90.0_to_5.3.80.rb b/src/onedb/local/4.90.0_to_5.3.80.rb index 41b5d8b7ff..da3aee46e5 100644 --- a/src/onedb/local/4.90.0_to_5.3.80.rb +++ b/src/onedb/local/4.90.0_to_5.3.80.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/local/5.3.80_to_5.4.0.rb b/src/onedb/local/5.3.80_to_5.4.0.rb index 4041de5580..96ea3e9cf9 100644 --- a/src/onedb/local/5.3.80_to_5.4.0.rb +++ b/src/onedb/local/5.3.80_to_5.4.0.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/local/5.4.0_to_5.4.1.rb b/src/onedb/local/5.4.0_to_5.4.1.rb index d663e9c635..5352d968e8 100644 --- a/src/onedb/local/5.4.0_to_5.4.1.rb +++ b/src/onedb/local/5.4.0_to_5.4.1.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/local/5.4.1_to_5.5.80.rb b/src/onedb/local/5.4.1_to_5.5.80.rb index 50b8366346..c565a5a9f9 100644 --- a/src/onedb/local/5.4.1_to_5.5.80.rb +++ b/src/onedb/local/5.4.1_to_5.5.80.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/local/5.5.80_to_5.6.0.rb b/src/onedb/local/5.5.80_to_5.6.0.rb index 3676475be7..f810ef17b8 100644 --- a/src/onedb/local/5.5.80_to_5.6.0.rb +++ b/src/onedb/local/5.5.80_to_5.6.0.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/local/5.6.0_to_5.7.80.rb b/src/onedb/local/5.6.0_to_5.7.80.rb index b220620991..1e2fdef924 100644 --- a/src/onedb/local/5.6.0_to_5.7.80.rb +++ b/src/onedb/local/5.6.0_to_5.7.80.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -38,7 +38,7 @@ module Migrator def up bug_2687 # MUST be run before 2489, which generates short body feature_2253 - feature_2489 + feature_2489_2671 feature_826 true end @@ -74,7 +74,12 @@ module Migrator @db.run 'DROP TABLE IF EXISTS old_vm_pool;' @db.run 'ALTER TABLE vm_pool RENAME TO old_vm_pool;' - create_table(:vm_pool) + + if !is_fts_available + create_table(:vm_pool_sqlite, "vm_pool", db_version) + else + create_table(:vm_pool, nil, db_version) + end @db.transaction do # updates VM's nics @@ -104,10 +109,15 @@ module Migrator @db.run 'DROP TABLE old_vm_pool;' end - def feature_2489 + def feature_2489_2671 @db.run 'DROP TABLE IF EXISTS old_vm_pool;' @db.run 'ALTER TABLE vm_pool RENAME TO old_vm_pool;' - create_table(:vm_pool, nil, db_version) + + if !is_fts_available + create_table(:vm_pool_sqlite, "vm_pool", db_version) + else + create_table(:vm_pool, nil, db_version) + end @db.transaction do @db.fetch('SELECT * FROM old_vm_pool') do |row| @@ -116,6 +126,7 @@ module Migrator end row[:short_body] = gen_short_body(doc) + row[:search_token] = gen_search_body(doc) @db[:vm_pool].insert(row) end @@ -135,6 +146,79 @@ module Migrator end end + def gen_search_body(body) + + search_body = "UNAME=" + escape_token(body.root.xpath('UNAME').text) + "\n" + + "GNAME=" + escape_token(body.root.xpath('GNAME').text) + "\n" + + "NAME=" + escape_token(body.root.xpath('NAME').text) + "\n" + + "LAST_POLL=" + escape_token(body.root.xpath('LAST_POLL').text) + "\n" + + "PREV_STATE=" + escape_token(body.root.xpath('PREV_STATE').text) + "\n" + + "PREV_LCM_STATE=" + escape_token(body.root.xpath('PREV_LCM_STATE').text) + "\n" + + "RESCHED=" + escape_token(body.root.xpath('RESCHED').text) + "\n" + + "STIME=" + escape_token(body.root.xpath('STIME').text) + "\n" + + "ETIME=" + escape_token(body.root.xpath('ETIME').text) + "\n" + + "DEPLOY_ID=" + escape_token(body.root.xpath('DEPLOY_ID').text) + "\n" + + body.root.xpath("//TEMPLATE/*").each do |node| + search_body += to_token(node) + end + + node = Nokogiri::XML(body.root.xpath("//HISTORY_RECORDS/HISTORY[last()]").to_s) + + if !node.root.nil? + search_body += history_to_token(node) + end + + return search_body + end + + def to_token(node) + search_body = "" + if node.children.size > 1 + node.children.each do |child| + search_body += to_token(child) + end + elsif + search_body += node.name + "=" + escape_token(node.children.text) + "\n" + end + + return search_body + end + + def history_to_token(hr) + hr_token = "HOSTNAME=" + escape_token(hr.xpath("//HOSTNAME").text) + "\n" + + "HID=" + hr.xpath("//HID").text + "\n" + + "CID=" + hr.xpath("//CID").text + "\n" + + "DS_ID=" + hr.xpath("//DS_ID").text + "\n" + end + + def escape_token(str) + str_scaped = "" + + str.split("").each do |c| + case c + when '-', '_', '.', ':' + str_scaped += '_' + else + str_scaped += c + end + end + + return str_scaped + end + + def is_fts_available() + if @db.adapter_scheme == :sqlite + return false + else + if @db.server_version >= 50600 + return true + else + return false + end + end + end + def gen_short_body(body) short_body = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml| xml.VM{ @@ -282,7 +366,11 @@ module Migrator @db.run "DROP TABLE IF EXISTS old_vm_pool;" @db.run "ALTER TABLE vm_pool RENAME TO old_vm_pool;" - create_table(:vm_pool) + if !is_fts_available + create_table(:vm_pool_sqlite, "vm_pool", db_version) + else + create_table(:vm_pool, nil, db_version) + end @db.transaction do @db.fetch("SELECT * FROM old_vm_pool") do |row| diff --git a/src/onedb/onedb b/src/onedb/onedb index feb33f8657..9d9f0efa54 100755 --- a/src/onedb/onedb +++ b/src/onedb/onedb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/onedb.rb b/src/onedb/onedb.rb index 34cd1b696b..b3fcc0b731 100644 --- a/src/onedb/onedb.rb +++ b/src/onedb/onedb.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/onedb_backend.rb b/src/onedb/onedb_backend.rb index 08a68e6b43..2842bad402 100644 --- a/src/onedb/onedb_backend.rb +++ b/src/onedb/onedb_backend.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/patches/4.14_monitoring.rb b/src/onedb/patches/4.14_monitoring.rb index 6221fc0eb8..3fd8d55159 100644 --- a/src/onedb/patches/4.14_monitoring.rb +++ b/src/onedb/patches/4.14_monitoring.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/patches/history_times.rb b/src/onedb/patches/history_times.rb index 91650014fb..2e6851d207 100644 --- a/src/onedb/patches/history_times.rb +++ b/src/onedb/patches/history_times.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/patches/ip4_ip6_static.rb b/src/onedb/patches/ip4_ip6_static.rb index 151b58f075..c1a0c790a6 100644 --- a/src/onedb/patches/ip4_ip6_static.rb +++ b/src/onedb/patches/ip4_ip6_static.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/patches/marketapps_clean.rb b/src/onedb/patches/marketapps_clean.rb index 1a87b5baef..c4eaad5b3d 100644 --- a/src/onedb/patches/marketapps_clean.rb +++ b/src/onedb/patches/marketapps_clean.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/patches/next_snapshot.rb b/src/onedb/patches/next_snapshot.rb index 1b61cf437a..c9bb5943c2 100644 --- a/src/onedb/patches/next_snapshot.rb +++ b/src/onedb/patches/next_snapshot.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/2.0_to_2.9.80.rb b/src/onedb/shared/2.0_to_2.9.80.rb index 980c1a83b7..4e49fd3a32 100644 --- a/src/onedb/shared/2.0_to_2.9.80.rb +++ b/src/onedb/shared/2.0_to_2.9.80.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/2.9.80_to_2.9.85.rb b/src/onedb/shared/2.9.80_to_2.9.85.rb index 8c3ef34cc5..7f2c4ed0a6 100644 --- a/src/onedb/shared/2.9.80_to_2.9.85.rb +++ b/src/onedb/shared/2.9.80_to_2.9.85.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/2.9.85_to_2.9.90.rb b/src/onedb/shared/2.9.85_to_2.9.90.rb index be86322272..46ad0208f5 100644 --- a/src/onedb/shared/2.9.85_to_2.9.90.rb +++ b/src/onedb/shared/2.9.85_to_2.9.90.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/2.9.90_to_3.0.0.rb b/src/onedb/shared/2.9.90_to_3.0.0.rb index 3098e62c56..bfa1792b6c 100644 --- a/src/onedb/shared/2.9.90_to_3.0.0.rb +++ b/src/onedb/shared/2.9.90_to_3.0.0.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/3.0.0_to_3.1.0.rb b/src/onedb/shared/3.0.0_to_3.1.0.rb index eb3cd8d201..7d991d82a8 100644 --- a/src/onedb/shared/3.0.0_to_3.1.0.rb +++ b/src/onedb/shared/3.0.0_to_3.1.0.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/3.1.0_to_3.1.80.rb b/src/onedb/shared/3.1.0_to_3.1.80.rb index 6481d6e4de..047e10c3d6 100644 --- a/src/onedb/shared/3.1.0_to_3.1.80.rb +++ b/src/onedb/shared/3.1.0_to_3.1.80.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/3.1.80_to_3.2.0.rb b/src/onedb/shared/3.1.80_to_3.2.0.rb index 5a9f5fa6c4..2c5d7e841b 100644 --- a/src/onedb/shared/3.1.80_to_3.2.0.rb +++ b/src/onedb/shared/3.1.80_to_3.2.0.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/3.2.0_to_3.2.1.rb b/src/onedb/shared/3.2.0_to_3.2.1.rb index 7c9514d027..bb6f337a9c 100644 --- a/src/onedb/shared/3.2.0_to_3.2.1.rb +++ b/src/onedb/shared/3.2.0_to_3.2.1.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/3.2.1_to_3.3.0.rb b/src/onedb/shared/3.2.1_to_3.3.0.rb index 07fe750f32..c87e9de734 100644 --- a/src/onedb/shared/3.2.1_to_3.3.0.rb +++ b/src/onedb/shared/3.2.1_to_3.3.0.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/3.3.0_to_3.3.80.rb b/src/onedb/shared/3.3.0_to_3.3.80.rb index 26df01c89d..2812482024 100644 --- a/src/onedb/shared/3.3.0_to_3.3.80.rb +++ b/src/onedb/shared/3.3.0_to_3.3.80.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/3.3.80_to_3.4.0.rb b/src/onedb/shared/3.3.80_to_3.4.0.rb index a670a19d31..b07006867e 100644 --- a/src/onedb/shared/3.3.80_to_3.4.0.rb +++ b/src/onedb/shared/3.3.80_to_3.4.0.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/3.4.0_to_3.4.1.rb b/src/onedb/shared/3.4.0_to_3.4.1.rb index dae6f5c6b0..f7cf0a355d 100644 --- a/src/onedb/shared/3.4.0_to_3.4.1.rb +++ b/src/onedb/shared/3.4.0_to_3.4.1.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/3.4.1_to_3.5.80.rb b/src/onedb/shared/3.4.1_to_3.5.80.rb index 1e14c8eb2a..ffb1ce49ca 100644 --- a/src/onedb/shared/3.4.1_to_3.5.80.rb +++ b/src/onedb/shared/3.4.1_to_3.5.80.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/3.5.80_to_3.6.0.rb b/src/onedb/shared/3.5.80_to_3.6.0.rb index 05b1b2422a..ed0e243f59 100644 --- a/src/onedb/shared/3.5.80_to_3.6.0.rb +++ b/src/onedb/shared/3.5.80_to_3.6.0.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/3.6.0_to_3.7.80.rb b/src/onedb/shared/3.6.0_to_3.7.80.rb index 7b5d238da0..1010dc95bb 100644 --- a/src/onedb/shared/3.6.0_to_3.7.80.rb +++ b/src/onedb/shared/3.6.0_to_3.7.80.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/3.7.80_to_3.8.0.rb b/src/onedb/shared/3.7.80_to_3.8.0.rb index bb06d9c415..9a9790b6de 100644 --- a/src/onedb/shared/3.7.80_to_3.8.0.rb +++ b/src/onedb/shared/3.7.80_to_3.8.0.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/3.8.0_to_3.8.1.rb b/src/onedb/shared/3.8.0_to_3.8.1.rb index a3b0e459f5..d38d7ed224 100644 --- a/src/onedb/shared/3.8.0_to_3.8.1.rb +++ b/src/onedb/shared/3.8.0_to_3.8.1.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/3.8.1_to_3.8.2.rb b/src/onedb/shared/3.8.1_to_3.8.2.rb index 0766cfef43..73fba742a2 100644 --- a/src/onedb/shared/3.8.1_to_3.8.2.rb +++ b/src/onedb/shared/3.8.1_to_3.8.2.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/3.8.2_to_3.8.3.rb b/src/onedb/shared/3.8.2_to_3.8.3.rb index b44db9013f..4a83035fc6 100644 --- a/src/onedb/shared/3.8.2_to_3.8.3.rb +++ b/src/onedb/shared/3.8.2_to_3.8.3.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/3.8.3_to_3.8.4.rb b/src/onedb/shared/3.8.3_to_3.8.4.rb index b95d8a3751..6224a78462 100644 --- a/src/onedb/shared/3.8.3_to_3.8.4.rb +++ b/src/onedb/shared/3.8.3_to_3.8.4.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/3.8.4_to_3.8.5.rb b/src/onedb/shared/3.8.4_to_3.8.5.rb index b5cd2d96d9..19c1f4a952 100644 --- a/src/onedb/shared/3.8.4_to_3.8.5.rb +++ b/src/onedb/shared/3.8.4_to_3.8.5.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/3.8.5_to_3.9.80.rb b/src/onedb/shared/3.8.5_to_3.9.80.rb index 9e57112a09..99ed98efd8 100644 --- a/src/onedb/shared/3.8.5_to_3.9.80.rb +++ b/src/onedb/shared/3.8.5_to_3.9.80.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/3.9.80_to_3.9.90.rb b/src/onedb/shared/3.9.80_to_3.9.90.rb index 9a8c59b44f..8b04424990 100644 --- a/src/onedb/shared/3.9.80_to_3.9.90.rb +++ b/src/onedb/shared/3.9.80_to_3.9.90.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/3.9.90_to_4.0.0.rb b/src/onedb/shared/3.9.90_to_4.0.0.rb index a99158f608..e2f4a88fa8 100644 --- a/src/onedb/shared/3.9.90_to_4.0.0.rb +++ b/src/onedb/shared/3.9.90_to_4.0.0.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/4.0.0_to_4.0.1.rb b/src/onedb/shared/4.0.0_to_4.0.1.rb index ca9df0c339..f75ac3c618 100644 --- a/src/onedb/shared/4.0.0_to_4.0.1.rb +++ b/src/onedb/shared/4.0.0_to_4.0.1.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/4.0.1_to_4.1.80.rb b/src/onedb/shared/4.0.1_to_4.1.80.rb index 405a765026..5417555141 100644 --- a/src/onedb/shared/4.0.1_to_4.1.80.rb +++ b/src/onedb/shared/4.0.1_to_4.1.80.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/4.1.80_to_4.2.0.rb b/src/onedb/shared/4.1.80_to_4.2.0.rb index a373429cfb..f172314108 100644 --- a/src/onedb/shared/4.1.80_to_4.2.0.rb +++ b/src/onedb/shared/4.1.80_to_4.2.0.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/4.11.80_to_4.90.0.rb b/src/onedb/shared/4.11.80_to_4.90.0.rb index d2ddfe884a..e16662b29e 100644 --- a/src/onedb/shared/4.11.80_to_4.90.0.rb +++ b/src/onedb/shared/4.11.80_to_4.90.0.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/4.2.0_to_4.3.80.rb b/src/onedb/shared/4.2.0_to_4.3.80.rb index 716846c83b..9bd0b11074 100644 --- a/src/onedb/shared/4.2.0_to_4.3.80.rb +++ b/src/onedb/shared/4.2.0_to_4.3.80.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/4.3.80_to_4.3.85.rb b/src/onedb/shared/4.3.80_to_4.3.85.rb index fa46056820..b4e19e0f2f 100644 --- a/src/onedb/shared/4.3.80_to_4.3.85.rb +++ b/src/onedb/shared/4.3.80_to_4.3.85.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/4.3.85_to_4.3.90.rb b/src/onedb/shared/4.3.85_to_4.3.90.rb index 5e94341260..e9b9998ca7 100644 --- a/src/onedb/shared/4.3.85_to_4.3.90.rb +++ b/src/onedb/shared/4.3.85_to_4.3.90.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/4.3.90_to_4.4.0.rb b/src/onedb/shared/4.3.90_to_4.4.0.rb index eaa8a49961..9a5706c63f 100644 --- a/src/onedb/shared/4.3.90_to_4.4.0.rb +++ b/src/onedb/shared/4.3.90_to_4.4.0.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/4.4.0_to_4.4.1.rb b/src/onedb/shared/4.4.0_to_4.4.1.rb index 9de29532df..5c6baaf008 100644 --- a/src/onedb/shared/4.4.0_to_4.4.1.rb +++ b/src/onedb/shared/4.4.0_to_4.4.1.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/4.4.1_to_4.5.80.rb b/src/onedb/shared/4.4.1_to_4.5.80.rb index eb44a69e04..040d4d84a9 100644 --- a/src/onedb/shared/4.4.1_to_4.5.80.rb +++ b/src/onedb/shared/4.4.1_to_4.5.80.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/4.5.80_to_4.6.0.rb b/src/onedb/shared/4.5.80_to_4.6.0.rb index b385d3e0b0..6b661775bb 100644 --- a/src/onedb/shared/4.5.80_to_4.6.0.rb +++ b/src/onedb/shared/4.5.80_to_4.6.0.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/4.6.0_to_4.11.80.rb b/src/onedb/shared/4.6.0_to_4.11.80.rb index 82aaf220ad..c72e8c9dce 100644 --- a/src/onedb/shared/4.6.0_to_4.11.80.rb +++ b/src/onedb/shared/4.6.0_to_4.11.80.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/4.90.0_to_5.2.0.rb b/src/onedb/shared/4.90.0_to_5.2.0.rb index 5555bcd3e0..3c8fbee455 100644 --- a/src/onedb/shared/4.90.0_to_5.2.0.rb +++ b/src/onedb/shared/4.90.0_to_5.2.0.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/5.2.0_to_5.3.80.rb b/src/onedb/shared/5.2.0_to_5.3.80.rb index afe0046e9b..5b1360907e 100644 --- a/src/onedb/shared/5.2.0_to_5.3.80.rb +++ b/src/onedb/shared/5.2.0_to_5.3.80.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/5.3.80_to_5.4.0.rb b/src/onedb/shared/5.3.80_to_5.4.0.rb index 98ee50101d..6270eade7a 100644 --- a/src/onedb/shared/5.3.80_to_5.4.0.rb +++ b/src/onedb/shared/5.3.80_to_5.4.0.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/5.4.0_to_5.4.1.rb b/src/onedb/shared/5.4.0_to_5.4.1.rb index 788dd7c754..11a1d2f7b5 100644 --- a/src/onedb/shared/5.4.0_to_5.4.1.rb +++ b/src/onedb/shared/5.4.0_to_5.4.1.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/5.4.1_to_5.5.80.rb b/src/onedb/shared/5.4.1_to_5.5.80.rb index b1a79d9fdd..076f0c6759 100644 --- a/src/onedb/shared/5.4.1_to_5.5.80.rb +++ b/src/onedb/shared/5.4.1_to_5.5.80.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/5.5.80_to_5.6.0.rb b/src/onedb/shared/5.5.80_to_5.6.0.rb index 927a38eb63..a10c7369f6 100644 --- a/src/onedb/shared/5.5.80_to_5.6.0.rb +++ b/src/onedb/shared/5.5.80_to_5.6.0.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/shared/5.6.0_to_5.7.80.rb b/src/onedb/shared/5.6.0_to_5.7.80.rb index 87b5c040a9..7384139729 100644 --- a/src/onedb/shared/5.6.0_to_5.7.80.rb +++ b/src/onedb/shared/5.6.0_to_5.7.80.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/vcenter_one54.rb b/src/onedb/vcenter_one54.rb index 629e6f8d48..5d5feb8ad7 100644 --- a/src/onedb/vcenter_one54.rb +++ b/src/onedb/vcenter_one54.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onedb/vcenter_one54_pre.rb b/src/onedb/vcenter_one54_pre.rb index 8bb8dbba96..1031cc5b87 100644 --- a/src/onedb/vcenter_one54_pre.rb +++ b/src/onedb/vcenter_one54_pre.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onegate/bin/onegate-server b/src/onegate/bin/onegate-server index b50ad46b77..0248fda1a9 100755 --- a/src/onegate/bin/onegate-server +++ b/src/onegate/bin/onegate-server @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onegate/etc/onegate-server.conf b/src/onegate/etc/onegate-server.conf index 751fd4e747..be218dd418 100644 --- a/src/onegate/etc/onegate-server.conf +++ b/src/onegate/etc/onegate-server.conf @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/onegate/onegate-server.rb b/src/onegate/onegate-server.rb index a3bd36a8cb..5f9787f100 100644 --- a/src/onegate/onegate-server.rb +++ b/src/onegate/onegate-server.rb @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/parsers/SConstruct b/src/parsers/SConstruct index 51c67c474a..8b5dfc3ebf 100644 --- a/src/parsers/SConstruct +++ b/src/parsers/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/template # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/parsers/expr_arith.y b/src/parsers/expr_arith.y index 1cdfeceb45..9540c9208b 100644 --- a/src/parsers/expr_arith.y +++ b/src/parsers/expr_arith.y @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/parsers/expr_bool.y b/src/parsers/expr_bool.y index 2f4879cbcc..17bdd16c4c 100644 --- a/src/parsers/expr_bool.y +++ b/src/parsers/expr_bool.y @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/parsers/expr_parser.cc b/src/parsers/expr_parser.cc index 9e5e7adde7..58092727bb 100644 --- a/src/parsers/expr_parser.cc +++ b/src/parsers/expr_parser.cc @@ -673,7 +673,7 @@ static const flex_int32_t yy_rule_can_match_eol[9] = #define YY_RESTORE_YY_MORE_OFFSET #line 1 "expr_parser.l" /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/parsers/expr_parser.l b/src/parsers/expr_parser.l index bab4911f02..0c69a2c37d 100644 --- a/src/parsers/expr_parser.l +++ b/src/parsers/expr_parser.l @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/parsers/mem_collector.cc b/src/parsers/mem_collector.cc index fead056bdc..4573d1703f 100644 --- a/src/parsers/mem_collector.cc +++ b/src/parsers/mem_collector.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/parsers/template_parser.cc b/src/parsers/template_parser.cc index 6c3e4be2c6..21fbea50c0 100644 --- a/src/parsers/template_parser.cc +++ b/src/parsers/template_parser.cc @@ -727,7 +727,7 @@ static const flex_int32_t yy_rule_can_match_eol[13] = #define YY_RESTORE_YY_MORE_OFFSET #line 1 "template_parser.l" /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/parsers/template_parser.l b/src/parsers/template_parser.l index 1ce4d6784b..dc96c88fe2 100644 --- a/src/parsers/template_parser.l +++ b/src/parsers/template_parser.l @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/parsers/template_syntax.y b/src/parsers/template_syntax.y index 7ec3ff32e6..989f5f550f 100644 --- a/src/parsers/template_syntax.y +++ b/src/parsers/template_syntax.y @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/parsers/vm_file_var_syntax.y b/src/parsers/vm_file_var_syntax.y index 48a05ba400..6639a722b7 100644 --- a/src/parsers/vm_file_var_syntax.y +++ b/src/parsers/vm_file_var_syntax.y @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/parsers/vm_var_parser.cc b/src/parsers/vm_var_parser.cc index 98b6e1bbcc..0d94e8169a 100644 --- a/src/parsers/vm_var_parser.cc +++ b/src/parsers/vm_var_parser.cc @@ -686,7 +686,7 @@ static const flex_int32_t yy_rule_can_match_eol[13] = #define YY_RESTORE_YY_MORE_OFFSET #line 1 "vm_var_parser.l" /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/parsers/vm_var_parser.l b/src/parsers/vm_var_parser.l index b683a1784d..ff93f64bd6 100644 --- a/src/parsers/vm_var_parser.l +++ b/src/parsers/vm_var_parser.l @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/parsers/vm_var_syntax.y b/src/parsers/vm_var_syntax.y index 31275a046b..ba642aa459 100644 --- a/src/parsers/vm_var_syntax.y +++ b/src/parsers/vm_var_syntax.y @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/pm_mad/remotes/dummy/cancel b/src/pm_mad/remotes/dummy/cancel index c5cca8851d..a77f5eb026 100755 --- a/src/pm_mad/remotes/dummy/cancel +++ b/src/pm_mad/remotes/dummy/cancel @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/pm_mad/remotes/dummy/deploy b/src/pm_mad/remotes/dummy/deploy index 604c10ee94..bff678fc57 100755 --- a/src/pm_mad/remotes/dummy/deploy +++ b/src/pm_mad/remotes/dummy/deploy @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/pm_mad/remotes/dummy/poll b/src/pm_mad/remotes/dummy/poll index 6245ea65c2..8bcd448071 100755 --- a/src/pm_mad/remotes/dummy/poll +++ b/src/pm_mad/remotes/dummy/poll @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/pm_mad/remotes/dummy/reboot b/src/pm_mad/remotes/dummy/reboot index c5cca8851d..a77f5eb026 100755 --- a/src/pm_mad/remotes/dummy/reboot +++ b/src/pm_mad/remotes/dummy/reboot @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/pm_mad/remotes/dummy/reset b/src/pm_mad/remotes/dummy/reset index c5cca8851d..a77f5eb026 100755 --- a/src/pm_mad/remotes/dummy/reset +++ b/src/pm_mad/remotes/dummy/reset @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/pm_mad/remotes/dummy/shutdown b/src/pm_mad/remotes/dummy/shutdown index c5cca8851d..a77f5eb026 100755 --- a/src/pm_mad/remotes/dummy/shutdown +++ b/src/pm_mad/remotes/dummy/shutdown @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/pm_mad/remotes/ec2/cancel b/src/pm_mad/remotes/ec2/cancel index 36bc3e4bd3..6334a3006f 100755 --- a/src/pm_mad/remotes/ec2/cancel +++ b/src/pm_mad/remotes/ec2/cancel @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/pm_mad/remotes/ec2/deploy b/src/pm_mad/remotes/ec2/deploy index a1ec65f476..144e460b73 100755 --- a/src/pm_mad/remotes/ec2/deploy +++ b/src/pm_mad/remotes/ec2/deploy @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/pm_mad/remotes/ec2/poll b/src/pm_mad/remotes/ec2/poll index 6fb2af1f21..6322d6834f 100755 --- a/src/pm_mad/remotes/ec2/poll +++ b/src/pm_mad/remotes/ec2/poll @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/pm_mad/remotes/ec2/reboot b/src/pm_mad/remotes/ec2/reboot index 7632cd8fd5..abf781cb16 100755 --- a/src/pm_mad/remotes/ec2/reboot +++ b/src/pm_mad/remotes/ec2/reboot @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/pm_mad/remotes/ec2/reset b/src/pm_mad/remotes/ec2/reset index 5441f6ad0f..c98e9fc420 100755 --- a/src/pm_mad/remotes/ec2/reset +++ b/src/pm_mad/remotes/ec2/reset @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/pm_mad/remotes/ec2/shutdown b/src/pm_mad/remotes/ec2/shutdown index 7f951428d4..49e8633813 100755 --- a/src/pm_mad/remotes/ec2/shutdown +++ b/src/pm_mad/remotes/ec2/shutdown @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/pm_mad/remotes/packet/cancel b/src/pm_mad/remotes/packet/cancel index 8118416c91..95eb7c8475 100755 --- a/src/pm_mad/remotes/packet/cancel +++ b/src/pm_mad/remotes/packet/cancel @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/pm_mad/remotes/packet/deploy b/src/pm_mad/remotes/packet/deploy index 4eb2f1ec57..dff568daef 100755 --- a/src/pm_mad/remotes/packet/deploy +++ b/src/pm_mad/remotes/packet/deploy @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/pm_mad/remotes/packet/poll b/src/pm_mad/remotes/packet/poll index 38901657ff..1dc0dcc423 100755 --- a/src/pm_mad/remotes/packet/poll +++ b/src/pm_mad/remotes/packet/poll @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/pm_mad/remotes/packet/reboot b/src/pm_mad/remotes/packet/reboot index 19ddf7bf10..e77895e733 100755 --- a/src/pm_mad/remotes/packet/reboot +++ b/src/pm_mad/remotes/packet/reboot @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/pm_mad/remotes/packet/reset b/src/pm_mad/remotes/packet/reset index d820ed9ad0..9f41d1adbb 100755 --- a/src/pm_mad/remotes/packet/reset +++ b/src/pm_mad/remotes/packet/reset @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/pm_mad/remotes/packet/shutdown b/src/pm_mad/remotes/packet/shutdown index c876d79f5b..1e964b6131 100755 --- a/src/pm_mad/remotes/packet/shutdown +++ b/src/pm_mad/remotes/packet/shutdown @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/pool/ObjectCollection.cc b/src/pool/ObjectCollection.cc index 1cb816b244..0d9b75250a 100644 --- a/src/pool/ObjectCollection.cc +++ b/src/pool/ObjectCollection.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/pool/PoolObjectAuth.cc b/src/pool/PoolObjectAuth.cc index 410c3710a1..cbaaaa1537 100644 --- a/src/pool/PoolObjectAuth.cc +++ b/src/pool/PoolObjectAuth.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/pool/PoolObjectSQL.cc b/src/pool/PoolObjectSQL.cc index 5d7cce9425..781c522ca0 100644 --- a/src/pool/PoolObjectSQL.cc +++ b/src/pool/PoolObjectSQL.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -593,6 +593,11 @@ bool PoolObjectSQL::name_is_valid(const string& obj_name, int PoolObjectSQL::lock_db(const int owner, const int req_id, const int level) { + if ( level < ST_NONE || level > ST_ADMIN ) + { + return -1; + } + locked = static_cast(level); lock_time = time(0); lock_owner = owner; @@ -626,18 +631,23 @@ int PoolObjectSQL::unlock_db(const int owner, const int req_id) string& PoolObjectSQL::lock_db_to_xml(string& xml) const { - ostringstream oss; - if (locked != LockStates::ST_NONE) + if (locked == LockStates::ST_NONE) { - oss << "" - << "" << static_cast(locked) << "" - << "" << lock_owner << "" - << "" - << "" << lock_req_id << "" - << ""; + xml.clear(); + return xml; } + ostringstream oss; + + oss << "" + << "" << static_cast(locked) << "" + << "" << lock_owner << "" + << "" + << "" << lock_req_id << "" + << ""; + xml = oss.str(); + return xml; } @@ -648,17 +658,25 @@ int PoolObjectSQL::lock_db_from_xml() { int rc = 0; int locked_int; + vector content; - if (ObjectXML::get_nodes("/*/LOCK/LOCKED", content) > 0) - { - rc += xpath(locked_int, "/*/LOCK/LOCKED", 0); - rc += xpath(lock_req_id, "/*/LOCK/REQ_ID", -1); - rc += xpath(lock_owner, "/*/LOCK/OWNER", -1); - xpath(lock_time, "/*/LOCK/TIME", time(0)); + ObjectXML::get_nodes("/*/LOCK/LOCKED", content); - locked = static_cast(locked_int); + if ( content.empty() ) + { + return 0; } + rc += xpath(locked_int, "/*/LOCK/LOCKED", 0); + rc += xpath(lock_req_id, "/*/LOCK/REQ_ID", -1); + rc += xpath(lock_owner, "/*/LOCK/OWNER", -1); + + xpath(lock_time, "/*/LOCK/TIME", time(0)); + + locked = static_cast(locked_int); + + ObjectXML::free_nodes(content); + return rc; } diff --git a/src/pool/PoolSQL.cc b/src/pool/PoolSQL.cc index 7261615905..392cf6e4f8 100644 --- a/src/pool/PoolSQL.cc +++ b/src/pool/PoolSQL.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -148,7 +148,14 @@ int PoolSQL::allocate(PoolObjectSQL *objsql, string& error_str) if( rc == -1 ) { - _set_lastOID(--lastOID, db, table); + lastOID = lastOID - 1; + + if ( lastOID < 0 ) + { + lastOID = 0; + } + + _set_lastOID(lastOID, db, table); } unlock(); diff --git a/src/pool/PoolSQLCache.cc b/src/pool/PoolSQLCache.cc index 3b632d1a6e..eec5f3ab6e 100644 --- a/src/pool/PoolSQLCache.cc +++ b/src/pool/PoolSQLCache.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/pool/SConstruct b/src/pool/SConstruct index df61f729a9..bf0452a32f 100644 --- a/src/pool/SConstruct +++ b/src/pool/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/pool # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/raft/FedReplicaManager.cc b/src/raft/FedReplicaManager.cc index 1d9a8c8b64..b9f5e3bf09 100644 --- a/src/raft/FedReplicaManager.cc +++ b/src/raft/FedReplicaManager.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/raft/RaftHook.cc b/src/raft/RaftHook.cc index e14dedeeaf..153dbcc337 100644 --- a/src/raft/RaftHook.cc +++ b/src/raft/RaftHook.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/raft/RaftManager.cc b/src/raft/RaftManager.cc index aa948ed4c9..ac2fc21dc3 100644 --- a/src/raft/RaftManager.cc +++ b/src/raft/RaftManager.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/raft/ReplicaManager.cc b/src/raft/ReplicaManager.cc index 29e7503e6d..fbeb2a7398 100644 --- a/src/raft/ReplicaManager.cc +++ b/src/raft/ReplicaManager.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/raft/ReplicaThread.cc b/src/raft/ReplicaThread.cc index c562e149e0..b7b0d1c2f8 100644 --- a/src/raft/ReplicaThread.cc +++ b/src/raft/ReplicaThread.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/raft/SConstruct b/src/raft/SConstruct index d175aeddef..0ea788bd89 100644 --- a/src/raft/SConstruct +++ b/src/raft/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/log # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/rm/Request.cc b/src/rm/Request.cc index 152b78a593..a06f11b5f3 100644 --- a/src/rm/Request.cc +++ b/src/rm/Request.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/rm/RequestManager.cc b/src/rm/RequestManager.cc index e29ebc1dd1..49f8d3ab90 100644 --- a/src/rm/RequestManager.cc +++ b/src/rm/RequestManager.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/rm/RequestManagerAcl.cc b/src/rm/RequestManagerAcl.cc index 02c12c0882..042579e249 100644 --- a/src/rm/RequestManagerAcl.cc +++ b/src/rm/RequestManagerAcl.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/rm/RequestManagerAllocate.cc b/src/rm/RequestManagerAllocate.cc index d55d97695d..ebf846c5fb 100644 --- a/src/rm/RequestManagerAllocate.cc +++ b/src/rm/RequestManagerAllocate.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/rm/RequestManagerChmod.cc b/src/rm/RequestManagerChmod.cc index 6b42d29a4d..806e245f53 100644 --- a/src/rm/RequestManagerChmod.cc +++ b/src/rm/RequestManagerChmod.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/rm/RequestManagerChown.cc b/src/rm/RequestManagerChown.cc index 60022f8176..9025af8764 100644 --- a/src/rm/RequestManagerChown.cc +++ b/src/rm/RequestManagerChown.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/rm/RequestManagerClone.cc b/src/rm/RequestManagerClone.cc index e5d380d03f..132050e126 100644 --- a/src/rm/RequestManagerClone.cc +++ b/src/rm/RequestManagerClone.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/rm/RequestManagerCluster.cc b/src/rm/RequestManagerCluster.cc index e5495a9e4c..2786e97135 100644 --- a/src/rm/RequestManagerCluster.cc +++ b/src/rm/RequestManagerCluster.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/rm/RequestManagerDatastore.cc b/src/rm/RequestManagerDatastore.cc index c9e28b8e3f..0712dde351 100644 --- a/src/rm/RequestManagerDatastore.cc +++ b/src/rm/RequestManagerDatastore.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/rm/RequestManagerDelete.cc b/src/rm/RequestManagerDelete.cc index bed9a9d870..79181be014 100644 --- a/src/rm/RequestManagerDelete.cc +++ b/src/rm/RequestManagerDelete.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -17,8 +17,6 @@ #include "RequestManagerDelete.h" #include "NebulaUtil.h" -using namespace std; - /* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */ @@ -66,7 +64,42 @@ void RequestManagerDelete::request_execute(xmlrpc_c::paramList const& paramList, recursive = xmlrpc_c::value_boolean(paramList.getBoolean(2)); } - ErrorCode ec = delete_object(oid, recursive, att); + ErrorCode ec = delete_object(oid, recursive, att, auth_op); + + if ( ec == SUCCESS ) + { + success_response(oid, att); + } + else + { + failure_response(ec, att); + } +} + +void ImageDelete::request_execute(xmlrpc_c::paramList const& paramList, + RequestAttributes& att) +{ + int oid = xmlrpc_c::value_int(paramList.getInt(1)); + AuthRequest::Operation auth = auth_op; + + //get the image + Image* img = static_cast(pool)->get_ro(oid); + + if (img == 0) + { + att.resp_id = oid; + failure_response(NO_EXISTS, att); + return; + } + + if (img->is_locked()) + { + auth = AuthRequest::ADMIN; + } + + img->unlock(); + + ErrorCode ec = delete_object(oid, false, att, auth); if ( ec == SUCCESS ) { @@ -83,10 +116,12 @@ void RequestManagerDelete::request_execute(xmlrpc_c::paramList const& paramList, /* ------------------------------------------------------------------------- */ Request::ErrorCode RequestManagerDelete::delete_object(int oid, - bool recursive, RequestAttributes& att) + bool recursive, RequestAttributes& att, AuthRequest::Operation auth) { string err; - ErrorCode ec = delete_authorization(pool, oid, auth_op, att); + ErrorCode ec; + + ec = delete_authorization(pool, oid, auth, att); if ( ec != SUCCESS ) { diff --git a/src/rm/RequestManagerGroup.cc b/src/rm/RequestManagerGroup.cc index 7e38e9e234..b645e4ec5b 100644 --- a/src/rm/RequestManagerGroup.cc +++ b/src/rm/RequestManagerGroup.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/rm/RequestManagerHost.cc b/src/rm/RequestManagerHost.cc index 6043f89dc2..b195afa9ea 100644 --- a/src/rm/RequestManagerHost.cc +++ b/src/rm/RequestManagerHost.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/rm/RequestManagerImage.cc b/src/rm/RequestManagerImage.cc index 56c75a83b1..6b93adf6cc 100644 --- a/src/rm/RequestManagerImage.cc +++ b/src/rm/RequestManagerImage.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/rm/RequestManagerInfo.cc b/src/rm/RequestManagerInfo.cc index 08bf819f09..ce3dc8bd6a 100644 --- a/src/rm/RequestManagerInfo.cc +++ b/src/rm/RequestManagerInfo.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/rm/RequestManagerLock.cc b/src/rm/RequestManagerLock.cc index 61440576c3..3963c8bc78 100644 --- a/src/rm/RequestManagerLock.cc +++ b/src/rm/RequestManagerLock.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/rm/RequestManagerMarketPlaceApp.cc b/src/rm/RequestManagerMarketPlaceApp.cc index 5c88c11d49..fc06727045 100644 --- a/src/rm/RequestManagerMarketPlaceApp.cc +++ b/src/rm/RequestManagerMarketPlaceApp.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/rm/RequestManagerPoolInfoFilter.cc b/src/rm/RequestManagerPoolInfoFilter.cc index a8d5bd5345..77c1a3ade5 100644 --- a/src/rm/RequestManagerPoolInfoFilter.cc +++ b/src/rm/RequestManagerPoolInfoFilter.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -96,12 +96,28 @@ void VirtualMachinePoolInfo::request_execute( int end_id = xmlrpc_c::value_int(paramList.getInt(3)); int state = xmlrpc_c::value_int(paramList.getInt(4)); - ostringstream state_filter; + std::string fts_query; + + if (paramList.size() > 5) + { + fts_query = xmlrpc_c::value_string(paramList.getString(5)); + + if (!fts_query.empty() && !pool->is_fts_available()) + { + att.resp_msg = "Full text search is not allowed with sqlite backend"; + + failure_response(INTERNAL, att); + return; + } + } + + ostringstream and_filter; if (( state < VirtualMachinePoolInfo::ALL_VM ) || ( state > VirtualMachine::CLONING_FAILURE )) { att.resp_msg = "Incorrect filter_flag, state"; + failure_response(XML_RPC_API, att); return; } @@ -112,15 +128,39 @@ void VirtualMachinePoolInfo::request_execute( break; case VirtualMachinePoolInfo::NOT_DONE: - state_filter << "state <> " << VirtualMachine::DONE; + and_filter << "state <> " << VirtualMachine::DONE; break; default: - state_filter << "state = " << state; + and_filter << "state = " << state; break; } - dump(att, filter_flag, start_id, end_id, state_filter.str(), ""); + if (!fts_query.empty()) + { + char * _fts_query = pool->escape_str(fts_query); + + if ( _fts_query == 0 ) + { + att.resp_msg = "Error building search query"; + + failure_response(INTERNAL, att); + return; + } + + if (!and_filter.str().empty()) + { + and_filter << " AND "; + } + + and_filter << "MATCH(search_token) AGAINST ('+\""; + one_util::escape_token(_fts_query, and_filter); + and_filter << "\"' in boolean mode)"; + + pool->free_str(_fts_query); + } + + dump(att, filter_flag, start_id, end_id, and_filter.str(), ""); } /* ------------------------------------------------------------------------- */ @@ -471,7 +511,7 @@ void RequestManagerPoolInfoFilter::dump( limit_clause = oss.str(); } - Nebula::instance().get_configuration_attribute(att.uid, att.gid, + Nebula::instance().get_configuration_attribute(att.uid, att.gid, "API_LIST_ORDER", desc); rc = pool->dump(str, where_string, limit_clause, diff --git a/src/rm/RequestManagerProxy.cc b/src/rm/RequestManagerProxy.cc index 7ee382a712..e72bbbd4b4 100644 --- a/src/rm/RequestManagerProxy.cc +++ b/src/rm/RequestManagerProxy.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/rm/RequestManagerRename.cc b/src/rm/RequestManagerRename.cc index 00ac88acc8..bf597188c5 100644 --- a/src/rm/RequestManagerRename.cc +++ b/src/rm/RequestManagerRename.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/rm/RequestManagerSecurityGroup.cc b/src/rm/RequestManagerSecurityGroup.cc index e51e517f54..33e2167ea8 100644 --- a/src/rm/RequestManagerSecurityGroup.cc +++ b/src/rm/RequestManagerSecurityGroup.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/rm/RequestManagerSystem.cc b/src/rm/RequestManagerSystem.cc index 9065ede743..2b62011407 100644 --- a/src/rm/RequestManagerSystem.cc +++ b/src/rm/RequestManagerSystem.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/rm/RequestManagerUpdateTemplate.cc b/src/rm/RequestManagerUpdateTemplate.cc index 972f124c3c..45623a28f2 100644 --- a/src/rm/RequestManagerUpdateTemplate.cc +++ b/src/rm/RequestManagerUpdateTemplate.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/rm/RequestManagerUser.cc b/src/rm/RequestManagerUser.cc index 40e73f2a5d..fd09a36a54 100644 --- a/src/rm/RequestManagerUser.cc +++ b/src/rm/RequestManagerUser.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/rm/RequestManagerVMTemplate.cc b/src/rm/RequestManagerVMTemplate.cc index 7928ae1338..c958dfe1d7 100644 --- a/src/rm/RequestManagerVMTemplate.cc +++ b/src/rm/RequestManagerVMTemplate.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/rm/RequestManagerVNTemplate.cc b/src/rm/RequestManagerVNTemplate.cc index eb81a86538..f136b1a3b7 100644 --- a/src/rm/RequestManagerVNTemplate.cc +++ b/src/rm/RequestManagerVNTemplate.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/rm/RequestManagerVdc.cc b/src/rm/RequestManagerVdc.cc index 3e431a13f6..74caa75b5e 100644 --- a/src/rm/RequestManagerVdc.cc +++ b/src/rm/RequestManagerVdc.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/rm/RequestManagerVirtualMachine.cc b/src/rm/RequestManagerVirtualMachine.cc index 97399d460d..ba740290f0 100644 --- a/src/rm/RequestManagerVirtualMachine.cc +++ b/src/rm/RequestManagerVirtualMachine.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -1277,7 +1277,17 @@ void VirtualMachineMigrate::request_execute(xmlrpc_c::paramList const& paramList if (ds_id != -1) { - if ( c_ds_id != ds_id && live ) + VirtualMachineManager * vmm = Nebula::instance().get_vmm(); + const VirtualMachineManagerDriver * vmmd = vmm->get(vmm_mad); + + if ( vmmd == 0 ) + { + att.resp_msg = "Cannot find vmm driver: " + vmm_mad; + failure_response(ACTION, att); + return; + } + + if ( c_ds_id != ds_id && live && !vmmd->is_ds_live_migration()) { att.resp_msg = "A migration to a different system datastore " "cannot be performed live."; diff --git a/src/rm/RequestManagerVirtualNetwork.cc b/src/rm/RequestManagerVirtualNetwork.cc index d9c3153628..6c3185cd76 100644 --- a/src/rm/RequestManagerVirtualNetwork.cc +++ b/src/rm/RequestManagerVirtualNetwork.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/rm/RequestManagerVirtualRouter.cc b/src/rm/RequestManagerVirtualRouter.cc index 115b277b7a..bd748c762a 100644 --- a/src/rm/RequestManagerVirtualRouter.cc +++ b/src/rm/RequestManagerVirtualRouter.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/rm/RequestManagerZone.cc b/src/rm/RequestManagerZone.cc index c5a37003c0..b11d5af0bc 100644 --- a/src/rm/RequestManagerZone.cc +++ b/src/rm/RequestManagerZone.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/rm/SConstruct b/src/rm/SConstruct index 128d8b94cf..a163d03243 100644 --- a/src/rm/SConstruct +++ b/src/rm/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/rm # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/scheduler/SConstruct b/src/scheduler/SConstruct index 2ddb1513ea..bad3e92f90 100644 --- a/src/scheduler/SConstruct +++ b/src/scheduler/SConstruct @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/scheduler/etc/sched.conf b/src/scheduler/etc/sched.conf index a7d97656a8..eca73381c4 100644 --- a/src/scheduler/etc/sched.conf +++ b/src/scheduler/etc/sched.conf @@ -16,10 +16,10 @@ # MAX_VM: Maximum number of Virtual Machines scheduled in each scheduling # action. Use 0 to schedule all pending VMs each time. # -# MAX_DISPATCH: Maximum number of Virtual Machines actually dispatched to a -# host in each scheduling action +# MAX_DISPATCH: Maximum number of Virtual Machines dispatched in each +# scheduling action # -# MAX_HOST: Maximum number of Virtual Machines dispatched to a given host in +# MAX_HOST: Maximum number of Virtual Machines dispatched to each host in # each scheduling action # # LIVE_RESCHEDS: Perform live (1) or cold migrations (0) when rescheduling a VM @@ -45,7 +45,7 @@ # 1 = Striping. Tries to optimize I/O by distributing the VMs across # datastores. # 2 = Custom. -# - rank: Custom arithmetic exprission to rank suitable datastores based +# - rank: Custom arithmetic expression to rank suitable datastores based # on their attributes # 3 = Fixed. Datastores will be ranked according to the PRIORITY attribute # found in the Datastore template. @@ -56,13 +56,13 @@ # less free leases # 1 = Striping. Tries to distribute address usage across VNETs. # 2 = Custom. -# - rank: Custom arithmetic exprission to rank suitable datastores based +# - rank: Custom arithmetic expression to rank suitable datastores based # on their attributes -# 3 = Fixed. Virtual Networks will be ranked according to the PRIORITY +# 3 = Fixed. Virtual Networks will be ranked according to the PRIORITY # attribute found in the Virtual Network template. # -# DIFFERENT_VNETS: When set (YES) the NICs of a VM will be forced to be in -# different Virtual Networks. +# DIFFERENT_VNETS: When set (YES) the NICs of a VM will be forced to be in +# different Virtual Networks. # # LOG: Configuration for the logging system # - system: defines the logging system: @@ -86,7 +86,7 @@ #******************************************************************************* MESSAGE_SIZE = 1073741824 -TIMEOUT = 60 +TIMEOUT = 60 ONE_XMLRPC = "http://localhost:2633/RPC2" diff --git a/src/scheduler/include/AclXML.h b/src/scheduler/include/AclXML.h index 80113b3a98..a2dd82b04b 100644 --- a/src/scheduler/include/AclXML.h +++ b/src/scheduler/include/AclXML.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/include/ClusterPoolXML.h b/src/scheduler/include/ClusterPoolXML.h index 1bbe727f59..75ef9c3645 100644 --- a/src/scheduler/include/ClusterPoolXML.h +++ b/src/scheduler/include/ClusterPoolXML.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project Leads (OpenNebula.org) */ +/* Copyright 2002-2019, OpenNebula Project Leads (OpenNebula.org) */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/include/ClusterXML.h b/src/scheduler/include/ClusterXML.h index c710ce8056..f92702d19b 100644 --- a/src/scheduler/include/ClusterXML.h +++ b/src/scheduler/include/ClusterXML.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project Leads (OpenNebula.org) */ +/* Copyright 2002-2019, OpenNebula Project Leads (OpenNebula.org) */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/include/DatastorePoolXML.h b/src/scheduler/include/DatastorePoolXML.h index a24a564c10..9078e75a78 100644 --- a/src/scheduler/include/DatastorePoolXML.h +++ b/src/scheduler/include/DatastorePoolXML.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/include/DatastoreXML.h b/src/scheduler/include/DatastoreXML.h index 1d8e154063..c8b4767797 100644 --- a/src/scheduler/include/DatastoreXML.h +++ b/src/scheduler/include/DatastoreXML.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/include/HostPoolXML.h b/src/scheduler/include/HostPoolXML.h index 7c48824cf8..ac018852d3 100644 --- a/src/scheduler/include/HostPoolXML.h +++ b/src/scheduler/include/HostPoolXML.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/include/HostXML.h b/src/scheduler/include/HostXML.h index 3b4d2036dd..87a297557a 100644 --- a/src/scheduler/include/HostXML.h +++ b/src/scheduler/include/HostXML.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/include/PoolXML.h b/src/scheduler/include/PoolXML.h index 402622c5d0..beb9571250 100644 --- a/src/scheduler/include/PoolXML.h +++ b/src/scheduler/include/PoolXML.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/include/RankPolicy.h b/src/scheduler/include/RankPolicy.h index 7853bded61..61b27a81ad 100644 --- a/src/scheduler/include/RankPolicy.h +++ b/src/scheduler/include/RankPolicy.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/include/Resource.h b/src/scheduler/include/Resource.h index a97820d153..2bb23ad444 100644 --- a/src/scheduler/include/Resource.h +++ b/src/scheduler/include/Resource.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/include/Scheduler.h b/src/scheduler/include/Scheduler.h index c95dbf57a5..ce6b61ee68 100644 --- a/src/scheduler/include/Scheduler.h +++ b/src/scheduler/include/Scheduler.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/include/SchedulerPolicy.h b/src/scheduler/include/SchedulerPolicy.h index 944cbee3e4..7bde95ef03 100644 --- a/src/scheduler/include/SchedulerPolicy.h +++ b/src/scheduler/include/SchedulerPolicy.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/include/SchedulerTemplate.h b/src/scheduler/include/SchedulerTemplate.h index 11427df135..589c76c07a 100644 --- a/src/scheduler/include/SchedulerTemplate.h +++ b/src/scheduler/include/SchedulerTemplate.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/include/UserPoolXML.h b/src/scheduler/include/UserPoolXML.h index a459ab7e36..a5b53948a8 100644 --- a/src/scheduler/include/UserPoolXML.h +++ b/src/scheduler/include/UserPoolXML.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project Leads (OpenNebula.org) */ +/* Copyright 2002-2019, OpenNebula Project Leads (OpenNebula.org) */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/include/UserPriorityPolicy.h b/src/scheduler/include/UserPriorityPolicy.h index 8fb8b95d34..b56719efaf 100644 --- a/src/scheduler/include/UserPriorityPolicy.h +++ b/src/scheduler/include/UserPriorityPolicy.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/include/UserXML.h b/src/scheduler/include/UserXML.h index 101b48e9af..4f227d1ead 100644 --- a/src/scheduler/include/UserXML.h +++ b/src/scheduler/include/UserXML.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project Leads (OpenNebula.org) */ +/* Copyright 2002-2019, OpenNebula Project Leads (OpenNebula.org) */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/include/VMGroupPoolXML.h b/src/scheduler/include/VMGroupPoolXML.h index bf46e134fc..c9671bd49a 100644 --- a/src/scheduler/include/VMGroupPoolXML.h +++ b/src/scheduler/include/VMGroupPoolXML.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project Leads (OpenNebula.org) */ +/* Copyright 2002-2019, OpenNebula Project Leads (OpenNebula.org) */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/include/VMGroupXML.h b/src/scheduler/include/VMGroupXML.h index 9c555a53e6..6b2464d590 100644 --- a/src/scheduler/include/VMGroupXML.h +++ b/src/scheduler/include/VMGroupXML.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project Leads (OpenNebula.org) */ +/* Copyright 2002-2019, OpenNebula Project Leads (OpenNebula.org) */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/include/VirtualMachinePoolXML.h b/src/scheduler/include/VirtualMachinePoolXML.h index c7a80d7848..2272e12cc4 100644 --- a/src/scheduler/include/VirtualMachinePoolXML.h +++ b/src/scheduler/include/VirtualMachinePoolXML.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/include/VirtualMachineXML.h b/src/scheduler/include/VirtualMachineXML.h index 739924a3f1..9ac3698816 100644 --- a/src/scheduler/include/VirtualMachineXML.h +++ b/src/scheduler/include/VirtualMachineXML.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/include/VirtualNetworkPoolXML.h b/src/scheduler/include/VirtualNetworkPoolXML.h index ff0dfe838d..b06d171350 100644 --- a/src/scheduler/include/VirtualNetworkPoolXML.h +++ b/src/scheduler/include/VirtualNetworkPoolXML.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/include/VirtualNetworkXML.h b/src/scheduler/include/VirtualNetworkXML.h index 9fd7f68fb3..32e158a6db 100644 --- a/src/scheduler/include/VirtualNetworkXML.h +++ b/src/scheduler/include/VirtualNetworkXML.h @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/src/pool/AclXML.cc b/src/scheduler/src/pool/AclXML.cc index 6bd3c6e95b..079d1a0638 100644 --- a/src/scheduler/src/pool/AclXML.cc +++ b/src/scheduler/src/pool/AclXML.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/src/pool/ClusterPoolXML.cc b/src/scheduler/src/pool/ClusterPoolXML.cc index 659e5b51fe..44b7ec1209 100644 --- a/src/scheduler/src/pool/ClusterPoolXML.cc +++ b/src/scheduler/src/pool/ClusterPoolXML.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project Leads (OpenNebula.org) */ +/* Copyright 2002-2019, OpenNebula Project Leads (OpenNebula.org) */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/src/pool/DatastorePoolXML.cc b/src/scheduler/src/pool/DatastorePoolXML.cc index bd595fb589..c616abe6db 100644 --- a/src/scheduler/src/pool/DatastorePoolXML.cc +++ b/src/scheduler/src/pool/DatastorePoolXML.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/src/pool/DatastoreXML.cc b/src/scheduler/src/pool/DatastoreXML.cc index 49a0aebe47..03413fc27a 100644 --- a/src/scheduler/src/pool/DatastoreXML.cc +++ b/src/scheduler/src/pool/DatastoreXML.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/src/pool/HostPoolXML.cc b/src/scheduler/src/pool/HostPoolXML.cc index 7b28a41b87..d9bc893925 100644 --- a/src/scheduler/src/pool/HostPoolXML.cc +++ b/src/scheduler/src/pool/HostPoolXML.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/src/pool/HostXML.cc b/src/scheduler/src/pool/HostXML.cc index 41413cda1b..21b08689bb 100644 --- a/src/scheduler/src/pool/HostXML.cc +++ b/src/scheduler/src/pool/HostXML.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/src/pool/SConstruct b/src/scheduler/src/pool/SConstruct index 46912b7582..2a6ff20d6c 100644 --- a/src/scheduler/src/pool/SConstruct +++ b/src/scheduler/src/pool/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/pool # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/scheduler/src/pool/UserPoolXML.cc b/src/scheduler/src/pool/UserPoolXML.cc index e9f4fb55ce..439325b57c 100644 --- a/src/scheduler/src/pool/UserPoolXML.cc +++ b/src/scheduler/src/pool/UserPoolXML.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project Leads (OpenNebula.org) */ +/* Copyright 2002-2019, OpenNebula Project Leads (OpenNebula.org) */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/src/pool/VMGroupPoolXML.cc b/src/scheduler/src/pool/VMGroupPoolXML.cc index 9e39c007f5..a15d9c758b 100644 --- a/src/scheduler/src/pool/VMGroupPoolXML.cc +++ b/src/scheduler/src/pool/VMGroupPoolXML.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project Leads (OpenNebula.org) */ +/* Copyright 2002-2019, OpenNebula Project Leads (OpenNebula.org) */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/src/pool/VMGroupXML.cc b/src/scheduler/src/pool/VMGroupXML.cc index 380b38b72b..cc541ecdf5 100644 --- a/src/scheduler/src/pool/VMGroupXML.cc +++ b/src/scheduler/src/pool/VMGroupXML.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project Leads (OpenNebula.org) */ +/* Copyright 2002-2019, OpenNebula Project Leads (OpenNebula.org) */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/src/pool/VirtualMachinePoolXML.cc b/src/scheduler/src/pool/VirtualMachinePoolXML.cc index ddba745cf4..cbfafe4c2d 100644 --- a/src/scheduler/src/pool/VirtualMachinePoolXML.cc +++ b/src/scheduler/src/pool/VirtualMachinePoolXML.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/src/pool/VirtualMachineXML.cc b/src/scheduler/src/pool/VirtualMachineXML.cc index ddb535de44..d17c5fccf1 100644 --- a/src/scheduler/src/pool/VirtualMachineXML.cc +++ b/src/scheduler/src/pool/VirtualMachineXML.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/src/pool/VirtualNetworkPoolXML.cc b/src/scheduler/src/pool/VirtualNetworkPoolXML.cc index 7f7121cf71..df1a87125d 100644 --- a/src/scheduler/src/pool/VirtualNetworkPoolXML.cc +++ b/src/scheduler/src/pool/VirtualNetworkPoolXML.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/src/pool/VirtualNetworkXML.cc b/src/scheduler/src/pool/VirtualNetworkXML.cc index 1b79549ae4..eef7f042a2 100644 --- a/src/scheduler/src/pool/VirtualNetworkXML.cc +++ b/src/scheduler/src/pool/VirtualNetworkXML.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/src/sched/SConstruct b/src/scheduler/src/sched/SConstruct index 323467e21d..81cd432574 100644 --- a/src/scheduler/src/sched/SConstruct +++ b/src/scheduler/src/sched/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/pool # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/scheduler/src/sched/Scheduler.cc b/src/scheduler/src/sched/Scheduler.cc index 354bbea1ba..1702088057 100644 --- a/src/scheduler/src/sched/Scheduler.cc +++ b/src/scheduler/src/sched/Scheduler.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/src/sched/SchedulerTemplate.cc b/src/scheduler/src/sched/SchedulerTemplate.cc index 04659ece83..4d1baaebaf 100644 --- a/src/scheduler/src/sched/SchedulerTemplate.cc +++ b/src/scheduler/src/sched/SchedulerTemplate.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/scheduler/src/sched/mm_sched.cc b/src/scheduler/src/sched/mm_sched.cc index 950d6a5639..f4216d0e8b 100644 --- a/src/scheduler/src/sched/mm_sched.cc +++ b/src/scheduler/src/sched/mm_sched.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/secgroup/SConstruct b/src/secgroup/SConstruct index 72e9b00c75..01c3e76bfe 100644 --- a/src/secgroup/SConstruct +++ b/src/secgroup/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/secgroup # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/secgroup/SecurityGroup.cc b/src/secgroup/SecurityGroup.cc index 133758e32e..2c3bf7a08c 100644 --- a/src/secgroup/SecurityGroup.cc +++ b/src/secgroup/SecurityGroup.cc @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/secgroup/SecurityGroupPool.cc b/src/secgroup/SecurityGroupPool.cc index 04c9e3f641..3bc6116b00 100644 --- a/src/secgroup/SecurityGroupPool.cc +++ b/src/secgroup/SecurityGroupPool.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sql/LogDB.cc b/src/sql/LogDB.cc index 4bd585079d..a79333ccfc 100644 --- a/src/sql/LogDB.cc +++ b/src/sql/LogDB.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sql/MySqlDB.cc b/src/sql/MySqlDB.cc index 767cf563c2..d1771764e8 100644 --- a/src/sql/MySqlDB.cc +++ b/src/sql/MySqlDB.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -345,3 +345,21 @@ void MySqlDB::free_db_connection(MYSQL * db) } /* -------------------------------------------------------------------------- */ + +bool MySqlDB::fts_available() +{ + unsigned long version; + + version = mysql_get_server_version(db_escape_connect); + + if (version >= 50600) + { + return true; + } + else + { + return false; + } +} + +/* -------------------------------------------------------------------------- */ \ No newline at end of file diff --git a/src/sql/SConstruct b/src/sql/SConstruct index 5178441777..04cae3380e 100644 --- a/src/sql/SConstruct +++ b/src/sql/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/pool # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sql/SqliteDB.cc b/src/sql/SqliteDB.cc index 6bc191b307..37c735f14f 100644 --- a/src/sql/SqliteDB.cc +++ b/src/sql/SqliteDB.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/OpenNebulaAddons.rb b/src/sunstone/OpenNebulaAddons.rb index ae5343f98f..12ac98f16e 100644 --- a/src/sunstone/OpenNebulaAddons.rb +++ b/src/sunstone/OpenNebulaAddons.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/OpenNebulaVNC.rb b/src/sunstone/OpenNebulaVNC.rb index 0451bb9a34..120f2a1745 100644 --- a/src/sunstone/OpenNebulaVNC.rb +++ b/src/sunstone/OpenNebulaVNC.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -109,7 +109,7 @@ class OpenNebulaVNC @pipe = nil @token_folder = File.join(VAR_LOCATION, opts[:token_folder_name]) - @proxy_path = File.join(SHARE_LOCATION, "websockify/websocketproxy.py") + @proxy_path = File.join(SHARE_LOCATION, "websockify/run") @proxy_port = config[:vnc_proxy_port] @proxy_ipv6 = config[:vnc_proxy_ipv6] @@ -151,10 +151,7 @@ class OpenNebulaVNC proxy_options << " -6" end - system("which python2 >/dev/null 2>&1") - python = $?.success? ? "python2" : "python" - - cmd ="#{python} #{@proxy_path} #{proxy_options} #{@proxy_port}" + cmd ="python #{@proxy_path} #{proxy_options} #{@proxy_port}" begin @logger.info { "Starting VNC proxy: #{cmd}" } diff --git a/src/sunstone/bin/novnc-server b/src/sunstone/bin/novnc-server index 482c2b192a..a910131d08 100755 --- a/src/sunstone/bin/novnc-server +++ b/src/sunstone/bin/novnc-server @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/bin/sunstone-server b/src/sunstone/bin/sunstone-server index af95b670c4..46b358e1cf 100755 --- a/src/sunstone/bin/sunstone-server +++ b/src/sunstone/bin/sunstone-server @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/etc/sunstone-server.conf b/src/sunstone/etc/sunstone-server.conf index 23921970c6..79aa26199d 100644 --- a/src/sunstone/etc/sunstone-server.conf +++ b/src/sunstone/etc/sunstone-server.conf @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/models/OpenNebulaJSON.rb b/src/sunstone/models/OpenNebulaJSON.rb index 76887e1017..2a442a2c0d 100644 --- a/src/sunstone/models/OpenNebulaJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/models/OpenNebulaJSON/AclJSON.rb b/src/sunstone/models/OpenNebulaJSON/AclJSON.rb index ff7a0e0e6a..14c1a8e08f 100644 --- a/src/sunstone/models/OpenNebulaJSON/AclJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/AclJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/models/OpenNebulaJSON/ClusterJSON.rb b/src/sunstone/models/OpenNebulaJSON/ClusterJSON.rb index 26f86dfbaf..187392a9c1 100644 --- a/src/sunstone/models/OpenNebulaJSON/ClusterJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/ClusterJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/models/OpenNebulaJSON/DatastoreJSON.rb b/src/sunstone/models/OpenNebulaJSON/DatastoreJSON.rb index d0be008fcf..2df53fab5e 100644 --- a/src/sunstone/models/OpenNebulaJSON/DatastoreJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/DatastoreJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/models/OpenNebulaJSON/GroupJSON.rb b/src/sunstone/models/OpenNebulaJSON/GroupJSON.rb index 01848f8bc0..f4d6536823 100644 --- a/src/sunstone/models/OpenNebulaJSON/GroupJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/GroupJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/models/OpenNebulaJSON/HostJSON.rb b/src/sunstone/models/OpenNebulaJSON/HostJSON.rb index 4b4eba0e5a..26625f01be 100644 --- a/src/sunstone/models/OpenNebulaJSON/HostJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/HostJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/models/OpenNebulaJSON/ImageJSON.rb b/src/sunstone/models/OpenNebulaJSON/ImageJSON.rb index b1e2e99d80..5ee9f7bc19 100644 --- a/src/sunstone/models/OpenNebulaJSON/ImageJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/ImageJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/models/OpenNebulaJSON/JSONUtils.rb b/src/sunstone/models/OpenNebulaJSON/JSONUtils.rb index 6bed1c5b5f..62a39b41a5 100644 --- a/src/sunstone/models/OpenNebulaJSON/JSONUtils.rb +++ b/src/sunstone/models/OpenNebulaJSON/JSONUtils.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/models/OpenNebulaJSON/MarketPlaceAppJSON.rb b/src/sunstone/models/OpenNebulaJSON/MarketPlaceAppJSON.rb index 7584355a1c..8ef2ab7283 100644 --- a/src/sunstone/models/OpenNebulaJSON/MarketPlaceAppJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/MarketPlaceAppJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/models/OpenNebulaJSON/MarketPlaceJSON.rb b/src/sunstone/models/OpenNebulaJSON/MarketPlaceJSON.rb index 5f19480f2f..52ae4e8f36 100644 --- a/src/sunstone/models/OpenNebulaJSON/MarketPlaceJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/MarketPlaceJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/models/OpenNebulaJSON/PoolJSON.rb b/src/sunstone/models/OpenNebulaJSON/PoolJSON.rb index e02d8bb4e6..52a88941b6 100644 --- a/src/sunstone/models/OpenNebulaJSON/PoolJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/PoolJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/models/OpenNebulaJSON/SecurityGroupJSON.rb b/src/sunstone/models/OpenNebulaJSON/SecurityGroupJSON.rb index 026f27cbfe..fffdb05371 100644 --- a/src/sunstone/models/OpenNebulaJSON/SecurityGroupJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/SecurityGroupJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/models/OpenNebulaJSON/TemplateJSON.rb b/src/sunstone/models/OpenNebulaJSON/TemplateJSON.rb index 143d85d6c1..450dcc23aa 100644 --- a/src/sunstone/models/OpenNebulaJSON/TemplateJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/TemplateJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/models/OpenNebulaJSON/UserJSON.rb b/src/sunstone/models/OpenNebulaJSON/UserJSON.rb index 31de208315..b62e92b6a1 100644 --- a/src/sunstone/models/OpenNebulaJSON/UserJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/UserJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/models/OpenNebulaJSON/VMGroupJSON.rb b/src/sunstone/models/OpenNebulaJSON/VMGroupJSON.rb index 841e726241..4a59e8945f 100644 --- a/src/sunstone/models/OpenNebulaJSON/VMGroupJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/VMGroupJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/models/OpenNebulaJSON/VdcJSON.rb b/src/sunstone/models/OpenNebulaJSON/VdcJSON.rb index 87614f6471..9608625b27 100644 --- a/src/sunstone/models/OpenNebulaJSON/VdcJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/VdcJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/models/OpenNebulaJSON/VirtualMachineJSON.rb b/src/sunstone/models/OpenNebulaJSON/VirtualMachineJSON.rb index fb92b83260..8b64602965 100644 --- a/src/sunstone/models/OpenNebulaJSON/VirtualMachineJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/VirtualMachineJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/models/OpenNebulaJSON/VirtualNetworkJSON.rb b/src/sunstone/models/OpenNebulaJSON/VirtualNetworkJSON.rb index c7db3fe6b5..43a115563e 100644 --- a/src/sunstone/models/OpenNebulaJSON/VirtualNetworkJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/VirtualNetworkJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/models/OpenNebulaJSON/VirtualNetworkTemplateJSON.rb b/src/sunstone/models/OpenNebulaJSON/VirtualNetworkTemplateJSON.rb index 96bfec9d32..99355649b3 100644 --- a/src/sunstone/models/OpenNebulaJSON/VirtualNetworkTemplateJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/VirtualNetworkTemplateJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/models/OpenNebulaJSON/VirtualRouterJSON.rb b/src/sunstone/models/OpenNebulaJSON/VirtualRouterJSON.rb index 76f32a6b63..ca1903aa9a 100644 --- a/src/sunstone/models/OpenNebulaJSON/VirtualRouterJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/VirtualRouterJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/models/OpenNebulaJSON/ZoneJSON.rb b/src/sunstone/models/OpenNebulaJSON/ZoneJSON.rb index 588dc58136..096c59a49e 100644 --- a/src/sunstone/models/OpenNebulaJSON/ZoneJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/ZoneJSON.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/models/SunstoneServer.rb b/src/sunstone/models/SunstoneServer.rb index 1828349fcc..d5804d5451 100644 --- a/src/sunstone/models/SunstoneServer.rb +++ b/src/sunstone/models/SunstoneServer.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/models/SunstoneViews.rb b/src/sunstone/models/SunstoneViews.rb index 92709b44f0..f2bcb1d2b0 100644 --- a/src/sunstone/models/SunstoneViews.rb +++ b/src/sunstone/models/SunstoneViews.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/public/Gruntfile.js b/src/sunstone/public/Gruntfile.js index a80b4db7be..4b383171c8 100644 --- a/src/sunstone/public/Gruntfile.js +++ b/src/sunstone/public/Gruntfile.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/SConstruct b/src/sunstone/public/SConstruct index 4105167849..bf5e588d6e 100644 --- a/src/sunstone/public/SConstruct +++ b/src/sunstone/public/SConstruct @@ -1,7 +1,7 @@ # SConstruct for share/man # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/public/app/app.js b/src/sunstone/public/app/app.js index e484c63960..35d7c7cadd 100644 --- a/src/sunstone/public/app/app.js +++ b/src/sunstone/public/app/app.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/console/spice.js b/src/sunstone/public/app/console/spice.js index 50cd04ab62..0b223ec8e8 100644 --- a/src/sunstone/public/app/console/spice.js +++ b/src/sunstone/public/app/console/spice.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/console/vnc.js b/src/sunstone/public/app/console/vnc.js index 02e062417a..b0e385a697 100644 --- a/src/sunstone/public/app/console/vnc.js +++ b/src/sunstone/public/app/console/vnc.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/login.js b/src/sunstone/public/app/login.js index 059c7e36f9..269a6a52ab 100644 --- a/src/sunstone/public/app/login.js +++ b/src/sunstone/public/app/login.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/main.js b/src/sunstone/public/app/main.js index 2479d2a059..d2be8b0a08 100644 --- a/src/sunstone/public/app/main.js +++ b/src/sunstone/public/app/main.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/opennebula.js b/src/sunstone/public/app/opennebula.js index b5a942d169..5bd2a55695 100644 --- a/src/sunstone/public/app/opennebula.js +++ b/src/sunstone/public/app/opennebula.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/opennebula/acl.js b/src/sunstone/public/app/opennebula/acl.js index 37eec724f1..a81f39a5ef 100644 --- a/src/sunstone/public/app/opennebula/acl.js +++ b/src/sunstone/public/app/opennebula/acl.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/opennebula/action.js b/src/sunstone/public/app/opennebula/action.js index e9fa1b6464..25c212ca7d 100644 --- a/src/sunstone/public/app/opennebula/action.js +++ b/src/sunstone/public/app/opennebula/action.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/opennebula/auth.js b/src/sunstone/public/app/opennebula/auth.js index e61b1e9136..23f44a21a7 100644 --- a/src/sunstone/public/app/opennebula/auth.js +++ b/src/sunstone/public/app/opennebula/auth.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/opennebula/cluster.js b/src/sunstone/public/app/opennebula/cluster.js index 3c4d74c555..2085413e64 100644 --- a/src/sunstone/public/app/opennebula/cluster.js +++ b/src/sunstone/public/app/opennebula/cluster.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/opennebula/datastore.js b/src/sunstone/public/app/opennebula/datastore.js index 4b0645765f..b5cdefde0a 100644 --- a/src/sunstone/public/app/opennebula/datastore.js +++ b/src/sunstone/public/app/opennebula/datastore.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/opennebula/error.js b/src/sunstone/public/app/opennebula/error.js index 1719bd52aa..73f17addf8 100644 --- a/src/sunstone/public/app/opennebula/error.js +++ b/src/sunstone/public/app/opennebula/error.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/opennebula/group.js b/src/sunstone/public/app/opennebula/group.js index a08d11fbc8..2d2c3f8bb6 100644 --- a/src/sunstone/public/app/opennebula/group.js +++ b/src/sunstone/public/app/opennebula/group.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/opennebula/helper.js b/src/sunstone/public/app/opennebula/helper.js index fea3b2471c..aa252415c7 100644 --- a/src/sunstone/public/app/opennebula/helper.js +++ b/src/sunstone/public/app/opennebula/helper.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/opennebula/host.js b/src/sunstone/public/app/opennebula/host.js index 65297f21a9..a455a30fad 100644 --- a/src/sunstone/public/app/opennebula/host.js +++ b/src/sunstone/public/app/opennebula/host.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/opennebula/image.js b/src/sunstone/public/app/opennebula/image.js index 6d31270758..11b4905cfd 100644 --- a/src/sunstone/public/app/opennebula/image.js +++ b/src/sunstone/public/app/opennebula/image.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/opennebula/marketplace.js b/src/sunstone/public/app/opennebula/marketplace.js index 7136919c7f..4a339e88b5 100644 --- a/src/sunstone/public/app/opennebula/marketplace.js +++ b/src/sunstone/public/app/opennebula/marketplace.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/opennebula/marketplaceapp.js b/src/sunstone/public/app/opennebula/marketplaceapp.js index dbdb928159..8ae2b03d41 100644 --- a/src/sunstone/public/app/opennebula/marketplaceapp.js +++ b/src/sunstone/public/app/opennebula/marketplaceapp.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/opennebula/network.js b/src/sunstone/public/app/opennebula/network.js index 39b42ae6b0..ae1bf269ac 100644 --- a/src/sunstone/public/app/opennebula/network.js +++ b/src/sunstone/public/app/opennebula/network.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/opennebula/role.js b/src/sunstone/public/app/opennebula/role.js index 2871443de6..c1700c3af0 100644 --- a/src/sunstone/public/app/opennebula/role.js +++ b/src/sunstone/public/app/opennebula/role.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/opennebula/securitygroup.js b/src/sunstone/public/app/opennebula/securitygroup.js index 9d983baee6..cf68b6bc67 100644 --- a/src/sunstone/public/app/opennebula/securitygroup.js +++ b/src/sunstone/public/app/opennebula/securitygroup.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/opennebula/service.js b/src/sunstone/public/app/opennebula/service.js index 844573bd91..d202bf8723 100644 --- a/src/sunstone/public/app/opennebula/service.js +++ b/src/sunstone/public/app/opennebula/service.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/opennebula/servicetemplate.js b/src/sunstone/public/app/opennebula/servicetemplate.js index c7fb933c74..7f05a399e7 100644 --- a/src/sunstone/public/app/opennebula/servicetemplate.js +++ b/src/sunstone/public/app/opennebula/servicetemplate.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/opennebula/support.js b/src/sunstone/public/app/opennebula/support.js index 7849284dd7..fab6073ef4 100644 --- a/src/sunstone/public/app/opennebula/support.js +++ b/src/sunstone/public/app/opennebula/support.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/opennebula/template.js b/src/sunstone/public/app/opennebula/template.js index 3f8fe0c5f9..48ff1aad6c 100644 --- a/src/sunstone/public/app/opennebula/template.js +++ b/src/sunstone/public/app/opennebula/template.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/opennebula/user.js b/src/sunstone/public/app/opennebula/user.js index e67a49522c..46da82b5e6 100644 --- a/src/sunstone/public/app/opennebula/user.js +++ b/src/sunstone/public/app/opennebula/user.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/opennebula/vdc.js b/src/sunstone/public/app/opennebula/vdc.js index ee0c2dda1a..ab208035b0 100644 --- a/src/sunstone/public/app/opennebula/vdc.js +++ b/src/sunstone/public/app/opennebula/vdc.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/opennebula/virtualrouter.js b/src/sunstone/public/app/opennebula/virtualrouter.js index 5fe433e3ee..80dd1e28f3 100644 --- a/src/sunstone/public/app/opennebula/virtualrouter.js +++ b/src/sunstone/public/app/opennebula/virtualrouter.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/opennebula/vm.js b/src/sunstone/public/app/opennebula/vm.js index 683b5f49cc..5b6b135706 100644 --- a/src/sunstone/public/app/opennebula/vm.js +++ b/src/sunstone/public/app/opennebula/vm.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/opennebula/vmgroup.js b/src/sunstone/public/app/opennebula/vmgroup.js index c7c91378b1..0647a87809 100644 --- a/src/sunstone/public/app/opennebula/vmgroup.js +++ b/src/sunstone/public/app/opennebula/vmgroup.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/opennebula/vntemplate.js b/src/sunstone/public/app/opennebula/vntemplate.js index 3a0e6bacdc..58bc3fb5fa 100644 --- a/src/sunstone/public/app/opennebula/vntemplate.js +++ b/src/sunstone/public/app/opennebula/vntemplate.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/opennebula/zone.js b/src/sunstone/public/app/opennebula/zone.js index c3c21d2700..b13ff26d81 100644 --- a/src/sunstone/public/app/opennebula/zone.js +++ b/src/sunstone/public/app/opennebula/zone.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/sunstone-config.js b/src/sunstone/public/app/sunstone-config.js index d975bb749c..7576e209b9 100644 --- a/src/sunstone/public/app/sunstone-config.js +++ b/src/sunstone/public/app/sunstone-config.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/sunstone.js b/src/sunstone/public/app/sunstone.js index 42f78dc615..45146e6271 100644 --- a/src/sunstone/public/app/sunstone.js +++ b/src/sunstone/public/app/sunstone.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/sunstone/buttons.hbs b/src/sunstone/public/app/sunstone/buttons.hbs index 5c2ab71812..684c9da8cb 100644 --- a/src/sunstone/public/app/sunstone/buttons.hbs +++ b/src/sunstone/public/app/sunstone/buttons.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/sunstone/panels.hbs b/src/sunstone/public/app/sunstone/panels.hbs index 564e03be14..82100d9d21 100644 --- a/src/sunstone/public/app/sunstone/panels.hbs +++ b/src/sunstone/public/app/sunstone/panels.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/sunstone/tab.hbs b/src/sunstone/public/app/sunstone/tab.hbs index 77deafa190..e58fd83ebf 100644 --- a/src/sunstone/public/app/sunstone/tab.hbs +++ b/src/sunstone/public/app/sunstone/tab.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/sunstone/user_and_zone.hbs b/src/sunstone/public/app/sunstone/user_and_zone.hbs index 7b77ecd162..c7d343b958 100644 --- a/src/sunstone/public/app/sunstone/user_and_zone.hbs +++ b/src/sunstone/public/app/sunstone/user_and_zone.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/acls-tab.js b/src/sunstone/public/app/tabs/acls-tab.js index 60e0d7eeff..c727e2ad60 100644 --- a/src/sunstone/public/app/tabs/acls-tab.js +++ b/src/sunstone/public/app/tabs/acls-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/acls-tab/actions.js b/src/sunstone/public/app/tabs/acls-tab/actions.js index 81264064f1..441aa30df7 100644 --- a/src/sunstone/public/app/tabs/acls-tab/actions.js +++ b/src/sunstone/public/app/tabs/acls-tab/actions.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/acls-tab/buttons.js b/src/sunstone/public/app/tabs/acls-tab/buttons.js index 928dfe586a..8f8397a012 100644 --- a/src/sunstone/public/app/tabs/acls-tab/buttons.js +++ b/src/sunstone/public/app/tabs/acls-tab/buttons.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/acls-tab/datatable.js b/src/sunstone/public/app/tabs/acls-tab/datatable.js index 635da4db68..f9ff33aec6 100644 --- a/src/sunstone/public/app/tabs/acls-tab/datatable.js +++ b/src/sunstone/public/app/tabs/acls-tab/datatable.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/acls-tab/form-panels/create.js b/src/sunstone/public/app/tabs/acls-tab/form-panels/create.js index 6457db4fb0..a042fc89b3 100644 --- a/src/sunstone/public/app/tabs/acls-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/acls-tab/form-panels/create.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/acls-tab/form-panels/create/formPanelId.js b/src/sunstone/public/app/tabs/acls-tab/form-panels/create/formPanelId.js index 9ba53e53df..d211f91cbd 100644 --- a/src/sunstone/public/app/tabs/acls-tab/form-panels/create/formPanelId.js +++ b/src/sunstone/public/app/tabs/acls-tab/form-panels/create/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/acls-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/acls-tab/form-panels/create/wizard.hbs index 14c4a8a903..47ee64c842 100644 --- a/src/sunstone/public/app/tabs/acls-tab/form-panels/create/wizard.hbs +++ b/src/sunstone/public/app/tabs/acls-tab/form-panels/create/wizard.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/acls-tab/tabId.js b/src/sunstone/public/app/tabs/acls-tab/tabId.js index 775de2537d..a0ca973f40 100644 --- a/src/sunstone/public/app/tabs/acls-tab/tabId.js +++ b/src/sunstone/public/app/tabs/acls-tab/tabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/clusters-tab.js b/src/sunstone/public/app/tabs/clusters-tab.js index 90965c3dd9..591a019abf 100644 --- a/src/sunstone/public/app/tabs/clusters-tab.js +++ b/src/sunstone/public/app/tabs/clusters-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/clusters-tab/actions.js b/src/sunstone/public/app/tabs/clusters-tab/actions.js index 3c83a5ef5d..d53b9b98ff 100644 --- a/src/sunstone/public/app/tabs/clusters-tab/actions.js +++ b/src/sunstone/public/app/tabs/clusters-tab/actions.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/clusters-tab/buttons.js b/src/sunstone/public/app/tabs/clusters-tab/buttons.js index 95f27ddaa2..a2d3ad37a6 100644 --- a/src/sunstone/public/app/tabs/clusters-tab/buttons.js +++ b/src/sunstone/public/app/tabs/clusters-tab/buttons.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/clusters-tab/datatable.js b/src/sunstone/public/app/tabs/clusters-tab/datatable.js index a866c920de..90a077aafe 100644 --- a/src/sunstone/public/app/tabs/clusters-tab/datatable.js +++ b/src/sunstone/public/app/tabs/clusters-tab/datatable.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/clusters-tab/form-panels/create.js b/src/sunstone/public/app/tabs/clusters-tab/form-panels/create.js index 0e98266c95..e66a71cb9e 100644 --- a/src/sunstone/public/app/tabs/clusters-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/clusters-tab/form-panels/create.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/clusters-tab/form-panels/create/formPanelId.js b/src/sunstone/public/app/tabs/clusters-tab/form-panels/create/formPanelId.js index a1c735a287..1417dd1a51 100644 --- a/src/sunstone/public/app/tabs/clusters-tab/form-panels/create/formPanelId.js +++ b/src/sunstone/public/app/tabs/clusters-tab/form-panels/create/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/clusters-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/clusters-tab/form-panels/create/wizard.hbs index 67ba13e62a..5303657202 100644 --- a/src/sunstone/public/app/tabs/clusters-tab/form-panels/create/wizard.hbs +++ b/src/sunstone/public/app/tabs/clusters-tab/form-panels/create/wizard.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/clusters-tab/panels/datastores.js b/src/sunstone/public/app/tabs/clusters-tab/panels/datastores.js index 9b8dfe96ad..dd68507ac4 100644 --- a/src/sunstone/public/app/tabs/clusters-tab/panels/datastores.js +++ b/src/sunstone/public/app/tabs/clusters-tab/panels/datastores.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/clusters-tab/panels/datastores/panelId.js b/src/sunstone/public/app/tabs/clusters-tab/panels/datastores/panelId.js index 532560cd99..55831f0538 100644 --- a/src/sunstone/public/app/tabs/clusters-tab/panels/datastores/panelId.js +++ b/src/sunstone/public/app/tabs/clusters-tab/panels/datastores/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/clusters-tab/panels/hosts.js b/src/sunstone/public/app/tabs/clusters-tab/panels/hosts.js index b5a8e3fe74..7ca745e73d 100644 --- a/src/sunstone/public/app/tabs/clusters-tab/panels/hosts.js +++ b/src/sunstone/public/app/tabs/clusters-tab/panels/hosts.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/clusters-tab/panels/hosts/panelId.js b/src/sunstone/public/app/tabs/clusters-tab/panels/hosts/panelId.js index ba1c9cbb8e..bc89f071d9 100644 --- a/src/sunstone/public/app/tabs/clusters-tab/panels/hosts/panelId.js +++ b/src/sunstone/public/app/tabs/clusters-tab/panels/hosts/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/clusters-tab/panels/info.js b/src/sunstone/public/app/tabs/clusters-tab/panels/info.js index d5cd5fee81..02370e4781 100644 --- a/src/sunstone/public/app/tabs/clusters-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/clusters-tab/panels/info.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/clusters-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/clusters-tab/panels/info/html.hbs index 8c06727dc8..302f653bdf 100644 --- a/src/sunstone/public/app/tabs/clusters-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/clusters-tab/panels/info/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/clusters-tab/panels/info/panelId.js b/src/sunstone/public/app/tabs/clusters-tab/panels/info/panelId.js index 8415f337da..73d97709c1 100644 --- a/src/sunstone/public/app/tabs/clusters-tab/panels/info/panelId.js +++ b/src/sunstone/public/app/tabs/clusters-tab/panels/info/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/clusters-tab/panels/vnets.js b/src/sunstone/public/app/tabs/clusters-tab/panels/vnets.js index 3cb9b071df..724875247c 100644 --- a/src/sunstone/public/app/tabs/clusters-tab/panels/vnets.js +++ b/src/sunstone/public/app/tabs/clusters-tab/panels/vnets.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/clusters-tab/panels/vnets/panelId.js b/src/sunstone/public/app/tabs/clusters-tab/panels/vnets/panelId.js index 7dce3408c4..4b21372806 100644 --- a/src/sunstone/public/app/tabs/clusters-tab/panels/vnets/panelId.js +++ b/src/sunstone/public/app/tabs/clusters-tab/panels/vnets/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/clusters-tab/tabId.js b/src/sunstone/public/app/tabs/clusters-tab/tabId.js index 395d32859c..d9b3acb689 100644 --- a/src/sunstone/public/app/tabs/clusters-tab/tabId.js +++ b/src/sunstone/public/app/tabs/clusters-tab/tabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/dashboard-tab.js b/src/sunstone/public/app/tabs/dashboard-tab.js index 0e5fe77fd5..eebe6cca10 100644 --- a/src/sunstone/public/app/tabs/dashboard-tab.js +++ b/src/sunstone/public/app/tabs/dashboard-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/dashboard-tab/empty-graph.hbs b/src/sunstone/public/app/tabs/dashboard-tab/empty-graph.hbs index b8a08702ee..4e75f8b7cb 100644 --- a/src/sunstone/public/app/tabs/dashboard-tab/empty-graph.hbs +++ b/src/sunstone/public/app/tabs/dashboard-tab/empty-graph.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/dashboard-tab/hosts.hbs b/src/sunstone/public/app/tabs/dashboard-tab/hosts.hbs index f130fc09e9..18d5725ae0 100644 --- a/src/sunstone/public/app/tabs/dashboard-tab/hosts.hbs +++ b/src/sunstone/public/app/tabs/dashboard-tab/hosts.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/dashboard-tab/html.hbs b/src/sunstone/public/app/tabs/dashboard-tab/html.hbs index 39f80a2300..4fbeca833b 100644 --- a/src/sunstone/public/app/tabs/dashboard-tab/html.hbs +++ b/src/sunstone/public/app/tabs/dashboard-tab/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/dashboard-tab/network.hbs b/src/sunstone/public/app/tabs/dashboard-tab/network.hbs index c716ec0f43..6882dbac68 100644 --- a/src/sunstone/public/app/tabs/dashboard-tab/network.hbs +++ b/src/sunstone/public/app/tabs/dashboard-tab/network.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/dashboard-tab/storage.hbs b/src/sunstone/public/app/tabs/dashboard-tab/storage.hbs index 93a07a3c43..9359f138d2 100644 --- a/src/sunstone/public/app/tabs/dashboard-tab/storage.hbs +++ b/src/sunstone/public/app/tabs/dashboard-tab/storage.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/dashboard-tab/tabId.js b/src/sunstone/public/app/tabs/dashboard-tab/tabId.js index f25aa4eb5a..836e335434 100644 --- a/src/sunstone/public/app/tabs/dashboard-tab/tabId.js +++ b/src/sunstone/public/app/tabs/dashboard-tab/tabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/dashboard-tab/users.hbs b/src/sunstone/public/app/tabs/dashboard-tab/users.hbs index 10d9919508..d386bbadf1 100644 --- a/src/sunstone/public/app/tabs/dashboard-tab/users.hbs +++ b/src/sunstone/public/app/tabs/dashboard-tab/users.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/dashboard-tab/vms.hbs b/src/sunstone/public/app/tabs/dashboard-tab/vms.hbs index ec27f8a96b..c54d14b17a 100644 --- a/src/sunstone/public/app/tabs/dashboard-tab/vms.hbs +++ b/src/sunstone/public/app/tabs/dashboard-tab/vms.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/datastores-tab.js b/src/sunstone/public/app/tabs/datastores-tab.js index a1bb9c2acd..0d90e31fb0 100644 --- a/src/sunstone/public/app/tabs/datastores-tab.js +++ b/src/sunstone/public/app/tabs/datastores-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/datastores-tab/actions.js b/src/sunstone/public/app/tabs/datastores-tab/actions.js index ff54b4a254..d4dbe3f79c 100644 --- a/src/sunstone/public/app/tabs/datastores-tab/actions.js +++ b/src/sunstone/public/app/tabs/datastores-tab/actions.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/datastores-tab/buttons.js b/src/sunstone/public/app/tabs/datastores-tab/buttons.js index cf496707c2..86326a1379 100644 --- a/src/sunstone/public/app/tabs/datastores-tab/buttons.js +++ b/src/sunstone/public/app/tabs/datastores-tab/buttons.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/datastores-tab/datatable.js b/src/sunstone/public/app/tabs/datastores-tab/datatable.js index 3c8456c648..b5543a3199 100644 --- a/src/sunstone/public/app/tabs/datastores-tab/datatable.js +++ b/src/sunstone/public/app/tabs/datastores-tab/datatable.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js index b4f911de9f..b9505b1d35 100644 --- a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create/advanced.hbs b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create/advanced.hbs index cd5052ba94..59dc072fa7 100644 --- a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create/advanced.hbs +++ b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create/advanced.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create/formPanelId.js b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create/formPanelId.js index d51ab2a165..e4bceb4fe6 100644 --- a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create/formPanelId.js +++ b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create/wizard.hbs index f06fafc7aa..877f2181b5 100644 --- a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create/wizard.hbs +++ b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create/wizard.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/datastores-tab/form-panels/import.js b/src/sunstone/public/app/tabs/datastores-tab/form-panels/import.js index c3d5f75f08..a0cde030ad 100644 --- a/src/sunstone/public/app/tabs/datastores-tab/form-panels/import.js +++ b/src/sunstone/public/app/tabs/datastores-tab/form-panels/import.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/datastores-tab/form-panels/import/formPanelId.js b/src/sunstone/public/app/tabs/datastores-tab/form-panels/import/formPanelId.js index 4b3272062d..dec28ebb78 100644 --- a/src/sunstone/public/app/tabs/datastores-tab/form-panels/import/formPanelId.js +++ b/src/sunstone/public/app/tabs/datastores-tab/form-panels/import/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/datastores-tab/form-panels/import/html.hbs b/src/sunstone/public/app/tabs/datastores-tab/form-panels/import/html.hbs index b5f63ec7ac..63c6d7131d 100644 --- a/src/sunstone/public/app/tabs/datastores-tab/form-panels/import/html.hbs +++ b/src/sunstone/public/app/tabs/datastores-tab/form-panels/import/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/datastores-tab/panels/clusters.js b/src/sunstone/public/app/tabs/datastores-tab/panels/clusters.js index 1a19b89c91..5fe1a4f456 100644 --- a/src/sunstone/public/app/tabs/datastores-tab/panels/clusters.js +++ b/src/sunstone/public/app/tabs/datastores-tab/panels/clusters.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/datastores-tab/panels/clusters/panelId.js b/src/sunstone/public/app/tabs/datastores-tab/panels/clusters/panelId.js index 7c9ffeff4b..7aa453aecd 100644 --- a/src/sunstone/public/app/tabs/datastores-tab/panels/clusters/panelId.js +++ b/src/sunstone/public/app/tabs/datastores-tab/panels/clusters/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/datastores-tab/panels/images.js b/src/sunstone/public/app/tabs/datastores-tab/panels/images.js index e392adcdcc..2f231f637c 100644 --- a/src/sunstone/public/app/tabs/datastores-tab/panels/images.js +++ b/src/sunstone/public/app/tabs/datastores-tab/panels/images.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/datastores-tab/panels/images/panelId.js b/src/sunstone/public/app/tabs/datastores-tab/panels/images/panelId.js index c9c2950ba6..6fd9a89c3c 100644 --- a/src/sunstone/public/app/tabs/datastores-tab/panels/images/panelId.js +++ b/src/sunstone/public/app/tabs/datastores-tab/panels/images/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/datastores-tab/panels/info.js b/src/sunstone/public/app/tabs/datastores-tab/panels/info.js index 6281d2d1c3..7d23657c6f 100644 --- a/src/sunstone/public/app/tabs/datastores-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/datastores-tab/panels/info.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/datastores-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/datastores-tab/panels/info/html.hbs index 179f0372eb..e94a549f44 100644 --- a/src/sunstone/public/app/tabs/datastores-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/datastores-tab/panels/info/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/datastores-tab/panels/info/panelId.js b/src/sunstone/public/app/tabs/datastores-tab/panels/info/panelId.js index 92e753089d..f4c4d3a388 100644 --- a/src/sunstone/public/app/tabs/datastores-tab/panels/info/panelId.js +++ b/src/sunstone/public/app/tabs/datastores-tab/panels/info/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/datastores-tab/tabId.js b/src/sunstone/public/app/tabs/datastores-tab/tabId.js index d1c5772807..96eec3b6e6 100644 --- a/src/sunstone/public/app/tabs/datastores-tab/tabId.js +++ b/src/sunstone/public/app/tabs/datastores-tab/tabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/datastores-tab/utils/datastore-capacity-bar.js b/src/sunstone/public/app/tabs/datastores-tab/utils/datastore-capacity-bar.js index e63605b167..149466d97e 100644 --- a/src/sunstone/public/app/tabs/datastores-tab/utils/datastore-capacity-bar.js +++ b/src/sunstone/public/app/tabs/datastores-tab/utils/datastore-capacity-bar.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/files-tab.js b/src/sunstone/public/app/tabs/files-tab.js index 76eb42bc1d..9b2a7522a1 100644 --- a/src/sunstone/public/app/tabs/files-tab.js +++ b/src/sunstone/public/app/tabs/files-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/files-tab/actions.js b/src/sunstone/public/app/tabs/files-tab/actions.js index 654d323fe8..596de59edb 100644 --- a/src/sunstone/public/app/tabs/files-tab/actions.js +++ b/src/sunstone/public/app/tabs/files-tab/actions.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/files-tab/buttons.js b/src/sunstone/public/app/tabs/files-tab/buttons.js index 667626e559..70ee7568fd 100644 --- a/src/sunstone/public/app/tabs/files-tab/buttons.js +++ b/src/sunstone/public/app/tabs/files-tab/buttons.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/files-tab/datatable.js b/src/sunstone/public/app/tabs/files-tab/datatable.js index d25bc6c1fb..6b3318a159 100644 --- a/src/sunstone/public/app/tabs/files-tab/datatable.js +++ b/src/sunstone/public/app/tabs/files-tab/datatable.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/files-tab/form-panels/create.js b/src/sunstone/public/app/tabs/files-tab/form-panels/create.js index 8293e111ad..664a02ee4c 100644 --- a/src/sunstone/public/app/tabs/files-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/files-tab/form-panels/create.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/files-tab/form-panels/create/formPanelId.js b/src/sunstone/public/app/tabs/files-tab/form-panels/create/formPanelId.js index 6b88220acc..b1d199a718 100644 --- a/src/sunstone/public/app/tabs/files-tab/form-panels/create/formPanelId.js +++ b/src/sunstone/public/app/tabs/files-tab/form-panels/create/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/files-tab/panels/info.js b/src/sunstone/public/app/tabs/files-tab/panels/info.js index a112f27c5f..a15aa109a4 100644 --- a/src/sunstone/public/app/tabs/files-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/files-tab/panels/info.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/files-tab/panels/info/panelId.js b/src/sunstone/public/app/tabs/files-tab/panels/info/panelId.js index 3ac6f5f0df..3f275595b9 100644 --- a/src/sunstone/public/app/tabs/files-tab/panels/info/panelId.js +++ b/src/sunstone/public/app/tabs/files-tab/panels/info/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/files-tab/tabId.js b/src/sunstone/public/app/tabs/files-tab/tabId.js index eddc4a7ae2..5f18781b51 100644 --- a/src/sunstone/public/app/tabs/files-tab/tabId.js +++ b/src/sunstone/public/app/tabs/files-tab/tabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/groups-tab.js b/src/sunstone/public/app/tabs/groups-tab.js index b31214d71e..e985fdee16 100644 --- a/src/sunstone/public/app/tabs/groups-tab.js +++ b/src/sunstone/public/app/tabs/groups-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/groups-tab/actions.js b/src/sunstone/public/app/tabs/groups-tab/actions.js index 9ebe60c27c..07edc40154 100644 --- a/src/sunstone/public/app/tabs/groups-tab/actions.js +++ b/src/sunstone/public/app/tabs/groups-tab/actions.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/groups-tab/buttons.js b/src/sunstone/public/app/tabs/groups-tab/buttons.js index e6336d0942..5505034574 100644 --- a/src/sunstone/public/app/tabs/groups-tab/buttons.js +++ b/src/sunstone/public/app/tabs/groups-tab/buttons.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/groups-tab/datatable.js b/src/sunstone/public/app/tabs/groups-tab/datatable.js index e59fccaa5c..094978c591 100644 --- a/src/sunstone/public/app/tabs/groups-tab/datatable.js +++ b/src/sunstone/public/app/tabs/groups-tab/datatable.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/groups-tab/dialogs/image.js b/src/sunstone/public/app/tabs/groups-tab/dialogs/image.js index f4f6acf389..850cf399fc 100644 --- a/src/sunstone/public/app/tabs/groups-tab/dialogs/image.js +++ b/src/sunstone/public/app/tabs/groups-tab/dialogs/image.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/groups-tab/dialogs/image/dialogId.js b/src/sunstone/public/app/tabs/groups-tab/dialogs/image/dialogId.js index 09cac12567..e8e12a4420 100644 --- a/src/sunstone/public/app/tabs/groups-tab/dialogs/image/dialogId.js +++ b/src/sunstone/public/app/tabs/groups-tab/dialogs/image/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/groups-tab/dialogs/image/html.hbs b/src/sunstone/public/app/tabs/groups-tab/dialogs/image/html.hbs index 06a33c1b52..3e4c988218 100644 --- a/src/sunstone/public/app/tabs/groups-tab/dialogs/image/html.hbs +++ b/src/sunstone/public/app/tabs/groups-tab/dialogs/image/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/groups-tab/dialogs/quotas.js b/src/sunstone/public/app/tabs/groups-tab/dialogs/quotas.js index 2917e01434..85bbf7666c 100644 --- a/src/sunstone/public/app/tabs/groups-tab/dialogs/quotas.js +++ b/src/sunstone/public/app/tabs/groups-tab/dialogs/quotas.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/groups-tab/dialogs/quotas/dialogId.js b/src/sunstone/public/app/tabs/groups-tab/dialogs/quotas/dialogId.js index 5637811b8c..8f3fd0b6ec 100644 --- a/src/sunstone/public/app/tabs/groups-tab/dialogs/quotas/dialogId.js +++ b/src/sunstone/public/app/tabs/groups-tab/dialogs/quotas/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/groups-tab/dialogs/quotas/html.hbs b/src/sunstone/public/app/tabs/groups-tab/dialogs/quotas/html.hbs index 9968c4e7e7..9e6475a9ba 100644 --- a/src/sunstone/public/app/tabs/groups-tab/dialogs/quotas/html.hbs +++ b/src/sunstone/public/app/tabs/groups-tab/dialogs/quotas/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/groups-tab/form-panels/create.js b/src/sunstone/public/app/tabs/groups-tab/form-panels/create.js index e208c6ca8e..344b71e33f 100644 --- a/src/sunstone/public/app/tabs/groups-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/groups-tab/form-panels/create.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/groups-tab/form-panels/create/formPanelId.js b/src/sunstone/public/app/tabs/groups-tab/form-panels/create/formPanelId.js index d19a8689fb..a1e509078a 100644 --- a/src/sunstone/public/app/tabs/groups-tab/form-panels/create/formPanelId.js +++ b/src/sunstone/public/app/tabs/groups-tab/form-panels/create/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/groups-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/groups-tab/form-panels/create/wizard.hbs index 41913f77cf..7c89e33c5b 100644 --- a/src/sunstone/public/app/tabs/groups-tab/form-panels/create/wizard.hbs +++ b/src/sunstone/public/app/tabs/groups-tab/form-panels/create/wizard.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/groups-tab/panels/accounting.js b/src/sunstone/public/app/tabs/groups-tab/panels/accounting.js index 68ca7e0641..05567b8d3d 100644 --- a/src/sunstone/public/app/tabs/groups-tab/panels/accounting.js +++ b/src/sunstone/public/app/tabs/groups-tab/panels/accounting.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/groups-tab/panels/accounting/panelId.js b/src/sunstone/public/app/tabs/groups-tab/panels/accounting/panelId.js index 3690aebb41..6d7f15b9f9 100644 --- a/src/sunstone/public/app/tabs/groups-tab/panels/accounting/panelId.js +++ b/src/sunstone/public/app/tabs/groups-tab/panels/accounting/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/groups-tab/panels/info.js b/src/sunstone/public/app/tabs/groups-tab/panels/info.js index 3de0ea48d2..d9dc13c9ef 100644 --- a/src/sunstone/public/app/tabs/groups-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/groups-tab/panels/info.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/groups-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/groups-tab/panels/info/html.hbs index 34c3504846..3c0e60fb94 100644 --- a/src/sunstone/public/app/tabs/groups-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/groups-tab/panels/info/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/groups-tab/panels/info/panelId.js b/src/sunstone/public/app/tabs/groups-tab/panels/info/panelId.js index e1a2793e00..ecde41d675 100644 --- a/src/sunstone/public/app/tabs/groups-tab/panels/info/panelId.js +++ b/src/sunstone/public/app/tabs/groups-tab/panels/info/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/groups-tab/panels/quotas.js b/src/sunstone/public/app/tabs/groups-tab/panels/quotas.js index d5137f4f20..744d3b7be7 100644 --- a/src/sunstone/public/app/tabs/groups-tab/panels/quotas.js +++ b/src/sunstone/public/app/tabs/groups-tab/panels/quotas.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/groups-tab/panels/quotas/panelId.js b/src/sunstone/public/app/tabs/groups-tab/panels/quotas/panelId.js index 050d88e4b8..5a35fbedb1 100644 --- a/src/sunstone/public/app/tabs/groups-tab/panels/quotas/panelId.js +++ b/src/sunstone/public/app/tabs/groups-tab/panels/quotas/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/groups-tab/panels/showback.js b/src/sunstone/public/app/tabs/groups-tab/panels/showback.js index 74e1f123b1..5b21c57099 100644 --- a/src/sunstone/public/app/tabs/groups-tab/panels/showback.js +++ b/src/sunstone/public/app/tabs/groups-tab/panels/showback.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/groups-tab/panels/showback/panelId.js b/src/sunstone/public/app/tabs/groups-tab/panels/showback/panelId.js index 9ecd4f675a..ac5abd66a0 100644 --- a/src/sunstone/public/app/tabs/groups-tab/panels/showback/panelId.js +++ b/src/sunstone/public/app/tabs/groups-tab/panels/showback/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/groups-tab/panels/users.js b/src/sunstone/public/app/tabs/groups-tab/panels/users.js index 5cdc43b579..bb53a666f5 100644 --- a/src/sunstone/public/app/tabs/groups-tab/panels/users.js +++ b/src/sunstone/public/app/tabs/groups-tab/panels/users.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/groups-tab/panels/users/html.hbs b/src/sunstone/public/app/tabs/groups-tab/panels/users/html.hbs index 43d0bde713..dc63ba803a 100644 --- a/src/sunstone/public/app/tabs/groups-tab/panels/users/html.hbs +++ b/src/sunstone/public/app/tabs/groups-tab/panels/users/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/groups-tab/panels/users/panelId.js b/src/sunstone/public/app/tabs/groups-tab/panels/users/panelId.js index 3c3f41bf3c..9a786a7aab 100644 --- a/src/sunstone/public/app/tabs/groups-tab/panels/users/panelId.js +++ b/src/sunstone/public/app/tabs/groups-tab/panels/users/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/groups-tab/tabId.js b/src/sunstone/public/app/tabs/groups-tab/tabId.js index e4b2b05ee7..39bcf6e1d3 100644 --- a/src/sunstone/public/app/tabs/groups-tab/tabId.js +++ b/src/sunstone/public/app/tabs/groups-tab/tabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/groups-tab/utils/views.js b/src/sunstone/public/app/tabs/groups-tab/utils/views.js index 0535226e57..e15ece31a7 100644 --- a/src/sunstone/public/app/tabs/groups-tab/utils/views.js +++ b/src/sunstone/public/app/tabs/groups-tab/utils/views.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/hosts-tab.js b/src/sunstone/public/app/tabs/hosts-tab.js index 7a37c6942c..f552eddc4e 100644 --- a/src/sunstone/public/app/tabs/hosts-tab.js +++ b/src/sunstone/public/app/tabs/hosts-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/hosts-tab/actions.js b/src/sunstone/public/app/tabs/hosts-tab/actions.js index 456591f708..ca62b58e2d 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/actions.js +++ b/src/sunstone/public/app/tabs/hosts-tab/actions.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/hosts-tab/buttons.js b/src/sunstone/public/app/tabs/hosts-tab/buttons.js index 678ed984f7..4087f2e698 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/buttons.js +++ b/src/sunstone/public/app/tabs/hosts-tab/buttons.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/hosts-tab/datatable.js b/src/sunstone/public/app/tabs/hosts-tab/datatable.js index 836833a9be..3197acdd1a 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/datatable.js +++ b/src/sunstone/public/app/tabs/hosts-tab/datatable.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/hosts-tab/dialogs/create/dialogId.js b/src/sunstone/public/app/tabs/hosts-tab/dialogs/create/dialogId.js index 4e8b2a8235..3ae8871886 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/dialogs/create/dialogId.js +++ b/src/sunstone/public/app/tabs/hosts-tab/dialogs/create/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/hosts-tab/form-panels/create.js b/src/sunstone/public/app/tabs/hosts-tab/form-panels/create.js index 484339d5e3..6906b375a4 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/hosts-tab/form-panels/create.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/hosts-tab/form-panels/create/formPanelId.js b/src/sunstone/public/app/tabs/hosts-tab/form-panels/create/formPanelId.js index 5eee5d0e12..dccdd7c62a 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/form-panels/create/formPanelId.js +++ b/src/sunstone/public/app/tabs/hosts-tab/form-panels/create/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/hosts-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/hosts-tab/form-panels/create/wizard.hbs index ab9f0ce6e5..70051be33f 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/form-panels/create/wizard.hbs +++ b/src/sunstone/public/app/tabs/hosts-tab/form-panels/create/wizard.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/esx.js b/src/sunstone/public/app/tabs/hosts-tab/panels/esx.js index ccc3a8d9e6..52c25cbde9 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/esx.js +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/esx.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/esx/html.hbs b/src/sunstone/public/app/tabs/hosts-tab/panels/esx/html.hbs index e339962ef8..02b2c88ab1 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/esx/html.hbs +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/esx/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/esx/panelId.js b/src/sunstone/public/app/tabs/hosts-tab/panels/esx/panelId.js index 2545a09d11..512277f66e 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/esx/panelId.js +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/esx/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/info.js b/src/sunstone/public/app/tabs/hosts-tab/panels/info.js index 7697a635b0..9cc7cf5c4e 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/info.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/hosts-tab/panels/info/html.hbs index 32392013c6..b181cd453c 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/info/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/info/panelId.js b/src/sunstone/public/app/tabs/hosts-tab/panels/info/panelId.js index 9118aa1314..4d30e7dde0 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/info/panelId.js +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/info/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/monitor.js b/src/sunstone/public/app/tabs/hosts-tab/panels/monitor.js index e2ff736ac2..100057d839 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/monitor.js +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/monitor.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/monitor/html.hbs b/src/sunstone/public/app/tabs/hosts-tab/panels/monitor/html.hbs index 4c71129c0d..c47d0f160a 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/monitor/html.hbs +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/monitor/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/monitor/panelId.js b/src/sunstone/public/app/tabs/hosts-tab/panels/monitor/panelId.js index 63fcc365a7..a2d1fc0640 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/monitor/panelId.js +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/monitor/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/pci.js b/src/sunstone/public/app/tabs/hosts-tab/panels/pci.js index 1a93b4bdb7..3358f16cfb 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/pci.js +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/pci.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/pci/html.hbs b/src/sunstone/public/app/tabs/hosts-tab/panels/pci/html.hbs index 7f671a9ad0..567693168b 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/pci/html.hbs +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/pci/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/pci/panelId.js b/src/sunstone/public/app/tabs/hosts-tab/panels/pci/panelId.js index ab70521a78..2a83b56b57 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/pci/panelId.js +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/pci/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/vms.js b/src/sunstone/public/app/tabs/hosts-tab/panels/vms.js index 76d757cf13..84ff42e79e 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/vms.js +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/vms.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/vms/panelId.js b/src/sunstone/public/app/tabs/hosts-tab/panels/vms/panelId.js index dddf029bc4..f902128d6b 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/vms/panelId.js +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/vms/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/wilds.js b/src/sunstone/public/app/tabs/hosts-tab/panels/wilds.js index 5de81cc757..401a49384c 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/wilds.js +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/wilds.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/wilds/html.hbs b/src/sunstone/public/app/tabs/hosts-tab/panels/wilds/html.hbs index aafc654046..e6cdb68f9d 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/wilds/html.hbs +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/wilds/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/wilds/panelId.js b/src/sunstone/public/app/tabs/hosts-tab/panels/wilds/panelId.js index 30b3b06ea7..982446778b 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/wilds/panelId.js +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/wilds/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/zombies.js b/src/sunstone/public/app/tabs/hosts-tab/panels/zombies.js index 6b5c797e1a..d7fe093286 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/zombies.js +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/zombies.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/zombies/html.hbs b/src/sunstone/public/app/tabs/hosts-tab/panels/zombies/html.hbs index cbcd62c6bc..4625495dde 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/zombies/html.hbs +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/zombies/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/zombies/panelId.js b/src/sunstone/public/app/tabs/hosts-tab/panels/zombies/panelId.js index 70de8cd2ae..a10be128dd 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/zombies/panelId.js +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/zombies/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/hosts-tab/tabId.js b/src/sunstone/public/app/tabs/hosts-tab/tabId.js index 5f077aa0ab..f124732d21 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/tabId.js +++ b/src/sunstone/public/app/tabs/hosts-tab/tabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/hosts-tab/utils/can-import-wilds.js b/src/sunstone/public/app/tabs/hosts-tab/utils/can-import-wilds.js index 6f0b51ee30..2637b63e2d 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/utils/can-import-wilds.js +++ b/src/sunstone/public/app/tabs/hosts-tab/utils/can-import-wilds.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/hosts-tab/utils/cpu-bars.js b/src/sunstone/public/app/tabs/hosts-tab/utils/cpu-bars.js index 4407525ee0..6cc189a804 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/utils/cpu-bars.js +++ b/src/sunstone/public/app/tabs/hosts-tab/utils/cpu-bars.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/hosts-tab/utils/datastore-capacity-table/html.hbs b/src/sunstone/public/app/tabs/hosts-tab/utils/datastore-capacity-table/html.hbs index 0f6703d1f3..b09cf22b53 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/utils/datastore-capacity-table/html.hbs +++ b/src/sunstone/public/app/tabs/hosts-tab/utils/datastore-capacity-table/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/hosts-tab/utils/datastores-capacity-table.js b/src/sunstone/public/app/tabs/hosts-tab/utils/datastores-capacity-table.js index 8e78585450..1fd4503f10 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/utils/datastores-capacity-table.js +++ b/src/sunstone/public/app/tabs/hosts-tab/utils/datastores-capacity-table.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/hosts-tab/utils/memory-bars.js b/src/sunstone/public/app/tabs/hosts-tab/utils/memory-bars.js index 1118cb703e..9baaf10b91 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/utils/memory-bars.js +++ b/src/sunstone/public/app/tabs/hosts-tab/utils/memory-bars.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/hosts-tab/utils/reserved.js b/src/sunstone/public/app/tabs/hosts-tab/utils/reserved.js index d483a388be..98c2bce0d6 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/utils/reserved.js +++ b/src/sunstone/public/app/tabs/hosts-tab/utils/reserved.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/images-tab.js b/src/sunstone/public/app/tabs/images-tab.js index e751834525..b149ca853e 100644 --- a/src/sunstone/public/app/tabs/images-tab.js +++ b/src/sunstone/public/app/tabs/images-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/images-tab/actions.js b/src/sunstone/public/app/tabs/images-tab/actions.js index a687989faf..dd915050d3 100644 --- a/src/sunstone/public/app/tabs/images-tab/actions.js +++ b/src/sunstone/public/app/tabs/images-tab/actions.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/images-tab/buttons.js b/src/sunstone/public/app/tabs/images-tab/buttons.js index 50fe49ba78..bef0ba3269 100644 --- a/src/sunstone/public/app/tabs/images-tab/buttons.js +++ b/src/sunstone/public/app/tabs/images-tab/buttons.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/images-tab/datatable-common.js b/src/sunstone/public/app/tabs/images-tab/datatable-common.js index c9b87d6f82..9cffe9e277 100644 --- a/src/sunstone/public/app/tabs/images-tab/datatable-common.js +++ b/src/sunstone/public/app/tabs/images-tab/datatable-common.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/images-tab/datatable.js b/src/sunstone/public/app/tabs/images-tab/datatable.js index 5cff83898b..ece7797f79 100644 --- a/src/sunstone/public/app/tabs/images-tab/datatable.js +++ b/src/sunstone/public/app/tabs/images-tab/datatable.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/images-tab/dialogs/clone.js b/src/sunstone/public/app/tabs/images-tab/dialogs/clone.js index 33cd8f975a..89a99fba58 100644 --- a/src/sunstone/public/app/tabs/images-tab/dialogs/clone.js +++ b/src/sunstone/public/app/tabs/images-tab/dialogs/clone.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/images-tab/dialogs/clone/dialogId.js b/src/sunstone/public/app/tabs/images-tab/dialogs/clone/dialogId.js index d3472b1839..1e50bd07ac 100644 --- a/src/sunstone/public/app/tabs/images-tab/dialogs/clone/dialogId.js +++ b/src/sunstone/public/app/tabs/images-tab/dialogs/clone/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/images-tab/dialogs/clone/html.hbs b/src/sunstone/public/app/tabs/images-tab/dialogs/clone/html.hbs index 92714e58b8..dc298af300 100644 --- a/src/sunstone/public/app/tabs/images-tab/dialogs/clone/html.hbs +++ b/src/sunstone/public/app/tabs/images-tab/dialogs/clone/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/images-tab/form-panels/create-common.js b/src/sunstone/public/app/tabs/images-tab/form-panels/create-common.js index f7009624db..2629e47979 100644 --- a/src/sunstone/public/app/tabs/images-tab/form-panels/create-common.js +++ b/src/sunstone/public/app/tabs/images-tab/form-panels/create-common.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/images-tab/form-panels/create.js b/src/sunstone/public/app/tabs/images-tab/form-panels/create.js index d366ed20eb..376a44fdf7 100644 --- a/src/sunstone/public/app/tabs/images-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/images-tab/form-panels/create.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/images-tab/form-panels/create/advanced.hbs b/src/sunstone/public/app/tabs/images-tab/form-panels/create/advanced.hbs index 12f7d08cf3..0e1a12168b 100644 --- a/src/sunstone/public/app/tabs/images-tab/form-panels/create/advanced.hbs +++ b/src/sunstone/public/app/tabs/images-tab/form-panels/create/advanced.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/images-tab/form-panels/create/formPanelId.js b/src/sunstone/public/app/tabs/images-tab/form-panels/create/formPanelId.js index 8cd4ff74a3..2eb4138778 100644 --- a/src/sunstone/public/app/tabs/images-tab/form-panels/create/formPanelId.js +++ b/src/sunstone/public/app/tabs/images-tab/form-panels/create/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard.hbs index a32261a5dd..2df7b6c29d 100644 --- a/src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard.hbs +++ b/src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/images-tab/form-panels/import.js b/src/sunstone/public/app/tabs/images-tab/form-panels/import.js index 1244f5ac1b..569455b7fb 100644 --- a/src/sunstone/public/app/tabs/images-tab/form-panels/import.js +++ b/src/sunstone/public/app/tabs/images-tab/form-panels/import.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/images-tab/form-panels/import/formPanelId.js b/src/sunstone/public/app/tabs/images-tab/form-panels/import/formPanelId.js index 51634d7882..663f676239 100644 --- a/src/sunstone/public/app/tabs/images-tab/form-panels/import/formPanelId.js +++ b/src/sunstone/public/app/tabs/images-tab/form-panels/import/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/images-tab/form-panels/import/html.hbs b/src/sunstone/public/app/tabs/images-tab/form-panels/import/html.hbs index 38825b1d47..15d2fbb67e 100644 --- a/src/sunstone/public/app/tabs/images-tab/form-panels/import/html.hbs +++ b/src/sunstone/public/app/tabs/images-tab/form-panels/import/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/images-tab/panels/info-common.js b/src/sunstone/public/app/tabs/images-tab/panels/info-common.js index 1fa62385c8..2417a16a90 100644 --- a/src/sunstone/public/app/tabs/images-tab/panels/info-common.js +++ b/src/sunstone/public/app/tabs/images-tab/panels/info-common.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/images-tab/panels/info.js b/src/sunstone/public/app/tabs/images-tab/panels/info.js index 69c71aa05d..857197c51d 100644 --- a/src/sunstone/public/app/tabs/images-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/images-tab/panels/info.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/images-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/images-tab/panels/info/html.hbs index 2237a84563..13b5a04e55 100644 --- a/src/sunstone/public/app/tabs/images-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/images-tab/panels/info/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/images-tab/panels/info/panelId.js b/src/sunstone/public/app/tabs/images-tab/panels/info/panelId.js index e5b376ff94..a71a33d8f7 100644 --- a/src/sunstone/public/app/tabs/images-tab/panels/info/panelId.js +++ b/src/sunstone/public/app/tabs/images-tab/panels/info/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/images-tab/panels/snapshots.js b/src/sunstone/public/app/tabs/images-tab/panels/snapshots.js index 91f9dfdf1f..25f2903dee 100644 --- a/src/sunstone/public/app/tabs/images-tab/panels/snapshots.js +++ b/src/sunstone/public/app/tabs/images-tab/panels/snapshots.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/images-tab/panels/snapshots/html.hbs b/src/sunstone/public/app/tabs/images-tab/panels/snapshots/html.hbs index e89784e876..14ffdbb6d8 100644 --- a/src/sunstone/public/app/tabs/images-tab/panels/snapshots/html.hbs +++ b/src/sunstone/public/app/tabs/images-tab/panels/snapshots/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/images-tab/panels/snapshots/panelId.js b/src/sunstone/public/app/tabs/images-tab/panels/snapshots/panelId.js index fc8c2fdf4f..ecdd1e6cda 100644 --- a/src/sunstone/public/app/tabs/images-tab/panels/snapshots/panelId.js +++ b/src/sunstone/public/app/tabs/images-tab/panels/snapshots/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/images-tab/panels/vms.js b/src/sunstone/public/app/tabs/images-tab/panels/vms.js index 28f13fe71f..013dbeed69 100644 --- a/src/sunstone/public/app/tabs/images-tab/panels/vms.js +++ b/src/sunstone/public/app/tabs/images-tab/panels/vms.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/images-tab/panels/vms/panelId.js b/src/sunstone/public/app/tabs/images-tab/panels/vms/panelId.js index 379193ba10..ed987dcd7d 100644 --- a/src/sunstone/public/app/tabs/images-tab/panels/vms/panelId.js +++ b/src/sunstone/public/app/tabs/images-tab/panels/vms/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/images-tab/tabId.js b/src/sunstone/public/app/tabs/images-tab/tabId.js index 3ba3b691de..776b36d783 100644 --- a/src/sunstone/public/app/tabs/images-tab/tabId.js +++ b/src/sunstone/public/app/tabs/images-tab/tabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/infrastructure-top-tab.js b/src/sunstone/public/app/tabs/infrastructure-top-tab.js index d3cb2f700e..2f4a3564c2 100644 --- a/src/sunstone/public/app/tabs/infrastructure-top-tab.js +++ b/src/sunstone/public/app/tabs/infrastructure-top-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/instances-top-tab.js b/src/sunstone/public/app/tabs/instances-top-tab.js index d6344529d8..7d2e523145 100644 --- a/src/sunstone/public/app/tabs/instances-top-tab.js +++ b/src/sunstone/public/app/tabs/instances-top-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab.js b/src/sunstone/public/app/tabs/marketplaceapps-tab.js index d555a5ced8..1bdb8fc1fc 100644 --- a/src/sunstone/public/app/tabs/marketplaceapps-tab.js +++ b/src/sunstone/public/app/tabs/marketplaceapps-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/actions.js b/src/sunstone/public/app/tabs/marketplaceapps-tab/actions.js index 9582e688c8..108f045062 100644 --- a/src/sunstone/public/app/tabs/marketplaceapps-tab/actions.js +++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/actions.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/buttons.js b/src/sunstone/public/app/tabs/marketplaceapps-tab/buttons.js index be4e78e375..bf8d23cee4 100644 --- a/src/sunstone/public/app/tabs/marketplaceapps-tab/buttons.js +++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/buttons.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/datatable.js b/src/sunstone/public/app/tabs/marketplaceapps-tab/datatable.js index b5468c88fc..061eeaf04b 100644 --- a/src/sunstone/public/app/tabs/marketplaceapps-tab/datatable.js +++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/datatable.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create.js b/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create.js index 25f5a69bcc..0eb1564618 100644 --- a/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create/advanced.hbs b/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create/advanced.hbs index 45e365c228..020ffc4bf9 100644 --- a/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create/advanced.hbs +++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create/advanced.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create/formPanelId.js b/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create/formPanelId.js index 4cdd99427b..7e0d64806f 100644 --- a/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create/formPanelId.js +++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create/wizard.hbs index 570b2f62e2..13ed379910 100644 --- a/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create/wizard.hbs +++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/create/wizard.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/export.js b/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/export.js index 94749a047f..edc631c58d 100644 --- a/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/export.js +++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/export.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/export/formPanelId.js b/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/export/formPanelId.js index f803d9521b..7230172b74 100644 --- a/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/export/formPanelId.js +++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/export/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/export/wizard.hbs b/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/export/wizard.hbs index 8ca7f785e0..502b65d320 100644 --- a/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/export/wizard.hbs +++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/form-panels/export/wizard.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/hooks/init.js b/src/sunstone/public/app/tabs/marketplaceapps-tab/hooks/init.js index 2f1de3655c..0e661c0930 100644 --- a/src/sunstone/public/app/tabs/marketplaceapps-tab/hooks/init.js +++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/hooks/init.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/panels/info.js b/src/sunstone/public/app/tabs/marketplaceapps-tab/panels/info.js index f688b64387..5e22a88d19 100644 --- a/src/sunstone/public/app/tabs/marketplaceapps-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/panels/info.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/marketplaceapps-tab/panels/info/html.hbs index 42f744114a..6d0c1e4f63 100644 --- a/src/sunstone/public/app/tabs/marketplaceapps-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/panels/info/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/panels/info/panelId.js b/src/sunstone/public/app/tabs/marketplaceapps-tab/panels/info/panelId.js index 5718a528d9..8931673126 100644 --- a/src/sunstone/public/app/tabs/marketplaceapps-tab/panels/info/panelId.js +++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/panels/info/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/panels/templates.js b/src/sunstone/public/app/tabs/marketplaceapps-tab/panels/templates.js index c1a0090f14..07117d979e 100644 --- a/src/sunstone/public/app/tabs/marketplaceapps-tab/panels/templates.js +++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/panels/templates.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/panels/templates/html.hbs b/src/sunstone/public/app/tabs/marketplaceapps-tab/panels/templates/html.hbs index e25af62e79..fc852b7338 100644 --- a/src/sunstone/public/app/tabs/marketplaceapps-tab/panels/templates/html.hbs +++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/panels/templates/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/panels/templates/panelId.js b/src/sunstone/public/app/tabs/marketplaceapps-tab/panels/templates/panelId.js index 492b813f8e..718d11e2fc 100644 --- a/src/sunstone/public/app/tabs/marketplaceapps-tab/panels/templates/panelId.js +++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/panels/templates/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/tabId.js b/src/sunstone/public/app/tabs/marketplaceapps-tab/tabId.js index 3ba08f2c46..59082278ba 100644 --- a/src/sunstone/public/app/tabs/marketplaceapps-tab/tabId.js +++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/tabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/marketplaces-tab.js b/src/sunstone/public/app/tabs/marketplaces-tab.js index 0389c36794..003747719f 100644 --- a/src/sunstone/public/app/tabs/marketplaces-tab.js +++ b/src/sunstone/public/app/tabs/marketplaces-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/actions.js b/src/sunstone/public/app/tabs/marketplaces-tab/actions.js index 2bccb4fc90..0525328d0d 100644 --- a/src/sunstone/public/app/tabs/marketplaces-tab/actions.js +++ b/src/sunstone/public/app/tabs/marketplaces-tab/actions.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/buttons.js b/src/sunstone/public/app/tabs/marketplaces-tab/buttons.js index afd46b1a17..10ce728fd8 100644 --- a/src/sunstone/public/app/tabs/marketplaces-tab/buttons.js +++ b/src/sunstone/public/app/tabs/marketplaces-tab/buttons.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/datatable.js b/src/sunstone/public/app/tabs/marketplaces-tab/datatable.js index 8d87774e78..bd0aefa989 100644 --- a/src/sunstone/public/app/tabs/marketplaces-tab/datatable.js +++ b/src/sunstone/public/app/tabs/marketplaces-tab/datatable.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create.js b/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create.js index 6d9ef15b2f..c6849d9dcc 100644 --- a/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create/advanced.hbs b/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create/advanced.hbs index 09fa3eb200..eed7c4ff2d 100644 --- a/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create/advanced.hbs +++ b/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create/advanced.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create/formPanelId.js b/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create/formPanelId.js index 0b08567e9b..80e58f576c 100644 --- a/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create/formPanelId.js +++ b/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create/wizard.hbs index afb32ada28..59f9f8424d 100644 --- a/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create/wizard.hbs +++ b/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create/wizard.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/hooks/init.js b/src/sunstone/public/app/tabs/marketplaces-tab/hooks/init.js index 3aa2ff6625..19efdb084a 100644 --- a/src/sunstone/public/app/tabs/marketplaces-tab/hooks/init.js +++ b/src/sunstone/public/app/tabs/marketplaces-tab/hooks/init.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/panels/apps.js b/src/sunstone/public/app/tabs/marketplaces-tab/panels/apps.js index 3da73d3b95..bac1fbcf2c 100644 --- a/src/sunstone/public/app/tabs/marketplaces-tab/panels/apps.js +++ b/src/sunstone/public/app/tabs/marketplaces-tab/panels/apps.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/panels/apps/panelId.js b/src/sunstone/public/app/tabs/marketplaces-tab/panels/apps/panelId.js index 57bb814022..1a7def6345 100644 --- a/src/sunstone/public/app/tabs/marketplaces-tab/panels/apps/panelId.js +++ b/src/sunstone/public/app/tabs/marketplaces-tab/panels/apps/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/panels/info.js b/src/sunstone/public/app/tabs/marketplaces-tab/panels/info.js index 0db93103c6..e945029627 100644 --- a/src/sunstone/public/app/tabs/marketplaces-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/marketplaces-tab/panels/info.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/marketplaces-tab/panels/info/html.hbs index 2359fb7848..18b7bf67ea 100644 --- a/src/sunstone/public/app/tabs/marketplaces-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/marketplaces-tab/panels/info/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/panels/info/panelId.js b/src/sunstone/public/app/tabs/marketplaces-tab/panels/info/panelId.js index 6f349f7f4a..6777e42f8e 100644 --- a/src/sunstone/public/app/tabs/marketplaces-tab/panels/info/panelId.js +++ b/src/sunstone/public/app/tabs/marketplaces-tab/panels/info/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/tabId.js b/src/sunstone/public/app/tabs/marketplaces-tab/tabId.js index abb3b0e6b5..ca090fbee9 100644 --- a/src/sunstone/public/app/tabs/marketplaces-tab/tabId.js +++ b/src/sunstone/public/app/tabs/marketplaces-tab/tabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/network-top-tab.js b/src/sunstone/public/app/tabs/network-top-tab.js index 4d73ce9f88..389e2844b7 100644 --- a/src/sunstone/public/app/tabs/network-top-tab.js +++ b/src/sunstone/public/app/tabs/network-top-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab.js b/src/sunstone/public/app/tabs/oneflow-services-tab.js index bb50c513d5..1f20c831cf 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/actions.js b/src/sunstone/public/app/tabs/oneflow-services-tab/actions.js index 91df9fb81a..85899648fb 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/actions.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/actions.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/buttons.js b/src/sunstone/public/app/tabs/oneflow-services-tab/buttons.js index 9633147290..810f84a17b 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/buttons.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/buttons.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js b/src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js index 24ec3b8885..e2c08d14e3 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/dialogs/scale.js b/src/sunstone/public/app/tabs/oneflow-services-tab/dialogs/scale.js index 2102b571be..0ab21af36a 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/dialogs/scale.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/dialogs/scale.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/dialogs/scale/dialogId.js b/src/sunstone/public/app/tabs/oneflow-services-tab/dialogs/scale/dialogId.js index 8ce5b4228e..328f9a219b 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/dialogs/scale/dialogId.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/dialogs/scale/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/dialogs/scale/html.hbs b/src/sunstone/public/app/tabs/oneflow-services-tab/dialogs/scale/html.hbs index 1bcd3aa399..f5435d839e 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/dialogs/scale/html.hbs +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/dialogs/scale/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/form-panels/create.js b/src/sunstone/public/app/tabs/oneflow-services-tab/form-panels/create.js index 3962dc6d60..8186e153d9 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/form-panels/create.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/form-panels/create/formPanelId.js b/src/sunstone/public/app/tabs/oneflow-services-tab/form-panels/create/formPanelId.js index b1d5a8293a..875df444f5 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/form-panels/create/formPanelId.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/form-panels/create/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/hooks/header.js b/src/sunstone/public/app/tabs/oneflow-services-tab/hooks/header.js index d4de28148f..ef45ab2221 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/hooks/header.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/hooks/header.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/info.js b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/info.js index fa093d71ee..79019fb240 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/info.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/info/html.hbs index b4b17d8240..af98f7eebe 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/info/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/info/panelId.js b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/info/panelId.js index ec074271c3..531de4d192 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/info/panelId.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/info/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/log.js b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/log.js index 3c34dfa107..95d113112a 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/log.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/log.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/log/panelId.js b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/log/panelId.js index 6903f4a53e..dc08c694b3 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/log/panelId.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/log/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles.js b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles.js index 0215175ef3..861264c674 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles/html.hbs b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles/html.hbs index 121e22a653..3d05d1a69f 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles/html.hbs +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles/panelId.js b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles/panelId.js index 6fc982587e..771a27f229 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles/panelId.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles/roleInfo.hbs b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles/roleInfo.hbs index 7a982d5d37..aec54b5853 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles/roleInfo.hbs +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles/roleInfo.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles/roles-buttons.js b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles/roles-buttons.js index fe5b1ffd9b..bc13ec4b49 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles/roles-buttons.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles/roles-buttons.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles/roles-vm-buttons.js b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles/roles-vm-buttons.js index 26cbb7bab7..1a403f72c3 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles/roles-vm-buttons.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles/roles-vm-buttons.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/tabId.js b/src/sunstone/public/app/tabs/oneflow-services-tab/tabId.js index 148f6fab4d..e42e66cb11 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/tabId.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/tabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab.js b/src/sunstone/public/app/tabs/oneflow-templates-tab.js index 9ee91f5d96..3fc275cd4c 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab.js +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/actions.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/actions.js index 5b0ea2064b..8d8166bf6e 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/actions.js +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/actions.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/buttons.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/buttons.js index e0129a2ff0..65de2318da 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/buttons.js +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/buttons.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/datatable.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/datatable.js index 411c7131fe..e2aa7bbccd 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/datatable.js +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/datatable.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/dialogs/clone.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/dialogs/clone.js index c67cbdc5ab..117cc1df06 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/dialogs/clone.js +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/dialogs/clone.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/dialogs/clone/dialogId.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/dialogs/clone/dialogId.js index 3cf74896a2..714bbe88b8 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/dialogs/clone/dialogId.js +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/dialogs/clone/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/dialogs/clone/html.hbs b/src/sunstone/public/app/tabs/oneflow-templates-tab/dialogs/clone/html.hbs index b1a2d1d962..0939c862b4 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/dialogs/clone/html.hbs +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/dialogs/clone/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create.js index 8de6c5df78..fb137b3721 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create/advanced.hbs b/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create/advanced.hbs index 0a08257221..fc7b96345e 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create/advanced.hbs +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create/advanced.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create/formPanelId.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create/formPanelId.js index f5da003576..7616eeeb1c 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create/formPanelId.js +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create/wizard.hbs index 79abbd717d..ae4b802d99 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create/wizard.hbs +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create/wizard.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/instantiate.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/instantiate.js index 14c95e0b77..b800ab4850 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/instantiate.js +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/instantiate.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/instantiate/formPanelId.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/instantiate/formPanelId.js index 8b4cea1f1a..a4c0f9cb90 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/instantiate/formPanelId.js +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/instantiate/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/instantiate/html.hbs b/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/instantiate/html.hbs index 26124fa29f..140f6adfb6 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/instantiate/html.hbs +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/instantiate/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/info.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/info.js index 2b240b56b6..055946ea98 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/info.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/info/html.hbs index 9c3f8a4091..f6ec6e603d 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/info/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/info/panelId.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/info/panelId.js index ca8cf07a41..cfe181e8e0 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/info/panelId.js +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/info/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/roles.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/roles.js index cd70733667..af127bcf8e 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/roles.js +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/roles.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/roles/panelId.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/roles/panelId.js index 9f7fd0ba8d..5fe88014a7 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/roles/panelId.js +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/roles/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/template.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/template.js index 5e970ac28f..5ff38c6227 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/template.js +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/template.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/template/html.hbs b/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/template/html.hbs index db7e6a9acc..6882c74380 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/template/html.hbs +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/template/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/template/panelId.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/template/panelId.js index dc2ceb4adc..fa32f21afc 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/template/panelId.js +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/template/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/tabId.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/tabId.js index 463f7e996b..d8de198041 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/tabId.js +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/tabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab.js index f5a3da85a8..f3d4266a7f 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab.js +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab/elasticity-row.hbs b/src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab/elasticity-row.hbs index 96ac012f94..35b4b4453a 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab/elasticity-row.hbs +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab/elasticity-row.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab/elasticity-thead.hbs b/src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab/elasticity-thead.hbs index b57570c216..17e1246930 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab/elasticity-thead.hbs +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab/elasticity-thead.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab/html.hbs b/src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab/html.hbs index a5acefbacf..f3808db3f0 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab/html.hbs +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab/sche-row.hbs b/src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab/sche-row.hbs index eaede1f512..eb3d3d8997 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab/sche-row.hbs +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab/sche-row.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab/sched-thead.hbs b/src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab/sched-thead.hbs index bc76ed58b1..f92822f231 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab/sched-thead.hbs +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab/sched-thead.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/provision-tab.js b/src/sunstone/public/app/tabs/provision-tab.js index 77e589a382..93972d3560 100644 --- a/src/sunstone/public/app/tabs/provision-tab.js +++ b/src/sunstone/public/app/tabs/provision-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/provision-tab/content.hbs b/src/sunstone/public/app/tabs/provision-tab/content.hbs index 49b3a6d7d1..386fac8646 100644 --- a/src/sunstone/public/app/tabs/provision-tab/content.hbs +++ b/src/sunstone/public/app/tabs/provision-tab/content.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/provision-tab/dashboard/empty-graphs.hbs b/src/sunstone/public/app/tabs/provision-tab/dashboard/empty-graphs.hbs index b8a08702ee..4e75f8b7cb 100644 --- a/src/sunstone/public/app/tabs/provision-tab/dashboard/empty-graphs.hbs +++ b/src/sunstone/public/app/tabs/provision-tab/dashboard/empty-graphs.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/provision-tab/dashboard/empty-quota.hbs b/src/sunstone/public/app/tabs/provision-tab/dashboard/empty-quota.hbs index 076eaa8625..7736987fd9 100644 --- a/src/sunstone/public/app/tabs/provision-tab/dashboard/empty-quota.hbs +++ b/src/sunstone/public/app/tabs/provision-tab/dashboard/empty-quota.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/provision-tab/dashboard/group-quotas.hbs b/src/sunstone/public/app/tabs/provision-tab/dashboard/group-quotas.hbs index 9e632f2c40..952e5f10d8 100644 --- a/src/sunstone/public/app/tabs/provision-tab/dashboard/group-quotas.hbs +++ b/src/sunstone/public/app/tabs/provision-tab/dashboard/group-quotas.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/provision-tab/dashboard/group-vms.hbs b/src/sunstone/public/app/tabs/provision-tab/dashboard/group-vms.hbs index d9d567cd3f..c0512bc4ae 100644 --- a/src/sunstone/public/app/tabs/provision-tab/dashboard/group-vms.hbs +++ b/src/sunstone/public/app/tabs/provision-tab/dashboard/group-vms.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/provision-tab/dashboard/quotas.hbs b/src/sunstone/public/app/tabs/provision-tab/dashboard/quotas.hbs index 1d0b45c6d6..b8c5d1069c 100644 --- a/src/sunstone/public/app/tabs/provision-tab/dashboard/quotas.hbs +++ b/src/sunstone/public/app/tabs/provision-tab/dashboard/quotas.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/provision-tab/dashboard/vms.hbs b/src/sunstone/public/app/tabs/provision-tab/dashboard/vms.hbs index e084693ad7..0b16174135 100644 --- a/src/sunstone/public/app/tabs/provision-tab/dashboard/vms.hbs +++ b/src/sunstone/public/app/tabs/provision-tab/dashboard/vms.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/provision-tab/flows/create.hbs b/src/sunstone/public/app/tabs/provision-tab/flows/create.hbs index 324a75140a..e5cb001e3c 100644 --- a/src/sunstone/public/app/tabs/provision-tab/flows/create.hbs +++ b/src/sunstone/public/app/tabs/provision-tab/flows/create.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/provision-tab/flows/info.hbs b/src/sunstone/public/app/tabs/provision-tab/flows/info.hbs index 964d6189f2..014b732c4f 100644 --- a/src/sunstone/public/app/tabs/provision-tab/flows/info.hbs +++ b/src/sunstone/public/app/tabs/provision-tab/flows/info.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/provision-tab/flows/list.hbs b/src/sunstone/public/app/tabs/provision-tab/flows/list.hbs index 60a7149a2a..08abdb27e8 100644 --- a/src/sunstone/public/app/tabs/provision-tab/flows/list.hbs +++ b/src/sunstone/public/app/tabs/provision-tab/flows/list.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/provision-tab/flows/list.js b/src/sunstone/public/app/tabs/provision-tab/flows/list.js index c50da85c34..96bb578c85 100644 --- a/src/sunstone/public/app/tabs/provision-tab/flows/list.js +++ b/src/sunstone/public/app/tabs/provision-tab/flows/list.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/provision-tab/tabId.js b/src/sunstone/public/app/tabs/provision-tab/tabId.js index aecb9cd252..55e977b6f4 100644 --- a/src/sunstone/public/app/tabs/provision-tab/tabId.js +++ b/src/sunstone/public/app/tabs/provision-tab/tabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/provision-tab/templates/list.hbs b/src/sunstone/public/app/tabs/provision-tab/templates/list.hbs index 97dafd2c59..6429e67fd5 100644 --- a/src/sunstone/public/app/tabs/provision-tab/templates/list.hbs +++ b/src/sunstone/public/app/tabs/provision-tab/templates/list.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/provision-tab/templates/list.js b/src/sunstone/public/app/tabs/provision-tab/templates/list.js index 802712351b..2bcc2b8494 100644 --- a/src/sunstone/public/app/tabs/provision-tab/templates/list.js +++ b/src/sunstone/public/app/tabs/provision-tab/templates/list.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/provision-tab/vms/create.hbs b/src/sunstone/public/app/tabs/provision-tab/vms/create.hbs index f1aa7be26e..6bdfee9386 100644 --- a/src/sunstone/public/app/tabs/provision-tab/vms/create.hbs +++ b/src/sunstone/public/app/tabs/provision-tab/vms/create.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/provision-tab/vms/info.hbs b/src/sunstone/public/app/tabs/provision-tab/vms/info.hbs index c388f0cb05..4eda39b4bb 100644 --- a/src/sunstone/public/app/tabs/provision-tab/vms/info.hbs +++ b/src/sunstone/public/app/tabs/provision-tab/vms/info.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/provision-tab/vms/list.hbs b/src/sunstone/public/app/tabs/provision-tab/vms/list.hbs index 9e1b8718d4..366210e396 100644 --- a/src/sunstone/public/app/tabs/provision-tab/vms/list.hbs +++ b/src/sunstone/public/app/tabs/provision-tab/vms/list.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/provision-tab/vms/list.js b/src/sunstone/public/app/tabs/provision-tab/vms/list.js index 183602792c..f3c00e3349 100644 --- a/src/sunstone/public/app/tabs/provision-tab/vms/list.js +++ b/src/sunstone/public/app/tabs/provision-tab/vms/list.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/secgroups-tab.js b/src/sunstone/public/app/tabs/secgroups-tab.js index 4a8629b6b8..f20d8888c7 100644 --- a/src/sunstone/public/app/tabs/secgroups-tab.js +++ b/src/sunstone/public/app/tabs/secgroups-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/secgroups-tab/actions.js b/src/sunstone/public/app/tabs/secgroups-tab/actions.js index 89aea97f9c..dd77b605d8 100644 --- a/src/sunstone/public/app/tabs/secgroups-tab/actions.js +++ b/src/sunstone/public/app/tabs/secgroups-tab/actions.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/secgroups-tab/buttons.js b/src/sunstone/public/app/tabs/secgroups-tab/buttons.js index 537d1b3bb0..8d0df462ba 100644 --- a/src/sunstone/public/app/tabs/secgroups-tab/buttons.js +++ b/src/sunstone/public/app/tabs/secgroups-tab/buttons.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/secgroups-tab/datatable.js b/src/sunstone/public/app/tabs/secgroups-tab/datatable.js index d962f62bb7..afb21bb3ec 100644 --- a/src/sunstone/public/app/tabs/secgroups-tab/datatable.js +++ b/src/sunstone/public/app/tabs/secgroups-tab/datatable.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/secgroups-tab/dialogs/clone.js b/src/sunstone/public/app/tabs/secgroups-tab/dialogs/clone.js index 94efc8f11b..9049acd2d8 100644 --- a/src/sunstone/public/app/tabs/secgroups-tab/dialogs/clone.js +++ b/src/sunstone/public/app/tabs/secgroups-tab/dialogs/clone.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/secgroups-tab/dialogs/clone/dialogId.js b/src/sunstone/public/app/tabs/secgroups-tab/dialogs/clone/dialogId.js index 2f442245bf..844fb0ee24 100644 --- a/src/sunstone/public/app/tabs/secgroups-tab/dialogs/clone/dialogId.js +++ b/src/sunstone/public/app/tabs/secgroups-tab/dialogs/clone/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/secgroups-tab/dialogs/clone/html.hbs b/src/sunstone/public/app/tabs/secgroups-tab/dialogs/clone/html.hbs index 20008ef6bd..0e5cfdb753 100644 --- a/src/sunstone/public/app/tabs/secgroups-tab/dialogs/clone/html.hbs +++ b/src/sunstone/public/app/tabs/secgroups-tab/dialogs/clone/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/secgroups-tab/form-panels/create.js b/src/sunstone/public/app/tabs/secgroups-tab/form-panels/create.js index 7db10dfbe2..e792729de1 100644 --- a/src/sunstone/public/app/tabs/secgroups-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/secgroups-tab/form-panels/create.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/secgroups-tab/form-panels/create/advanced.hbs b/src/sunstone/public/app/tabs/secgroups-tab/form-panels/create/advanced.hbs index 3a4bda2e22..b719a11a4c 100644 --- a/src/sunstone/public/app/tabs/secgroups-tab/form-panels/create/advanced.hbs +++ b/src/sunstone/public/app/tabs/secgroups-tab/form-panels/create/advanced.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/secgroups-tab/form-panels/create/formPanelId.js b/src/sunstone/public/app/tabs/secgroups-tab/form-panels/create/formPanelId.js index 6befb8452b..a405e8a442 100644 --- a/src/sunstone/public/app/tabs/secgroups-tab/form-panels/create/formPanelId.js +++ b/src/sunstone/public/app/tabs/secgroups-tab/form-panels/create/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/secgroups-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/secgroups-tab/form-panels/create/wizard.hbs index 93d4cded2d..9feab72448 100644 --- a/src/sunstone/public/app/tabs/secgroups-tab/form-panels/create/wizard.hbs +++ b/src/sunstone/public/app/tabs/secgroups-tab/form-panels/create/wizard.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/secgroups-tab/panels/info.js b/src/sunstone/public/app/tabs/secgroups-tab/panels/info.js index 6b9e564c27..9771dd7692 100644 --- a/src/sunstone/public/app/tabs/secgroups-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/secgroups-tab/panels/info.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/secgroups-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/secgroups-tab/panels/info/html.hbs index 70e345253a..0ac118bf4c 100644 --- a/src/sunstone/public/app/tabs/secgroups-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/secgroups-tab/panels/info/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/secgroups-tab/panels/info/panelId.js b/src/sunstone/public/app/tabs/secgroups-tab/panels/info/panelId.js index 4dcd26e03c..6ce7707f09 100644 --- a/src/sunstone/public/app/tabs/secgroups-tab/panels/info/panelId.js +++ b/src/sunstone/public/app/tabs/secgroups-tab/panels/info/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/secgroups-tab/panels/vms.js b/src/sunstone/public/app/tabs/secgroups-tab/panels/vms.js index 63bf861aab..8f01070988 100644 --- a/src/sunstone/public/app/tabs/secgroups-tab/panels/vms.js +++ b/src/sunstone/public/app/tabs/secgroups-tab/panels/vms.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/secgroups-tab/panels/vms/html.hbs b/src/sunstone/public/app/tabs/secgroups-tab/panels/vms/html.hbs index fb1c87af4e..3ebdf2bb7f 100644 --- a/src/sunstone/public/app/tabs/secgroups-tab/panels/vms/html.hbs +++ b/src/sunstone/public/app/tabs/secgroups-tab/panels/vms/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/secgroups-tab/panels/vms/panelId.js b/src/sunstone/public/app/tabs/secgroups-tab/panels/vms/panelId.js index bac1f52418..9a9bbfc84b 100644 --- a/src/sunstone/public/app/tabs/secgroups-tab/panels/vms/panelId.js +++ b/src/sunstone/public/app/tabs/secgroups-tab/panels/vms/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/secgroups-tab/tabId.js b/src/sunstone/public/app/tabs/secgroups-tab/tabId.js index d9015ff537..fe55a44ac4 100644 --- a/src/sunstone/public/app/tabs/secgroups-tab/tabId.js +++ b/src/sunstone/public/app/tabs/secgroups-tab/tabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/secgroups-tab/utils/common.js b/src/sunstone/public/app/tabs/secgroups-tab/utils/common.js index 6883eadb6b..ead187cc6b 100644 --- a/src/sunstone/public/app/tabs/secgroups-tab/utils/common.js +++ b/src/sunstone/public/app/tabs/secgroups-tab/utils/common.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/settings-tab.js b/src/sunstone/public/app/tabs/settings-tab.js index d844225f6f..989e089052 100644 --- a/src/sunstone/public/app/tabs/settings-tab.js +++ b/src/sunstone/public/app/tabs/settings-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/settings-tab/panels/accounting.js b/src/sunstone/public/app/tabs/settings-tab/panels/accounting.js index 71e2cd3e38..aa715ebba7 100644 --- a/src/sunstone/public/app/tabs/settings-tab/panels/accounting.js +++ b/src/sunstone/public/app/tabs/settings-tab/panels/accounting.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/settings-tab/panels/accounting/panelId.js b/src/sunstone/public/app/tabs/settings-tab/panels/accounting/panelId.js index 224218602f..2444b753fb 100644 --- a/src/sunstone/public/app/tabs/settings-tab/panels/accounting/panelId.js +++ b/src/sunstone/public/app/tabs/settings-tab/panels/accounting/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/settings-tab/panels/auth.js b/src/sunstone/public/app/tabs/settings-tab/panels/auth.js index 4d416ec573..265a3e503d 100644 --- a/src/sunstone/public/app/tabs/settings-tab/panels/auth.js +++ b/src/sunstone/public/app/tabs/settings-tab/panels/auth.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/settings-tab/panels/auth/panelId.js b/src/sunstone/public/app/tabs/settings-tab/panels/auth/panelId.js index 9452d8ff95..3342795284 100644 --- a/src/sunstone/public/app/tabs/settings-tab/panels/auth/panelId.js +++ b/src/sunstone/public/app/tabs/settings-tab/panels/auth/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/settings-tab/panels/group-quotas.js b/src/sunstone/public/app/tabs/settings-tab/panels/group-quotas.js index 22344e8ded..e84890a7ce 100644 --- a/src/sunstone/public/app/tabs/settings-tab/panels/group-quotas.js +++ b/src/sunstone/public/app/tabs/settings-tab/panels/group-quotas.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/settings-tab/panels/group-quotas/panelId.js b/src/sunstone/public/app/tabs/settings-tab/panels/group-quotas/panelId.js index c99082d03f..56da790af0 100644 --- a/src/sunstone/public/app/tabs/settings-tab/panels/group-quotas/panelId.js +++ b/src/sunstone/public/app/tabs/settings-tab/panels/group-quotas/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/settings-tab/panels/info.js b/src/sunstone/public/app/tabs/settings-tab/panels/info.js index f82dd273c5..2a521f88e5 100644 --- a/src/sunstone/public/app/tabs/settings-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/settings-tab/panels/info.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/settings-tab/panels/info/panelId.js b/src/sunstone/public/app/tabs/settings-tab/panels/info/panelId.js index 62c34885b4..b4679c471b 100644 --- a/src/sunstone/public/app/tabs/settings-tab/panels/info/panelId.js +++ b/src/sunstone/public/app/tabs/settings-tab/panels/info/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/settings-tab/panels/quotas.js b/src/sunstone/public/app/tabs/settings-tab/panels/quotas.js index 04a5189986..2cad1e877a 100644 --- a/src/sunstone/public/app/tabs/settings-tab/panels/quotas.js +++ b/src/sunstone/public/app/tabs/settings-tab/panels/quotas.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/settings-tab/panels/quotas/panelId.js b/src/sunstone/public/app/tabs/settings-tab/panels/quotas/panelId.js index e8dbd99e86..f94a3da342 100644 --- a/src/sunstone/public/app/tabs/settings-tab/panels/quotas/panelId.js +++ b/src/sunstone/public/app/tabs/settings-tab/panels/quotas/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/settings-tab/panels/showback.js b/src/sunstone/public/app/tabs/settings-tab/panels/showback.js index 616f39b075..4c2ce6e8ee 100644 --- a/src/sunstone/public/app/tabs/settings-tab/panels/showback.js +++ b/src/sunstone/public/app/tabs/settings-tab/panels/showback.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/settings-tab/panels/showback/panelId.js b/src/sunstone/public/app/tabs/settings-tab/panels/showback/panelId.js index 998a771a91..4c6154267e 100644 --- a/src/sunstone/public/app/tabs/settings-tab/panels/showback/panelId.js +++ b/src/sunstone/public/app/tabs/settings-tab/panels/showback/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/settings-tab/panels/user-config.js b/src/sunstone/public/app/tabs/settings-tab/panels/user-config.js index 331f20503f..3da34647b9 100644 --- a/src/sunstone/public/app/tabs/settings-tab/panels/user-config.js +++ b/src/sunstone/public/app/tabs/settings-tab/panels/user-config.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/settings-tab/panels/user-config/html.hbs b/src/sunstone/public/app/tabs/settings-tab/panels/user-config/html.hbs index acc77d636a..886f39a48c 100644 --- a/src/sunstone/public/app/tabs/settings-tab/panels/user-config/html.hbs +++ b/src/sunstone/public/app/tabs/settings-tab/panels/user-config/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/settings-tab/panels/user-config/panelId.js b/src/sunstone/public/app/tabs/settings-tab/panels/user-config/panelId.js index 24887b8c81..fe567fd854 100644 --- a/src/sunstone/public/app/tabs/settings-tab/panels/user-config/panelId.js +++ b/src/sunstone/public/app/tabs/settings-tab/panels/user-config/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/settings-tab/tabId.js b/src/sunstone/public/app/tabs/settings-tab/tabId.js index 164dcf2c0a..c594a8dcf4 100644 --- a/src/sunstone/public/app/tabs/settings-tab/tabId.js +++ b/src/sunstone/public/app/tabs/settings-tab/tabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/storage-top-tab.js b/src/sunstone/public/app/tabs/storage-top-tab.js index e2dd34460b..950537df67 100644 --- a/src/sunstone/public/app/tabs/storage-top-tab.js +++ b/src/sunstone/public/app/tabs/storage-top-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/support-tab.js b/src/sunstone/public/app/tabs/support-tab.js index 7ab08c6363..25d9e5ec68 100644 --- a/src/sunstone/public/app/tabs/support-tab.js +++ b/src/sunstone/public/app/tabs/support-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/support-tab/actions.js b/src/sunstone/public/app/tabs/support-tab/actions.js index 83111689b9..58a24e8903 100644 --- a/src/sunstone/public/app/tabs/support-tab/actions.js +++ b/src/sunstone/public/app/tabs/support-tab/actions.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/support-tab/buttons.js b/src/sunstone/public/app/tabs/support-tab/buttons.js index ecc0b8a598..90feb4c9e5 100644 --- a/src/sunstone/public/app/tabs/support-tab/buttons.js +++ b/src/sunstone/public/app/tabs/support-tab/buttons.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/support-tab/datatable.js b/src/sunstone/public/app/tabs/support-tab/datatable.js index 4464ee6fb9..a4eeedd961 100644 --- a/src/sunstone/public/app/tabs/support-tab/datatable.js +++ b/src/sunstone/public/app/tabs/support-tab/datatable.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/support-tab/dialogs/upload.js b/src/sunstone/public/app/tabs/support-tab/dialogs/upload.js index 312f491bfc..e67e13fa96 100644 --- a/src/sunstone/public/app/tabs/support-tab/dialogs/upload.js +++ b/src/sunstone/public/app/tabs/support-tab/dialogs/upload.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/support-tab/dialogs/upload/dialogId.js b/src/sunstone/public/app/tabs/support-tab/dialogs/upload/dialogId.js index 431142777a..88ed25f47c 100644 --- a/src/sunstone/public/app/tabs/support-tab/dialogs/upload/dialogId.js +++ b/src/sunstone/public/app/tabs/support-tab/dialogs/upload/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/support-tab/dialogs/upload/html.hbs b/src/sunstone/public/app/tabs/support-tab/dialogs/upload/html.hbs index 166f496d5f..ccf8e9bffc 100644 --- a/src/sunstone/public/app/tabs/support-tab/dialogs/upload/html.hbs +++ b/src/sunstone/public/app/tabs/support-tab/dialogs/upload/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/support-tab/form-panels/create.js b/src/sunstone/public/app/tabs/support-tab/form-panels/create.js index 380a42da96..ab1242d48d 100644 --- a/src/sunstone/public/app/tabs/support-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/support-tab/form-panels/create.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/support-tab/form-panels/create/formPanelId.js b/src/sunstone/public/app/tabs/support-tab/form-panels/create/formPanelId.js index 4d14d81f7d..b239092538 100644 --- a/src/sunstone/public/app/tabs/support-tab/form-panels/create/formPanelId.js +++ b/src/sunstone/public/app/tabs/support-tab/form-panels/create/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/support-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/support-tab/form-panels/create/wizard.hbs index 64d302d93f..0769ce94f8 100644 --- a/src/sunstone/public/app/tabs/support-tab/form-panels/create/wizard.hbs +++ b/src/sunstone/public/app/tabs/support-tab/form-panels/create/wizard.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/support-tab/panels/info.js b/src/sunstone/public/app/tabs/support-tab/panels/info.js index b6a6cff818..82d5f42ed6 100644 --- a/src/sunstone/public/app/tabs/support-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/support-tab/panels/info.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/support-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/support-tab/panels/info/html.hbs index 5ae9cc3df4..fd7bb14543 100644 --- a/src/sunstone/public/app/tabs/support-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/support-tab/panels/info/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/support-tab/panels/info/panelId.js b/src/sunstone/public/app/tabs/support-tab/panels/info/panelId.js index 47bc2ee18d..e86e9bf9a9 100644 --- a/src/sunstone/public/app/tabs/support-tab/panels/info/panelId.js +++ b/src/sunstone/public/app/tabs/support-tab/panels/info/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/support-tab/subheader.hbs b/src/sunstone/public/app/tabs/support-tab/subheader.hbs index 2b2e07739c..5e174b9068 100644 --- a/src/sunstone/public/app/tabs/support-tab/subheader.hbs +++ b/src/sunstone/public/app/tabs/support-tab/subheader.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/support-tab/tabId.js b/src/sunstone/public/app/tabs/support-tab/tabId.js index 575210086b..9c7d50f3b4 100644 --- a/src/sunstone/public/app/tabs/support-tab/tabId.js +++ b/src/sunstone/public/app/tabs/support-tab/tabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/support-tab/title.hbs b/src/sunstone/public/app/tabs/support-tab/title.hbs index 7c67400477..e11c980042 100644 --- a/src/sunstone/public/app/tabs/support-tab/title.hbs +++ b/src/sunstone/public/app/tabs/support-tab/title.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/support-tab/utils/common.js b/src/sunstone/public/app/tabs/support-tab/utils/common.js index be6dc41417..17144e35b5 100644 --- a/src/sunstone/public/app/tabs/support-tab/utils/common.js +++ b/src/sunstone/public/app/tabs/support-tab/utils/common.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/system-top-tab.js b/src/sunstone/public/app/tabs/system-top-tab.js index 57efd68362..2011ca03c4 100644 --- a/src/sunstone/public/app/tabs/system-top-tab.js +++ b/src/sunstone/public/app/tabs/system-top-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab.js b/src/sunstone/public/app/tabs/templates-tab.js index 46611a745c..ced45b9ac6 100644 --- a/src/sunstone/public/app/tabs/templates-tab.js +++ b/src/sunstone/public/app/tabs/templates-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/actions-common.js b/src/sunstone/public/app/tabs/templates-tab/actions-common.js index 650b759a40..cb0fe1f73d 100644 --- a/src/sunstone/public/app/tabs/templates-tab/actions-common.js +++ b/src/sunstone/public/app/tabs/templates-tab/actions-common.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/actions.js b/src/sunstone/public/app/tabs/templates-tab/actions.js index 424dbb8605..15b666f94c 100644 --- a/src/sunstone/public/app/tabs/templates-tab/actions.js +++ b/src/sunstone/public/app/tabs/templates-tab/actions.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/buttons.js b/src/sunstone/public/app/tabs/templates-tab/buttons.js index b16e0e5c20..67975f6b7f 100644 --- a/src/sunstone/public/app/tabs/templates-tab/buttons.js +++ b/src/sunstone/public/app/tabs/templates-tab/buttons.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/datatable-common.js b/src/sunstone/public/app/tabs/templates-tab/datatable-common.js index 54889d911c..a0eb87b4e9 100644 --- a/src/sunstone/public/app/tabs/templates-tab/datatable-common.js +++ b/src/sunstone/public/app/tabs/templates-tab/datatable-common.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/datatable.js b/src/sunstone/public/app/tabs/templates-tab/datatable.js index c203a40573..26e71d171d 100644 --- a/src/sunstone/public/app/tabs/templates-tab/datatable.js +++ b/src/sunstone/public/app/tabs/templates-tab/datatable.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/dialogs/clone.js b/src/sunstone/public/app/tabs/templates-tab/dialogs/clone.js index 4759a66093..b2e81b3869 100644 --- a/src/sunstone/public/app/tabs/templates-tab/dialogs/clone.js +++ b/src/sunstone/public/app/tabs/templates-tab/dialogs/clone.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/dialogs/clone/dialogId.js b/src/sunstone/public/app/tabs/templates-tab/dialogs/clone/dialogId.js index f053604135..3027cc0be9 100644 --- a/src/sunstone/public/app/tabs/templates-tab/dialogs/clone/dialogId.js +++ b/src/sunstone/public/app/tabs/templates-tab/dialogs/clone/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/dialogs/clone/html.hbs b/src/sunstone/public/app/tabs/templates-tab/dialogs/clone/html.hbs index 442ec200b0..cd8e284095 100644 --- a/src/sunstone/public/app/tabs/templates-tab/dialogs/clone/html.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/dialogs/clone/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create-common.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create-common.js index 14870d368f..5692c9d182 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create-common.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create-common.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create.js index 7a237add85..1226c8deb3 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/advanced.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/advanced.hbs index 3810efa4b8..eb953faa01 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/advanced.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/advanced.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/formPanelId.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/formPanelId.js index 464c867a22..91fbbfa399 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/formPanelId.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/actions.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/actions.js index 1d0ff63d0d..3ba22fa860 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/actions.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/actions.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/actions/wizardTabId.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/actions/wizardTabId.js index 8f8a74a29d..aa213d97f1 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/actions/wizardTabId.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/actions/wizardTabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context.js index 97f8831e88..b4aa5b4db4 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context/html.hbs index 19d2570d90..8e893408f5 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context/html.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context/wizardTabId.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context/wizardTabId.js index a088423941..2e023e2430 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context/wizardTabId.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/context/wizardTabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general.js index 0661114f5b..e58c21032a 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -122,15 +122,6 @@ define(function(require) { } return number.toFixed(6); } - function caculatedTotalMemory(context){ - var memory_cost = document.getElementById('MEMORY_COST').value; - var type = document.getElementById('MEMORY_UNIT_COST').value; - var real_memory = document.getElementById('MEMORY').value; - memory = memory_cost * real_memory * 24 * 30; //24 hours and 30 days - document.getElementById('total_value_memory').textContent = convertCostNumber(memory); - if (memory_cost != "") - $(".total_memory_cost", context).show(); - } function _setup(context) { var that = this; @@ -145,21 +136,15 @@ define(function(require) { }); context.on("change", "#MEMORY_COST", function() { - caculatedTotalMemory(context); CapacityCreate.calculatedRealMemory(context); }); context.on("change", "#MEMORY_UNIT_COST", function() { - caculatedTotalMemory(context); - CapacityCreate.calculatedRealMemory(); + CapacityCreate.calculatedRealMemory(context); }); context.on("change", "#CPU_COST", function() { - var cpu = document.getElementById('CPU').value; - var cpu_cost = document.getElementById('CPU_COST').value; - document.getElementById('total_value_cpu').textContent = convertCostNumber(cpu * cpu_cost * 24 * 30); - $(".total_cpu_cost", context).show(); - CapacityCreate.calculatedRealCpu(); + CapacityCreate.calculatedRealCpu(context); }); context.on("change", "#DISK_COST", function() { diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-create.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-create.js index 0f84e0900e..ea5c3878b2 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-create.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-create.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -106,47 +106,58 @@ define(function(require) { } } - function _calculatedRealMemory(){ + function _calculatedRealMemory(context){ var memory_cost = $("#MEMORY_COST").val(); - var type_cost = $("#MEMORY_UNIT_COST").val(); + var type_cost = $("#MEMORY_UNIT_COST").val(); + var memory = $("#MEMORY").val(); - var type = $("#memory_unit").val(); + var type = $("#memory_unit").val(); + if (type_cost == "GB"){ memory = (memory / 1024) * memory_cost * 24 * 30; } else { memory = memory * memory_cost * 24 * 30; } - document.getElementById('real_memory_cost').textContent = "Cost: " + convertCostNumber(memory); + document.getElementById('real_memory_cost').value = memory; - document.getElementById('total_value_memory').textContent = memory; + document.getElementById('total_value_memory').textContent = convertCostNumber(memory); + + if (memory_cost != "") + $(".total_memory_cost", context).show(); + _totalCost(); } - function _calculatedRealCpu(){ + function _calculatedRealCpu(context){ var cpu_cost = $("#CPU_COST").val(); - var cpu = $("#CPU").val(); + var cpu = $("#CPU").val(); + cpu = cpu * cpu_cost * 24 * 30; - document.getElementById('real_cpu_cost').textContent = "Cost: " + convertCostNumber(cpu); + document.getElementById('real_cpu_cost').value = cpu; - document.getElementById('total_value_cpu').textContent = cpu; + document.getElementById('total_value_cpu').textContent = convertCostNumber(cpu); + + if (cpu_cost != "") + $(".total_cpu_cost", context).show(); + _totalCost(); } function _setup(context) { context.on("change", "#MEMORY", function() { - _calculatedRealMemory(); + _calculatedRealMemory(context); }); context.on("change", "#MEMORY_GB", function() { - _calculatedRealMemory(); + _calculatedRealMemory(context); }); context.on("change", "#memory_unit", function() { - _calculatedRealMemory(); + _calculatedRealMemory(context); }); context.on("change", "#CPU", function() { - _calculatedRealCpu(); + _calculatedRealCpu(context); }); // MB to GB diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-create/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-create/html.hbs index 97f4aa6c0b..947e4532b5 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-create/html.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-create/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-inputs.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-inputs.js index b6759a6b98..52d2b2ba78 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-inputs.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-inputs.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-inputs/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-inputs/html.hbs index f8f8319eff..1b9e8bc265 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-inputs/html.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-inputs/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/html.hbs index 054ef6313e..623acece5e 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/html.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/wizardTabId.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/wizardTabId.js index d513d92241..080a11d619 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/wizardTabId.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/wizardTabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/hybrid.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/hybrid.js index 60a45e4731..a93690ff9c 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/hybrid.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/hybrid.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/hybrid/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/hybrid/html.hbs index 67f4fa9f38..911196d4a0 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/hybrid/html.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/hybrid/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/hybrid/wizardTabId.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/hybrid/wizardTabId.js index 4e46f77480..971288ed08 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/hybrid/wizardTabId.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/hybrid/wizardTabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/io.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/io.js index f4234518ca..ced5869104 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/io.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/io.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/io/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/io/html.hbs index 2ef6b49064..139bd26189 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/io/html.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/io/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/io/wizardTabId.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/io/wizardTabId.js index f52fc043dd..3727e89750 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/io/wizardTabId.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/io/wizardTabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network.js index d1b1f56a2e..00defb684a 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -245,7 +245,10 @@ define(function(require) { var that = this; if (!that.nics.find(nic => nic.NAME === ("NIC" + that.numberOfNics))) { - that.nics.push({"NAME": "NIC" + that.numberOfNics, "ALIAS": false}); + that.nics.push({"NAME": "NIC" + that.numberOfNics, + "ALIAS": false, + "ID": that.numberOfNics, + "CONTEXT": context}); } that.numberOfNics++; @@ -296,12 +299,12 @@ define(function(require) { function _renameTabLinks(context) { $("#" + LINKS_CONTAINER_ID + " li", context).each(function(index) { - $("a", this).html(Locale.tr("NIC") + ' ' + index + " "); + $("a", this).html(Locale.tr("NIC") + ' ' + index + " "); - if (!that.nics.find(nic => nic.ALIAS === ("NIC" + index))) { - $("#remove_nic_" + index).show(); + if (that.nics.find(nic => nic.ALIAS === ("NIC" + index))) { + $("#update_remove_nic_" + index).hide(); } else { - $("#remove_nic_" + index).hide(); + $("#update_remove_nic_" + index).show(); } }) diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/html.hbs index 8c6fbd7c39..b7606fd045 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/html.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/nic-tab.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/nic-tab.js index a31915a302..632afce6e1 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/nic-tab.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/nic-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -232,6 +232,7 @@ define(function(require) { } else { if(alias_on && !alias) { $("#" + that.nicTabId + "_alias_parent", context).show(); + $("#" + that.nicTabId + "_alias_parent", context).click(); $(".network_selection", context).hide(); $("#" + that.nicTabId + "_no_alias").hide(); } else if (alias_on && alias) { @@ -246,19 +247,7 @@ define(function(require) { } }); - if (alias) { - $.each(that.nics, function(index, value) { - if (value.ALIAS == alias) { - found = true; - } - }); - - if (found) { - $("#remove_nic_" + (alias[alias.length - 1])).hide(); - } else { - $("#remove_nic_" + (alias[alias.length - 1])).show(); - } - } + _hide_remove(that.nics); $("#" + that.nicTabId + "_alias_parent", context).hide(); $(".network_selection", context).show(); @@ -290,29 +279,16 @@ define(function(require) { if (!add) { $("#" + that.nicTabId + "_alias_parent", context).append(new Option("No NIC available", "INVALID")); $("#" + that.nicTabId + "_alias_parent", context).val("INVALID"); - } else if (add && selected_nic == "INVALID") { - $("#" + that.nicTabId + "_alias_parent", context).val($("#" + that.nicTabId + "_alias_parent option:first").val()); - selected_nic = $("#" + that.nicTabId + "_alias_parent", context).val(); } $.each(that.nics, function(index, value) { - if (value.NAME == ("NIC" + that.nicId) && selected_nic != "INVALID") { + if (value.NAME == ("NIC" + that.nicId) && selected_nic && selected_nic != "INVALID") { value.ALIAS = selected_nic; } }); if (selected_nic && selected_nic != "INVALID") { - $.each(that.nics, function(index, value) { - if (value.ALIAS == selected_nic) { - found = true; - } - }); - - if (found) { - $("#remove_nic_" + (selected_nic[selected_nic.length - 1])).hide(); - } else { - $("#remove_nic_" + (selected_nic[selected_nic.length - 1])).show(); - } + _hide_remove(that.nics); $("#" + that.nicTabId + "_alias_parent", context).val(selected_nic); } @@ -510,11 +486,19 @@ define(function(require) { }); $("#" + this.nicTabId + "interface_type", this.context).show(); - $("input#" + this.nicTabId + "_interface_type", this.context).click(); $("#" + this.nicTabId + "_alias_parent", this.context).show(); - $("#" + this.nicTabId + "_alias_parent", this.context).empty(); - $("#" + this.nicTabId + "_alias_parent").append(new Option(nicname, nicname)); + $("#" + this.nicTabId + "_alias_parent", this.context).click(); + $("#" + this.nicTabId + "_interface_type", this.context).click(); $("#" + this.nicTabId + "_alias_parent", this.context).val(nicname); - $(".network_selection", this.context).hide(); + } + + function _hide_remove(nics) { + $.each(nics, function(index, value) { + if (that.nics.find(nic => nic.ALIAS === value.NAME)) { + $("#update_remove_nic_" + value.ID).hide(); + } else { + $("#update_remove_nic_" + value.ID).show(); + } + }); } }); diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/nic-tab/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/nic-tab/html.hbs index dcf41d6c5b..0c2ff94fef 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/nic-tab/html.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/nic-tab/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/wizardTabId.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/wizardTabId.js index 7ec0d1c200..d6dde1dfde 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/wizardTabId.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/network/wizardTabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os.js index 2e9589947b..51d172ace1 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os/html.hbs index 6d897d74eb..6bc49209ba 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os/html.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os/wizardTabId.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os/wizardTabId.js index bd713a07a3..4cfe340d2d 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os/wizardTabId.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os/wizardTabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/other.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/other.js index 0f7bf5d3e5..7fa3e2f1ad 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/other.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/other.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/other/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/other/html.hbs index cb01de7b9d..ac3b08f5cd 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/other/html.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/other/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/other/wizardTabId.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/other/wizardTabId.js index 68233df147..19cdb9688f 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/other/wizardTabId.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/other/wizardTabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/scheduling.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/scheduling.js index fcfd5d45b3..42bf7bf8bc 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/scheduling.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/scheduling.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/scheduling/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/scheduling/html.hbs index 0346773d15..18ed28ccfc 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/scheduling/html.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/scheduling/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/scheduling/wizardTabId.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/scheduling/wizardTabId.js index a0f63eeb51..d5159813c0 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/scheduling/wizardTabId.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/scheduling/wizardTabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage.js index 8eaaeca6d4..1909fe638e 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab.js index 1a8203088c..8b2a196431 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/html.hbs index 828512d264..48fd951d1a 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/html.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/html.hbs index 76de0144d7..f9680a2048 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/html.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/wizardTabId.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/wizardTabId.js index 5e84a0d45d..3f4cd125aa 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/wizardTabId.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/wizardTabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/utils.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/utils.js index 41cf048c40..b25434c47b 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/utils.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/utils.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/utils/pciRow.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/utils/pciRow.hbs index 29fba80b71..11b11a9926 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/utils/pciRow.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/utils/pciRow.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/vmgroup.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/vmgroup.js index 1816e38de4..49fe87815d 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/vmgroup.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/vmgroup.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/vmgroup/wizardTabId.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/vmgroup/wizardTabId.js index f7cc8896e0..00f1a526e7 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/vmgroup/wizardTabId.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/vmgroup/wizardTabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard.hbs index 978234d8b6..a95cc4b244 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/import.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/import.js index 7dff1a6504..2f6373f007 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/import.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/import.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/import/formPanelId.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/import/formPanelId.js index e8ff7e1406..f5ae20247d 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/import/formPanelId.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/import/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/import/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/import/html.hbs index f85aafcb8b..cd61735d85 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/import/html.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/import/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate.js index 4009e4f787..482a4c5499 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate/formPanelId.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate/formPanelId.js index 497793347c..a5d4fd90d9 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate/formPanelId.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate/html.hbs index ec6270029c..cb91b6ef9e 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate/html.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate/templateRow.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate/templateRow.hbs index 610c386a42..4790d30dd5 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate/templateRow.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate/templateRow.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/templates-tab/panels/info-common.js b/src/sunstone/public/app/tabs/templates-tab/panels/info-common.js index e29e3ea4ea..c8997a5fc0 100644 --- a/src/sunstone/public/app/tabs/templates-tab/panels/info-common.js +++ b/src/sunstone/public/app/tabs/templates-tab/panels/info-common.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/panels/info.js b/src/sunstone/public/app/tabs/templates-tab/panels/info.js index 4bc4ec60dd..a4e53f61c8 100644 --- a/src/sunstone/public/app/tabs/templates-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/templates-tab/panels/info.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/templates-tab/panels/info/html.hbs index 55c8b0a3b0..d8921db99b 100644 --- a/src/sunstone/public/app/tabs/templates-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/panels/info/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/templates-tab/panels/info/panelId.js b/src/sunstone/public/app/tabs/templates-tab/panels/info/panelId.js index 8ed202beca..bc2b44c3e4 100644 --- a/src/sunstone/public/app/tabs/templates-tab/panels/info/panelId.js +++ b/src/sunstone/public/app/tabs/templates-tab/panels/info/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/panels/template-common.js b/src/sunstone/public/app/tabs/templates-tab/panels/template-common.js index fd9a197095..b2f5cb074f 100644 --- a/src/sunstone/public/app/tabs/templates-tab/panels/template-common.js +++ b/src/sunstone/public/app/tabs/templates-tab/panels/template-common.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/panels/template.js b/src/sunstone/public/app/tabs/templates-tab/panels/template.js index ee41612b8b..fe64de46ea 100644 --- a/src/sunstone/public/app/tabs/templates-tab/panels/template.js +++ b/src/sunstone/public/app/tabs/templates-tab/panels/template.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/panels/template/html.hbs b/src/sunstone/public/app/tabs/templates-tab/panels/template/html.hbs index db7e6a9acc..6882c74380 100644 --- a/src/sunstone/public/app/tabs/templates-tab/panels/template/html.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/panels/template/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/templates-tab/panels/template/panelId.js b/src/sunstone/public/app/tabs/templates-tab/panels/template/panelId.js index 3b8a565631..ef8ea331a0 100644 --- a/src/sunstone/public/app/tabs/templates-tab/panels/template/panelId.js +++ b/src/sunstone/public/app/tabs/templates-tab/panels/template/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-tab/tabId.js b/src/sunstone/public/app/tabs/templates-tab/tabId.js index 485bd0955f..09b9bb8deb 100644 --- a/src/sunstone/public/app/tabs/templates-tab/tabId.js +++ b/src/sunstone/public/app/tabs/templates-tab/tabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/templates-top-tab.js b/src/sunstone/public/app/tabs/templates-top-tab.js index 1e6cb91c13..3da8606a91 100644 --- a/src/sunstone/public/app/tabs/templates-top-tab.js +++ b/src/sunstone/public/app/tabs/templates-top-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/upgrade-top-tab.js b/src/sunstone/public/app/tabs/upgrade-top-tab.js index 0ea69bba73..b4a6b381ae 100644 --- a/src/sunstone/public/app/tabs/upgrade-top-tab.js +++ b/src/sunstone/public/app/tabs/upgrade-top-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab.js b/src/sunstone/public/app/tabs/users-tab.js index e16e823476..c0efb8c0d7 100644 --- a/src/sunstone/public/app/tabs/users-tab.js +++ b/src/sunstone/public/app/tabs/users-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/actions.js b/src/sunstone/public/app/tabs/users-tab/actions.js index 65cbfa67c7..fbfeff869f 100644 --- a/src/sunstone/public/app/tabs/users-tab/actions.js +++ b/src/sunstone/public/app/tabs/users-tab/actions.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/buttons.js b/src/sunstone/public/app/tabs/users-tab/buttons.js index 564ecda956..6b3a44fd80 100644 --- a/src/sunstone/public/app/tabs/users-tab/buttons.js +++ b/src/sunstone/public/app/tabs/users-tab/buttons.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/datatable.js b/src/sunstone/public/app/tabs/users-tab/datatable.js index dabf6517ef..fa7d633628 100644 --- a/src/sunstone/public/app/tabs/users-tab/datatable.js +++ b/src/sunstone/public/app/tabs/users-tab/datatable.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/dialogs/auth-driver.js b/src/sunstone/public/app/tabs/users-tab/dialogs/auth-driver.js index 4a432fac23..340e227aa9 100644 --- a/src/sunstone/public/app/tabs/users-tab/dialogs/auth-driver.js +++ b/src/sunstone/public/app/tabs/users-tab/dialogs/auth-driver.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/dialogs/auth-driver/dialogId.js b/src/sunstone/public/app/tabs/users-tab/dialogs/auth-driver/dialogId.js index c8d3130298..e898e93a84 100644 --- a/src/sunstone/public/app/tabs/users-tab/dialogs/auth-driver/dialogId.js +++ b/src/sunstone/public/app/tabs/users-tab/dialogs/auth-driver/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/dialogs/auth-driver/html.hbs b/src/sunstone/public/app/tabs/users-tab/dialogs/auth-driver/html.hbs index f5aa1c880f..41459e22a1 100644 --- a/src/sunstone/public/app/tabs/users-tab/dialogs/auth-driver/html.hbs +++ b/src/sunstone/public/app/tabs/users-tab/dialogs/auth-driver/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/users-tab/dialogs/groups.js b/src/sunstone/public/app/tabs/users-tab/dialogs/groups.js index d8cd73d14f..61a5954eab 100644 --- a/src/sunstone/public/app/tabs/users-tab/dialogs/groups.js +++ b/src/sunstone/public/app/tabs/users-tab/dialogs/groups.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/dialogs/groups/dialogId.js b/src/sunstone/public/app/tabs/users-tab/dialogs/groups/dialogId.js index 9e35a7e9bc..45115d70a2 100644 --- a/src/sunstone/public/app/tabs/users-tab/dialogs/groups/dialogId.js +++ b/src/sunstone/public/app/tabs/users-tab/dialogs/groups/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/dialogs/groups/html.hbs b/src/sunstone/public/app/tabs/users-tab/dialogs/groups/html.hbs index e016255b96..b65e9f8c96 100644 --- a/src/sunstone/public/app/tabs/users-tab/dialogs/groups/html.hbs +++ b/src/sunstone/public/app/tabs/users-tab/dialogs/groups/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/users-tab/dialogs/login-token.js b/src/sunstone/public/app/tabs/users-tab/dialogs/login-token.js index 45dc70f800..f73eaf042a 100644 --- a/src/sunstone/public/app/tabs/users-tab/dialogs/login-token.js +++ b/src/sunstone/public/app/tabs/users-tab/dialogs/login-token.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/dialogs/login-token/dialogId.js b/src/sunstone/public/app/tabs/users-tab/dialogs/login-token/dialogId.js index 3fe3077ef9..7ed7510bb0 100644 --- a/src/sunstone/public/app/tabs/users-tab/dialogs/login-token/dialogId.js +++ b/src/sunstone/public/app/tabs/users-tab/dialogs/login-token/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/dialogs/login-token/html.hbs b/src/sunstone/public/app/tabs/users-tab/dialogs/login-token/html.hbs index 8c29ae1b92..374d7ecb5a 100644 --- a/src/sunstone/public/app/tabs/users-tab/dialogs/login-token/html.hbs +++ b/src/sunstone/public/app/tabs/users-tab/dialogs/login-token/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/users-tab/dialogs/password.js b/src/sunstone/public/app/tabs/users-tab/dialogs/password.js index 9f91b5f3ab..f2edfa9990 100644 --- a/src/sunstone/public/app/tabs/users-tab/dialogs/password.js +++ b/src/sunstone/public/app/tabs/users-tab/dialogs/password.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/dialogs/password/dialogId.js b/src/sunstone/public/app/tabs/users-tab/dialogs/password/dialogId.js index 7dc93ecf63..b810c32991 100644 --- a/src/sunstone/public/app/tabs/users-tab/dialogs/password/dialogId.js +++ b/src/sunstone/public/app/tabs/users-tab/dialogs/password/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/dialogs/password/html.hbs b/src/sunstone/public/app/tabs/users-tab/dialogs/password/html.hbs index 035bb18b33..2022041fd5 100644 --- a/src/sunstone/public/app/tabs/users-tab/dialogs/password/html.hbs +++ b/src/sunstone/public/app/tabs/users-tab/dialogs/password/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/users-tab/dialogs/quotas.js b/src/sunstone/public/app/tabs/users-tab/dialogs/quotas.js index 1ed9ec170a..7621c2feef 100644 --- a/src/sunstone/public/app/tabs/users-tab/dialogs/quotas.js +++ b/src/sunstone/public/app/tabs/users-tab/dialogs/quotas.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/dialogs/quotas/dialogId.js b/src/sunstone/public/app/tabs/users-tab/dialogs/quotas/dialogId.js index 0f35b318bb..a195f2606d 100644 --- a/src/sunstone/public/app/tabs/users-tab/dialogs/quotas/dialogId.js +++ b/src/sunstone/public/app/tabs/users-tab/dialogs/quotas/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/dialogs/quotas/html.hbs b/src/sunstone/public/app/tabs/users-tab/dialogs/quotas/html.hbs index 73310dbba1..0417353545 100644 --- a/src/sunstone/public/app/tabs/users-tab/dialogs/quotas/html.hbs +++ b/src/sunstone/public/app/tabs/users-tab/dialogs/quotas/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/users-tab/form-panels/create.js b/src/sunstone/public/app/tabs/users-tab/form-panels/create.js index 09331ea4a0..a75a79f8f3 100644 --- a/src/sunstone/public/app/tabs/users-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/users-tab/form-panels/create.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/form-panels/create/formPanelId.js b/src/sunstone/public/app/tabs/users-tab/form-panels/create/formPanelId.js index 0d7b8b64e7..366ba002bb 100644 --- a/src/sunstone/public/app/tabs/users-tab/form-panels/create/formPanelId.js +++ b/src/sunstone/public/app/tabs/users-tab/form-panels/create/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/users-tab/form-panels/create/wizard.hbs index f99cb7c616..63df777f94 100644 --- a/src/sunstone/public/app/tabs/users-tab/form-panels/create/wizard.hbs +++ b/src/sunstone/public/app/tabs/users-tab/form-panels/create/wizard.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/users-tab/panels/accounting-common.js b/src/sunstone/public/app/tabs/users-tab/panels/accounting-common.js index dc7e1a12a2..538a14f275 100644 --- a/src/sunstone/public/app/tabs/users-tab/panels/accounting-common.js +++ b/src/sunstone/public/app/tabs/users-tab/panels/accounting-common.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/panels/accounting.js b/src/sunstone/public/app/tabs/users-tab/panels/accounting.js index 71e2cd3e38..aa715ebba7 100644 --- a/src/sunstone/public/app/tabs/users-tab/panels/accounting.js +++ b/src/sunstone/public/app/tabs/users-tab/panels/accounting.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/panels/accounting/panelId.js b/src/sunstone/public/app/tabs/users-tab/panels/accounting/panelId.js index fe41576fb4..b76d2e515d 100644 --- a/src/sunstone/public/app/tabs/users-tab/panels/accounting/panelId.js +++ b/src/sunstone/public/app/tabs/users-tab/panels/accounting/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/panels/auth-common.js b/src/sunstone/public/app/tabs/users-tab/panels/auth-common.js index 123327e9a7..0880655262 100644 --- a/src/sunstone/public/app/tabs/users-tab/panels/auth-common.js +++ b/src/sunstone/public/app/tabs/users-tab/panels/auth-common.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/panels/auth.js b/src/sunstone/public/app/tabs/users-tab/panels/auth.js index 4d416ec573..265a3e503d 100644 --- a/src/sunstone/public/app/tabs/users-tab/panels/auth.js +++ b/src/sunstone/public/app/tabs/users-tab/panels/auth.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/panels/auth/html.hbs b/src/sunstone/public/app/tabs/users-tab/panels/auth/html.hbs index c7a6356710..f4ac10cad6 100644 --- a/src/sunstone/public/app/tabs/users-tab/panels/auth/html.hbs +++ b/src/sunstone/public/app/tabs/users-tab/panels/auth/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/users-tab/panels/auth/panelId.js b/src/sunstone/public/app/tabs/users-tab/panels/auth/panelId.js index 74209fc1dc..b15396ab44 100644 --- a/src/sunstone/public/app/tabs/users-tab/panels/auth/panelId.js +++ b/src/sunstone/public/app/tabs/users-tab/panels/auth/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/panels/groups.js b/src/sunstone/public/app/tabs/users-tab/panels/groups.js index 88254b35af..4625c44285 100644 --- a/src/sunstone/public/app/tabs/users-tab/panels/groups.js +++ b/src/sunstone/public/app/tabs/users-tab/panels/groups.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/panels/groups/html.hbs b/src/sunstone/public/app/tabs/users-tab/panels/groups/html.hbs index 10963ebcd9..c28049c578 100644 --- a/src/sunstone/public/app/tabs/users-tab/panels/groups/html.hbs +++ b/src/sunstone/public/app/tabs/users-tab/panels/groups/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/users-tab/panels/groups/panelId.js b/src/sunstone/public/app/tabs/users-tab/panels/groups/panelId.js index a019839d9d..234120ad60 100644 --- a/src/sunstone/public/app/tabs/users-tab/panels/groups/panelId.js +++ b/src/sunstone/public/app/tabs/users-tab/panels/groups/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/panels/info-common.js b/src/sunstone/public/app/tabs/users-tab/panels/info-common.js index 3202e8a8d5..d7a0f18460 100644 --- a/src/sunstone/public/app/tabs/users-tab/panels/info-common.js +++ b/src/sunstone/public/app/tabs/users-tab/panels/info-common.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/panels/info.js b/src/sunstone/public/app/tabs/users-tab/panels/info.js index f82dd273c5..2a521f88e5 100644 --- a/src/sunstone/public/app/tabs/users-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/users-tab/panels/info.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/panels/info/chgrp-tr.hbs b/src/sunstone/public/app/tabs/users-tab/panels/info/chgrp-tr.hbs index 8ddff7d3c5..3fdb596805 100644 --- a/src/sunstone/public/app/tabs/users-tab/panels/info/chgrp-tr.hbs +++ b/src/sunstone/public/app/tabs/users-tab/panels/info/chgrp-tr.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/users-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/users-tab/panels/info/html.hbs index d061329173..e38c393546 100644 --- a/src/sunstone/public/app/tabs/users-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/users-tab/panels/info/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/users-tab/panels/info/panelId.js b/src/sunstone/public/app/tabs/users-tab/panels/info/panelId.js index fe4bdea62f..ea68664c9e 100644 --- a/src/sunstone/public/app/tabs/users-tab/panels/info/panelId.js +++ b/src/sunstone/public/app/tabs/users-tab/panels/info/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/panels/quotas-common.js b/src/sunstone/public/app/tabs/users-tab/panels/quotas-common.js index 286b18eb96..fc983b3192 100644 --- a/src/sunstone/public/app/tabs/users-tab/panels/quotas-common.js +++ b/src/sunstone/public/app/tabs/users-tab/panels/quotas-common.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/panels/quotas.js b/src/sunstone/public/app/tabs/users-tab/panels/quotas.js index 04a5189986..2cad1e877a 100644 --- a/src/sunstone/public/app/tabs/users-tab/panels/quotas.js +++ b/src/sunstone/public/app/tabs/users-tab/panels/quotas.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/panels/quotas/panelId.js b/src/sunstone/public/app/tabs/users-tab/panels/quotas/panelId.js index bc33ec787f..091dfc7c6e 100644 --- a/src/sunstone/public/app/tabs/users-tab/panels/quotas/panelId.js +++ b/src/sunstone/public/app/tabs/users-tab/panels/quotas/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/panels/showback-common.js b/src/sunstone/public/app/tabs/users-tab/panels/showback-common.js index 33b78d152c..a692f7fdde 100644 --- a/src/sunstone/public/app/tabs/users-tab/panels/showback-common.js +++ b/src/sunstone/public/app/tabs/users-tab/panels/showback-common.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/panels/showback.js b/src/sunstone/public/app/tabs/users-tab/panels/showback.js index 616f39b075..4c2ce6e8ee 100644 --- a/src/sunstone/public/app/tabs/users-tab/panels/showback.js +++ b/src/sunstone/public/app/tabs/users-tab/panels/showback.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/panels/showback/panelId.js b/src/sunstone/public/app/tabs/users-tab/panels/showback/panelId.js index aca0bf6642..727c8b02fe 100644 --- a/src/sunstone/public/app/tabs/users-tab/panels/showback/panelId.js +++ b/src/sunstone/public/app/tabs/users-tab/panels/showback/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/tabId.js b/src/sunstone/public/app/tabs/users-tab/tabId.js index 63f672e5c9..af14718ca5 100644 --- a/src/sunstone/public/app/tabs/users-tab/tabId.js +++ b/src/sunstone/public/app/tabs/users-tab/tabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/utils/user-creation.js b/src/sunstone/public/app/tabs/users-tab/utils/user-creation.js index 0f28ee6617..a59ef4b178 100644 --- a/src/sunstone/public/app/tabs/users-tab/utils/user-creation.js +++ b/src/sunstone/public/app/tabs/users-tab/utils/user-creation.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/users-tab/utils/user-creation/html.hbs b/src/sunstone/public/app/tabs/users-tab/utils/user-creation/html.hbs index f6f4e2b807..3ae2afd91f 100644 --- a/src/sunstone/public/app/tabs/users-tab/utils/user-creation/html.hbs +++ b/src/sunstone/public/app/tabs/users-tab/utils/user-creation/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vdcs-tab.js b/src/sunstone/public/app/tabs/vdcs-tab.js index 4453556012..fe1e11c328 100644 --- a/src/sunstone/public/app/tabs/vdcs-tab.js +++ b/src/sunstone/public/app/tabs/vdcs-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vdcs-tab/actions.js b/src/sunstone/public/app/tabs/vdcs-tab/actions.js index e9d3171343..6712d1abdf 100644 --- a/src/sunstone/public/app/tabs/vdcs-tab/actions.js +++ b/src/sunstone/public/app/tabs/vdcs-tab/actions.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vdcs-tab/buttons.js b/src/sunstone/public/app/tabs/vdcs-tab/buttons.js index 8ff09b8616..2a73c94145 100644 --- a/src/sunstone/public/app/tabs/vdcs-tab/buttons.js +++ b/src/sunstone/public/app/tabs/vdcs-tab/buttons.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vdcs-tab/datatable.js b/src/sunstone/public/app/tabs/vdcs-tab/datatable.js index 35a17c956d..3e6d3e2e62 100644 --- a/src/sunstone/public/app/tabs/vdcs-tab/datatable.js +++ b/src/sunstone/public/app/tabs/vdcs-tab/datatable.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vdcs-tab/form-panels/create.js b/src/sunstone/public/app/tabs/vdcs-tab/form-panels/create.js index 8a4148745c..43bc95f3a6 100644 --- a/src/sunstone/public/app/tabs/vdcs-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/vdcs-tab/form-panels/create.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vdcs-tab/form-panels/create/advanced.hbs b/src/sunstone/public/app/tabs/vdcs-tab/form-panels/create/advanced.hbs index ec82b2d12c..c83dae266b 100644 --- a/src/sunstone/public/app/tabs/vdcs-tab/form-panels/create/advanced.hbs +++ b/src/sunstone/public/app/tabs/vdcs-tab/form-panels/create/advanced.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vdcs-tab/form-panels/create/formPanelId.js b/src/sunstone/public/app/tabs/vdcs-tab/form-panels/create/formPanelId.js index 2335bf0acb..e417c9f289 100644 --- a/src/sunstone/public/app/tabs/vdcs-tab/form-panels/create/formPanelId.js +++ b/src/sunstone/public/app/tabs/vdcs-tab/form-panels/create/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vdcs-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/vdcs-tab/form-panels/create/wizard.hbs index 676b72e0c1..43a75b1d77 100644 --- a/src/sunstone/public/app/tabs/vdcs-tab/form-panels/create/wizard.hbs +++ b/src/sunstone/public/app/tabs/vdcs-tab/form-panels/create/wizard.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vdcs-tab/panels/groups.js b/src/sunstone/public/app/tabs/vdcs-tab/panels/groups.js index f3824abae9..2696c3c142 100644 --- a/src/sunstone/public/app/tabs/vdcs-tab/panels/groups.js +++ b/src/sunstone/public/app/tabs/vdcs-tab/panels/groups.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vdcs-tab/panels/groups/panelId.js b/src/sunstone/public/app/tabs/vdcs-tab/panels/groups/panelId.js index 34b046f032..7aa7d2bc2d 100644 --- a/src/sunstone/public/app/tabs/vdcs-tab/panels/groups/panelId.js +++ b/src/sunstone/public/app/tabs/vdcs-tab/panels/groups/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vdcs-tab/panels/info.js b/src/sunstone/public/app/tabs/vdcs-tab/panels/info.js index e0e3c92225..0353e8c0b6 100644 --- a/src/sunstone/public/app/tabs/vdcs-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/vdcs-tab/panels/info.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vdcs-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/vdcs-tab/panels/info/html.hbs index f627b771d9..fcb502d328 100644 --- a/src/sunstone/public/app/tabs/vdcs-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/vdcs-tab/panels/info/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vdcs-tab/panels/info/panelId.js b/src/sunstone/public/app/tabs/vdcs-tab/panels/info/panelId.js index cd09799755..4e579a46b6 100644 --- a/src/sunstone/public/app/tabs/vdcs-tab/panels/info/panelId.js +++ b/src/sunstone/public/app/tabs/vdcs-tab/panels/info/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vdcs-tab/panels/resources.js b/src/sunstone/public/app/tabs/vdcs-tab/panels/resources.js index 1d5c9dbaec..b89304b844 100644 --- a/src/sunstone/public/app/tabs/vdcs-tab/panels/resources.js +++ b/src/sunstone/public/app/tabs/vdcs-tab/panels/resources.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vdcs-tab/panels/resources/panelId.js b/src/sunstone/public/app/tabs/vdcs-tab/panels/resources/panelId.js index 26bd167451..5f39816ffc 100644 --- a/src/sunstone/public/app/tabs/vdcs-tab/panels/resources/panelId.js +++ b/src/sunstone/public/app/tabs/vdcs-tab/panels/resources/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vdcs-tab/tabId.js b/src/sunstone/public/app/tabs/vdcs-tab/tabId.js index 4e10c5d9fa..8f13d7439c 100644 --- a/src/sunstone/public/app/tabs/vdcs-tab/tabId.js +++ b/src/sunstone/public/app/tabs/vdcs-tab/tabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vdcs-tab/utils/common.js b/src/sunstone/public/app/tabs/vdcs-tab/utils/common.js index 974e37df9c..049c6fa9be 100644 --- a/src/sunstone/public/app/tabs/vdcs-tab/utils/common.js +++ b/src/sunstone/public/app/tabs/vdcs-tab/utils/common.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vdcs-tab/utils/resources-tab.js b/src/sunstone/public/app/tabs/vdcs-tab/utils/resources-tab.js index e8188c2376..5745a15b60 100644 --- a/src/sunstone/public/app/tabs/vdcs-tab/utils/resources-tab.js +++ b/src/sunstone/public/app/tabs/vdcs-tab/utils/resources-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vdcs-tab/utils/resources-tab/html.hbs b/src/sunstone/public/app/tabs/vdcs-tab/utils/resources-tab/html.hbs index d9323d8673..c6903a12e4 100644 --- a/src/sunstone/public/app/tabs/vdcs-tab/utils/resources-tab/html.hbs +++ b/src/sunstone/public/app/tabs/vdcs-tab/utils/resources-tab/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vdcs-tab/utils/resources-zone.js b/src/sunstone/public/app/tabs/vdcs-tab/utils/resources-zone.js index 71ca096d08..baa1f2b77d 100644 --- a/src/sunstone/public/app/tabs/vdcs-tab/utils/resources-zone.js +++ b/src/sunstone/public/app/tabs/vdcs-tab/utils/resources-zone.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vdcs-tab/utils/resources-zone/html.hbs b/src/sunstone/public/app/tabs/vdcs-tab/utils/resources-zone/html.hbs index 06cb71047e..9080442616 100644 --- a/src/sunstone/public/app/tabs/vdcs-tab/utils/resources-zone/html.hbs +++ b/src/sunstone/public/app/tabs/vdcs-tab/utils/resources-zone/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vmgroup-tab.js b/src/sunstone/public/app/tabs/vmgroup-tab.js index f37191ee68..ac39e26bbf 100644 --- a/src/sunstone/public/app/tabs/vmgroup-tab.js +++ b/src/sunstone/public/app/tabs/vmgroup-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vmgroup-tab/actions.js b/src/sunstone/public/app/tabs/vmgroup-tab/actions.js index 614d889edd..746fd66703 100644 --- a/src/sunstone/public/app/tabs/vmgroup-tab/actions.js +++ b/src/sunstone/public/app/tabs/vmgroup-tab/actions.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vmgroup-tab/buttons.js b/src/sunstone/public/app/tabs/vmgroup-tab/buttons.js index 32693867b5..3714180184 100644 --- a/src/sunstone/public/app/tabs/vmgroup-tab/buttons.js +++ b/src/sunstone/public/app/tabs/vmgroup-tab/buttons.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vmgroup-tab/datatable.js b/src/sunstone/public/app/tabs/vmgroup-tab/datatable.js index 4fb24d097b..aba1d8cdf3 100644 --- a/src/sunstone/public/app/tabs/vmgroup-tab/datatable.js +++ b/src/sunstone/public/app/tabs/vmgroup-tab/datatable.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vmgroup-tab/form-panels/create.js b/src/sunstone/public/app/tabs/vmgroup-tab/form-panels/create.js index 6f3ebdb9af..70241bb4a7 100644 --- a/src/sunstone/public/app/tabs/vmgroup-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/vmgroup-tab/form-panels/create.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vmgroup-tab/form-panels/create/advanced.hbs b/src/sunstone/public/app/tabs/vmgroup-tab/form-panels/create/advanced.hbs index bbe9e48e0a..606445d314 100644 --- a/src/sunstone/public/app/tabs/vmgroup-tab/form-panels/create/advanced.hbs +++ b/src/sunstone/public/app/tabs/vmgroup-tab/form-panels/create/advanced.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vmgroup-tab/form-panels/create/formPanelId.js b/src/sunstone/public/app/tabs/vmgroup-tab/form-panels/create/formPanelId.js index f0c0aea2c2..40e59c6f30 100644 --- a/src/sunstone/public/app/tabs/vmgroup-tab/form-panels/create/formPanelId.js +++ b/src/sunstone/public/app/tabs/vmgroup-tab/form-panels/create/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vmgroup-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/vmgroup-tab/form-panels/create/wizard.hbs index a02ab8259e..566cdeb166 100644 --- a/src/sunstone/public/app/tabs/vmgroup-tab/form-panels/create/wizard.hbs +++ b/src/sunstone/public/app/tabs/vmgroup-tab/form-panels/create/wizard.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vmgroup-tab/panels/info.js b/src/sunstone/public/app/tabs/vmgroup-tab/panels/info.js index 5f10c76409..17cef25298 100644 --- a/src/sunstone/public/app/tabs/vmgroup-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/vmgroup-tab/panels/info.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vmgroup-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/vmgroup-tab/panels/info/html.hbs index 8139051926..3e1ea68b6e 100644 --- a/src/sunstone/public/app/tabs/vmgroup-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/vmgroup-tab/panels/info/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vmgroup-tab/panels/info/panelId.js b/src/sunstone/public/app/tabs/vmgroup-tab/panels/info/panelId.js index 3f86a04a7c..40b6df07ab 100644 --- a/src/sunstone/public/app/tabs/vmgroup-tab/panels/info/panelId.js +++ b/src/sunstone/public/app/tabs/vmgroup-tab/panels/info/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vmgroup-tab/panels/vms.js b/src/sunstone/public/app/tabs/vmgroup-tab/panels/vms.js index a4464b6179..c499f8bb2e 100644 --- a/src/sunstone/public/app/tabs/vmgroup-tab/panels/vms.js +++ b/src/sunstone/public/app/tabs/vmgroup-tab/panels/vms.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vmgroup-tab/panels/vms/html.hbs b/src/sunstone/public/app/tabs/vmgroup-tab/panels/vms/html.hbs index dff86d82f9..efd5728e79 100644 --- a/src/sunstone/public/app/tabs/vmgroup-tab/panels/vms/html.hbs +++ b/src/sunstone/public/app/tabs/vmgroup-tab/panels/vms/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vmgroup-tab/panels/vms/panelId.js b/src/sunstone/public/app/tabs/vmgroup-tab/panels/vms/panelId.js index 4ba4a95620..4f89720e92 100644 --- a/src/sunstone/public/app/tabs/vmgroup-tab/panels/vms/panelId.js +++ b/src/sunstone/public/app/tabs/vmgroup-tab/panels/vms/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vmgroup-tab/tabId.js b/src/sunstone/public/app/tabs/vmgroup-tab/tabId.js index d08952a48e..ac89bba151 100644 --- a/src/sunstone/public/app/tabs/vmgroup-tab/tabId.js +++ b/src/sunstone/public/app/tabs/vmgroup-tab/tabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vmgroup-tab/utils/affinity-role-tab.js b/src/sunstone/public/app/tabs/vmgroup-tab/utils/affinity-role-tab.js index 59417cde12..a85ee47adf 100644 --- a/src/sunstone/public/app/tabs/vmgroup-tab/utils/affinity-role-tab.js +++ b/src/sunstone/public/app/tabs/vmgroup-tab/utils/affinity-role-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vmgroup-tab/utils/common.js b/src/sunstone/public/app/tabs/vmgroup-tab/utils/common.js index 3795153bf9..6ad0fb0486 100644 --- a/src/sunstone/public/app/tabs/vmgroup-tab/utils/common.js +++ b/src/sunstone/public/app/tabs/vmgroup-tab/utils/common.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vmgroup-tab/utils/datatable.js b/src/sunstone/public/app/tabs/vmgroup-tab/utils/datatable.js index 253387e0b8..2750740554 100644 --- a/src/sunstone/public/app/tabs/vmgroup-tab/utils/datatable.js +++ b/src/sunstone/public/app/tabs/vmgroup-tab/utils/datatable.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vmgroup-tab/utils/group-role-affinity.js b/src/sunstone/public/app/tabs/vmgroup-tab/utils/group-role-affinity.js index 8ad647c958..7c6382b5c5 100644 --- a/src/sunstone/public/app/tabs/vmgroup-tab/utils/group-role-affinity.js +++ b/src/sunstone/public/app/tabs/vmgroup-tab/utils/group-role-affinity.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vmgroup-tab/utils/role-tab.js b/src/sunstone/public/app/tabs/vmgroup-tab/utils/role-tab.js index a185775dc2..4f8237541c 100644 --- a/src/sunstone/public/app/tabs/vmgroup-tab/utils/role-tab.js +++ b/src/sunstone/public/app/tabs/vmgroup-tab/utils/role-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vmgroup-tab/utils/role-tab/html.hbs b/src/sunstone/public/app/tabs/vmgroup-tab/utils/role-tab/html.hbs index 556623c2c2..155451272b 100644 --- a/src/sunstone/public/app/tabs/vmgroup-tab/utils/role-tab/html.hbs +++ b/src/sunstone/public/app/tabs/vmgroup-tab/utils/role-tab/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vms-tab.js b/src/sunstone/public/app/tabs/vms-tab.js index b8c6524fa0..7263cc1d73 100644 --- a/src/sunstone/public/app/tabs/vms-tab.js +++ b/src/sunstone/public/app/tabs/vms-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/actions.js b/src/sunstone/public/app/tabs/vms-tab/actions.js index 11e23bb144..861511d290 100644 --- a/src/sunstone/public/app/tabs/vms-tab/actions.js +++ b/src/sunstone/public/app/tabs/vms-tab/actions.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/buttons.js b/src/sunstone/public/app/tabs/vms-tab/buttons.js index e575519119..e29464a20c 100644 --- a/src/sunstone/public/app/tabs/vms-tab/buttons.js +++ b/src/sunstone/public/app/tabs/vms-tab/buttons.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/datatable.js b/src/sunstone/public/app/tabs/vms-tab/datatable.js index 3d2575ca30..12878353d2 100644 --- a/src/sunstone/public/app/tabs/vms-tab/datatable.js +++ b/src/sunstone/public/app/tabs/vms-tab/datatable.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/attach-disk.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/attach-disk.js index 4bed53b216..901694b7ac 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/attach-disk.js +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/attach-disk.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/attach-disk/dialogId.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/attach-disk/dialogId.js index c2bc2ba9d8..cdfe97c686 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/attach-disk/dialogId.js +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/attach-disk/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/attach-disk/html.hbs b/src/sunstone/public/app/tabs/vms-tab/dialogs/attach-disk/html.hbs index 7f29f9bee4..40437141ef 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/attach-disk/html.hbs +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/attach-disk/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/attach-nic.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/attach-nic.js index a70db65bae..ef9eb1aad3 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/attach-nic.js +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/attach-nic.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/attach-nic/dialogId.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/attach-nic/dialogId.js index 79a0b773ee..655b94d07c 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/attach-nic/dialogId.js +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/attach-nic/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/attach-nic/html.hbs b/src/sunstone/public/app/tabs/vms-tab/dialogs/attach-nic/html.hbs index e178c31a9f..a1013d2c3c 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/attach-nic/html.hbs +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/attach-nic/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/deploy.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/deploy.js index b8f6804ff2..ff96e8cc30 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/deploy.js +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/deploy.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/deploy/dialogId.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/deploy/dialogId.js index a6bf870f6e..13bbb34d04 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/deploy/dialogId.js +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/deploy/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/deploy/html.hbs b/src/sunstone/public/app/tabs/vms-tab/dialogs/deploy/html.hbs index d71bd37ed8..6ec85fd6de 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/deploy/html.hbs +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/deploy/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-resize.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-resize.js index a8c25d0aec..c94d40a2e1 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-resize.js +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-resize.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-resize/dialogId.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-resize/dialogId.js index c6b14a8cfd..e91094de71 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-resize/dialogId.js +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-resize/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-resize/html.hbs b/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-resize/html.hbs index c70c7abb94..92a214986f 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-resize/html.hbs +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-resize/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-saveas.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-saveas.js index a9235b8ffd..4f0571b6d9 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-saveas.js +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-saveas.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-saveas/dialogId.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-saveas/dialogId.js index 78760e7753..7a1a7311e0 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-saveas/dialogId.js +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-saveas/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-saveas/html.hbs b/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-saveas/html.hbs index 3c5ddb2f41..c436085523 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-saveas/html.hbs +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-saveas/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-snapshot-rename.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-snapshot-rename.js index f2526a4fa2..df9bf2a1e8 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-snapshot-rename.js +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-snapshot-rename.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-snapshot-rename/dialogId.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-snapshot-rename/dialogId.js index 2a7a917f69..1f847b0ee2 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-snapshot-rename/dialogId.js +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-snapshot-rename/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-snapshot-rename/html.hbs b/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-snapshot-rename/html.hbs index 9227fc0358..9f1a29d049 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-snapshot-rename/html.hbs +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-snapshot-rename/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-snapshot.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-snapshot.js index 8b1f279734..2fc327b04a 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-snapshot.js +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-snapshot.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-snapshot/dialogId.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-snapshot/dialogId.js index a0851c570c..1e99939922 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-snapshot/dialogId.js +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-snapshot/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-snapshot/html.hbs b/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-snapshot/html.hbs index bce089443f..3c5086ecfb 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-snapshot/html.hbs +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-snapshot/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/migrate.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/migrate.js index 06326b2085..6ae8367dcd 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/migrate.js +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/migrate.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/migrate/dialogId.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/migrate/dialogId.js index 95badca595..b3cacce9a4 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/migrate/dialogId.js +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/migrate/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/migrate/html.hbs b/src/sunstone/public/app/tabs/vms-tab/dialogs/migrate/html.hbs index 9ac1791b65..d30aedf60c 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/migrate/html.hbs +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/migrate/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/resize.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/resize.js index 1da1a34a3c..1fb71f1b77 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/resize.js +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/resize.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/resize/dialogId.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/resize/dialogId.js index a58bfec39b..aafc0db884 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/resize/dialogId.js +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/resize/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/resize/html.hbs b/src/sunstone/public/app/tabs/vms-tab/dialogs/resize/html.hbs index fbd615bef3..a87dae776f 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/resize/html.hbs +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/resize/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/revert.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/revert.js index 69bc6f499e..548966e523 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/revert.js +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/revert.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/revert/dialogId.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/revert/dialogId.js index 62d9a4ff4f..41efe81d99 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/revert/dialogId.js +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/revert/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/revert/html.hbs b/src/sunstone/public/app/tabs/vms-tab/dialogs/revert/html.hbs index 6645102115..9105f31f86 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/revert/html.hbs +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/revert/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/saveas-template.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/saveas-template.js index 11d04afbc6..b534ec181d 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/saveas-template.js +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/saveas-template.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/saveas-template/dialogId.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/saveas-template/dialogId.js index ce8ee33515..b92151c693 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/saveas-template/dialogId.js +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/saveas-template/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/saveas-template/html.hbs b/src/sunstone/public/app/tabs/vms-tab/dialogs/saveas-template/html.hbs index 3702342a14..fa22b1e216 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/saveas-template/html.hbs +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/saveas-template/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/snapshot.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/snapshot.js index c2c57008d5..acd79d76e3 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/snapshot.js +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/snapshot.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/snapshot/dialogId.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/snapshot/dialogId.js index 7adef6c140..b4d5ca3776 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/snapshot/dialogId.js +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/snapshot/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/snapshot/html.hbs b/src/sunstone/public/app/tabs/vms-tab/dialogs/snapshot/html.hbs index 8337e4beee..f79301dce3 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/snapshot/html.hbs +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/snapshot/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/spice.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/spice.js index e1b0bd562b..f385d7ea47 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/spice.js +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/spice.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/spice/dialogId.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/spice/dialogId.js index fcb8e06e4c..d2d605d958 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/spice/dialogId.js +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/spice/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/spice/html.hbs b/src/sunstone/public/app/tabs/vms-tab/dialogs/spice/html.hbs index 7b9b57b041..218d0780bc 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/spice/html.hbs +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/spice/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/vnc.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/vnc.js index 51a3201bd1..e5d3b51bc0 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/vnc.js +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/vnc.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/vnc/dialogId.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/vnc/dialogId.js index a06e787e4c..c220e5f5e1 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/vnc/dialogId.js +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/vnc/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/vnc/html.hbs b/src/sunstone/public/app/tabs/vms-tab/dialogs/vnc/html.hbs index aa1da513e5..3c71a0a800 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/vnc/html.hbs +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/vnc/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vms-tab/form-panels/create.js b/src/sunstone/public/app/tabs/vms-tab/form-panels/create.js index 703f6d75e3..c02620869f 100644 --- a/src/sunstone/public/app/tabs/vms-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/vms-tab/form-panels/create.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/form-panels/create/formPanelId.js b/src/sunstone/public/app/tabs/vms-tab/form-panels/create/formPanelId.js index 69470c7cbf..ce10fa6bb6 100644 --- a/src/sunstone/public/app/tabs/vms-tab/form-panels/create/formPanelId.js +++ b/src/sunstone/public/app/tabs/vms-tab/form-panels/create/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/form-panels/updateconf.js b/src/sunstone/public/app/tabs/vms-tab/form-panels/updateconf.js index 6b603f8152..3d196c4f09 100644 --- a/src/sunstone/public/app/tabs/vms-tab/form-panels/updateconf.js +++ b/src/sunstone/public/app/tabs/vms-tab/form-panels/updateconf.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/form-panels/updateconf/advanced.hbs b/src/sunstone/public/app/tabs/vms-tab/form-panels/updateconf/advanced.hbs index 3810efa4b8..eb953faa01 100644 --- a/src/sunstone/public/app/tabs/vms-tab/form-panels/updateconf/advanced.hbs +++ b/src/sunstone/public/app/tabs/vms-tab/form-panels/updateconf/advanced.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vms-tab/form-panels/updateconf/formPanelId.js b/src/sunstone/public/app/tabs/vms-tab/form-panels/updateconf/formPanelId.js index 3d498e8a5a..a916b8c4b2 100644 --- a/src/sunstone/public/app/tabs/vms-tab/form-panels/updateconf/formPanelId.js +++ b/src/sunstone/public/app/tabs/vms-tab/form-panels/updateconf/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/form-panels/updateconf/wizard.hbs b/src/sunstone/public/app/tabs/vms-tab/form-panels/updateconf/wizard.hbs index 978234d8b6..a95cc4b244 100644 --- a/src/sunstone/public/app/tabs/vms-tab/form-panels/updateconf/wizard.hbs +++ b/src/sunstone/public/app/tabs/vms-tab/form-panels/updateconf/wizard.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vms-tab/hooks/header.js b/src/sunstone/public/app/tabs/vms-tab/hooks/header.js index 16bb013423..573acb317d 100644 --- a/src/sunstone/public/app/tabs/vms-tab/hooks/header.js +++ b/src/sunstone/public/app/tabs/vms-tab/hooks/header.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/hooks/state.js b/src/sunstone/public/app/tabs/vms-tab/hooks/state.js index 22de47c51f..82ceaeabae 100644 --- a/src/sunstone/public/app/tabs/vms-tab/hooks/state.js +++ b/src/sunstone/public/app/tabs/vms-tab/hooks/state.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/actions.js b/src/sunstone/public/app/tabs/vms-tab/panels/actions.js index 94484f0abf..24dfc27939 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/actions.js +++ b/src/sunstone/public/app/tabs/vms-tab/panels/actions.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/actions/panelId.js b/src/sunstone/public/app/tabs/vms-tab/panels/actions/panelId.js index 6c8ad8ff7d..db9454b824 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/actions/panelId.js +++ b/src/sunstone/public/app/tabs/vms-tab/panels/actions/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/capacity.js b/src/sunstone/public/app/tabs/vms-tab/panels/capacity.js index 2bbff7b205..a04bf2e74a 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/capacity.js +++ b/src/sunstone/public/app/tabs/vms-tab/panels/capacity.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/capacity/html.hbs b/src/sunstone/public/app/tabs/vms-tab/panels/capacity/html.hbs index f57abb674e..4ce5708dea 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/capacity/html.hbs +++ b/src/sunstone/public/app/tabs/vms-tab/panels/capacity/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/capacity/panelId.js b/src/sunstone/public/app/tabs/vms-tab/panels/capacity/panelId.js index cdfe3086bf..18b6b31dc7 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/capacity/panelId.js +++ b/src/sunstone/public/app/tabs/vms-tab/panels/capacity/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/conf.js b/src/sunstone/public/app/tabs/vms-tab/panels/conf.js index 4051816780..25f01d144c 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/conf.js +++ b/src/sunstone/public/app/tabs/vms-tab/panels/conf.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -56,7 +56,7 @@ define(function(require) { var conf = {}; var template = this.element.TEMPLATE; - $.each(["OS", "FEATURES", "INPUT", "GRAPHICS", "RAW", "CONTEXT"], function(){ + $.each(["OS", "FEATURES", "INPUT", "GRAPHICS", "RAW", "CONTEXT", "CPU_MODEL"], function(){ if(template[this] != undefined){ conf[this] = template[this]; } diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/conf/html.hbs b/src/sunstone/public/app/tabs/vms-tab/panels/conf/html.hbs index 506ee64487..7583cbb9e0 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/conf/html.hbs +++ b/src/sunstone/public/app/tabs/vms-tab/panels/conf/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/conf/panelId.js b/src/sunstone/public/app/tabs/vms-tab/panels/conf/panelId.js index 818cc3b3e2..0282b20aac 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/conf/panelId.js +++ b/src/sunstone/public/app/tabs/vms-tab/panels/conf/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/info.js b/src/sunstone/public/app/tabs/vms-tab/panels/info.js index 0d563cf41d..b0b5876ccb 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/vms-tab/panels/info.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/vms-tab/panels/info/html.hbs index 2e26079c6a..31fce0cb91 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/vms-tab/panels/info/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/info/panelId.js b/src/sunstone/public/app/tabs/vms-tab/panels/info/panelId.js index 664c6a55b7..eaa81e61cc 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/info/panelId.js +++ b/src/sunstone/public/app/tabs/vms-tab/panels/info/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/log.js b/src/sunstone/public/app/tabs/vms-tab/panels/log.js index f581e50f46..790c6a73fd 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/log.js +++ b/src/sunstone/public/app/tabs/vms-tab/panels/log.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/log/panelId.js b/src/sunstone/public/app/tabs/vms-tab/panels/log/panelId.js index 78adbb3d5e..4db4779b08 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/log/panelId.js +++ b/src/sunstone/public/app/tabs/vms-tab/panels/log/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/network.js b/src/sunstone/public/app/tabs/vms-tab/panels/network.js index eba5adaed1..dab8d2bf01 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/network.js +++ b/src/sunstone/public/app/tabs/vms-tab/panels/network.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/network/panelId.js b/src/sunstone/public/app/tabs/vms-tab/panels/network/panelId.js index 9de2a068b9..f214ac629b 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/network/panelId.js +++ b/src/sunstone/public/app/tabs/vms-tab/panels/network/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/placement.js b/src/sunstone/public/app/tabs/vms-tab/panels/placement.js index 9661635048..ab7c630630 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/placement.js +++ b/src/sunstone/public/app/tabs/vms-tab/panels/placement.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/placement/panelId.js b/src/sunstone/public/app/tabs/vms-tab/panels/placement/panelId.js index 2e9c70f5df..86eb3db4a5 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/placement/panelId.js +++ b/src/sunstone/public/app/tabs/vms-tab/panels/placement/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/snapshots.js b/src/sunstone/public/app/tabs/vms-tab/panels/snapshots.js index f4116a9980..f9619f24cb 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/snapshots.js +++ b/src/sunstone/public/app/tabs/vms-tab/panels/snapshots.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/snapshots/panelId.js b/src/sunstone/public/app/tabs/vms-tab/panels/snapshots/panelId.js index a400b90667..a3c623c294 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/snapshots/panelId.js +++ b/src/sunstone/public/app/tabs/vms-tab/panels/snapshots/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/storage.js b/src/sunstone/public/app/tabs/vms-tab/panels/storage.js index 9ae11238f6..54fd288abb 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/storage.js +++ b/src/sunstone/public/app/tabs/vms-tab/panels/storage.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/storage/disk-details.hbs b/src/sunstone/public/app/tabs/vms-tab/panels/storage/disk-details.hbs index 211865b388..1ecac8de38 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/storage/disk-details.hbs +++ b/src/sunstone/public/app/tabs/vms-tab/panels/storage/disk-details.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/storage/html.hbs b/src/sunstone/public/app/tabs/vms-tab/panels/storage/html.hbs index f181cbf88c..c2d40cdddb 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/storage/html.hbs +++ b/src/sunstone/public/app/tabs/vms-tab/panels/storage/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/storage/panelId.js b/src/sunstone/public/app/tabs/vms-tab/panels/storage/panelId.js index 13112ee514..a53c8aa283 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/storage/panelId.js +++ b/src/sunstone/public/app/tabs/vms-tab/panels/storage/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/template.js b/src/sunstone/public/app/tabs/vms-tab/panels/template.js index 4a05fee0a6..974894e64a 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/template.js +++ b/src/sunstone/public/app/tabs/vms-tab/panels/template.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/template/html.hbs b/src/sunstone/public/app/tabs/vms-tab/panels/template/html.hbs index cc8b2aa7eb..2e8777786a 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/template/html.hbs +++ b/src/sunstone/public/app/tabs/vms-tab/panels/template/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vms-tab/panels/template/panelId.js b/src/sunstone/public/app/tabs/vms-tab/panels/template/panelId.js index 99d2164ee8..9d46dea3cc 100644 --- a/src/sunstone/public/app/tabs/vms-tab/panels/template/panelId.js +++ b/src/sunstone/public/app/tabs/vms-tab/panels/template/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/tabId.js b/src/sunstone/public/app/tabs/vms-tab/tabId.js index 8ece130655..415af0d211 100644 --- a/src/sunstone/public/app/tabs/vms-tab/tabId.js +++ b/src/sunstone/public/app/tabs/vms-tab/tabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js b/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js index bc39116790..02896a6462 100644 --- a/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js +++ b/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vms-tab/utils/state-actions.js b/src/sunstone/public/app/tabs/vms-tab/utils/state-actions.js index fabc0b58f8..555bb13fb7 100644 --- a/src/sunstone/public/app/tabs/vms-tab/utils/state-actions.js +++ b/src/sunstone/public/app/tabs/vms-tab/utils/state-actions.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab.js b/src/sunstone/public/app/tabs/vnets-tab.js index 92ff8c479d..67a6d5c785 100644 --- a/src/sunstone/public/app/tabs/vnets-tab.js +++ b/src/sunstone/public/app/tabs/vnets-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/actions.js b/src/sunstone/public/app/tabs/vnets-tab/actions.js index fd29128060..81b37b5f94 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/actions.js +++ b/src/sunstone/public/app/tabs/vnets-tab/actions.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/buttons.js b/src/sunstone/public/app/tabs/vnets-tab/buttons.js index 814f39c051..fbb3a9a0fc 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/buttons.js +++ b/src/sunstone/public/app/tabs/vnets-tab/buttons.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/datatable.js b/src/sunstone/public/app/tabs/vnets-tab/datatable.js index ee9fc1859a..108a272ef0 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/datatable.js +++ b/src/sunstone/public/app/tabs/vnets-tab/datatable.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/dialogs/add-ar.js b/src/sunstone/public/app/tabs/vnets-tab/dialogs/add-ar.js index 19627adaa5..b220c87835 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/dialogs/add-ar.js +++ b/src/sunstone/public/app/tabs/vnets-tab/dialogs/add-ar.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/dialogs/add-ar/dialogId.js b/src/sunstone/public/app/tabs/vnets-tab/dialogs/add-ar/dialogId.js index 1d53dfdebc..3a423dfb48 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/dialogs/add-ar/dialogId.js +++ b/src/sunstone/public/app/tabs/vnets-tab/dialogs/add-ar/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/dialogs/add-ar/html.hbs b/src/sunstone/public/app/tabs/vnets-tab/dialogs/add-ar/html.hbs index 93d72dd6cd..a95715c1c1 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/dialogs/add-ar/html.hbs +++ b/src/sunstone/public/app/tabs/vnets-tab/dialogs/add-ar/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vnets-tab/dialogs/reserve.js b/src/sunstone/public/app/tabs/vnets-tab/dialogs/reserve.js index 3afd07d21e..de0e4db4af 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/dialogs/reserve.js +++ b/src/sunstone/public/app/tabs/vnets-tab/dialogs/reserve.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/dialogs/reserve/ar-datatable.js b/src/sunstone/public/app/tabs/vnets-tab/dialogs/reserve/ar-datatable.js index eefbac5299..2943a6f520 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/dialogs/reserve/ar-datatable.js +++ b/src/sunstone/public/app/tabs/vnets-tab/dialogs/reserve/ar-datatable.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/dialogs/reserve/dialogId.js b/src/sunstone/public/app/tabs/vnets-tab/dialogs/reserve/dialogId.js index 0db4645e95..1cf6de1623 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/dialogs/reserve/dialogId.js +++ b/src/sunstone/public/app/tabs/vnets-tab/dialogs/reserve/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/dialogs/reserve/html.hbs b/src/sunstone/public/app/tabs/vnets-tab/dialogs/reserve/html.hbs index 791cac5911..faa778dcc7 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/dialogs/reserve/html.hbs +++ b/src/sunstone/public/app/tabs/vnets-tab/dialogs/reserve/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vnets-tab/dialogs/update-ar.js b/src/sunstone/public/app/tabs/vnets-tab/dialogs/update-ar.js index 534a78b1d0..b0c4768b1b 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/dialogs/update-ar.js +++ b/src/sunstone/public/app/tabs/vnets-tab/dialogs/update-ar.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/dialogs/update-ar/dialogId.js b/src/sunstone/public/app/tabs/vnets-tab/dialogs/update-ar/dialogId.js index f61922b5a2..7e1c02ed25 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/dialogs/update-ar/dialogId.js +++ b/src/sunstone/public/app/tabs/vnets-tab/dialogs/update-ar/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/dialogs/update-ar/html.hbs b/src/sunstone/public/app/tabs/vnets-tab/dialogs/update-ar/html.hbs index 8de27dc39e..6aa0ef141b 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/dialogs/update-ar/html.hbs +++ b/src/sunstone/public/app/tabs/vnets-tab/dialogs/update-ar/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vnets-tab/form-panels/create.js b/src/sunstone/public/app/tabs/vnets-tab/form-panels/create.js index b9c7eb6774..26c494b793 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/vnets-tab/form-panels/create.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/form-panels/create/advanced.hbs b/src/sunstone/public/app/tabs/vnets-tab/form-panels/create/advanced.hbs index 94ea336cb1..9432b09f9a 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/form-panels/create/advanced.hbs +++ b/src/sunstone/public/app/tabs/vnets-tab/form-panels/create/advanced.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vnets-tab/form-panels/create/formPanelId.js b/src/sunstone/public/app/tabs/vnets-tab/form-panels/create/formPanelId.js index 8bcea84847..db1a8e407d 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/form-panels/create/formPanelId.js +++ b/src/sunstone/public/app/tabs/vnets-tab/form-panels/create/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/vnets-tab/form-panels/create/wizard.hbs index eb1457471a..072f42794c 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/form-panels/create/wizard.hbs +++ b/src/sunstone/public/app/tabs/vnets-tab/form-panels/create/wizard.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vnets-tab/form-panels/import.js b/src/sunstone/public/app/tabs/vnets-tab/form-panels/import.js index 7cb4a0d19b..23759c4db2 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/form-panels/import.js +++ b/src/sunstone/public/app/tabs/vnets-tab/form-panels/import.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/form-panels/import/formPanelId.js b/src/sunstone/public/app/tabs/vnets-tab/form-panels/import/formPanelId.js index a672e80a1c..39823402a1 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/form-panels/import/formPanelId.js +++ b/src/sunstone/public/app/tabs/vnets-tab/form-panels/import/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/form-panels/import/html.hbs b/src/sunstone/public/app/tabs/vnets-tab/form-panels/import/html.hbs index 8d681682d9..16b1fb409b 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/form-panels/import/html.hbs +++ b/src/sunstone/public/app/tabs/vnets-tab/form-panels/import/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vnets-tab/form-panels/instantiate.js b/src/sunstone/public/app/tabs/vnets-tab/form-panels/instantiate.js index 9b17a2db53..4466aa3d57 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/form-panels/instantiate.js +++ b/src/sunstone/public/app/tabs/vnets-tab/form-panels/instantiate.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/form-panels/instantiate/formPanelId.js b/src/sunstone/public/app/tabs/vnets-tab/form-panels/instantiate/formPanelId.js index e427b8acaa..df20a99317 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/form-panels/instantiate/formPanelId.js +++ b/src/sunstone/public/app/tabs/vnets-tab/form-panels/instantiate/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/panels/ar.js b/src/sunstone/public/app/tabs/vnets-tab/panels/ar.js index f5b44e2f22..350942f31d 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/panels/ar.js +++ b/src/sunstone/public/app/tabs/vnets-tab/panels/ar.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/panels/ar/arInfo.hbs b/src/sunstone/public/app/tabs/vnets-tab/panels/ar/arInfo.hbs index 0b3f460177..cc0fdeb9b6 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/panels/ar/arInfo.hbs +++ b/src/sunstone/public/app/tabs/vnets-tab/panels/ar/arInfo.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vnets-tab/panels/ar/html.hbs b/src/sunstone/public/app/tabs/vnets-tab/panels/ar/html.hbs index b8946a162f..0e9a6a7539 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/panels/ar/html.hbs +++ b/src/sunstone/public/app/tabs/vnets-tab/panels/ar/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vnets-tab/panels/ar/panelId.js b/src/sunstone/public/app/tabs/vnets-tab/panels/ar/panelId.js index f4c397006c..0c05f75e66 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/panels/ar/panelId.js +++ b/src/sunstone/public/app/tabs/vnets-tab/panels/ar/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/panels/clusters.js b/src/sunstone/public/app/tabs/vnets-tab/panels/clusters.js index 0a19878c33..2f17ad8a6e 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/panels/clusters.js +++ b/src/sunstone/public/app/tabs/vnets-tab/panels/clusters.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/panels/clusters/panelId.js b/src/sunstone/public/app/tabs/vnets-tab/panels/clusters/panelId.js index b565a2cb71..3748a2cc92 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/panels/clusters/panelId.js +++ b/src/sunstone/public/app/tabs/vnets-tab/panels/clusters/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/panels/info.js b/src/sunstone/public/app/tabs/vnets-tab/panels/info.js index 46c89b8a64..91bd642311 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/vnets-tab/panels/info.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/vnets-tab/panels/info/html.hbs index 79cb2dc548..7cf854db7c 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/vnets-tab/panels/info/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vnets-tab/panels/info/panelId.js b/src/sunstone/public/app/tabs/vnets-tab/panels/info/panelId.js index e6581d871e..7d331a1e17 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/panels/info/panelId.js +++ b/src/sunstone/public/app/tabs/vnets-tab/panels/info/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/panels/leases.js b/src/sunstone/public/app/tabs/vnets-tab/panels/leases.js index aec475c7b8..0290732fe7 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/panels/leases.js +++ b/src/sunstone/public/app/tabs/vnets-tab/panels/leases.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/panels/leases/html.hbs b/src/sunstone/public/app/tabs/vnets-tab/panels/leases/html.hbs index 66d7805646..6a38421a35 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/panels/leases/html.hbs +++ b/src/sunstone/public/app/tabs/vnets-tab/panels/leases/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vnets-tab/panels/leases/panelId.js b/src/sunstone/public/app/tabs/vnets-tab/panels/leases/panelId.js index f1cfe2144c..b1a8cc7067 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/panels/leases/panelId.js +++ b/src/sunstone/public/app/tabs/vnets-tab/panels/leases/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/panels/secgroups.js b/src/sunstone/public/app/tabs/vnets-tab/panels/secgroups.js index c8a7478b06..9b6ec8d210 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/panels/secgroups.js +++ b/src/sunstone/public/app/tabs/vnets-tab/panels/secgroups.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/panels/secgroups/panelId.js b/src/sunstone/public/app/tabs/vnets-tab/panels/secgroups/panelId.js index 925a0114a8..5bf82d78ac 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/panels/secgroups/panelId.js +++ b/src/sunstone/public/app/tabs/vnets-tab/panels/secgroups/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/panels/vrouters.js b/src/sunstone/public/app/tabs/vnets-tab/panels/vrouters.js index c518a973fa..f09f65d1db 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/panels/vrouters.js +++ b/src/sunstone/public/app/tabs/vnets-tab/panels/vrouters.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/panels/vrouters/panelId.js b/src/sunstone/public/app/tabs/vnets-tab/panels/vrouters/panelId.js index a598a0d0e4..850cb58ef3 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/panels/vrouters/panelId.js +++ b/src/sunstone/public/app/tabs/vnets-tab/panels/vrouters/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/tabId.js b/src/sunstone/public/app/tabs/vnets-tab/tabId.js index eedb5a396e..09e11e6779 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/tabId.js +++ b/src/sunstone/public/app/tabs/vnets-tab/tabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/utils/ar-tab.js b/src/sunstone/public/app/tabs/vnets-tab/utils/ar-tab.js index a65a69c5a1..0ba310eb92 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/utils/ar-tab.js +++ b/src/sunstone/public/app/tabs/vnets-tab/utils/ar-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-tab/utils/ar-tab/html.hbs b/src/sunstone/public/app/tabs/vnets-tab/utils/ar-tab/html.hbs index 85aba1f4f4..d8d81a0704 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/utils/ar-tab/html.hbs +++ b/src/sunstone/public/app/tabs/vnets-tab/utils/ar-tab/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vnets-tab/utils/common.js b/src/sunstone/public/app/tabs/vnets-tab/utils/common.js index 31fc2ebebf..6e0d04a128 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/utils/common.js +++ b/src/sunstone/public/app/tabs/vnets-tab/utils/common.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab.js b/src/sunstone/public/app/tabs/vnets-templates-tab.js index c823cf5c6d..99689fcdc0 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab.js +++ b/src/sunstone/public/app/tabs/vnets-templates-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/actions.js b/src/sunstone/public/app/tabs/vnets-templates-tab/actions.js index 42e65b0bf9..68af0123bd 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/actions.js +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/actions.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/buttons.js b/src/sunstone/public/app/tabs/vnets-templates-tab/buttons.js index a1cbbbc3a3..74dcfbe61a 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/buttons.js +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/buttons.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/datatable.js b/src/sunstone/public/app/tabs/vnets-templates-tab/datatable.js index 474620eeb0..1466a6fe78 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/datatable.js +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/datatable.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/add-ar.js b/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/add-ar.js index 0d4d6aab33..0a95161d59 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/add-ar.js +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/add-ar.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/add-ar/dialogId.js b/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/add-ar/dialogId.js index 0a98fb7d06..29790a886f 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/add-ar/dialogId.js +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/add-ar/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/instantiate-add-ar.js b/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/instantiate-add-ar.js index a2a4043c06..176290739f 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/instantiate-add-ar.js +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/instantiate-add-ar.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/instantiate-add-ar/dialogId.js b/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/instantiate-add-ar/dialogId.js index a7ae8e13f9..98765dc314 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/instantiate-add-ar/dialogId.js +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/instantiate-add-ar/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/instantiate-update-ar.js b/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/instantiate-update-ar.js index e5dbeacdae..8832eb6bbc 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/instantiate-update-ar.js +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/instantiate-update-ar.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/instantiate-update-ar/dialogId.js b/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/instantiate-update-ar/dialogId.js index 899c6ba2db..f9dbcd6484 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/instantiate-update-ar/dialogId.js +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/instantiate-update-ar/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/update-ar.js b/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/update-ar.js index aa12db8f37..e8be482700 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/update-ar.js +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/update-ar.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/update-ar/dialogId.js b/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/update-ar/dialogId.js index 86a53f960e..826324f812 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/update-ar/dialogId.js +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/dialogs/update-ar/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/create.js b/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/create.js index 1417b52b4b..5e108e8f85 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/create.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/create/formPanelId.js b/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/create/formPanelId.js index facda1ac22..3b9981c208 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/create/formPanelId.js +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/create/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/instantiate.js b/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/instantiate.js index 8a06653289..c3d4aa4277 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/instantiate.js +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/instantiate.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/instantiate/formPanelId.js b/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/instantiate/formPanelId.js index dded9f0b50..d8ded8253a 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/instantiate/formPanelId.js +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/instantiate/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/instantiate/html.hbs b/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/instantiate/html.hbs index 1ca3b97d02..65e18ee823 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/instantiate/html.hbs +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/instantiate/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/instantiate/templateRow.hbs b/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/instantiate/templateRow.hbs index 733c276676..544f76a27c 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/instantiate/templateRow.hbs +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/form-panels/instantiate/templateRow.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/panels/ar.js b/src/sunstone/public/app/tabs/vnets-templates-tab/panels/ar.js index b95751a261..01b49861c6 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/panels/ar.js +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/panels/ar.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/panels/ar/panelId.js b/src/sunstone/public/app/tabs/vnets-templates-tab/panels/ar/panelId.js index 9be96896b8..3a4d816639 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/panels/ar/panelId.js +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/panels/ar/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/panels/clusters.js b/src/sunstone/public/app/tabs/vnets-templates-tab/panels/clusters.js index e633e9ad5e..0c1ff35717 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/panels/clusters.js +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/panels/clusters.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/panels/clusters/panelId.js b/src/sunstone/public/app/tabs/vnets-templates-tab/panels/clusters/panelId.js index 926158b205..18c8f278da 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/panels/clusters/panelId.js +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/panels/clusters/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/panels/info.js b/src/sunstone/public/app/tabs/vnets-templates-tab/panels/info.js index 983a88b0eb..d4fe609cd2 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/panels/info.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/panels/info/panelId.js b/src/sunstone/public/app/tabs/vnets-templates-tab/panels/info/panelId.js index 9e7d0291c1..886bf3f3a5 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/panels/info/panelId.js +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/panels/info/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/panels/secgroups.js b/src/sunstone/public/app/tabs/vnets-templates-tab/panels/secgroups.js index e87512877f..0769fe23fd 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/panels/secgroups.js +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/panels/secgroups.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/panels/secgroups/panelId.js b/src/sunstone/public/app/tabs/vnets-templates-tab/panels/secgroups/panelId.js index 61d5ead459..e39edd1cec 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/panels/secgroups/panelId.js +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/panels/secgroups/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/panels/template/html.hbs b/src/sunstone/public/app/tabs/vnets-templates-tab/panels/template/html.hbs index db7e6a9acc..6882c74380 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/panels/template/html.hbs +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/panels/template/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/panels/template/panelId.js b/src/sunstone/public/app/tabs/vnets-templates-tab/panels/template/panelId.js index 04055fdaf2..c1e509ff5d 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/panels/template/panelId.js +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/panels/template/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/panels/templates.js b/src/sunstone/public/app/tabs/vnets-templates-tab/panels/templates.js index e6261cc0c1..27c488ad94 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/panels/templates.js +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/panels/templates.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-templates-tab/tabId.js b/src/sunstone/public/app/tabs/vnets-templates-tab/tabId.js index 8bd014ea7a..04dd69ab61 100644 --- a/src/sunstone/public/app/tabs/vnets-templates-tab/tabId.js +++ b/src/sunstone/public/app/tabs/vnets-templates-tab/tabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-topology-tab.js b/src/sunstone/public/app/tabs/vnets-topology-tab.js index eec04135bd..93a6862dab 100644 --- a/src/sunstone/public/app/tabs/vnets-topology-tab.js +++ b/src/sunstone/public/app/tabs/vnets-topology-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vnets-topology-tab/html.hbs b/src/sunstone/public/app/tabs/vnets-topology-tab/html.hbs index e970eab847..4edd39832f 100644 --- a/src/sunstone/public/app/tabs/vnets-topology-tab/html.hbs +++ b/src/sunstone/public/app/tabs/vnets-topology-tab/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vnets-topology-tab/tabId.js b/src/sunstone/public/app/tabs/vnets-topology-tab/tabId.js index 802e525a9d..5b56d6c900 100644 --- a/src/sunstone/public/app/tabs/vnets-topology-tab/tabId.js +++ b/src/sunstone/public/app/tabs/vnets-topology-tab/tabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vrouter-templates-tab.js b/src/sunstone/public/app/tabs/vrouter-templates-tab.js index f8ab20bb13..77b63fc812 100644 --- a/src/sunstone/public/app/tabs/vrouter-templates-tab.js +++ b/src/sunstone/public/app/tabs/vrouter-templates-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vrouter-templates-tab/actions.js b/src/sunstone/public/app/tabs/vrouter-templates-tab/actions.js index 713058365f..8373d63384 100644 --- a/src/sunstone/public/app/tabs/vrouter-templates-tab/actions.js +++ b/src/sunstone/public/app/tabs/vrouter-templates-tab/actions.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vrouter-templates-tab/buttons.js b/src/sunstone/public/app/tabs/vrouter-templates-tab/buttons.js index 6c81314f6e..9b11172484 100644 --- a/src/sunstone/public/app/tabs/vrouter-templates-tab/buttons.js +++ b/src/sunstone/public/app/tabs/vrouter-templates-tab/buttons.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vrouter-templates-tab/datatable.js b/src/sunstone/public/app/tabs/vrouter-templates-tab/datatable.js index 3f2d240dad..b8b2a74312 100644 --- a/src/sunstone/public/app/tabs/vrouter-templates-tab/datatable.js +++ b/src/sunstone/public/app/tabs/vrouter-templates-tab/datatable.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/create.js b/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/create.js index 77e95f5558..c5e1b479c9 100644 --- a/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/create.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/create/formPanelId.js b/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/create/formPanelId.js index c0b554730f..3fd4dd7a06 100644 --- a/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/create/formPanelId.js +++ b/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/create/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/instantiate.js b/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/instantiate.js index 21f0ffabfd..1a543cf462 100644 --- a/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/instantiate.js +++ b/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/instantiate.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/instantiate/formPanelId.js b/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/instantiate/formPanelId.js index e0de184bd1..02fd1aca04 100644 --- a/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/instantiate/formPanelId.js +++ b/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/instantiate/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/instantiate/templateSelection.hbs b/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/instantiate/templateSelection.hbs index d8f00bc099..a38e8ee215 100644 --- a/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/instantiate/templateSelection.hbs +++ b/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/instantiate/templateSelection.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/instantiate/wizard.hbs b/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/instantiate/wizard.hbs index 285c7b0088..0ef2f976c7 100644 --- a/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/instantiate/wizard.hbs +++ b/src/sunstone/public/app/tabs/vrouter-templates-tab/form-panels/instantiate/wizard.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vrouter-templates-tab/panels/info.js b/src/sunstone/public/app/tabs/vrouter-templates-tab/panels/info.js index 201b20387f..e60ab6ddda 100644 --- a/src/sunstone/public/app/tabs/vrouter-templates-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/vrouter-templates-tab/panels/info.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vrouter-templates-tab/panels/info/panelId.js b/src/sunstone/public/app/tabs/vrouter-templates-tab/panels/info/panelId.js index 24e54b50a6..0973f27cc2 100644 --- a/src/sunstone/public/app/tabs/vrouter-templates-tab/panels/info/panelId.js +++ b/src/sunstone/public/app/tabs/vrouter-templates-tab/panels/info/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vrouter-templates-tab/panels/template.js b/src/sunstone/public/app/tabs/vrouter-templates-tab/panels/template.js index 2d65dae526..ca74ab8da6 100644 --- a/src/sunstone/public/app/tabs/vrouter-templates-tab/panels/template.js +++ b/src/sunstone/public/app/tabs/vrouter-templates-tab/panels/template.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vrouter-templates-tab/panels/template/panelId.js b/src/sunstone/public/app/tabs/vrouter-templates-tab/panels/template/panelId.js index 794c7193a9..7f34b1f5c0 100644 --- a/src/sunstone/public/app/tabs/vrouter-templates-tab/panels/template/panelId.js +++ b/src/sunstone/public/app/tabs/vrouter-templates-tab/panels/template/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vrouter-templates-tab/tabId.js b/src/sunstone/public/app/tabs/vrouter-templates-tab/tabId.js index f7cc9ec7cd..14c78dc4c4 100644 --- a/src/sunstone/public/app/tabs/vrouter-templates-tab/tabId.js +++ b/src/sunstone/public/app/tabs/vrouter-templates-tab/tabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vrouters-tab.js b/src/sunstone/public/app/tabs/vrouters-tab.js index 7af6e72229..217ee411b2 100644 --- a/src/sunstone/public/app/tabs/vrouters-tab.js +++ b/src/sunstone/public/app/tabs/vrouters-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vrouters-tab/actions.js b/src/sunstone/public/app/tabs/vrouters-tab/actions.js index a95591020e..aa161363c1 100644 --- a/src/sunstone/public/app/tabs/vrouters-tab/actions.js +++ b/src/sunstone/public/app/tabs/vrouters-tab/actions.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vrouters-tab/buttons.js b/src/sunstone/public/app/tabs/vrouters-tab/buttons.js index 39c3948fd7..3a0ca18529 100644 --- a/src/sunstone/public/app/tabs/vrouters-tab/buttons.js +++ b/src/sunstone/public/app/tabs/vrouters-tab/buttons.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vrouters-tab/datatable.js b/src/sunstone/public/app/tabs/vrouters-tab/datatable.js index 71acd1e091..6cf4717649 100644 --- a/src/sunstone/public/app/tabs/vrouters-tab/datatable.js +++ b/src/sunstone/public/app/tabs/vrouters-tab/datatable.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vrouters-tab/dialogs/attach-nic.js b/src/sunstone/public/app/tabs/vrouters-tab/dialogs/attach-nic.js index 4922157ff9..c1a35031ca 100644 --- a/src/sunstone/public/app/tabs/vrouters-tab/dialogs/attach-nic.js +++ b/src/sunstone/public/app/tabs/vrouters-tab/dialogs/attach-nic.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vrouters-tab/dialogs/attach-nic/dialogId.js b/src/sunstone/public/app/tabs/vrouters-tab/dialogs/attach-nic/dialogId.js index a168642681..5f5d05677e 100644 --- a/src/sunstone/public/app/tabs/vrouters-tab/dialogs/attach-nic/dialogId.js +++ b/src/sunstone/public/app/tabs/vrouters-tab/dialogs/attach-nic/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vrouters-tab/dialogs/attach-nic/html.hbs b/src/sunstone/public/app/tabs/vrouters-tab/dialogs/attach-nic/html.hbs index 2463576b7d..ed37fdb109 100644 --- a/src/sunstone/public/app/tabs/vrouters-tab/dialogs/attach-nic/html.hbs +++ b/src/sunstone/public/app/tabs/vrouters-tab/dialogs/attach-nic/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js index faceede0de..3180340b1c 100644 --- a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/advanced.hbs b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/advanced.hbs index 830feca061..128f7a3b9e 100644 --- a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/advanced.hbs +++ b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/advanced.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/formPanelId.js b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/formPanelId.js index 98ad7b4598..15b7bc95e6 100644 --- a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/formPanelId.js +++ b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/create/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/instantiate.js b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/instantiate.js index 49c932efc4..5ecbe276aa 100644 --- a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/instantiate.js +++ b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/instantiate.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/instantiate/formPanelId.js b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/instantiate/formPanelId.js index 13aeafcdd4..67e14c9d71 100644 --- a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/instantiate/formPanelId.js +++ b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/instantiate/formPanelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/instantiate/html.hbs b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/instantiate/html.hbs index cc0b0e90f4..89882a2fea 100644 --- a/src/sunstone/public/app/tabs/vrouters-tab/form-panels/instantiate/html.hbs +++ b/src/sunstone/public/app/tabs/vrouters-tab/form-panels/instantiate/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vrouters-tab/panels/info.js b/src/sunstone/public/app/tabs/vrouters-tab/panels/info.js index 0a0852e7a9..2fddb24484 100644 --- a/src/sunstone/public/app/tabs/vrouters-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/vrouters-tab/panels/info.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs index d17f46217b..4f96ef3eaa 100644 --- a/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/vrouters-tab/panels/info/panelId.js b/src/sunstone/public/app/tabs/vrouters-tab/panels/info/panelId.js index c8378993e0..9e76041869 100644 --- a/src/sunstone/public/app/tabs/vrouters-tab/panels/info/panelId.js +++ b/src/sunstone/public/app/tabs/vrouters-tab/panels/info/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vrouters-tab/panels/vms.js b/src/sunstone/public/app/tabs/vrouters-tab/panels/vms.js index c072d063d2..829509e044 100644 --- a/src/sunstone/public/app/tabs/vrouters-tab/panels/vms.js +++ b/src/sunstone/public/app/tabs/vrouters-tab/panels/vms.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vrouters-tab/panels/vms/panelId.js b/src/sunstone/public/app/tabs/vrouters-tab/panels/vms/panelId.js index 3904a2db7e..1e5353e124 100644 --- a/src/sunstone/public/app/tabs/vrouters-tab/panels/vms/panelId.js +++ b/src/sunstone/public/app/tabs/vrouters-tab/panels/vms/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/vrouters-tab/tabId.js b/src/sunstone/public/app/tabs/vrouters-tab/tabId.js index a3a89a606e..56f3e9c3c7 100644 --- a/src/sunstone/public/app/tabs/vrouters-tab/tabId.js +++ b/src/sunstone/public/app/tabs/vrouters-tab/tabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/zones-tab.js b/src/sunstone/public/app/tabs/zones-tab.js index 3a52f3746e..1901b5d766 100644 --- a/src/sunstone/public/app/tabs/zones-tab.js +++ b/src/sunstone/public/app/tabs/zones-tab.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/zones-tab/actions.js b/src/sunstone/public/app/tabs/zones-tab/actions.js index e2033615e1..3f4159999c 100644 --- a/src/sunstone/public/app/tabs/zones-tab/actions.js +++ b/src/sunstone/public/app/tabs/zones-tab/actions.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/zones-tab/buttons.js b/src/sunstone/public/app/tabs/zones-tab/buttons.js index 28cb628e82..fa13476225 100644 --- a/src/sunstone/public/app/tabs/zones-tab/buttons.js +++ b/src/sunstone/public/app/tabs/zones-tab/buttons.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/zones-tab/datatable.js b/src/sunstone/public/app/tabs/zones-tab/datatable.js index 8aa5d2fa64..f6665f06a5 100644 --- a/src/sunstone/public/app/tabs/zones-tab/datatable.js +++ b/src/sunstone/public/app/tabs/zones-tab/datatable.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/zones-tab/dialogs/create.js b/src/sunstone/public/app/tabs/zones-tab/dialogs/create.js index edcbac670a..86c8430e77 100644 --- a/src/sunstone/public/app/tabs/zones-tab/dialogs/create.js +++ b/src/sunstone/public/app/tabs/zones-tab/dialogs/create.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/zones-tab/dialogs/create/dialogId.js b/src/sunstone/public/app/tabs/zones-tab/dialogs/create/dialogId.js index 2515f0385e..9451d8b526 100644 --- a/src/sunstone/public/app/tabs/zones-tab/dialogs/create/dialogId.js +++ b/src/sunstone/public/app/tabs/zones-tab/dialogs/create/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/zones-tab/dialogs/create/html.hbs b/src/sunstone/public/app/tabs/zones-tab/dialogs/create/html.hbs index 2abf18b560..0eb4118895 100644 --- a/src/sunstone/public/app/tabs/zones-tab/dialogs/create/html.hbs +++ b/src/sunstone/public/app/tabs/zones-tab/dialogs/create/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/zones-tab/panels/info.js b/src/sunstone/public/app/tabs/zones-tab/panels/info.js index 10ebdc398b..1566e17aac 100644 --- a/src/sunstone/public/app/tabs/zones-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/zones-tab/panels/info.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/zones-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/zones-tab/panels/info/html.hbs index f70cdaa7e6..a60ba3865f 100644 --- a/src/sunstone/public/app/tabs/zones-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/zones-tab/panels/info/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/tabs/zones-tab/panels/info/panelId.js b/src/sunstone/public/app/tabs/zones-tab/panels/info/panelId.js index 18cbd65dcc..1c7e5e82ab 100644 --- a/src/sunstone/public/app/tabs/zones-tab/panels/info/panelId.js +++ b/src/sunstone/public/app/tabs/zones-tab/panels/info/panelId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/tabs/zones-tab/tabId.js b/src/sunstone/public/app/tabs/zones-tab/tabId.js index f11bbdd0dd..a338db0399 100644 --- a/src/sunstone/public/app/tabs/zones-tab/tabId.js +++ b/src/sunstone/public/app/tabs/zones-tab/tabId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/templates/helpers/advancedImportationSection.js b/src/sunstone/public/app/templates/helpers/advancedImportationSection.js index a4dc31e5fb..938391de47 100644 --- a/src/sunstone/public/app/templates/helpers/advancedImportationSection.js +++ b/src/sunstone/public/app/templates/helpers/advancedImportationSection.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/templates/helpers/advancedSection.js b/src/sunstone/public/app/templates/helpers/advancedSection.js index 1cc31f97ea..cd9a184d58 100644 --- a/src/sunstone/public/app/templates/helpers/advancedSection.js +++ b/src/sunstone/public/app/templates/helpers/advancedSection.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/templates/helpers/htmlDecode.js b/src/sunstone/public/app/templates/helpers/htmlDecode.js index 89a045aaca..a774ff6643 100644 --- a/src/sunstone/public/app/templates/helpers/htmlDecode.js +++ b/src/sunstone/public/app/templates/helpers/htmlDecode.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/templates/helpers/humanizeSize.js b/src/sunstone/public/app/templates/helpers/humanizeSize.js index 70686b9b58..e0c0b87ccc 100644 --- a/src/sunstone/public/app/templates/helpers/humanizeSize.js +++ b/src/sunstone/public/app/templates/helpers/humanizeSize.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/templates/helpers/humanizeTime.js b/src/sunstone/public/app/templates/helpers/humanizeTime.js index 124644eb00..fa749a8245 100644 --- a/src/sunstone/public/app/templates/helpers/humanizeTime.js +++ b/src/sunstone/public/app/templates/helpers/humanizeTime.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/templates/helpers/isAdvancedEnabled.js b/src/sunstone/public/app/templates/helpers/isAdvancedEnabled.js index e306fec243..29153db105 100644 --- a/src/sunstone/public/app/templates/helpers/isAdvancedEnabled.js +++ b/src/sunstone/public/app/templates/helpers/isAdvancedEnabled.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/templates/helpers/isFeatureEnabled.js b/src/sunstone/public/app/templates/helpers/isFeatureEnabled.js index be15189bc4..6412e5fa4a 100644 --- a/src/sunstone/public/app/templates/helpers/isFeatureEnabled.js +++ b/src/sunstone/public/app/templates/helpers/isFeatureEnabled.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/templates/helpers/isProvisionTabEnabled.js b/src/sunstone/public/app/templates/helpers/isProvisionTabEnabled.js index 7ff5ddcc88..e528cb11e2 100644 --- a/src/sunstone/public/app/templates/helpers/isProvisionTabEnabled.js +++ b/src/sunstone/public/app/templates/helpers/isProvisionTabEnabled.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project (OpenNebula.org), C12G Labs */ +/* Copyright 2002-2019, OpenNebula Project (OpenNebula.org), C12G Labs */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/templates/helpers/isTabActionEnabled.js b/src/sunstone/public/app/templates/helpers/isTabActionEnabled.js index cae2064219..f88dc0a62e 100644 --- a/src/sunstone/public/app/templates/helpers/isTabActionEnabled.js +++ b/src/sunstone/public/app/templates/helpers/isTabActionEnabled.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/templates/helpers/isTabPanelEnabled.js b/src/sunstone/public/app/templates/helpers/isTabPanelEnabled.js index 3ba61709eb..7d2aa3244a 100644 --- a/src/sunstone/public/app/templates/helpers/isTabPanelEnabled.js +++ b/src/sunstone/public/app/templates/helpers/isTabPanelEnabled.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/templates/helpers/navigate.js b/src/sunstone/public/app/templates/helpers/navigate.js index 1e86da9a31..f82c51effd 100644 --- a/src/sunstone/public/app/templates/helpers/navigate.js +++ b/src/sunstone/public/app/templates/helpers/navigate.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/templates/helpers/tip.js b/src/sunstone/public/app/templates/helpers/tip.js index f0632dacf1..2e497c5da5 100644 --- a/src/sunstone/public/app/templates/helpers/tip.js +++ b/src/sunstone/public/app/templates/helpers/tip.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/templates/helpers/tr.js b/src/sunstone/public/app/templates/helpers/tr.js index 7dc63abd47..876baba3fd 100644 --- a/src/sunstone/public/app/templates/helpers/tr.js +++ b/src/sunstone/public/app/templates/helpers/tr.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/templates/helpers/valOrDefault.js b/src/sunstone/public/app/templates/helpers/valOrDefault.js index 8441765784..04e1e886bd 100644 --- a/src/sunstone/public/app/templates/helpers/valOrDefault.js +++ b/src/sunstone/public/app/templates/helpers/valOrDefault.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/accounting.js b/src/sunstone/public/app/utils/accounting.js index 62d3b7f2e8..0470112c45 100644 --- a/src/sunstone/public/app/utils/accounting.js +++ b/src/sunstone/public/app/utils/accounting.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/accounting/empty-graph.hbs b/src/sunstone/public/app/utils/accounting/empty-graph.hbs index b8a08702ee..4e75f8b7cb 100644 --- a/src/sunstone/public/app/utils/accounting/empty-graph.hbs +++ b/src/sunstone/public/app/utils/accounting/empty-graph.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/accounting/html.hbs b/src/sunstone/public/app/utils/accounting/html.hbs index 7f2a2b1d12..cf90aa2c26 100644 --- a/src/sunstone/public/app/utils/accounting/html.hbs +++ b/src/sunstone/public/app/utils/accounting/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/actions.js b/src/sunstone/public/app/utils/actions.js index 94de2f5aae..de7aacf9b1 100644 --- a/src/sunstone/public/app/utils/actions.js +++ b/src/sunstone/public/app/utils/actions.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/browser-info.js b/src/sunstone/public/app/utils/browser-info.js index 99b74994a2..b8bed546a3 100644 --- a/src/sunstone/public/app/utils/browser-info.js +++ b/src/sunstone/public/app/utils/browser-info.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/common-actions.js b/src/sunstone/public/app/utils/common-actions.js index 328e4a72a2..98d1a4f81f 100644 --- a/src/sunstone/public/app/utils/common-actions.js +++ b/src/sunstone/public/app/utils/common-actions.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/custom-tags-table.js b/src/sunstone/public/app/utils/custom-tags-table.js index 290d589996..1c41aeb5f4 100644 --- a/src/sunstone/public/app/utils/custom-tags-table.js +++ b/src/sunstone/public/app/utils/custom-tags-table.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/custom-tags-table/html.hbs b/src/sunstone/public/app/utils/custom-tags-table/html.hbs index b184d2ef3a..8bcab77798 100644 --- a/src/sunstone/public/app/utils/custom-tags-table/html.hbs +++ b/src/sunstone/public/app/utils/custom-tags-table/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/custom-tags-table/row.hbs b/src/sunstone/public/app/utils/custom-tags-table/row.hbs index 19bf243abd..4aa78e67ee 100644 --- a/src/sunstone/public/app/utils/custom-tags-table/row.hbs +++ b/src/sunstone/public/app/utils/custom-tags-table/row.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/dashboard.js b/src/sunstone/public/app/utils/dashboard.js index e83c3ed0d5..a3cc58b7ac 100644 --- a/src/sunstone/public/app/utils/dashboard.js +++ b/src/sunstone/public/app/utils/dashboard.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/dialogs/clusters.js b/src/sunstone/public/app/utils/dialogs/clusters.js index 51f495e235..afbf5e7e37 100644 --- a/src/sunstone/public/app/utils/dialogs/clusters.js +++ b/src/sunstone/public/app/utils/dialogs/clusters.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -152,9 +152,9 @@ define(function(require) { } else { clusters = this.element.TEMPLATE.CLUSTERS; - clusters = clusters.split(","); if (clusters !== undefined ) { + clusters = clusters.split(","); if ($.isArray(clusters)) { this.originalClusterIds = clusters; } else { diff --git a/src/sunstone/public/app/utils/dialogs/clusters/dialogId.js b/src/sunstone/public/app/utils/dialogs/clusters/dialogId.js index 790aa637d0..8b8fcdb222 100644 --- a/src/sunstone/public/app/utils/dialogs/clusters/dialogId.js +++ b/src/sunstone/public/app/utils/dialogs/clusters/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/dialogs/confirm-with-select.js b/src/sunstone/public/app/utils/dialogs/confirm-with-select.js index c43e233a03..9cc21e086f 100644 --- a/src/sunstone/public/app/utils/dialogs/confirm-with-select.js +++ b/src/sunstone/public/app/utils/dialogs/confirm-with-select.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/dialogs/confirm-with-select/dialogId.js b/src/sunstone/public/app/utils/dialogs/confirm-with-select/dialogId.js index e0a7cecc49..54d119937d 100644 --- a/src/sunstone/public/app/utils/dialogs/confirm-with-select/dialogId.js +++ b/src/sunstone/public/app/utils/dialogs/confirm-with-select/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/dialogs/confirm-with-select/html.hbs b/src/sunstone/public/app/utils/dialogs/confirm-with-select/html.hbs index 930184fec4..fe62eb4679 100644 --- a/src/sunstone/public/app/utils/dialogs/confirm-with-select/html.hbs +++ b/src/sunstone/public/app/utils/dialogs/confirm-with-select/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/dialogs/confirm.js b/src/sunstone/public/app/utils/dialogs/confirm.js index 2ff3878f1e..a6116f8247 100644 --- a/src/sunstone/public/app/utils/dialogs/confirm.js +++ b/src/sunstone/public/app/utils/dialogs/confirm.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/dialogs/confirm/dialogId.js b/src/sunstone/public/app/utils/dialogs/confirm/dialogId.js index 3ba1887521..26c644acbc 100644 --- a/src/sunstone/public/app/utils/dialogs/confirm/dialogId.js +++ b/src/sunstone/public/app/utils/dialogs/confirm/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/dialogs/confirm/html.hbs b/src/sunstone/public/app/utils/dialogs/confirm/html.hbs index 01e9eaaae1..3990406cce 100644 --- a/src/sunstone/public/app/utils/dialogs/confirm/html.hbs +++ b/src/sunstone/public/app/utils/dialogs/confirm/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/dialogs/dialog.js b/src/sunstone/public/app/utils/dialogs/dialog.js index 4b985404d8..e90049422e 100644 --- a/src/sunstone/public/app/utils/dialogs/dialog.js +++ b/src/sunstone/public/app/utils/dialogs/dialog.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/dialogs/generic-confirm.js b/src/sunstone/public/app/utils/dialogs/generic-confirm.js index 482bd28f4b..94fd42c25c 100644 --- a/src/sunstone/public/app/utils/dialogs/generic-confirm.js +++ b/src/sunstone/public/app/utils/dialogs/generic-confirm.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/dialogs/generic-confirm/dialogId.js b/src/sunstone/public/app/utils/dialogs/generic-confirm/dialogId.js index 5814a6a312..d3c407b884 100644 --- a/src/sunstone/public/app/utils/dialogs/generic-confirm/dialogId.js +++ b/src/sunstone/public/app/utils/dialogs/generic-confirm/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/dialogs/generic-confirm/html.hbs b/src/sunstone/public/app/utils/dialogs/generic-confirm/html.hbs index 82b1833cb9..0a4c254bbf 100644 --- a/src/sunstone/public/app/utils/dialogs/generic-confirm/html.hbs +++ b/src/sunstone/public/app/utils/dialogs/generic-confirm/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/dialogs/overcommit.js b/src/sunstone/public/app/utils/dialogs/overcommit.js index 62fbd6d8ad..8139b01ee2 100644 --- a/src/sunstone/public/app/utils/dialogs/overcommit.js +++ b/src/sunstone/public/app/utils/dialogs/overcommit.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/dialogs/overcommit/dialogId.js b/src/sunstone/public/app/utils/dialogs/overcommit/dialogId.js index 494cfe144b..f736c96a26 100644 --- a/src/sunstone/public/app/utils/dialogs/overcommit/dialogId.js +++ b/src/sunstone/public/app/utils/dialogs/overcommit/dialogId.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/dialogs/overcommit/html.hbs b/src/sunstone/public/app/utils/dialogs/overcommit/html.hbs index 3d178cd194..bded1ff445 100644 --- a/src/sunstone/public/app/utils/dialogs/overcommit/html.hbs +++ b/src/sunstone/public/app/utils/dialogs/overcommit/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/disks-resize.js b/src/sunstone/public/app/utils/disks-resize.js index 09ae93c05d..21f57bda1d 100644 --- a/src/sunstone/public/app/utils/disks-resize.js +++ b/src/sunstone/public/app/utils/disks-resize.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/disks-resize/html.hbs b/src/sunstone/public/app/utils/disks-resize/html.hbs index d4b03f47a8..553faed0c9 100644 --- a/src/sunstone/public/app/utils/disks-resize/html.hbs +++ b/src/sunstone/public/app/utils/disks-resize/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/dom-datatable.js b/src/sunstone/public/app/utils/dom-datatable.js index e4cae589ea..04751cfe20 100644 --- a/src/sunstone/public/app/utils/dom-datatable.js +++ b/src/sunstone/public/app/utils/dom-datatable.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/form-panels/form-panel.js b/src/sunstone/public/app/utils/form-panels/form-panel.js index 1f5d4bfe15..b5d008e05c 100644 --- a/src/sunstone/public/app/utils/form-panels/form-panel.js +++ b/src/sunstone/public/app/utils/form-panels/form-panel.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/graphs.js b/src/sunstone/public/app/utils/graphs.js index 9f475587bd..6726eec42f 100644 --- a/src/sunstone/public/app/utils/graphs.js +++ b/src/sunstone/public/app/utils/graphs.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/hooks/header.js b/src/sunstone/public/app/utils/hooks/header.js index 6f65a63f4e..182b52c2d9 100644 --- a/src/sunstone/public/app/utils/hooks/header.js +++ b/src/sunstone/public/app/utils/hooks/header.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/humanize.js b/src/sunstone/public/app/utils/humanize.js index 714d1014bd..d92457c66f 100644 --- a/src/sunstone/public/app/utils/humanize.js +++ b/src/sunstone/public/app/utils/humanize.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/labels/tree.js b/src/sunstone/public/app/utils/labels/tree.js index c0c756e14c..d5175ac1d9 100644 --- a/src/sunstone/public/app/utils/labels/tree.js +++ b/src/sunstone/public/app/utils/labels/tree.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/labels/utils.js b/src/sunstone/public/app/utils/labels/utils.js index 07a07364b1..287a367a4b 100644 --- a/src/sunstone/public/app/utils/labels/utils.js +++ b/src/sunstone/public/app/utils/labels/utils.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/locale.js b/src/sunstone/public/app/utils/locale.js index b350f44f72..2901296c82 100644 --- a/src/sunstone/public/app/utils/locale.js +++ b/src/sunstone/public/app/utils/locale.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/menu.js b/src/sunstone/public/app/utils/menu.js index e51f522363..7ea32d4539 100644 --- a/src/sunstone/public/app/utils/menu.js +++ b/src/sunstone/public/app/utils/menu.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/menu/provision-top-row.hbs b/src/sunstone/public/app/utils/menu/provision-top-row.hbs index 6759e783c1..f4c7db821e 100644 --- a/src/sunstone/public/app/utils/menu/provision-top-row.hbs +++ b/src/sunstone/public/app/utils/menu/provision-top-row.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/menu/top-row.hbs b/src/sunstone/public/app/utils/menu/top-row.hbs index 8d14adf508..f8651abd6f 100644 --- a/src/sunstone/public/app/utils/menu/top-row.hbs +++ b/src/sunstone/public/app/utils/menu/top-row.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/navigation.js b/src/sunstone/public/app/utils/navigation.js index 9a6450d033..542728c66b 100644 --- a/src/sunstone/public/app/utils/navigation.js +++ b/src/sunstone/public/app/utils/navigation.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/nics-section.js b/src/sunstone/public/app/utils/nics-section.js index b0a5973c4f..d293edf51f 100644 --- a/src/sunstone/public/app/utils/nics-section.js +++ b/src/sunstone/public/app/utils/nics-section.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -119,7 +119,7 @@ define(function(require) { nicId ++; }); - _hide_remove(context); + _hide_remove(); } } catch(err) { _generate_provision_network_accordion( @@ -371,6 +371,7 @@ define(function(require) { } else { if(alias_on && !alias) { $("#provision_accordion_dd_" + dd_context["dd_id"] + "_alias_parent", dd_context).show(); + $("#provision_accordion_dd_" + dd_context["dd_id"] + "_alias_parent", dd_context).click(); $(".network_selection", dd_context).hide(); $("#provision_accordion_dd_" + dd_context["dd_id"] + "_no_alias", dd_context).hide(); } else if (alias_on && alias) { @@ -384,7 +385,7 @@ define(function(require) { } }); - _hide_remove(that.context); + _hide_remove(); $("#provision_accordion_dd_" + dd_context["dd_id"] + "_alias_parent", dd_context).hide(); $(".network_selection", dd_context).show(); @@ -413,19 +414,16 @@ define(function(require) { if (!add) { $("#provision_accordion_dd_" + dd_context["dd_id"] + "_alias_parent", dd_context).append(new Option("No NIC available", "INVALID")); $("#provision_accordion_dd_" + dd_context["dd_id"] + "_alias_parent", dd_context).val("INVALID"); - } else if (add && selected_nic == "INVALID") { - selected_nic = $("#provision_accordion_dd_" + dd_context["dd_id"] + "_alias_parent option:first").val(); - $("#provision_accordion_dd_" + dd_context["dd_id"] + "_alias_parent", dd_context).val(selected_nic); } $.each(_nics, function(index, value) { - if (value.NAME == ("NIC" + dd_context["nic_id"])) { + if (value.NAME == ("NIC" + dd_context["nic_id"]) && selected_nic && selected_nic != "INVALID") { value.ALIAS = selected_nic; } }); if (selected_nic && selected_nic != "INVALID") { - _hide_remove(that.context); + _hide_remove(); $("#provision_accordion_dd_" + dd_context["dd_id"] + "_alias_parent", dd_context).val(selected_nic); } @@ -647,20 +645,18 @@ define(function(require) { }); $("#provision_accordion_dd_" + provision_nic_accordion_dd_id + "_interface_type_section", this.context).show(); - $("input#provision_accordion_dd_" + provision_nic_accordion_dd_id + "_interface_type", this.context).click(); $("#provision_accordion_dd_" + provision_nic_accordion_dd_id + "_alias_parent", this.context).show(); - $("#provision_accordion_dd_" + provision_nic_accordion_dd_id + "_alias_parent").empty(); - $("#provision_accordion_dd_" + provision_nic_accordion_dd_id + "_alias_parent").append(new Option(nicname, nicname)); + $("#provision_accordion_dd_" + provision_nic_accordion_dd_id + "_alias_parent", this.context).click(); + $("#provision_accordion_dd_" + provision_nic_accordion_dd_id + "_interface_type", this.context).click(); $("#provision_accordion_dd_" + provision_nic_accordion_dd_id + "_alias_parent", this.context).val(nicname); - $("#provision_accordion_dd_" + provision_nic_accordion_dd_id + "_network_selection", this.context).hide(); } - function _hide_remove(context) { + function _hide_remove() { $.each(_nics, function(index, value) { if (_nics.find(nic => nic.ALIAS === value.NAME)) { - $("#remove_nic_" + value.DD_ID, context).hide(); + $("#remove_nic_" + value.DD_ID).hide(); } else { - $("#remove_nic_" + value.DD_ID, context).show(); + $("#remove_nic_" + value.DD_ID).show(); } }); } diff --git a/src/sunstone/public/app/utils/notifier.js b/src/sunstone/public/app/utils/notifier.js index af1ebb63ad..a232c268ec 100644 --- a/src/sunstone/public/app/utils/notifier.js +++ b/src/sunstone/public/app/utils/notifier.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/panel/cluster-tr.js b/src/sunstone/public/app/utils/panel/cluster-tr.js index d136adb44c..32b7015c4b 100644 --- a/src/sunstone/public/app/utils/panel/cluster-tr.js +++ b/src/sunstone/public/app/utils/panel/cluster-tr.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/panel/cluster-tr/html.hbs b/src/sunstone/public/app/utils/panel/cluster-tr/html.hbs index 7b58f7805d..0cde91188a 100644 --- a/src/sunstone/public/app/utils/panel/cluster-tr/html.hbs +++ b/src/sunstone/public/app/utils/panel/cluster-tr/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/panel/ec2-tr.js b/src/sunstone/public/app/utils/panel/ec2-tr.js index 680eabb25c..1e80326a8f 100644 --- a/src/sunstone/public/app/utils/panel/ec2-tr.js +++ b/src/sunstone/public/app/utils/panel/ec2-tr.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/panel/permissions-table.js b/src/sunstone/public/app/utils/panel/permissions-table.js index 332ac16751..c49bc7cc0f 100644 --- a/src/sunstone/public/app/utils/panel/permissions-table.js +++ b/src/sunstone/public/app/utils/panel/permissions-table.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/panel/permissions-table/group.hbs b/src/sunstone/public/app/utils/panel/permissions-table/group.hbs index 7945f762f9..f6216a0162 100644 --- a/src/sunstone/public/app/utils/panel/permissions-table/group.hbs +++ b/src/sunstone/public/app/utils/panel/permissions-table/group.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/panel/permissions-table/html.hbs b/src/sunstone/public/app/utils/panel/permissions-table/html.hbs index 6bbd253469..f424a4e6aa 100644 --- a/src/sunstone/public/app/utils/panel/permissions-table/html.hbs +++ b/src/sunstone/public/app/utils/panel/permissions-table/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/panel/permissions-table/owner.hbs b/src/sunstone/public/app/utils/panel/permissions-table/owner.hbs index a62a8ec9eb..c0bdd7dd30 100644 --- a/src/sunstone/public/app/utils/panel/permissions-table/owner.hbs +++ b/src/sunstone/public/app/utils/panel/permissions-table/owner.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/panel/permissions-table/permissions.hbs b/src/sunstone/public/app/utils/panel/permissions-table/permissions.hbs index cdc8ffb7ab..d903f98ffa 100644 --- a/src/sunstone/public/app/utils/panel/permissions-table/permissions.hbs +++ b/src/sunstone/public/app/utils/panel/permissions-table/permissions.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/panel/rename-tr.js b/src/sunstone/public/app/utils/panel/rename-tr.js index d842cefcec..7d26d59e5e 100644 --- a/src/sunstone/public/app/utils/panel/rename-tr.js +++ b/src/sunstone/public/app/utils/panel/rename-tr.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/panel/rename-tr/html.hbs b/src/sunstone/public/app/utils/panel/rename-tr/html.hbs index d07871d6b6..f9717b64a6 100644 --- a/src/sunstone/public/app/utils/panel/rename-tr/html.hbs +++ b/src/sunstone/public/app/utils/panel/rename-tr/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/panel/template-table.js b/src/sunstone/public/app/utils/panel/template-table.js index becad8e1e0..4353cf3dc1 100644 --- a/src/sunstone/public/app/utils/panel/template-table.js +++ b/src/sunstone/public/app/utils/panel/template-table.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/progress-bar.js b/src/sunstone/public/app/utils/progress-bar.js index eec78d0ed1..96b19d6776 100644 --- a/src/sunstone/public/app/utils/progress-bar.js +++ b/src/sunstone/public/app/utils/progress-bar.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/quotas/quota-defaults.js b/src/sunstone/public/app/utils/quotas/quota-defaults.js index f7bef995e6..832a0c797c 100644 --- a/src/sunstone/public/app/utils/quotas/quota-defaults.js +++ b/src/sunstone/public/app/utils/quotas/quota-defaults.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/quotas/quota-limits.js b/src/sunstone/public/app/utils/quotas/quota-limits.js index 3f63599df2..683b53d422 100644 --- a/src/sunstone/public/app/utils/quotas/quota-limits.js +++ b/src/sunstone/public/app/utils/quotas/quota-limits.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/quotas/quota-widgets.js b/src/sunstone/public/app/utils/quotas/quota-widgets.js index 46cd326d07..fc8570ac14 100644 --- a/src/sunstone/public/app/utils/quotas/quota-widgets.js +++ b/src/sunstone/public/app/utils/quotas/quota-widgets.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/range-slider.js b/src/sunstone/public/app/utils/range-slider.js index 87eabeebdb..043e028975 100644 --- a/src/sunstone/public/app/utils/range-slider.js +++ b/src/sunstone/public/app/utils/range-slider.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/range-slider/html.hbs b/src/sunstone/public/app/utils/range-slider/html.hbs index 3cc720cc61..4ddc2cc0c0 100644 --- a/src/sunstone/public/app/utils/range-slider/html.hbs +++ b/src/sunstone/public/app/utils/range-slider/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/resource-select.js b/src/sunstone/public/app/utils/resource-select.js index d2658a8872..b50351aa63 100644 --- a/src/sunstone/public/app/utils/resource-select.js +++ b/src/sunstone/public/app/utils/resource-select.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/schedule_action.js b/src/sunstone/public/app/utils/schedule_action.js index 6902404723..698e3bf5cc 100644 --- a/src/sunstone/public/app/utils/schedule_action.js +++ b/src/sunstone/public/app/utils/schedule_action.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/schedule_action/html.hbs b/src/sunstone/public/app/utils/schedule_action/html.hbs index cda766f4cb..92da8c8030 100644 --- a/src/sunstone/public/app/utils/schedule_action/html.hbs +++ b/src/sunstone/public/app/utils/schedule_action/html.hbs @@ -1,4 +1,4 @@ -{{! -------------------------------------------------------------------------- }} {{! Copyright 2002-2018, OpenNebula Project, +{{! -------------------------------------------------------------------------- }} {{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed 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 diff --git a/src/sunstone/public/app/utils/schedule_action/table.hbs b/src/sunstone/public/app/utils/schedule_action/table.hbs index aeb33fc04c..f74bd0050e 100644 --- a/src/sunstone/public/app/utils/schedule_action/table.hbs +++ b/src/sunstone/public/app/utils/schedule_action/table.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/showback.js b/src/sunstone/public/app/utils/showback.js index d325c7b4ac..667b003b50 100644 --- a/src/sunstone/public/app/utils/showback.js +++ b/src/sunstone/public/app/utils/showback.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/showback/html.hbs b/src/sunstone/public/app/utils/showback/html.hbs index 86d1b78b6b..b35aca55d8 100644 --- a/src/sunstone/public/app/utils/showback/html.hbs +++ b/src/sunstone/public/app/utils/showback/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/spice.js b/src/sunstone/public/app/utils/spice.js index 77aa854ac4..94d79188d7 100644 --- a/src/sunstone/public/app/utils/spice.js +++ b/src/sunstone/public/app/utils/spice.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/status.js b/src/sunstone/public/app/utils/status.js index f4715a657c..431a74c72d 100644 --- a/src/sunstone/public/app/utils/status.js +++ b/src/sunstone/public/app/utils/status.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/tab-datatable.js b/src/sunstone/public/app/utils/tab-datatable.js index 1eb287ddfe..2e758d4ecf 100644 --- a/src/sunstone/public/app/utils/tab-datatable.js +++ b/src/sunstone/public/app/utils/tab-datatable.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/tab-datatable/empty-table.hbs b/src/sunstone/public/app/utils/tab-datatable/empty-table.hbs index 7d324a4fdc..335f5765b5 100644 --- a/src/sunstone/public/app/utils/tab-datatable/empty-table.hbs +++ b/src/sunstone/public/app/utils/tab-datatable/empty-table.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/tab-datatable/search-input.hbs b/src/sunstone/public/app/utils/tab-datatable/search-input.hbs index aff22b057d..e7f056c0fb 100644 --- a/src/sunstone/public/app/utils/tab-datatable/search-input.hbs +++ b/src/sunstone/public/app/utils/tab-datatable/search-input.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/tab-datatable/table.hbs b/src/sunstone/public/app/utils/tab-datatable/table.hbs index 14c6e4f050..9ae6327b8d 100644 --- a/src/sunstone/public/app/utils/tab-datatable/table.hbs +++ b/src/sunstone/public/app/utils/tab-datatable/table.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/template-utils.js b/src/sunstone/public/app/utils/template-utils.js index 5b78a8e8c5..3280001ff8 100644 --- a/src/sunstone/public/app/utils/template-utils.js +++ b/src/sunstone/public/app/utils/template-utils.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/tips.js b/src/sunstone/public/app/utils/tips.js index 476b183074..09247a92ce 100644 --- a/src/sunstone/public/app/utils/tips.js +++ b/src/sunstone/public/app/utils/tips.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/tree.js b/src/sunstone/public/app/utils/tree.js index c8fef3d9e6..a76ca2b6bd 100644 --- a/src/sunstone/public/app/utils/tree.js +++ b/src/sunstone/public/app/utils/tree.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/unique-id.js b/src/sunstone/public/app/utils/unique-id.js index 41e6131a1d..69f0475af9 100644 --- a/src/sunstone/public/app/utils/unique-id.js +++ b/src/sunstone/public/app/utils/unique-id.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/user-inputs.js b/src/sunstone/public/app/utils/user-inputs.js index 9fad82548d..060ab427bd 100644 --- a/src/sunstone/public/app/utils/user-inputs.js +++ b/src/sunstone/public/app/utils/user-inputs.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/vcenter-vm-folder.js b/src/sunstone/public/app/utils/vcenter-vm-folder.js index 2242fe8ea9..b4475f2e28 100644 --- a/src/sunstone/public/app/utils/vcenter-vm-folder.js +++ b/src/sunstone/public/app/utils/vcenter-vm-folder.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/vcenter-vm-folder/html.hbs b/src/sunstone/public/app/utils/vcenter-vm-folder/html.hbs index 84a9c0a565..a5ff4edeba 100644 --- a/src/sunstone/public/app/utils/vcenter-vm-folder/html.hbs +++ b/src/sunstone/public/app/utils/vcenter-vm-folder/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/vcenter/clusters.js b/src/sunstone/public/app/utils/vcenter/clusters.js index 181377bda7..8382c5dfde 100644 --- a/src/sunstone/public/app/utils/vcenter/clusters.js +++ b/src/sunstone/public/app/utils/vcenter/clusters.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/vcenter/clusters/row.hbs b/src/sunstone/public/app/utils/vcenter/clusters/row.hbs index a85d20c70b..171151e46b 100644 --- a/src/sunstone/public/app/utils/vcenter/clusters/row.hbs +++ b/src/sunstone/public/app/utils/vcenter/clusters/row.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/vcenter/common/empty-fieldset.hbs b/src/sunstone/public/app/utils/vcenter/common/empty-fieldset.hbs index 8291fb396e..518b181c45 100644 --- a/src/sunstone/public/app/utils/vcenter/common/empty-fieldset.hbs +++ b/src/sunstone/public/app/utils/vcenter/common/empty-fieldset.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/vcenter/common/fieldset-table.hbs b/src/sunstone/public/app/utils/vcenter/common/fieldset-table.hbs index 1ae0bf4247..d5c388b402 100644 --- a/src/sunstone/public/app/utils/vcenter/common/fieldset-table.hbs +++ b/src/sunstone/public/app/utils/vcenter/common/fieldset-table.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/vcenter/common/html.hbs b/src/sunstone/public/app/utils/vcenter/common/html.hbs index b41e2bb529..b6f1df30d5 100644 --- a/src/sunstone/public/app/utils/vcenter/common/html.hbs +++ b/src/sunstone/public/app/utils/vcenter/common/html.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/vcenter/datastores.js b/src/sunstone/public/app/utils/vcenter/datastores.js index 956d25f3f2..c0e065eb0e 100644 --- a/src/sunstone/public/app/utils/vcenter/datastores.js +++ b/src/sunstone/public/app/utils/vcenter/datastores.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/vcenter/datastores/row.hbs b/src/sunstone/public/app/utils/vcenter/datastores/row.hbs index b183c45e21..e8a5693ce2 100644 --- a/src/sunstone/public/app/utils/vcenter/datastores/row.hbs +++ b/src/sunstone/public/app/utils/vcenter/datastores/row.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/vcenter/images.js b/src/sunstone/public/app/utils/vcenter/images.js index a85ed432fc..6cad16c28f 100644 --- a/src/sunstone/public/app/utils/vcenter/images.js +++ b/src/sunstone/public/app/utils/vcenter/images.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/vcenter/images/row.hbs b/src/sunstone/public/app/utils/vcenter/images/row.hbs index d62cfa787b..b6c9426005 100644 --- a/src/sunstone/public/app/utils/vcenter/images/row.hbs +++ b/src/sunstone/public/app/utils/vcenter/images/row.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/vcenter/networks.js b/src/sunstone/public/app/utils/vcenter/networks.js index 15a2eaa26f..d91b69a028 100644 --- a/src/sunstone/public/app/utils/vcenter/networks.js +++ b/src/sunstone/public/app/utils/vcenter/networks.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/vcenter/networks/row.hbs b/src/sunstone/public/app/utils/vcenter/networks/row.hbs index 5e064610f9..73390795af 100644 --- a/src/sunstone/public/app/utils/vcenter/networks/row.hbs +++ b/src/sunstone/public/app/utils/vcenter/networks/row.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/vcenter/templates.js b/src/sunstone/public/app/utils/vcenter/templates.js index c8f83e5bbb..1d33a50747 100644 --- a/src/sunstone/public/app/utils/vcenter/templates.js +++ b/src/sunstone/public/app/utils/vcenter/templates.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/vcenter/templates/row.hbs b/src/sunstone/public/app/utils/vcenter/templates/row.hbs index 9b34c313dd..a807238a51 100644 --- a/src/sunstone/public/app/utils/vcenter/templates/row.hbs +++ b/src/sunstone/public/app/utils/vcenter/templates/row.hbs @@ -1,5 +1,5 @@ {{! -------------------------------------------------------------------------- }} -{{! Copyright 2002-2018, OpenNebula Project, OpenNebula Systems }} +{{! Copyright 2002-2019, OpenNebula Project, OpenNebula Systems }} {{! }} {{! Licensed under the Apache License, Version 2.0 (the "License"); you may }} {{! not use this file except in compliance with the License. You may obtain }} diff --git a/src/sunstone/public/app/utils/vcenter/vcenter-common.js b/src/sunstone/public/app/utils/vcenter/vcenter-common.js index 5e20811298..1d9d535784 100644 --- a/src/sunstone/public/app/utils/vcenter/vcenter-common.js +++ b/src/sunstone/public/app/utils/vcenter/vcenter-common.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/vmgroup-section.js b/src/sunstone/public/app/utils/vmgroup-section.js index 4c8666a152..24becaf678 100644 --- a/src/sunstone/public/app/utils/vmgroup-section.js +++ b/src/sunstone/public/app/utils/vmgroup-section.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/vnc.js b/src/sunstone/public/app/utils/vnc.js index ba7e0cce80..bcb75343d9 100644 --- a/src/sunstone/public/app/utils/vnc.js +++ b/src/sunstone/public/app/utils/vnc.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/app/utils/wizard-fields.js b/src/sunstone/public/app/utils/wizard-fields.js index 943794b522..c85652ae92 100644 --- a/src/sunstone/public/app/utils/wizard-fields.js +++ b/src/sunstone/public/app/utils/wizard-fields.js @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/public/css/login.css b/src/sunstone/public/css/login.css index 09482f6ca2..908248b5b6 100644 --- a/src/sunstone/public/css/login.css +++ b/src/sunstone/public/css/login.css @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/sunstone/routes/oneflow.rb b/src/sunstone/routes/oneflow.rb index c08f008450..8289153bb1 100644 --- a/src/sunstone/routes/oneflow.rb +++ b/src/sunstone/routes/oneflow.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/routes/support.rb b/src/sunstone/routes/support.rb index 22b90b8582..7a84b847e2 100644 --- a/src/sunstone/routes/support.rb +++ b/src/sunstone/routes/support.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/routes/vcenter.rb b/src/sunstone/routes/vcenter.rb index 212c77ca2b..78411f0b1a 100644 --- a/src/sunstone/routes/vcenter.rb +++ b/src/sunstone/routes/vcenter.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb index 7e18f752fc..d8ecd1a328 100755 --- a/src/sunstone/sunstone-server.rb +++ b/src/sunstone/sunstone-server.rb @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/test/spec/host_spec.rb b/src/sunstone/test/spec/host_spec.rb index 3138bb3808..4a82c2af93 100644 --- a/src/sunstone/test/spec/host_spec.rb +++ b/src/sunstone/test/spec/host_spec.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/test/spec/image_spec.rb b/src/sunstone/test/spec/image_spec.rb index a805766cbf..8a0e7ab9a3 100644 --- a/src/sunstone/test/spec/image_spec.rb +++ b/src/sunstone/test/spec/image_spec.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/test/spec/spec_helper.rb b/src/sunstone/test/spec/spec_helper.rb index 5af106dfdf..6a86f8c087 100644 --- a/src/sunstone/test/spec/spec_helper.rb +++ b/src/sunstone/test/spec/spec_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/test/spec/user_spec.rb b/src/sunstone/test/spec/user_spec.rb index cf9307cedf..44dcef8757 100644 --- a/src/sunstone/test/spec/user_spec.rb +++ b/src/sunstone/test/spec/user_spec.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/test/spec/vm_spec.rb b/src/sunstone/test/spec/vm_spec.rb index 617a14b496..801c58a231 100644 --- a/src/sunstone/test/spec/vm_spec.rb +++ b/src/sunstone/test/spec/vm_spec.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/test/spec/vnet_spec.rb b/src/sunstone/test/spec/vnet_spec.rb index a9aac0cdf7..824ab17f7e 100644 --- a/src/sunstone/test/spec/vnet_spec.rb +++ b/src/sunstone/test/spec/vnet_spec.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/sunstone/test/test.sh b/src/sunstone/test/test.sh index 90b60196fc..6ea9e428a2 100755 --- a/src/sunstone/test/test.sh +++ b/src/sunstone/test/test.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/template/SConstruct b/src/template/SConstruct index 6edef38105..06495b166e 100644 --- a/src/template/SConstruct +++ b/src/template/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/template # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/template/Template.cc b/src/template/Template.cc index 29adf9a6d3..b14995a817 100644 --- a/src/template/Template.cc +++ b/src/template/Template.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -386,19 +386,14 @@ bool Template::get(const string& name, bool& value) const string& Template::to_xml(string& xml) const { - multimap::const_iterator it; - ostringstream oss; - string * s; + multimap::const_iterator it; + ostringstream oss; oss << "<" << xml_root << ">"; for ( it = attributes.begin(); it!=attributes.end(); it++) { - s = it->second->to_xml(); - - oss << *s; - - delete s; + it->second->to_xml(oss); } oss << ""; @@ -407,6 +402,81 @@ string& Template::to_xml(string& xml) const return xml; } + +string& Template::to_json(string& json) const +{ + multimap::const_iterator it; + ostringstream oss; + + bool is_first = true; + + oss << "\"" << xml_root << "\": {"; + + for ( it = attributes.begin(); it!=attributes.end(); ) + { + if (!is_first) + { + oss << ","; + } + else + { + is_first = false; + } + + oss << "\"" << it->first << "\": "; + + if ( attributes.count(it->first) == 1 ) + { + it->second->to_json(oss); + + ++it; + } + else + { + std::string jelem = it->first; + bool is_array_first = true; + + oss << "[ "; + + for ( ; it->first == jelem && it != attributes.end() ; ++it ) + { + if ( !is_array_first ) + { + oss << ","; + } + else + { + is_array_first = false; + } + + it->second->to_json(oss); + } + + oss << "]"; + } + } + + oss << "}"; + + json = oss.str(); + + return json; +} + +string& Template::to_token(string& str) const +{ + ostringstream os; + multimap::const_iterator it; + + for ( it = attributes.begin(); it!=attributes.end(); it++) + { + it->second->to_token(os); + } + + str = os.str(); + return str; +} + /* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */ diff --git a/src/tm/SConstruct b/src/tm/SConstruct index 7c6f1a443e..c8e1c62f54 100644 --- a/src/tm/SConstruct +++ b/src/tm/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/vm # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/tm/TransferManager.cc b/src/tm/TransferManager.cc index 214b81f406..57d26470af 100644 --- a/src/tm/TransferManager.cc +++ b/src/tm/TransferManager.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/tm/TransferManagerDriver.cc b/src/tm/TransferManagerDriver.cc index e13825c663..53582c3a97 100644 --- a/src/tm/TransferManagerDriver.cc +++ b/src/tm/TransferManagerDriver.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/tm_mad/ceph/clone b/src/tm_mad/ceph/clone index 09304b0af1..888059eb2a 100755 --- a/src/tm_mad/ceph/clone +++ b/src/tm_mad/ceph/clone @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -118,7 +118,7 @@ if [ -n "$EC_POOL_NAME" ]; then fi if [ "${TYPE}" = 'FILE' ]; then - ssh_make_path $DST_HOST $DST_DIR + ssh_make_path $DST_HOST $DST_DIR 'ssh' CLONE_CMD=$(cat </dev/null || : +fi +EOF +) + +MONITOR=$(ssh_monitor_and_log "$SRC_HOST" "$MONITOR_CMD" 'Get .monitor') + +ssh_make_path "$DST_HOST" "$DST_PATH" "$MONITOR" log "Moving $SRC to $DST" @@ -85,5 +96,7 @@ EOF ) ssh_exec_and_log "$SRC_HOST" "$TAR_SSH" "Error copying disk directory to target host" +hup_collectd $DST_HOST +hup_collectd $SRC_HOST exit 0 diff --git a/src/tm_mad/ssh/mvds b/src/tm_mad/ssh/mvds index 506197beae..88f97424f6 100755 --- a/src/tm_mad/ssh/mvds +++ b/src/tm_mad/ssh/mvds @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -53,6 +53,7 @@ exec_and_log "$SCP -r $SRC $DST" "Error copying $SRC to $DST" if $SSH $SRC_HOST ls ${SRC_PATH_SNAP} >/dev/null 2>&1; then exec_and_log "rsync -r --delete ${SRC_HOST}:${SRC_PATH_SNAP}/ ${DST_SNAP}" + hup_collectd $SRC_HOST fi exit 0 diff --git a/src/tm_mad/ssh/snap_create b/src/tm_mad/ssh/snap_create index a03b41ee44..97a9abde31 100755 --- a/src/tm_mad/ssh/snap_create +++ b/src/tm_mad/ssh/snap_create @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -82,4 +82,5 @@ EOT ssh_exec_and_log "${SRC_HOST}" "${CMD}" \ "Error creating snapshot ${SNAP_PATH}" +hup_collectd $SRC_HOST diff --git a/src/tm_mad/ssh/snap_delete b/src/tm_mad/ssh/snap_delete index 9781bcd4d6..f57d539def 100755 --- a/src/tm_mad/ssh/snap_delete +++ b/src/tm_mad/ssh/snap_delete @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -70,4 +70,5 @@ CURRENT_PATH=${DISK_PATH} ssh_exec_and_log "${SRC_HOST}" "rm ${SNAP_PATH}" \ "Error deleting snapshot ${SNAP_PATH}" +hup_collectd $SRC_HOST diff --git a/src/tm_mad/ssh/snap_revert b/src/tm_mad/ssh/snap_revert index 5a570111ea..8ac296cdfb 100755 --- a/src/tm_mad/ssh/snap_revert +++ b/src/tm_mad/ssh/snap_revert @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -77,4 +77,5 @@ EOF ssh_exec_and_log "${SRC_HOST}" "${CMD}" \ "Error reverting snapshot to ${SNAP_PATH}" +hup_collectd $SRC_HOST diff --git a/src/tm_mad/tm_common.sh b/src/tm_mad/tm_common.sh index a06b7460f1..d3e3d078a5 100644 --- a/src/tm_mad/tm_common.sh +++ b/src/tm_mad/tm_common.sh @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/tm_mad/tmrc b/src/tm_mad/tmrc index 017d59cd00..0d60d6c9ca 100644 --- a/src/tm_mad/tmrc +++ b/src/tm_mad/tmrc @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2019, OpenNebula Project (OpenNebula.org), C12G Labs # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/tm_mad/vcenter/clone b/src/tm_mad/vcenter/clone index 3e2202eb67..3182493066 100755 --- a/src/tm_mad/vcenter/clone +++ b/src/tm_mad/vcenter/clone @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -110,7 +110,9 @@ rescue Exception => e message = "Error clone virtual disk #{src_path} in "\ "datastore #{target_ds_name_vc}. "\ "Reason: #{e.message}\n#{e.backtrace}" - STDERR.puts error_message(message) + OpenNebula.log_error(message) + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit -1 ensure vi_client.close_connection if vi_client diff --git a/src/tm_mad/vcenter/cpds b/src/tm_mad/vcenter/cpds index 649374a97e..e29474ab14 100755 --- a/src/tm_mad/vcenter/cpds +++ b/src/tm_mad/vcenter/cpds @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -92,7 +92,9 @@ begin rescue Exception => e message = "Error copying img #{src_path} to #{target_ds_name_vc} "\ "Reason: #{e.message}\n#{e.backtrace}" - STDERR.puts error_message(message) + OpenNebula.log_error(message) + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit -1 ensure vi_client.close_connection if vi_client diff --git a/src/tm_mad/vcenter/delete b/src/tm_mad/vcenter/delete index 65131aec3b..a0f017d440 100755 --- a/src/tm_mad/vcenter/delete +++ b/src/tm_mad/vcenter/delete @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -104,6 +104,9 @@ begin rescue Exception => e vi_client.close_connection if vi_client - STDERR.puts "#{@error_message}. Reason: #{e.message}\n#{e.backtrace}" + message = "#{@error_message}. Reason: #{e.message}\n#{e.backtrace}" + OpenNebula.log_error(message) + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit -1 end diff --git a/src/tm_mad/vcenter/mkimage b/src/tm_mad/vcenter/mkimage index 2e5f7986c6..a06a5246f3 100755 --- a/src/tm_mad/vcenter/mkimage +++ b/src/tm_mad/vcenter/mkimage @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -88,7 +88,9 @@ begin rescue Exception => e message = "Error creating virtual disk in #{ds_vc['name']}."\ " Reason: #{e.message}\n#{e.backtrace}" - STDERR.puts error_message(message) + OpenNebula.log_error(message) + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit -1 ensure vi_client.close_connection if vi_client diff --git a/src/tm_mad/vcenter/mv b/src/tm_mad/vcenter/mv index 3b10d555e9..dac4b13926 100755 --- a/src/tm_mad/vcenter/mv +++ b/src/tm_mad/vcenter/mv @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -45,12 +45,12 @@ begin one_client = OpenNebula::Client.new vm = OpenNebula::VirtualMachine.new_with_id(vmid, one_client) vm.info - src_ds = vm.to_hash["VM"]["HISTORY_RECORDS"]["HISTORY"][-2]["DS_ID"] + src_ds = vm.retrieve_elements("HISTORY_RECORDS/HISTORY/DS_ID")[-2] if src_ds == dsid VCenterDriver::VirtualMachine.migrate_routine(vmid, host_orig, host_dest) else - VCenterDriver::VirtualMachine.migrate_routine(vmid, host_orig, host_dest, dsid) + VCenterDriver::VirtualMachine.migrate_routine(vmid, host_orig, host_dest, false, dsid) end rescue StandardError => e @@ -58,5 +58,7 @@ rescue StandardError => e 'failed due to '\ "\"#{e.message}\"\n" OpenNebula.log_error(message) + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit(-1) end diff --git a/src/tm_mad/vcenter/mvds b/src/tm_mad/vcenter/mvds index 667dbb6cda..d4cc5b8e74 100755 --- a/src/tm_mad/vcenter/mvds +++ b/src/tm_mad/vcenter/mvds @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -80,7 +80,9 @@ begin rescue Exception => e message = "Error detaching virtual disk #{disk_id} from vm #{vmid}."\ " Reason: #{e.message}\n#{e.backtrace}" - STDERR.puts error_message(message) + OpenNebula.log_error(message) + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit -1 ensure vi_client.close_connection if vi_client diff --git a/src/tm_mad/vcenter/resize b/src/tm_mad/vcenter/resize index 6c58197e68..3c30a2062f 100755 --- a/src/tm_mad/vcenter/resize +++ b/src/tm_mad/vcenter/resize @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -72,7 +72,9 @@ begin rescue Exception => e message = "Error resizing disk #{disk_id} for VM #{one_vm["NAME"]} "\ "Reason: #{e.message}\n#{e.backtrace}" - STDERR.puts error_message(message) + OpenNebula.log_error(message) + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit -1 ensure vi_client.close_connection if vi_client diff --git a/src/um/DefaultQuotas.cc b/src/um/DefaultQuotas.cc index ee4f5c9a80..6562843552 100644 --- a/src/um/DefaultQuotas.cc +++ b/src/um/DefaultQuotas.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/um/LoginToken.cc b/src/um/LoginToken.cc index 41495fcfc0..263809824d 100644 --- a/src/um/LoginToken.cc +++ b/src/um/LoginToken.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/um/Quota.cc b/src/um/Quota.cc index 42c1ed6eeb..b068428fde 100644 --- a/src/um/Quota.cc +++ b/src/um/Quota.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/um/QuotaDatastore.cc b/src/um/QuotaDatastore.cc index 1819fc7d77..e528bc5b1f 100644 --- a/src/um/QuotaDatastore.cc +++ b/src/um/QuotaDatastore.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/um/QuotaImage.cc b/src/um/QuotaImage.cc index 11adbc74af..120808b381 100644 --- a/src/um/QuotaImage.cc +++ b/src/um/QuotaImage.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/um/QuotaNetwork.cc b/src/um/QuotaNetwork.cc index fa5286bd14..6001120323 100644 --- a/src/um/QuotaNetwork.cc +++ b/src/um/QuotaNetwork.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/um/QuotaVirtualMachine.cc b/src/um/QuotaVirtualMachine.cc index d9624c45bb..e90fec7ea5 100644 --- a/src/um/QuotaVirtualMachine.cc +++ b/src/um/QuotaVirtualMachine.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/um/Quotas.cc b/src/um/Quotas.cc index 019705a338..5ff759051a 100644 --- a/src/um/Quotas.cc +++ b/src/um/Quotas.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/um/QuotasSQL.cc b/src/um/QuotasSQL.cc index 2f4a1702d4..b42b76e598 100644 --- a/src/um/QuotasSQL.cc +++ b/src/um/QuotasSQL.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/um/SConstruct b/src/um/SConstruct index bc5162a046..897292d8f0 100644 --- a/src/um/SConstruct +++ b/src/um/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/vm # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/um/User.cc b/src/um/User.cc index 721795b0ab..1656af6b06 100644 --- a/src/um/User.cc +++ b/src/um/User.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/um/UserPool.cc b/src/um/UserPool.cc index b092a5964e..e35862b398 100644 --- a/src/um/UserPool.cc +++ b/src/um/UserPool.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/vdc/SConstruct b/src/vdc/SConstruct index 28224579b0..8e46fceccf 100644 --- a/src/vdc/SConstruct +++ b/src/vdc/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/vdc # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vdc/Vdc.cc b/src/vdc/Vdc.cc index 9ac1beebd2..072ff329e7 100644 --- a/src/vdc/Vdc.cc +++ b/src/vdc/Vdc.cc @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/vdc/VdcPool.cc b/src/vdc/VdcPool.cc index fb5ccf7afd..9df1d2ed52 100644 --- a/src/vdc/VdcPool.cc +++ b/src/vdc/VdcPool.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/vm/History.cc b/src/vm/History.cc index 69ff32a63c..0668094436 100644 --- a/src/vm/History.cc +++ b/src/vm/History.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -341,6 +341,62 @@ string& History::to_xml(string& xml, bool database) const /* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */ +string& History::to_json(string& json) const +{ + ostringstream oss; + + oss << "\"HISTORY\": {" << + "\"OID\": \"" << oid << "\"," << + "\"SEQ\": \"" << seq << "\"," << + "\"HOSTNAME\": \"" << hostname << "\"," << + "\"HID\": \"" << hid << "\"," << + "\"CID\": \"" << cid << "\"," << + "\"STIME\": \"" << stime << "\"," << + "\"ETIME\": \"" << etime << "\"," << + "\"VM_MAD\": \"" << vmm_mad_name << "\"," << + "\"TM_MAD\": \"" << tm_mad_name << "\"," << + "\"DS_ID\": \"" << ds_id << "\"," << + "\"PSTIME\": \"" << prolog_stime << "\"," << + "\"PETIME\": \"" << prolog_etime << "\"," << + "\"RSTIME\": \"" << running_stime << "\"," << + "\"RETIME\": \"" << running_etime << "\"," << + "\"ESTIME\": \"" << epilog_stime << "\"," << + "\"EETIME\": \"" << epilog_etime << "\"," << + "\"ACTION\": \"" << action << "\"," << + "\"UID\": \"" << uid << "\"," << + "\"GID\": \"" << gid << "\"," << + "\"REQUEST_ID\": \"" << req_id << "\","; + + oss << "}"; + + json = oss.str(); + + return json; +} + +/* -------------------------------------------------------------------------- */ +/* -------------------------------------------------------------------------- */ + +string& History::to_token(string& text) const +{ + ostringstream oss; + + oss << "HOSTNAME="; + one_util::escape_token(hostname, oss); + oss << "\n"; + + oss << "HID=" << hid << "\n" << + "CID=" << cid << "\n" << + "DS_ID=" << ds_id << "\n"; + + text = oss.str(); + + return text; +} + +/* -------------------------------------------------------------------------- */ +/* -------------------------------------------------------------------------- */ + string& History::to_xml_short(string& xml) const { ostringstream oss; diff --git a/src/vm/SConstruct b/src/vm/SConstruct index bc442bf8ee..1a1cbeeacf 100644 --- a/src/vm/SConstruct +++ b/src/vm/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/vm # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vm/Snapshots.cc b/src/vm/Snapshots.cc index 5697a00809..836486d8ac 100644 --- a/src/vm/Snapshots.cc +++ b/src/vm/Snapshots.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -20,21 +20,24 @@ /* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */ -Snapshots::Snapshots(int _disk_id, bool _orphans): +Snapshots::Snapshots(int _disk_id, AllowOrphansMode _orphans): snapshot_template(false,'=',"SNAPSHOTS"), next_snapshot(0), active(-1), disk_id(_disk_id), - orphans(_orphans) + orphans(_orphans), + current_base(-1) { if (_disk_id != -1) { snapshot_template.add("DISK_ID", _disk_id); } - snapshot_template.add("ALLOW_ORPHANS", _orphans); + snapshot_template.add("ALLOW_ORPHANS", allow_orphans_mode_to_str(_orphans)); snapshot_template.add("NEXT_SNAPSHOT", 0); + + snapshot_template.add("CURRENT_BASE", -1); }; Snapshots::Snapshots(const Snapshots& s): @@ -42,7 +45,8 @@ Snapshots::Snapshots(const Snapshots& s): next_snapshot(0), active(-1), disk_id(-1), - orphans(false) + orphans(DENY), + current_base(-1) { init(); } @@ -55,6 +59,7 @@ Snapshots& Snapshots::operator= (const Snapshots& s) active = s.active; disk_id = s.disk_id; orphans = s.orphans; + current_base = s.current_base; snapshot_template = s.snapshot_template; @@ -119,9 +124,20 @@ void Snapshots::init() snapshot_template.get("NEXT_SNAPSHOT", next_snapshot); - if ( snapshot_template.get("ALLOW_ORPHANS", orphans) == false ) + string orphans_str; + + if (snapshot_template.get("ALLOW_ORPHANS", orphans_str) == false) { - orphans = false; + orphans = DENY; + } + else + { + orphans = str_to_allow_orphans_mode(one_util::toupper(orphans_str)); + } + + if (snapshot_template.get("CURRENT_BASE", current_base) == false) + { + current_base = -1; } } @@ -141,37 +157,18 @@ int Snapshots::create_snapshot(const string& name, long long size_mb) snapshot->replace("ID", next_snapshot); snapshot->replace("DATE", static_cast(time(0))); - if (!orphans) + if (orphans == DENY) { - snapshot->replace("PARENT", active); - - if (active != -1) + if (add_child_deny(snapshot) == -1) { - VectorAttribute * parent = get_snapshot(active); - - if (parent == 0) - { - delete snapshot; - return -1; - } - - string children = parent->vector_value("CHILDREN"); - - if (children.empty()) - { - parent->replace("CHILDREN", next_snapshot); - } - else - { - ostringstream oss; - - oss << children << "," << next_snapshot; - - parent->replace("CHILDREN", oss.str()); - } + return -1; } } - else + else if (orphans == MIXED) + { + add_child_mixed(snapshot); + } + else //ALLOW { snapshot->replace("PARENT", "-1"); } @@ -189,6 +186,73 @@ int Snapshots::create_snapshot(const string& name, long long size_mb) /* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */ +void Snapshots::add_child_mixed(VectorAttribute *snapshot) +{ + snapshot->replace("PARENT", current_base); + + if (current_base != -1) + { + VectorAttribute * parent = get_snapshot(current_base); + + if (parent != 0) + { + string children = parent->vector_value("CHILDREN"); + + if (children.empty()) + { + parent->replace("CHILDREN", next_snapshot); + } + else + { + ostringstream oss; + + oss << children << "," << next_snapshot; + + parent->replace("CHILDREN", oss.str()); + } + } + } +} + +/* -------------------------------------------------------------------------- */ +/* -------------------------------------------------------------------------- */ + +int Snapshots::add_child_deny(VectorAttribute *snapshot) +{ + snapshot->replace("PARENT", active); + + if (active != -1) + { + VectorAttribute * parent = get_snapshot(active); + + if (parent == 0) + { + delete snapshot; + return -1; + } + + string children = parent->vector_value("CHILDREN"); + + if (children.empty()) + { + parent->replace("CHILDREN", next_snapshot); + } + else + { + ostringstream oss; + + oss << children << "," << next_snapshot; + + parent->replace("CHILDREN", oss.str()); + } + } + + return 0; +} + +/* -------------------------------------------------------------------------- */ +/* -------------------------------------------------------------------------- */ + void Snapshots::delete_snapshot(int id) { int parent_id; @@ -200,7 +264,7 @@ void Snapshots::delete_snapshot(int id) return; } - if (!orphans) + if (orphans == DENY || orphans == MIXED) { snapshot->vector_value("PARENT", parent_id); @@ -243,7 +307,7 @@ void Snapshots::delete_snapshot(int id) /* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */ -int Snapshots::active_snapshot(int id) +int Snapshots::active_snapshot(int id, bool revert) { if (static_cast(id) == active) { @@ -257,6 +321,12 @@ int Snapshots::active_snapshot(int id) return -1; } + if (revert && (orphans == MIXED)) + { + current_base = id; + snapshot_template.replace("CURRENT_BASE", id); + } + snapshot->replace("ACTIVE", true); snapshot = get_snapshot(active); @@ -353,7 +423,7 @@ bool Snapshots::test_delete(int id, string& error) const return false; } - if (!orphans) + if (orphans == DENY || orphans == MIXED) { snapshot->vector_value("ACTIVE", current); diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc index 3f82fb8a7c..727f9868f1 100644 --- a/src/vm/VirtualMachine.cc +++ b/src/vm/VirtualMachine.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -457,13 +457,13 @@ const char * VirtualMachine::table = "vm_pool"; const char * VirtualMachine::db_names = "oid, name, body, uid, gid, last_poll, state, lcm_state, " - "owner_u, group_u, other_u, short_body"; + "owner_u, group_u, other_u, short_body, search_token"; const char * VirtualMachine::db_bootstrap = "CREATE TABLE IF NOT EXISTS " - "vm_pool (oid INTEGER PRIMARY KEY, name VARCHAR(128), body MEDIUMTEXT, uid INTEGER, " - "gid INTEGER, last_poll INTEGER, state INTEGER, lcm_state INTEGER, " - "owner_u INTEGER, group_u INTEGER, other_u INTEGER, short_body MEDIUMTEXT)"; - + "vm_pool (oid INTEGER PRIMARY KEY, name VARCHAR(128), body MEDIUMTEXT, " + "uid INTEGER, gid INTEGER, last_poll INTEGER, state INTEGER, " + "lcm_state INTEGER, owner_u INTEGER, group_u INTEGER, other_u INTEGER, " + "short_body MEDIUMTEXT, search_token MEDIUMTEXT"; const char * VirtualMachine::monit_table = "vm_monitoring"; @@ -489,7 +489,19 @@ int VirtualMachine::bootstrap(SqlDB * db) { int rc; - ostringstream oss_vm(VirtualMachine::db_bootstrap); + ostringstream oss_vm; + + oss_vm << VirtualMachine::db_bootstrap; + + if (db->fts_available()) + { + oss_vm << ", FULLTEXT ftidx(search_token))"; + } + else + { + oss_vm << ")"; + } + ostringstream oss_monit(VirtualMachine::monit_db_bootstrap); ostringstream oss_hist(History::db_bootstrap); ostringstream oss_showback(VirtualMachine::showback_db_bootstrap); @@ -1662,10 +1674,12 @@ int VirtualMachine::insert_replace(SqlDB *db, bool replace, string& error_str) ostringstream oss; int rc; - string xml_body, short_xml_body; + string xml_body, short_xml_body, text; + char * sql_name; char * sql_xml; char * sql_short_xml; + char * sql_text; sql_name = db->escape_str(name.c_str()); @@ -1698,6 +1712,13 @@ int VirtualMachine::insert_replace(SqlDB *db, bool replace, string& error_str) goto error_xml_short; } + sql_text = db->escape_str(to_token(text).c_str()); + + if ( sql_text == 0 ) + { + goto error_text; + } + if(replace) { oss << "REPLACE"; @@ -1719,17 +1740,21 @@ int VirtualMachine::insert_replace(SqlDB *db, bool replace, string& error_str) << owner_u << "," << group_u << "," << other_u << "," - << "'" << sql_short_xml << "'" + << "'" << sql_short_xml << "'," + << "'" << sql_text << "'" << ")"; db->free_str(sql_name); db->free_str(sql_xml); db->free_str(sql_short_xml); + db->free_str(sql_text); rc = db->exec_wr(oss); return rc; +error_text: + db->free_str(sql_text); error_xml_short: db->free_str(sql_short_xml); error_xml: @@ -2145,7 +2170,7 @@ string& VirtualMachine::to_xml_extended(string& xml, int n_history) const string snap_xml; string lock_str; - ostringstream oss; + ostringstream oss; oss << "" << "" << oid << "" @@ -2215,6 +2240,91 @@ string& VirtualMachine::to_xml_extended(string& xml, int n_history) const /* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */ +string& VirtualMachine::to_json(string& json) const +{ + string template_json; + string user_template_json; + string history_json; + + ostringstream oss; + + oss << "{\"VM\":{" + << "\"ID\": \""<< oid << "\"," + << "\"UID\": \""<< uid << "\"," + << "\"GID\": \""<< gid << "\"," + << "\"UNAME\": \""<< uname << "\"," + << "\"GNAME\": \""<< gname << "\"," + << "\"NAME\": \""<< name << "\"," + << "\"LAST_POLL\": \""<< last_poll << "\"," + << "\"STATE\": \""<< state << "\"," + << "\"LCM_STATE\": \""<< lcm_state << "\"," + << "\"PREV_STATE\": \""<< prev_state << "\"," + << "\"PREV_LCM_STATE\": \""<< prev_lcm_state << "\"," + << "\"RESCHED\": \""<< resched << "\"," + << "\"STIME\": \""<< stime << "\"," + << "\"ETIME\": \""<< etime << "\"," + << "\"DEPLOY_ID\": \""<< deploy_id << "\"," + << obj_template->to_json(template_json) << "," + << user_obj_template->to_json(user_template_json); + + if ( hasHistory() ) + { + oss << ",\"HISTORY_RECORDS\": ["; + + oss << history->to_json(history_json); + + oss << "]"; + } + + oss << "}}"; + + + json = oss.str(); + + return json; +} + +/* -------------------------------------------------------------------------- */ +/* -------------------------------------------------------------------------- */ + +string& VirtualMachine::to_token(string& text) const +{ + string template_text; + string user_template_text; + string history_text; + + ostringstream oss; + + oss << "UNAME="<< uname << "\n" + << "GNAME="<< gname << "\n"; + + oss << "NAME="; + one_util::escape_token(name, oss); + oss << "\n"; + + oss << "LAST_POLL="<< last_poll << "\n" + << "PREV_STATE="<< prev_state << "\n" + << "PREV_LCM_STATE="<< prev_lcm_state << "\n" + << "RESCHED="<< resched << "\n" + << "STIME="<< stime << "\n" + << "ETIME="<< etime << "\n" + << "DEPLOY_ID="<< deploy_id << "\n" + << obj_template->to_token(template_text) << "\n" + << user_obj_template->to_token(user_template_text); + + if ( hasHistory() ) + { + oss << "\n" << history->to_token(history_text); + } + + text = oss.str(); + + return text; +} + +/* -------------------------------------------------------------------------- */ +/* -------------------------------------------------------------------------- */ + string& VirtualMachine::to_xml_short(string& xml) { string disks_xml, monitoring_xml, user_template_xml, history_xml, nics_xml; @@ -2462,7 +2572,7 @@ int VirtualMachine::from_xml(const string &xml_str) for (vector::iterator it=content.begin();it!=content.end();it++) { - Snapshots * snap = new Snapshots(-1, false); + Snapshots * snap = new Snapshots(-1, Snapshots::DENY); rc += snap->from_xml_node(*it); @@ -2744,7 +2854,8 @@ static std::map> UPDATECONF_ATTRS = { "GUEST_AGENT"} }, {"INPUT", {"TYPE", "BUS"} }, {"GRAPHICS", {"TYPE", "LISTEN", "PASSWD", "KEYMAP"} }, - {"RAW", {"TYPE", "DATA", "DATA_VMX"} } + {"RAW", {"TYPE", "DATA", "DATA_VMX"} }, + {"CPU_MODEL", {"MODEL"} } }; /** @@ -2884,7 +2995,7 @@ int VirtualMachine::updateconf(VirtualMachineTemplate& tmpl, string &err) } // ------------------------------------------------------------------------- - // Update OS, FEATURES, INPUT, GRAPHICS, RAW + // Update OS, FEATURES, INPUT, GRAPHICS, RAW, CPU_MODEL // ------------------------------------------------------------------------- replace_vector_values(obj_template, &tmpl, "OS"); @@ -2901,6 +3012,8 @@ int VirtualMachine::updateconf(VirtualMachineTemplate& tmpl, string &err) replace_vector_values(obj_template, &tmpl, "RAW"); + replace_vector_values(obj_template, &tmpl, "CPU_MODEL"); + // ------------------------------------------------------------------------- // Update CONTEXT: any value // ------------------------------------------------------------------------- diff --git a/src/vm/VirtualMachineAttribute.cc b/src/vm/VirtualMachineAttribute.cc index 4317384b8f..73c6875f4e 100644 --- a/src/vm/VirtualMachineAttribute.cc +++ b/src/vm/VirtualMachineAttribute.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/vm/VirtualMachineContext.cc b/src/vm/VirtualMachineContext.cc index f1d68500a4..e0fe57d194 100644 --- a/src/vm/VirtualMachineContext.cc +++ b/src/vm/VirtualMachineContext.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/vm/VirtualMachineDisk.cc b/src/vm/VirtualMachineDisk.cc index 431df363cb..1374e298cb 100644 --- a/src/vm/VirtualMachineDisk.cc +++ b/src/vm/VirtualMachineDisk.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -277,14 +277,14 @@ int VirtualMachineDisk::create_snapshot(const string& name, string& error) /* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */ -int VirtualMachineDisk::revert_snapshot(int snap_id) +int VirtualMachineDisk::revert_snapshot(int snap_id, bool revert) { if ( snapshots == 0 ) { return -1; } - return snapshots->active_snapshot(snap_id); + return snapshots->active_snapshot(snap_id, revert); } /* -------------------------------------------------------------------------- */ @@ -1367,7 +1367,7 @@ const Snapshots * VirtualMachineDisks::get_snapshots(int id, string& error) cons /* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */ -int VirtualMachineDisks::revert_snapshot(int id, int snap_id) +int VirtualMachineDisks::revert_snapshot(int id, int snap_id, bool revert) { VirtualMachineDisk * disk = static_cast(get_attribute(id)); @@ -1377,7 +1377,7 @@ int VirtualMachineDisks::revert_snapshot(int id, int snap_id) return -1; } - return disk->revert_snapshot(snap_id); + return disk->revert_snapshot(snap_id, revert); } /* -------------------------------------------------------------------------- */ diff --git a/src/vm/VirtualMachineHook.cc b/src/vm/VirtualMachineHook.cc index f23f6d9126..a7f4346036 100644 --- a/src/vm/VirtualMachineHook.cc +++ b/src/vm/VirtualMachineHook.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/vm/VirtualMachineNic.cc b/src/vm/VirtualMachineNic.cc index f93aa274dc..89ed327f2d 100644 --- a/src/vm/VirtualMachineNic.cc +++ b/src/vm/VirtualMachineNic.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -280,7 +280,7 @@ int VirtualMachineNics::get_network_leases(int vm_id, int uid, one_util::toupper(net_mode); - if (vnic->name() == "NIC") + if (vnic->name() == "NIC" || vnic->name() == "PCI") { VirtualMachineNic * nic = new VirtualMachineNic(vnic, nic_id); @@ -321,7 +321,7 @@ int VirtualMachineNics::get_network_leases(int vm_id, int uid, return -1; } - else + else if (vnic->name() == "NIC_ALIAS") { alias_nics.push_back(vnic); } diff --git a/src/vm/VirtualMachineParser.cc b/src/vm/VirtualMachineParser.cc index f746fbf1b6..7a46a2ef01 100644 --- a/src/vm/VirtualMachineParser.cc +++ b/src/vm/VirtualMachineParser.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/vm/VirtualMachinePool.cc b/src/vm/VirtualMachinePool.cc index 7c8f8ab74b..02c3062436 100644 --- a/src/vm/VirtualMachinePool.cc +++ b/src/vm/VirtualMachinePool.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/vm/VirtualMachineSystemSnapshot.cc b/src/vm/VirtualMachineSystemSnapshot.cc index c174a1d93e..291828b2e3 100644 --- a/src/vm/VirtualMachineSystemSnapshot.cc +++ b/src/vm/VirtualMachineSystemSnapshot.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/vm/VirtualMachineTemplate.cc b/src/vm/VirtualMachineTemplate.cc index 32db1b32d6..9958d4098f 100644 --- a/src/vm/VirtualMachineTemplate.cc +++ b/src/vm/VirtualMachineTemplate.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/vm_group/SConstruct b/src/vm_group/SConstruct index 27859ae6ad..3d4f189cd1 100644 --- a/src/vm_group/SConstruct +++ b/src/vm_group/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/secgroup # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vm_group/VMGroup.cc b/src/vm_group/VMGroup.cc index 3eb7357fb0..938b4061fd 100644 --- a/src/vm_group/VMGroup.cc +++ b/src/vm_group/VMGroup.cc @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/vm_group/VMGroupPool.cc b/src/vm_group/VMGroupPool.cc index cf3685a796..4322fc87bf 100644 --- a/src/vm_group/VMGroupPool.cc +++ b/src/vm_group/VMGroupPool.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/vm_group/VMGroupRole.cc b/src/vm_group/VMGroupRole.cc index 20ce19b4d8..d65dd9e25c 100644 --- a/src/vm_group/VMGroupRole.cc +++ b/src/vm_group/VMGroupRole.cc @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/vm_group/VMGroupRule.cc b/src/vm_group/VMGroupRule.cc index b02ebf3bdf..af70007c2a 100644 --- a/src/vm_group/VMGroupRule.cc +++ b/src/vm_group/VMGroupRule.cc @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/vm_template/SConstruct b/src/vm_template/SConstruct index 0987c527e4..76b8ea330b 100644 --- a/src/vm_template/SConstruct +++ b/src/vm_template/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/vm # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vm_template/ScheduledAction.cc b/src/vm_template/ScheduledAction.cc index cf686dd1aa..f3bc8b972d 100644 --- a/src/vm_template/ScheduledAction.cc +++ b/src/vm_template/ScheduledAction.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/vm_template/VMTemplate.cc b/src/vm_template/VMTemplate.cc index 50c0867a75..d1b2af7a95 100644 --- a/src/vm_template/VMTemplate.cc +++ b/src/vm_template/VMTemplate.cc @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/vm_template/VMTemplatePool.cc b/src/vm_template/VMTemplatePool.cc index 9736c456b8..dc9c79afcf 100644 --- a/src/vm_template/VMTemplatePool.cc +++ b/src/vm_template/VMTemplatePool.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/vmm/LibVirtDriverKVM.cc b/src/vmm/LibVirtDriverKVM.cc index fda79ade8a..f6acdcc5a4 100644 --- a/src/vmm/LibVirtDriverKVM.cc +++ b/src/vmm/LibVirtDriverKVM.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -1472,9 +1472,11 @@ int LibVirtDriver::deployment_description_kvm( // Metadata used by drivers // ------------------------------------------------------------------------ file << "\t\n" - << "\t\t" + << "\t\t\n" + << "\t\t\t" << one_util::escape_xml(vm->get_system_dir()) - << "\n" + << "\n" + << "\t\t\n" // << "\t\t\n" << vm->to_xml(vm_xml) << "\t\t\n" << "\t\n"; diff --git a/src/vmm/SConstruct b/src/vmm/SConstruct index bacc2dc55f..79f857e4a2 100644 --- a/src/vmm/SConstruct +++ b/src/vmm/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/vmm # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm/VirtualMachineManager.cc b/src/vmm/VirtualMachineManager.cc index cd92e4f28e..9d275ebc18 100644 --- a/src/vmm/VirtualMachineManager.cc +++ b/src/vmm/VirtualMachineManager.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -2408,6 +2408,9 @@ void VirtualMachineManager::detach_nic_action( string vm_tmpl; string * drv_msg; string error_str; + string prolog_cmd; + string disk_path; + string password; // Get the VM from the pool vm = vmpool->get(vid); @@ -2417,6 +2420,19 @@ void VirtualMachineManager::detach_nic_action( return; } + int uid = vm->get_created_by_uid(); + int owner_id = vm->get_uid(); + vm->unlock(); + + password = Nebula::instance().get_upool()->get_token_password(uid, owner_id); + + vm = vmpool->get(vid); + + if (vm == 0) + { + return; + } + if (!vm->hasHistory()) { goto error_history; @@ -2430,6 +2446,11 @@ void VirtualMachineManager::detach_nic_action( goto error_driver; } + if ( do_context_command(vm, password, prolog_cmd, disk_path) == -1 ) + { + goto error_no_tm_command; + } + // Invoke driver method drv_msg = format_message( vm->get_hostname(), @@ -2438,9 +2459,9 @@ void VirtualMachineManager::detach_nic_action( "", "", "", + prolog_cmd, "", - "", - "", + disk_path, vm->to_xml(vm_tmpl), vm->get_ds_id(), -1); @@ -2463,6 +2484,11 @@ error_driver: os << "detach_nic_action, error getting driver " << vm->get_vmm_mad(); goto error_common; +error_no_tm_command: + os.str(""); + os << "Cannot set context disk to update it for VM " << vm->get_oid(); + goto error_common; + error_common: Nebula &ne = Nebula::instance(); LifeCycleManager * lcm = ne.get_lcm(); diff --git a/src/vmm/VirtualMachineManagerDriver.cc b/src/vmm/VirtualMachineManagerDriver.cc index aab45620f8..b6fb8e5cea 100644 --- a/src/vmm/VirtualMachineManagerDriver.cc +++ b/src/vmm/VirtualMachineManagerDriver.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -39,7 +39,7 @@ VirtualMachineManagerDriver::VirtualMachineManagerDriver( bool sudo, VirtualMachinePool * pool): Mad(userid,attrs,sudo), driver_conf(true), keep_snapshots(false), - vmpool(pool) + ds_live_migration(false), vmpool(pool) { map::const_iterator it; char * error_msg = 0; @@ -99,6 +99,11 @@ VirtualMachineManagerDriver::VirtualMachineManagerDriver( // ------------------------------------------------------------------------- driver_conf.get("KEEP_SNAPSHOTS", keep_snapshots); + // ------------------------------------------------------------------------- + // Parse KEEP_SNAPSHOTS + // ------------------------------------------------------------------------- + driver_conf.get("DS_LIVE_MIGRATION", ds_live_migration); + // ------------------------------------------------------------------------- // Parse IMPORTED_VMS_ACTIONS string and init the action set // ------------------------------------------------------------------------- diff --git a/src/vmm/XMLDriver.cc b/src/vmm/XMLDriver.cc index 05dc7a849a..13090a6130 100644 --- a/src/vmm/XMLDriver.cc +++ b/src/vmm/XMLDriver.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/vmm/XenDriver.cc b/src/vmm/XenDriver.cc index fd9b22b2c5..4450924904 100644 --- a/src/vmm/XenDriver.cc +++ b/src/vmm/XenDriver.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/vmm_mad/dummy/one_vmm_dummy b/src/vmm_mad/dummy/one_vmm_dummy index f71f04f47f..18734e4c60 100755 --- a/src/vmm_mad/dummy/one_vmm_dummy +++ b/src/vmm_mad/dummy/one_vmm_dummy @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/dummy/one_vmm_dummy.rb b/src/vmm_mad/dummy/one_vmm_dummy.rb index 7a84d9a75b..8c156863a7 100755 --- a/src/vmm_mad/dummy/one_vmm_dummy.rb +++ b/src/vmm_mad/dummy/one_vmm_dummy.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/exec/one_vmm_exec b/src/vmm_mad/exec/one_vmm_exec index 956bcb5a0f..4729e15469 100755 --- a/src/vmm_mad/exec/one_vmm_exec +++ b/src/vmm_mad/exec/one_vmm_exec @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/exec/one_vmm_exec.rb b/src/vmm_mad/exec/one_vmm_exec.rb index 256f93fecc..6f260efad0 100755 --- a/src/vmm_mad/exec/one_vmm_exec.rb +++ b/src/vmm_mad/exec/one_vmm_exec.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -1015,6 +1015,15 @@ class ExecDriver < VirtualMachineDriver action = ACTION[:detach_nic] xml_data = decode(drv_message) + tm_command = xml_data.elements['TM_COMMAND'] + tm_command = tm_command.text if tm_command + + target_path = xml_data.elements['DISK_TARGET_PATH'] + target_path = target_path.text if target_path + + target_device = xml_data.elements['VM/TEMPLATE/CONTEXT/TARGET'] + target_device = target_device.text if target_device + nic_alias = false external = false @@ -1036,6 +1045,8 @@ class ExecDriver < VirtualMachineDriver return end + action = VmmAction.new(self, id, :detach_nic, drv_message) + if !nic_alias steps=[ # Detach the NIC @@ -1062,13 +1073,27 @@ class ExecDriver < VirtualMachineDriver steps = [] end - if steps.empty? - send_message(action, RESULT[:success], id, "") - else - action = VmmAction.new(self, id, :detach_nic, drv_message) + steps << { + :driver => :vmm, + :action => :prereconfigure, + :parameters => [:deploy_id, target_device] + } - action.run(steps) + if tm_command && !tm_command.empty? + steps << { + :driver => :tm, + :action => :tm_context, + :parameters => tm_command.strip.split(' ') + } end + + steps << { + :driver => :vmm, + :action => :reconfigure, + :parameters => [:deploy_id, target_device, target_path] + } + + action.run(steps) end # diff --git a/src/vmm_mad/exec/one_vmm_sh b/src/vmm_mad/exec/one_vmm_sh index 931c3bd42c..05762711f6 100755 --- a/src/vmm_mad/exec/one_vmm_sh +++ b/src/vmm_mad/exec/one_vmm_sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/exec/one_vmm_ssh b/src/vmm_mad/exec/one_vmm_ssh index 0a224d6326..510cabe083 100755 --- a/src/vmm_mad/exec/one_vmm_ssh +++ b/src/vmm_mad/exec/one_vmm_ssh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/exec/vmm_exec_kvm.conf b/src/vmm_mad/exec/vmm_exec_kvm.conf index cb34a197fa..71cfb31cc3 100644 --- a/src/vmm_mad/exec/vmm_exec_kvm.conf +++ b/src/vmm_mad/exec/vmm_exec_kvm.conf @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/exec/vmm_exec_vcenter.conf b/src/vmm_mad/exec/vmm_exec_vcenter.conf index 1118c9bde4..484f0b3af1 100644 --- a/src/vmm_mad/exec/vmm_exec_vcenter.conf +++ b/src/vmm_mad/exec/vmm_exec_vcenter.conf @@ -1,5 +1,5 @@ # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -16,8 +16,8 @@ # Default configuration attributes for the vCenter driver # (all domains will use these values as defaults) -# Valid atributes: +# Valid attributes: # - nic[model] -NIC=[MODEL="VirtualE1000"] - +# WARNING: Do not use!! +# Not honored due to https://github.com/OpenNebula/one/issues/2855 diff --git a/src/vmm_mad/exec/vmm_execrc b/src/vmm_mad/exec/vmm_execrc index 92e6074d97..a1e4f181b8 100644 --- a/src/vmm_mad/exec/vmm_execrc +++ b/src/vmm_mad/exec/vmm_execrc @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/az/attach_disk b/src/vmm_mad/remotes/az/attach_disk index d415499ef5..9f65e99890 100644 --- a/src/vmm_mad/remotes/az/attach_disk +++ b/src/vmm_mad/remotes/az/attach_disk @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/az/attach_nic b/src/vmm_mad/remotes/az/attach_nic index d415499ef5..9f65e99890 100755 --- a/src/vmm_mad/remotes/az/attach_nic +++ b/src/vmm_mad/remotes/az/attach_nic @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/az/az_driver.default b/src/vmm_mad/remotes/az/az_driver.default index fc8975b3eb..4ecff0e0e0 100644 --- a/src/vmm_mad/remotes/az/az_driver.default +++ b/src/vmm_mad/remotes/az/az_driver.default @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/az/az_driver.rb b/src/vmm_mad/remotes/az/az_driver.rb index 2235933457..6e3e6ceaca 100755 --- a/src/vmm_mad/remotes/az/az_driver.rb +++ b/src/vmm_mad/remotes/az/az_driver.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/az/cancel b/src/vmm_mad/remotes/az/cancel index b1e8b9f00a..c7c2f4fd24 100755 --- a/src/vmm_mad/remotes/az/cancel +++ b/src/vmm_mad/remotes/az/cancel @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/az/deploy b/src/vmm_mad/remotes/az/deploy index e175f7a536..c6285b5c10 100755 --- a/src/vmm_mad/remotes/az/deploy +++ b/src/vmm_mad/remotes/az/deploy @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/az/detach_disk b/src/vmm_mad/remotes/az/detach_disk index d415499ef5..9f65e99890 100755 --- a/src/vmm_mad/remotes/az/detach_disk +++ b/src/vmm_mad/remotes/az/detach_disk @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/az/detach_nic b/src/vmm_mad/remotes/az/detach_nic index d415499ef5..9f65e99890 100755 --- a/src/vmm_mad/remotes/az/detach_nic +++ b/src/vmm_mad/remotes/az/detach_nic @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/az/migrate b/src/vmm_mad/remotes/az/migrate index d415499ef5..9f65e99890 100755 --- a/src/vmm_mad/remotes/az/migrate +++ b/src/vmm_mad/remotes/az/migrate @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/az/migrate_local b/src/vmm_mad/remotes/az/migrate_local index d415499ef5..9f65e99890 100755 --- a/src/vmm_mad/remotes/az/migrate_local +++ b/src/vmm_mad/remotes/az/migrate_local @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/az/poll b/src/vmm_mad/remotes/az/poll index bf620b8f1e..9ea31a2e24 100755 --- a/src/vmm_mad/remotes/az/poll +++ b/src/vmm_mad/remotes/az/poll @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/az/reboot b/src/vmm_mad/remotes/az/reboot index c3cb4fce4f..f00180fa82 100755 --- a/src/vmm_mad/remotes/az/reboot +++ b/src/vmm_mad/remotes/az/reboot @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/az/reset b/src/vmm_mad/remotes/az/reset index d415499ef5..9f65e99890 100755 --- a/src/vmm_mad/remotes/az/reset +++ b/src/vmm_mad/remotes/az/reset @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/az/restore b/src/vmm_mad/remotes/az/restore index 250765ce5a..b62413c92a 100755 --- a/src/vmm_mad/remotes/az/restore +++ b/src/vmm_mad/remotes/az/restore @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/az/save b/src/vmm_mad/remotes/az/save index 14f98b7f9b..9ff79678c4 100755 --- a/src/vmm_mad/remotes/az/save +++ b/src/vmm_mad/remotes/az/save @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/az/shutdown b/src/vmm_mad/remotes/az/shutdown index 5b4f7827a2..331139c79e 100755 --- a/src/vmm_mad/remotes/az/shutdown +++ b/src/vmm_mad/remotes/az/shutdown @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/az/snapshot_create b/src/vmm_mad/remotes/az/snapshot_create index d415499ef5..9f65e99890 100755 --- a/src/vmm_mad/remotes/az/snapshot_create +++ b/src/vmm_mad/remotes/az/snapshot_create @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/az/snapshot_delete b/src/vmm_mad/remotes/az/snapshot_delete index d415499ef5..9f65e99890 100755 --- a/src/vmm_mad/remotes/az/snapshot_delete +++ b/src/vmm_mad/remotes/az/snapshot_delete @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/az/snapshot_revert b/src/vmm_mad/remotes/az/snapshot_revert index d415499ef5..9f65e99890 100755 --- a/src/vmm_mad/remotes/az/snapshot_revert +++ b/src/vmm_mad/remotes/az/snapshot_revert @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/common/dummy.sh b/src/vmm_mad/remotes/common/dummy.sh index d24d2a262b..f6c157c95f 100755 --- a/src/vmm_mad/remotes/common/dummy.sh +++ b/src/vmm_mad/remotes/common/dummy.sh @@ -1,7 +1,7 @@ #!/bin/sh # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/common/not_supported.sh b/src/vmm_mad/remotes/common/not_supported.sh index 2e5ba286f5..f58bbbcc6e 100755 --- a/src/vmm_mad/remotes/common/not_supported.sh +++ b/src/vmm_mad/remotes/common/not_supported.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/ec2/attach_disk b/src/vmm_mad/remotes/ec2/attach_disk index d415499ef5..9f65e99890 100755 --- a/src/vmm_mad/remotes/ec2/attach_disk +++ b/src/vmm_mad/remotes/ec2/attach_disk @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/ec2/attach_nic b/src/vmm_mad/remotes/ec2/attach_nic index d415499ef5..9f65e99890 100755 --- a/src/vmm_mad/remotes/ec2/attach_nic +++ b/src/vmm_mad/remotes/ec2/attach_nic @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/ec2/cancel b/src/vmm_mad/remotes/ec2/cancel index a9d40d243c..2213ebdee4 100755 --- a/src/vmm_mad/remotes/ec2/cancel +++ b/src/vmm_mad/remotes/ec2/cancel @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/ec2/deploy b/src/vmm_mad/remotes/ec2/deploy index d02cd1247b..fd02dba709 100755 --- a/src/vmm_mad/remotes/ec2/deploy +++ b/src/vmm_mad/remotes/ec2/deploy @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/ec2/detach_disk b/src/vmm_mad/remotes/ec2/detach_disk index d415499ef5..9f65e99890 100755 --- a/src/vmm_mad/remotes/ec2/detach_disk +++ b/src/vmm_mad/remotes/ec2/detach_disk @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/ec2/detach_nic b/src/vmm_mad/remotes/ec2/detach_nic index d415499ef5..9f65e99890 100755 --- a/src/vmm_mad/remotes/ec2/detach_nic +++ b/src/vmm_mad/remotes/ec2/detach_nic @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/ec2/ec2_driver.default b/src/vmm_mad/remotes/ec2/ec2_driver.default index b82d241322..5d7bbf1114 100644 --- a/src/vmm_mad/remotes/ec2/ec2_driver.default +++ b/src/vmm_mad/remotes/ec2/ec2_driver.default @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/ec2/ec2_driver.rb b/src/vmm_mad/remotes/ec2/ec2_driver.rb index 1c9862ec8f..6019de98d3 100755 --- a/src/vmm_mad/remotes/ec2/ec2_driver.rb +++ b/src/vmm_mad/remotes/ec2/ec2_driver.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/ec2/migrate b/src/vmm_mad/remotes/ec2/migrate index d415499ef5..9f65e99890 100755 --- a/src/vmm_mad/remotes/ec2/migrate +++ b/src/vmm_mad/remotes/ec2/migrate @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/ec2/migrate_local b/src/vmm_mad/remotes/ec2/migrate_local index d415499ef5..9f65e99890 100755 --- a/src/vmm_mad/remotes/ec2/migrate_local +++ b/src/vmm_mad/remotes/ec2/migrate_local @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/ec2/poll b/src/vmm_mad/remotes/ec2/poll index 4aec32dafa..54c5bf2bf8 100755 --- a/src/vmm_mad/remotes/ec2/poll +++ b/src/vmm_mad/remotes/ec2/poll @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/ec2/reboot b/src/vmm_mad/remotes/ec2/reboot index 67b1f0adae..354d80c0e4 100755 --- a/src/vmm_mad/remotes/ec2/reboot +++ b/src/vmm_mad/remotes/ec2/reboot @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/ec2/reset b/src/vmm_mad/remotes/ec2/reset index d415499ef5..9f65e99890 100755 --- a/src/vmm_mad/remotes/ec2/reset +++ b/src/vmm_mad/remotes/ec2/reset @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/ec2/restore b/src/vmm_mad/remotes/ec2/restore index 0366d4327a..207fe5e3b3 100755 --- a/src/vmm_mad/remotes/ec2/restore +++ b/src/vmm_mad/remotes/ec2/restore @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/ec2/save b/src/vmm_mad/remotes/ec2/save index 0875e2b94e..ab39528aba 100755 --- a/src/vmm_mad/remotes/ec2/save +++ b/src/vmm_mad/remotes/ec2/save @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/ec2/shutdown b/src/vmm_mad/remotes/ec2/shutdown index ffe13193b2..7150a27df1 100755 --- a/src/vmm_mad/remotes/ec2/shutdown +++ b/src/vmm_mad/remotes/ec2/shutdown @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/ec2/snapshot_create b/src/vmm_mad/remotes/ec2/snapshot_create index d415499ef5..9f65e99890 100755 --- a/src/vmm_mad/remotes/ec2/snapshot_create +++ b/src/vmm_mad/remotes/ec2/snapshot_create @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/ec2/snapshot_delete b/src/vmm_mad/remotes/ec2/snapshot_delete index d415499ef5..9f65e99890 100755 --- a/src/vmm_mad/remotes/ec2/snapshot_delete +++ b/src/vmm_mad/remotes/ec2/snapshot_delete @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/ec2/snapshot_revert b/src/vmm_mad/remotes/ec2/snapshot_revert index d415499ef5..9f65e99890 100755 --- a/src/vmm_mad/remotes/ec2/snapshot_revert +++ b/src/vmm_mad/remotes/ec2/snapshot_revert @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/kvm/attach_disk b/src/vmm_mad/remotes/kvm/attach_disk index 6b82be8e4e..80be9aefa7 100755 --- a/src/vmm_mad/remotes/kvm/attach_disk +++ b/src/vmm_mad/remotes/kvm/attach_disk @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/kvm/attach_nic b/src/vmm_mad/remotes/kvm/attach_nic index 54a084cf74..e6b9ff17fc 100755 --- a/src/vmm_mad/remotes/kvm/attach_nic +++ b/src/vmm_mad/remotes/kvm/attach_nic @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/kvm/cancel b/src/vmm_mad/remotes/kvm/cancel index d494c57359..ec0a3e476b 100755 --- a/src/vmm_mad/remotes/kvm/cancel +++ b/src/vmm_mad/remotes/kvm/cancel @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/kvm/deploy b/src/vmm_mad/remotes/kvm/deploy index 8ed13b4480..488b601653 100755 --- a/src/vmm_mad/remotes/kvm/deploy +++ b/src/vmm_mad/remotes/kvm/deploy @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -19,16 +19,33 @@ source $(dirname $0)/../../etc/vmm/kvm/kvmrc source $(dirname $0)/../../scripts_common.sh -domain=$1 +DEP_FILE=$1 +DEP_FILE_LOCATION=$(dirname $DEP_FILE) -mkdir -p `dirname $domain` -cat > $domain +mkdir -p $DEP_FILE_LOCATION +cat > $DEP_FILE -data=`virsh --connect $LIBVIRT_URI create $domain` +DATA=`virsh --connect $LIBVIRT_URI create $DEP_FILE` if [ "x$?" = "x0" ]; then - echo $data | sed 's/Domain //' | sed 's/ created from .*$//' + + DOMAIN_ID=$(echo $DATA | sed 's/Domain //' | sed 's/ created from .*$//') + echo $DOMAIN_ID + + # redefine potential snapshots + for SNAPSHOT_MD_XML in $(ls ${DEP_FILE_LOCATION}/snap-*.xml 2>/dev/null); do + + # query UUID, but only once + UUID=${UUID:-$(virsh --connect $LIBVIRT_URI dominfo $DOMAIN_ID | grep UUID: | awk '{print $2}')} + + # replace uuid in the snapshot metadata xml + sed -i "s%[[:alnum:]-]*%$UUID%" $SNAPSHOT_MD_XML + + # redefine the snapshot using the xml metadata file + virsh --connect $LIBVIRT_URI snapshot-create $DOMAIN_ID $SNAPSHOT_MD_XML --redefine > /dev/null || true + done + else - error_message "Could not create domain from $domain" + error_message "Could not create domain from $DEP_FILE" exit -1 fi diff --git a/src/vmm_mad/remotes/kvm/detach_disk b/src/vmm_mad/remotes/kvm/detach_disk index ec641d22c5..02d569409b 100755 --- a/src/vmm_mad/remotes/kvm/detach_disk +++ b/src/vmm_mad/remotes/kvm/detach_disk @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/kvm/detach_nic b/src/vmm_mad/remotes/kvm/detach_nic index fcef8787d0..2b1b9fd20f 100755 --- a/src/vmm_mad/remotes/kvm/detach_nic +++ b/src/vmm_mad/remotes/kvm/detach_nic @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/kvm/kvmrc b/src/vmm_mad/remotes/kvm/kvmrc index 7edcab5379..8a643324c4 100644 --- a/src/vmm_mad/remotes/kvm/kvmrc +++ b/src/vmm_mad/remotes/kvm/kvmrc @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -20,6 +20,9 @@ export LIBVIRT_URI=qemu:///system export QEMU_PROTOCOL=qemu+ssh +export LIBVIRT_MD_URI=http://opennebula.org/xmlns/libvirt/1.0 +export LIBVIRT_MD_KEY=one + # Seconds to wait after shutdown until timeout export SHUTDOWN_TIMEOUT=300 diff --git a/src/vmm_mad/remotes/kvm/migrate b/src/vmm_mad/remotes/kvm/migrate index fb30c5e08f..8853c5e2bf 100755 --- a/src/vmm_mad/remotes/kvm/migrate +++ b/src/vmm_mad/remotes/kvm/migrate @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/kvm/migrate_local b/src/vmm_mad/remotes/kvm/migrate_local index 32ef4f3667..6113518f2a 100755 --- a/src/vmm_mad/remotes/kvm/migrate_local +++ b/src/vmm_mad/remotes/kvm/migrate_local @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/kvm/poll b/src/vmm_mad/remotes/kvm/poll index 1e3de34db0..811618dd14 100755 --- a/src/vmm_mad/remotes/kvm/poll +++ b/src/vmm_mad/remotes/kvm/poll @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -49,8 +49,7 @@ module KVM :domstate => 'virsh --connect LIBVIRT_URI --readonly domstate', :list => 'virsh --connect LIBVIRT_URI --readonly list', :dumpxml => 'virsh --connect LIBVIRT_URI --readonly dumpxml', - :domifstat => 'virsh --connect LIBVIRT_URI --readonly domifstat', - :domblkstat => 'virsh --connect LIBVIRT_URI --readonly domblkstat', + :domstats => 'virsh --connect LIBVIRT_URI --readonly domstats', :top => 'top -b -d2 -n 2 -p ', 'LIBVIRT_URI' => 'qemu:///system' } @@ -90,7 +89,7 @@ module KVM xml = dump_xml(one_vm) - values.merge!(get_interface_statistics(one_vm, xml)) + values.merge!(get_io_statistics(one_vm, xml)) return values end @@ -157,8 +156,7 @@ module KVM end if (values[:state] == 'a') && (vm[:reason] != 'migrating') - values.merge!(get_interface_statistics(name, xml)) - values.merge!(get_diskio_statistics(name, xml)) + values.merge!(get_io_statistics(name, xml)) end vms_info[vm[:name]] = values @@ -306,96 +304,39 @@ module KVM `#{virsh(:dumpxml)} '#{vmid}' 2>/dev/null` end - # Aggregate statics of all VM NICs - # @param the ID of the VM as defined in libvirt - # @param text [nil, String] dumpxml output or nil to execute dumpxml - # @return [Hash] with network stats, by name [symbol] :netrx, :nettx - def self.get_interface_statistics(vmid, text = nil) - text = dump_xml(vmid) if !text - - return {} if $?.exitstatus != 0 - - doc = REXML::Document.new(text) - - interfaces = Array.new - - doc.elements.each('domain/devices/interface/target') do |ele| - interfaces << ele.attributes["dev"] - end - - return {} if interfaces.empty? - - values = Hash.new + def self.get_io_statistics(vmid, text = nil) + vm_stats=`#{virsh(:domstats)} #{vmid}` + values={} values[:netrx] = 0 values[:nettx] = 0 + values[:diskrdbytes]=0 + values[:diskwrbytes]=0 + values[:diskrdiops]=0 + values[:diskwriops]=0 - interfaces.each do |interface| - text=`#{virsh(:domifstat)} #{vmid} #{interface} 2>/dev/null` - next if $?.exitstatus != 0 - - text.each_line do |line| - columns = line.split(/\s+/) - - case columns[1] - when 'rx_bytes' - values[:netrx] += columns[2].to_i - when 'tx_bytes' - values[:nettx]+=columns[2].to_i - end - end + vm_stats.each_line do |line| + columns=line.split(/=(\d+)/) + case columns[0] + when /rx.bytes/ + values[:netrx]+=columns[1].to_i + when /tx.bytes/ + values[:nettx]+=columns[1].to_i + when /rd.bytes/ + values[:diskrdbytes]+=columns[1].to_i + when /wr.bytes/ + values[:diskwrbytes]+=columns[1].to_i + when /rd.reqs/ + values[:diskrdiops]+=columns[1].to_i + when /wr.reqs/ + values[:diskwriops]+=columns[1].to_i + end end values end - def self.get_disk_names(vmid, text = nil) - text = dump_xml(vmid) if !text - - doc=REXML::Document.new(text) - disks = [] - doc.elements.each('domain/devices/disk/target') do |ele| - disks << ele.attributes["dev"] - end - - disks - end - - def self.get_diskio_statistics(vmid, text = nil) - disks=get_disk_names(vmid, text) - - if disks && !disks.empty? - values={} - values[:diskrdbytes]=0 - values[:diskwrbytes]=0 - values[:diskrdiops]=0 - values[:diskwriops]=0 - - disks.each do |disk| - text=`#{virsh(:domblkstat)} #{vmid} #{disk} 2>/dev/null` - - text.each_line do |line| - columns=line.split(/\s+/) - case columns[1] - when 'rd_bytes' - values[:diskrdbytes]+=columns[2].to_i - when 'wr_bytes' - values[:diskwrbytes]+=columns[2].to_i - when 'rd_req' - values[:diskrdiops]+=columns[2].to_i - when 'wr_req' - values[:diskwriops]+=columns[2].to_i - end - end - end - - values - else - {} - end - end - # Translate libvirt state to Opennebula monitor state # @param state [String] libvirt state # @return [String] OpenNebula state diff --git a/src/vmm_mad/remotes/kvm/prereconfigure b/src/vmm_mad/remotes/kvm/prereconfigure index 7562024db9..1c82fc5165 100755 --- a/src/vmm_mad/remotes/kvm/prereconfigure +++ b/src/vmm_mad/remotes/kvm/prereconfigure @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/kvm/reboot b/src/vmm_mad/remotes/kvm/reboot index cbce134e0c..14e00795fc 100755 --- a/src/vmm_mad/remotes/kvm/reboot +++ b/src/vmm_mad/remotes/kvm/reboot @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/kvm/reconfigure b/src/vmm_mad/remotes/kvm/reconfigure index b42d0521af..47b5971087 100755 --- a/src/vmm_mad/remotes/kvm/reconfigure +++ b/src/vmm_mad/remotes/kvm/reconfigure @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/kvm/reset b/src/vmm_mad/remotes/kvm/reset index 39b2df6cd6..570ac90d4a 100755 --- a/src/vmm_mad/remotes/kvm/reset +++ b/src/vmm_mad/remotes/kvm/reset @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/kvm/resize_disk b/src/vmm_mad/remotes/kvm/resize_disk index 0a84bf1bd4..aecacbcded 100755 --- a/src/vmm_mad/remotes/kvm/resize_disk +++ b/src/vmm_mad/remotes/kvm/resize_disk @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/kvm/restore b/src/vmm_mad/remotes/kvm/restore index 7e5273a34d..91f925549e 100755 --- a/src/vmm_mad/remotes/kvm/restore +++ b/src/vmm_mad/remotes/kvm/restore @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/kvm/restore.ceph b/src/vmm_mad/remotes/kvm/restore.ceph index f7dcd427e0..f79b7e1cf0 100755 --- a/src/vmm_mad/remotes/kvm/restore.ceph +++ b/src/vmm_mad/remotes/kvm/restore.ceph @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/kvm/save b/src/vmm_mad/remotes/kvm/save index 084c0ab657..45409efd76 100755 --- a/src/vmm_mad/remotes/kvm/save +++ b/src/vmm_mad/remotes/kvm/save @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/kvm/save.ceph b/src/vmm_mad/remotes/kvm/save.ceph index ca03be89da..69f62d4d8d 100755 --- a/src/vmm_mad/remotes/kvm/save.ceph +++ b/src/vmm_mad/remotes/kvm/save.ceph @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/kvm/shutdown b/src/vmm_mad/remotes/kvm/shutdown index 8ed50fdcde..b59fdeccae 100755 --- a/src/vmm_mad/remotes/kvm/shutdown +++ b/src/vmm_mad/remotes/kvm/shutdown @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/kvm/snapshot_create b/src/vmm_mad/remotes/kvm/snapshot_create index bd7bd2d9e9..269826cfc8 100755 --- a/src/vmm_mad/remotes/kvm/snapshot_create +++ b/src/vmm_mad/remotes/kvm/snapshot_create @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -22,9 +22,36 @@ source $(dirname $0)/../../scripts_common.sh DOMAIN="$1" SNAP_ID="$2" -data=`virsh --connect $LIBVIRT_URI snapshot-create-as $DOMAIN --name "snap-${SNAP_ID}"` +# -------- Get datastore location from libvirt metadata ------------ + +DRIVER_PATH=$(dirname $0) +XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin" + +METADATA_XML=`virsh --connect $LIBVIRT_URI metadata $DOMAIN $LIBVIRT_MD_URI $LIBVIRT_MD_KEY` + +unset i XPATH_ELEMENTS + +while IFS= read -r -d '' element; do + XPATH_ELEMENTS[i++]="$element" +done < <(echo "$METADATA_XML" | $XPATH /vm/system_datastore/) + +unset i + +DATASTORE_PATH="${XPATH_ELEMENTS[i++]}" + + +# -------- Create the snapshot and dump its metadata to xml file ------------ + +SNAP_NAME="snap-${SNAP_ID}" +data=`virsh --connect $LIBVIRT_URI snapshot-create-as $DOMAIN --name "$SNAP_NAME"` if [ "$?" = "0" ]; then + + SNAP_XML_PATH="${DATASTORE_PATH}/${SNAP_NAME}.xml" + + # dump snapshot metadata xml to the VM location + virsh --connect $LIBVIRT_URI snapshot-dumpxml $DOMAIN $SNAP_NAME > $SNAP_XML_PATH || true + echo "$data" | awk '{print $3}' else error_message "Could not create snapshot $NAME for domain $DOMAIN." diff --git a/src/vmm_mad/remotes/kvm/snapshot_delete b/src/vmm_mad/remotes/kvm/snapshot_delete index b0cb126085..0a940b49a8 100755 --- a/src/vmm_mad/remotes/kvm/snapshot_delete +++ b/src/vmm_mad/remotes/kvm/snapshot_delete @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -22,6 +22,28 @@ source $(dirname $0)/../../scripts_common.sh DOMAIN="$1" NAME="$2" +# -------- Get datastore location from libvirt metadata ------------ + +DRIVER_PATH=$(dirname $0) +XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin" + +METADATA_XML=`virsh --connect $LIBVIRT_URI metadata $DOMAIN $LIBVIRT_MD_URI $LIBVIRT_MD_KEY` + +unset i XPATH_ELEMENTS + +while IFS= read -r -d '' element; do + XPATH_ELEMENTS[i++]="$element" +done < <(echo "$METADATA_XML" | $XPATH /vm/system_datastore/) + +unset i + +DATASTORE_PATH="${XPATH_ELEMENTS[i++]}" + + +# ------ Delete snapshot metadata and the snapshot itself ---------- + +rm ${DATASTORE_PATH}/${NAME}.xml 2>/dev/null || true + exec_and_log \ "virsh --connect $LIBVIRT_URI snapshot-delete $DOMAIN $NAME" \ "Could not delete snapshot $NAME for domain $DOMAIN." diff --git a/src/vmm_mad/remotes/kvm/snapshot_revert b/src/vmm_mad/remotes/kvm/snapshot_revert index f00c820759..32270067e8 100755 --- a/src/vmm_mad/remotes/kvm/snapshot_revert +++ b/src/vmm_mad/remotes/kvm/snapshot_revert @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/lib/lxd/client.rb b/src/vmm_mad/remotes/lib/lxd/client.rb index 15f0944c1f..0f500d15d0 100644 --- a/src/vmm_mad/remotes/lib/lxd/client.rb +++ b/src/vmm_mad/remotes/lib/lxd/client.rb @@ -1,7 +1,7 @@ #!/usr/bin/ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -135,10 +135,15 @@ end # Error used for raising LXDClient exception when response is error return value class LXDError < StandardError - attr_reader :body + + attr_reader :body, :error, :error_code, :type def initialize(msg = 'LXD API error') @body = msg + @error = @body['error'] + @error_code = @body['error_code'] + @type = @body['type'] super end + end diff --git a/src/vmm_mad/remotes/lib/lxd/command.rb b/src/vmm_mad/remotes/lib/lxd/command.rb index 6352353f74..1f64a843db 100644 --- a/src/vmm_mad/remotes/lib/lxd/command.rb +++ b/src/vmm_mad/remotes/lib/lxd/command.rb @@ -1,7 +1,7 @@ #!/usr/bin/ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -53,11 +53,6 @@ module Command execute(cmd, lock) unless running?(cmd.split[0]) end - def self.lxc_execute(lxd_id, cmd) - cmd = "lxc exec #{lxd_id} -- #{cmd}" - execute(cmd, true) - end - # Return true if command is running def self.running?(command) !`ps --noheaders -C #{command}`.empty? diff --git a/src/vmm_mad/remotes/lib/lxd/container.rb b/src/vmm_mad/remotes/lib/lxd/container.rb index 77deee7842..5738a7f1dd 100644 --- a/src/vmm_mad/remotes/lib/lxd/container.rb +++ b/src/vmm_mad/remotes/lib/lxd/container.rb @@ -1,7 +1,7 @@ #!/usr/bin/ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -35,6 +35,7 @@ class Container # Class Constants API and Containers Paths #--------------------------------------------------------------------------- CONTAINERS = 'containers'.freeze + LXC_COMMAND = 'lxc' #--------------------------------------------------------------------------- # Methods to access container attributes @@ -161,7 +162,17 @@ class Container # Runs command inside container # @param command [String] to execute through lxc exec def exec(command) - Command.lxc_execute(name, command) + cmd = "#{LXC_COMMAND} exec #{@one.vm_name} -- #{command}" + rc, o, e = Command.execute(cmd, true) + + # TODO: this should be removed when Snap bug is fixed + err = 'cannot create user data directory:' + rc, o, e = Command.execute("sudo #{cmd}", true) if e.include?(err) + + log = "Failed to run command #{cmd}: #{e}" + OpenNebula.log_error("#{__method__}: #{log}") unless rc.zero? + + [rc, o, e] end #--------------------------------------------------------------------------- @@ -220,11 +231,17 @@ class Container return unless @one @one.get_disks.each do |disk| + if @one.volatile?(disk) + e = "disk #{disk['DISK_ID']} type #{disk['TYPE']} not supported" + OpenNebula.log_error e + next + end + status = setup_disk(disk, operation) return nil unless status end - return unless @one.has_context? + return 'no context' unless @one.has_context? csrc = @lxc['devices']['context']['source'].clone @@ -261,7 +278,7 @@ class Container # Removes the context section from the LXD configuration and unmap the # context device def detach_context - return unless @one.has_context? + return 'no context' unless @one.has_context? csrc = @lxc['devices']['context']['source'].clone @@ -399,7 +416,7 @@ class Container # so new mappers does not need to modified source code def new_disk_mapper(disk) case disk['TYPE'] - when 'FILE' + when 'FILE', 'BLOCK' ds = @one.disk_source(disk) diff --git a/src/vmm_mad/remotes/lib/lxd/mapper/mapper.rb b/src/vmm_mad/remotes/lib/lxd/mapper/mapper.rb index 21d31f5320..15ca6745a0 100644 --- a/src/vmm_mad/remotes/lib/lxd/mapper/mapper.rb +++ b/src/vmm_mad/remotes/lib/lxd/mapper/mapper.rb @@ -1,7 +1,7 @@ #!/usr/bin/ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -63,7 +63,7 @@ class Mapper :mkdir => 'mkdir -p', :catfstab => 'sudo catfstab', :cat => 'cat', - :file => 'file -L', + :file => 'file -L -s', :blkid => 'sudo blkid', :e2fsck => 'sudo e2fsck', :resize2fs => 'sudo resize2fs', @@ -163,8 +163,15 @@ class Mapper Command.execute("#{COMMANDS[:xfs_growfs]} -d #{directory}", false) when /ext/ - Command.execute("#{COMMANDS[:e2fsck]} -f -y #{device}", false) - Command.execute("#{COMMANDS[:resize2fs]} #{device}", false) + _rc, o, e = Command.execute("#{COMMANDS[:e2fsck]} -f -y #{device}", false) + + if o.empty? + err = "#{__method__}: failed to resize #{device}\n#{e}" + OpenNebula.log_error err + else + Command.execute("#{COMMANDS[:resize2fs]} #{device}", false) + end + rc = mount_dev(device, directory) else OpenNebula.log_info "Skipped filesystem #{fs_type} resize" diff --git a/src/vmm_mad/remotes/lib/lxd/mapper/qcow2.rb b/src/vmm_mad/remotes/lib/lxd/mapper/qcow2.rb index 5e7dcdd92d..54e51b2927 100644 --- a/src/vmm_mad/remotes/lib/lxd/mapper/qcow2.rb +++ b/src/vmm_mad/remotes/lib/lxd/mapper/qcow2.rb @@ -1,7 +1,7 @@ #!/usr/bin/ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -20,7 +20,7 @@ $LOAD_PATH.unshift File.dirname(__FILE__) require 'mapper' -class Qcow2Mapper < Mapper +class Qcow2Mapper < Mapper # Max number of block devices. This should be set to the parameter used # to load the nbd kernel module (default in kernel is 16) @@ -32,26 +32,34 @@ class Qcow2Mapper < Mapper return if device.empty? dsrc = one_vm.disk_source(disk) - cmd = "#{COMMANDS[:nbd]} -c #{device} #{dsrc}" + File.chmod(0o664, dsrc) if File.symlink?(one_vm.sysds_path) - File.chmod(0664, dsrc) if File.symlink?(one_vm.sysds_path) + map = "#{COMMANDS[:nbd]} -c #{device} #{dsrc}" + rc, _out, err = Command.execute(map, false) - rc, _out, err = Command.execute(cmd, true) - - if rc != 0 + unless rc.zero? OpenNebula.log_error("#{__method__}: #{err}") return end - sleep 0.5 # TODO: improve settledown, lsblk -f fails + sleep 5 # wait for parts to come out + + show_parts(device) unless part?(device) device end def do_unmap(device, _one_vm, _disk, _directory) + #After mapping and unmapping a qcow2 disk the next mapped qcow2 may collide with the previous one. + #The use of kpartx before unmapping seems to prevent this behavior on the nbd module used with + #the kernel versions in ubuntu 16.04 + # + # TODO: avoid using if kpartx was not used + hide_parts(device) + cmd = "#{COMMANDS[:nbd]} -d #{device}" - rc, _out, err = Command.execute(cmd, true) + rc, _out, err = Command.execute(cmd, false) return true if rc.zero? @@ -61,21 +69,45 @@ class Qcow2Mapper < Mapper private - def nbd_device() + def part?(device) + partitions = lsblk(device) + return true unless partitions[0]['type'] == 'part' + + false + end + + def show_parts(device) + action_parts(device, '-s -av') + end + + def hide_parts(device) + action_parts(device, '-d') + end + + def action_parts(device, action) + cmd = "#{COMMANDS[:kpartx]} #{action} #{device}" + rc, _out, err = Command.execute(cmd, false) + + return unless rc.zero? + + OpenNebula.log_error("#{__method__}: #{err}") + end + + def nbd_device sys_parts = lsblk('') device_id = -1 nbds = [] - sys_parts.each { |p| + sys_parts.each do |p| m = p['name'].match(/nbd(\d+)/) - next if !m + next unless m nbds << m[1].to_i - } + end - NBDS_MAX.times { |i| + NBDS_MAX.times do |i| return "/dev/nbd#{i}" unless nbds.include?(i) - } + end OpenNebula.log_error("#{__method__}: Cannot find free nbd device") diff --git a/src/vmm_mad/remotes/lib/lxd/mapper/raw.rb b/src/vmm_mad/remotes/lib/lxd/mapper/raw.rb index ba9414b166..cecb386365 100644 --- a/src/vmm_mad/remotes/lib/lxd/mapper/raw.rb +++ b/src/vmm_mad/remotes/lib/lxd/mapper/raw.rb @@ -1,7 +1,7 @@ #!/usr/bin/ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -44,7 +44,7 @@ class FSRawMapper < Mapper return true if rc.zero? - OpenNebula.log_error("#{__method__}: #{err}") if rc != 0 + OpenNebula.log_error("#{__method__}: #{err}") nil end @@ -60,7 +60,7 @@ class DiskRawMapper < Mapper # Fisrt line is matched to look for loop device 3, and return "/dev/loop3" def do_map(one_vm, disk, directory) dsrc = one_vm.disk_source(disk) - cmd = "#{COMMANDS[:kpartx]} -av #{dsrc}" + cmd = "#{COMMANDS[:kpartx]} -s -av #{dsrc}" rc, out, err = Command.execute(cmd, true) diff --git a/src/vmm_mad/remotes/lib/lxd/mapper/rbd.rb b/src/vmm_mad/remotes/lib/lxd/mapper/rbd.rb index 5c4a170a60..b3fbd55f89 100644 --- a/src/vmm_mad/remotes/lib/lxd/mapper/rbd.rb +++ b/src/vmm_mad/remotes/lib/lxd/mapper/rbd.rb @@ -1,7 +1,7 @@ #!/usr/bin/ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/lib/lxd/opennebula-lxd b/src/vmm_mad/remotes/lib/lxd/opennebula-lxd index 9de5ff78c7..73cdd05caf 100644 --- a/src/vmm_mad/remotes/lib/lxd/opennebula-lxd +++ b/src/vmm_mad/remotes/lib/lxd/opennebula-lxd @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -19,4 +19,4 @@ # Cmnd_Alias ONE_MAPPER = /bin/lsblk, /sbin/losetup, /bin/mount, /bin/umount, /sbin/kpartx, /usr/bin/qemu-nbd, /bin/mkdir, /usr/bin/catfstab, /sbin/blkid, /sbin/e2fsck, /sbin/resize2fs, /usr/sbin/xfs_growfs, /usr/bin/rbd-nbd -oneadmin ALL=(ALL:ALL) NOPASSWD: ONE_MAPPER \ No newline at end of file +oneadmin ALL=(ALL:ALL) NOPASSWD: ONE_MAPPER diff --git a/src/vmm_mad/remotes/lib/lxd/opennebula_vm.rb b/src/vmm_mad/remotes/lib/lxd/opennebula_vm.rb index abada26f68..50a87f32f9 100644 --- a/src/vmm_mad/remotes/lib/lxd/opennebula_vm.rb +++ b/src/vmm_mad/remotes/lib/lxd/opennebula_vm.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -196,6 +196,8 @@ class OpenNebulaVM disks = @xml.elements('//TEMPLATE/DISK') disks.each do |n| + next if volatile?(n) + hash.update(disk(n, nil, nil)) end @@ -305,6 +307,13 @@ class OpenNebulaVM { disk_name => disk } end + # Return true if disk if volatile + def volatile?(disk) + return true if %w[fs swap].include? disk['TYPE'] + + false + end + #--------------------------------------------------------------------------- # Container Mapping: Extra Configuration & Profiles #--------------------------------------------------------------------------- @@ -340,7 +349,19 @@ class OpenNebulaVM def profile(hash) profile = @xml['//USER_TEMPLATE/LXD_PROFILE'] - profile = 'default' if profile.empty? + + if profile.empty? + profile = 'default' + else + begin + LXDClient.new.get("profiles/#{profile}") + rescue LXDError => e + raise e unless e.error_code == 404 + + OpenNebula.log_error "Profile \"#{profile}\" not found\n#{e}" + profile = 'default' + end + end hash['profiles'] = [profile] end diff --git a/src/vmm_mad/remotes/lib/lxd/svncterm_server/SConstruct b/src/vmm_mad/remotes/lib/lxd/svncterm_server/SConstruct index 5b97556989..33254d3bf0 100644 --- a/src/vmm_mad/remotes/lib/lxd/svncterm_server/SConstruct +++ b/src/vmm_mad/remotes/lib/lxd/svncterm_server/SConstruct @@ -1,5 +1,5 @@ # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/lib/lxd/svncterm_server/copyright b/src/vmm_mad/remotes/lib/lxd/svncterm_server/copyright index e9e94070c7..9d08af6762 100644 --- a/src/vmm_mad/remotes/lib/lxd/svncterm_server/copyright +++ b/src/vmm_mad/remotes/lib/lxd/svncterm_server/copyright @@ -1,4 +1,4 @@ -Copyright 2002-2018, OpenNebula Project, OpenNebula Systems +Copyright 2002-2019, OpenNebula Project, OpenNebula Systems -Changes to genfont utility * Update psf loader to PSFv2 diff --git a/src/vmm_mad/remotes/lib/lxd/svncterm_server/genfont.c b/src/vmm_mad/remotes/lib/lxd/svncterm_server/genfont.c index 81306ab7e5..3a14441d40 100644 --- a/src/vmm_mad/remotes/lib/lxd/svncterm_server/genfont.c +++ b/src/vmm_mad/remotes/lib/lxd/svncterm_server/genfont.c @@ -20,7 +20,7 @@ Author: Dietmar Maurer - Copyright 2002-2018, OpenNebula Project, OpenNebula Systems + Copyright 2002-2019, OpenNebula Project, OpenNebula Systems - Update psf loader to PSFv2 - Added command line options & usage diff --git a/src/vmm_mad/remotes/lib/lxd/svncterm_server/svncterm_server.c b/src/vmm_mad/remotes/lib/lxd/svncterm_server/svncterm_server.c index 36a54ccbf7..efd1b259f6 100644 --- a/src/vmm_mad/remotes/lib/lxd/svncterm_server/svncterm_server.c +++ b/src/vmm_mad/remotes/lib/lxd/svncterm_server/svncterm_server.c @@ -2,7 +2,7 @@ Copyright (C) 2006 Universitat Politecnica de Valencia * Removing the usage of TLS and the need of patched versions of libraries - Copyright (C) 2007-2011 Proxmox Server Solutions GmbH + Copyright (C) 2007-2019 Proxmox Server Solutions GmbH Copyright: vzdump is under GNU GPL, the GNU General Public License. diff --git a/src/vmm_mad/remotes/lib/poll_common.rb b/src/vmm_mad/remotes/lib/poll_common.rb index aa79d83ad0..b0a7dce55e 100644 --- a/src/vmm_mad/remotes/lib/poll_common.rb +++ b/src/vmm_mad/remotes/lib/poll_common.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/datacenter.rb b/src/vmm_mad/remotes/lib/vcenter_driver/datacenter.rb index 4cf45964bb..21aff209bb 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/datacenter.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/datacenter.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/datastore.rb b/src/vmm_mad/remotes/lib/vcenter_driver/datastore.rb index 78c14ae606..e3af24a07c 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/datastore.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/datastore.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/file_helper.rb b/src/vmm_mad/remotes/lib/vcenter_driver/file_helper.rb index a6ccb908d4..93b9f5bfea 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/file_helper.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/file_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/host.rb b/src/vmm_mad/remotes/lib/vcenter_driver/host.rb index 73766ea624..fe25ff470b 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/host.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/host.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/memoize.rb b/src/vmm_mad/remotes/lib/vcenter_driver/memoize.rb index 574b6a1051..5f5dca0ec6 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/memoize.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/memoize.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/network.rb b/src/vmm_mad/remotes/lib/vcenter_driver/network.rb index 95b89de712..5281c872ce 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/network.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/network.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/vcenter_importer.rb b/src/vmm_mad/remotes/lib/vcenter_driver/vcenter_importer.rb index b68a16d78e..88607750e3 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/vcenter_importer.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/vcenter_importer.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/vi_client.rb b/src/vmm_mad/remotes/lib/vcenter_driver/vi_client.rb index 128c994093..6efe5477db 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/vi_client.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/vi_client.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -28,7 +28,7 @@ class VIClient @host_id = host_id @vim = RbVmomi::VIM.connect(opts) @vc_name = opts[:host] if opts[:host] - @vcenter_conf = load_vcenter_configuration + # Get ccr and get rp ccr_ref = opts.delete(:ccr) if ccr_ref @@ -46,23 +46,6 @@ class VIClient end end - def load_vcenter_configuration - begin - vcenter_conf = YAML::load(File.open("#{ETC_LOCATION}/vcenter_driver.conf")) - vcenter_conf - rescue - Hash.new - end - end - - def get_property_vcenter_conf(key) - if @vcenter_conf.key?(key) - return @vcenter_conf[key] - else - return nil - end - end - def rp_confined? !!@rp end diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/vi_helper.rb b/src/vmm_mad/remotes/lib/vcenter_driver/vi_helper.rb index 874362488b..0461062ccf 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/vi_helper.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/vi_helper.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb index 1c0330bd72..4839ea5b0c 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -769,7 +769,7 @@ class VirtualMachine < VCenterDriver::Template # The exception needs to be handled in the VMM drivers and any # process that uses this method def wait_timeout(action, timeout = 300) - conf = @vi_client.get_property_vcenter_conf(:vm_poweron_wait_default) + conf = CONFIG[:vm_poweron_wait_default] timeout = conf || timeout time_start = Time.now @@ -1050,7 +1050,7 @@ class VirtualMachine < VCenterDriver::Template key = backing.port.portgroupKey end - @nics[key] = Nic.vc_nic(d) + @nics["#{key}#{d.key}"] = Nic.vc_nic(d) end @nics.reject{|k| k == :macs} @@ -1163,8 +1163,8 @@ class VirtualMachine < VCenterDriver::Template return RbVmomi::VIM::VirtualVmxnet2 when 'virtualvmxnet3', 'vmxnet3' return RbVmomi::VIM::VirtualVmxnet3 - else # If none matches, use VirtualE1000 - return RbVmomi::VIM::VirtualE1000 + else # If none matches, use vmxnet3 + return RbVmomi::VIM::VirtualVmxnet3 end end @@ -1217,10 +1217,17 @@ class VirtualMachine < VCenterDriver::Template if !unmanaged_nics.empty? nics = get_vcenter_nics - select = ->(name){ + select_net =->(ref){ device = nil nics.each do |nic| - next unless nic.deviceInfo.summary == name + type = nic.backing.class + if type == NET_CARD + nref = nic.backing.network._ref + else + nref = nic.backing.port.portgroupKey + end + + next unless nref == ref device = nic break end @@ -1231,23 +1238,20 @@ class VirtualMachine < VCenterDriver::Template } unmanaged_nics.each do |unic| - vnic = select.call(unic['BRIDGE']) - if unic['MODEL'] && !unic['MODEL'].empty? && !unic['MODEL'].nil? - vcenter_nic_class = vnic.class - opennebula_nic_class = nic_model_class(unic['MODEL']) - if vcenter_nic_class != opennebula_nic_class - # delete actual nic and update the new one. + vnic = select_net.call(unic['VCENTER_NET_REF']) + nic_class = vnic.class + new_model = nic_model_class(unic['MODEL']) if unic['MODEL'] + + # delete actual nic and update the new one. + if new_model && new_model != nic_class device_change << { :device => vnic, :operation => :remove } - device_change << calculate_add_nic_spec(unic) - else + device_change << calculate_add_nic_spec(unic, vnic.unitNumber) + else vnic.macAddress = unic['MAC'] device_change << { :device => vnic, :operation => :edit } - end - else - vnic.macAddress = unic['MAC'] - device_change << { :device => vnic, :operation => :edit } end end + end rescue Exception => e raise "There is a problem with your vm NICS, make sure that they are working properly. Error: #{e.message}" @@ -1366,14 +1370,21 @@ class VirtualMachine < VCenterDriver::Template device_change = [] if option == :all + dchange = [] + # detached? condition indicates that the nic exists in OpeNebula but not # in vCenter nics_each(:detached?) do |nic| - device_change << { + dchange << { :operation => :remove, :device => nic.vc_item } end + if !dchange.empty? + dspec_hash = { :deviceChange => dchange } + dspec = RbVmomi::VIM.VirtualMachineConfigSpec(dspec_hash) + @item.ReconfigVM_Task(:spec => dspec).wait_for_completion + end end # no_exits? condition indicates that the nic does not exist in vCenter @@ -1482,38 +1493,6 @@ class VirtualMachine < VCenterDriver::Template end end - def device_change_nics - # Final list of changes to be applied in vCenter - device_change = [] - - # Hash of interfaces from the OpenNebula xml - nics_in_template = {} - xpath = "TEMPLATE/NIC" - one_item.each(xpath) { |nic| - nics_in_template[nic["MAC"]] = nic - } - - # Remove all NICs in the spawned VM, they'll be recreated - # using the configuration of the NICs defined in OpenNebula - self["config.hardware.device"].each do |dv| - if is_nic?(dv) - # B4897 - It was detached in poweroff, remove it from VM - device_change << { - :operation => :remove, - :device => dv - } - end - end - - # Attach new nics (nics_in_template now contains only the interfaces - # not present in the VM in vCenter) - nics_in_template.each do |key, nic| - device_change << calculate_add_nic_spec(nic) - end - - return device_change - end - # Regenerate context when devices are hot plugged (reconfigure) def regenerate_context spec_hash = { :extraConfig => extraconfig_context } @@ -1527,21 +1506,15 @@ class VirtualMachine < VCenterDriver::Template end # Returns an array of actions to be included in :deviceChange - def calculate_add_nic_spec(nic) + def calculate_add_nic_spec(nic, unumber = nil) mac = nic["MAC"] pg_name = nic["BRIDGE"] - model = '' + default = VCenterDriver::VIHelper.get_default('VM/TEMPLATE/NIC/MODEL') + tmodel = one_item['USER_TEMPLATE/NIC_DEFAULT/MODEL'] + + model = nic['MODEL'] || tmodel || default + raise 'nic model cannot be empty!' if model == '' - if !one_item.retrieve_xmlelements('TEMPLATE/NIC_DEFAULT/MODEL').nil? && - !one_item.retrieve_xmlelements('TEMPLATE/NIC_DEFAULT/MODEL').empty? - model = one_item['TEMPLATE/NIC_DEFAULT/MODEL'] - elsif (model.nil? || model.empty?) && - !nic['MODEL'].nil? && - !nic['MODEL'].empty? - model = nic['MODEL'] - else - model = VCenterDriver::VIHelper.get_default('VM/TEMPLATE/NIC/MODEL') - end vnet_ref = nic["VCENTER_NET_REF"] backing = nil @@ -1574,24 +1547,7 @@ class VirtualMachine < VCenterDriver::Template card_num += 1 if is_nic?(dv) end - nic_card = case model - when "virtuale1000", "e1000" - RbVmomi::VIM::VirtualE1000 - when "virtuale1000e", "e1000e" - RbVmomi::VIM::VirtualE1000e - when "virtualpcnet32", "pcnet32" - RbVmomi::VIM::VirtualPCNet32 - when "virtualsriovethernetcard", "sriovethernetcard" - RbVmomi::VIM::VirtualSriovEthernetCard - when "virtualvmxnetm", "vmxnetm" - RbVmomi::VIM::VirtualVmxnetm - when "virtualvmxnet2", "vmnet2" - RbVmomi::VIM::VirtualVmxnet2 - when "virtualvmxnet3", "vmxnet3" - RbVmomi::VIM::VirtualVmxnet3 - else # If none matches, use VirtualE1000 - RbVmomi::VIM::VirtualE1000 - end + nic_card = nic_model_class(model) if network.class == RbVmomi::VIM::Network backing = RbVmomi::VIM.VirtualEthernetCardNetworkBackingInfo( @@ -1608,7 +1564,13 @@ class VirtualMachine < VCenterDriver::Template end # grab the last unitNumber to ensure the nic to be added at the end - @unic = @unic || get_vcenter_nics.map{|d| d.unitNumber}.max rescue 0 + if !unumber + @unic = @unic || get_vcenter_nics.map{|d| d.unitNumber}.max || 0 + unumber = @unic += 1 + else + @unic = unumber + end + card_spec = { :key => 0, :deviceInfo => { @@ -1618,7 +1580,7 @@ class VirtualMachine < VCenterDriver::Template :backing => backing, :addressType => mac ? 'manual' : 'generated', :macAddress => mac, - :unitNumber => @unic+=1 + :unitNumber => unumber } if (limit || rsrv) && (limit > 0) @@ -1644,17 +1606,11 @@ class VirtualMachine < VCenterDriver::Template def calculate_add_nic_spec_autogenerate_mac(nic) pg_name = nic["BRIDGE"] model = '' + default = VCenterDriver::VIHelper.get_default('VM/TEMPLATE/NIC/MODEL') + tmodel = one_item['USER_TEMPLATE/NIC_DEFAULT/MODEL'] + + model = nic['MODEL'] || tmodel || default - if !one_item.retrieve_xmlelements('TEMPLATE/NIC_DEFAULT/MODEL').nil? && - !one_item.retrieve_xmlelements('TEMPLATE/NIC_DEFAULT/MODEL').empty? - model = one_item['TEMPLATE/NIC_DEFAULT/MODEL'] - elsif (model.nil? || model.empty?) && - !nic['MODEL'].nil? && - !nic['MODEL'].empty? - model = nic['MODEL'] - else - model = VCenterDriver::VIHelper.get_default('VM/TEMPLATE/NIC/MODEL') - end vnet_ref = nic["VCENTER_NET_REF"] backing = nil @@ -1686,24 +1642,7 @@ class VirtualMachine < VCenterDriver::Template card_num += 1 if is_nic?(dv) end - nic_card = case model - when "virtuale1000", "e1000" - RbVmomi::VIM::VirtualE1000 - when "virtuale1000e", "e1000e" - RbVmomi::VIM::VirtualE1000e - when "virtualpcnet32", "pcnet32" - RbVmomi::VIM::VirtualPCNet32 - when "virtualsriovethernetcard", "sriovethernetcard" - RbVmomi::VIM::VirtualSriovEthernetCard - when "virtualvmxnetm", "vmxnetm" - RbVmomi::VIM::VirtualVmxnetm - when "virtualvmxnet2", "vmnet2" - RbVmomi::VIM::VirtualVmxnet2 - when "virtualvmxnet3", "vmxnet3" - RbVmomi::VIM::VirtualVmxnet3 - else # If none matches, use VirtualE1000 - RbVmomi::VIM::VirtualE1000 - end + nic_card = nic_model_class(model) if network.class == RbVmomi::VIM::Network backing = RbVmomi::VIM.VirtualEthernetCardNetworkBackingInfo( @@ -1775,24 +1714,18 @@ class VirtualMachine < VCenterDriver::Template # Detach NIC from VM def detach_nic spec_hash = {} - nic = nil # Extract nic from driver action - nic = one_item.retrieve_xmlelements("TEMPLATE/NIC[ATTACH='YES']").first - mac = nic["MAC"] + one_nic = one_item.retrieve_xmlelements("TEMPLATE/NIC[ATTACH='YES']").first + mac = one_nic["MAC"] + nic = nic(mac) rescue nil - # Get VM nic element if it has a device with that mac - nic_device = @item["config.hardware.device"].find do |device| - is_nic?(device) && (device.macAddress == mac) - end rescue nil - - return if nic_device.nil? #Silently ignore if nic is not found + return if !nic || nic.no_exists? # Remove NIC from VM in the ReconfigVM_Task spec_hash[:deviceChange] = [ :operation => :remove, - :device => nic_device ] - + :device => nic.vc_item ] begin @item.ReconfigVM_Task(:spec => spec_hash).wait_for_completion rescue Exception => e @@ -1805,12 +1738,12 @@ class VirtualMachine < VCenterDriver::Template spec_hash = {} device_change = [] - @item["config.hardware.device"].each do |device| - if is_nic?(device) - device_change << {:operation => :remove, :device => device} - end + nics_each(:exists?) do |nic| + device_change << {:operation => :remove, :device => nic.vc_item} end + return if device_change.empty? + # Remove NIC from VM in the ReconfigVM_Task spec_hash[:deviceChange] = device_change @@ -1911,7 +1844,6 @@ class VirtualMachine < VCenterDriver::Template info_disks end - # TO DEPRECATE: build new attach using new disk class structure # Attach DISK to VM (hotplug) def attach_disk spec_hash = {} @@ -2503,6 +2435,16 @@ class VirtualMachine < VCenterDriver::Template datastore: datastore, } + if config[:esx_migration_list].is_a?(String) + if config[:esx_migration_list]=="" + relocate_spec_params[:host] = config[:cluster].host.sample + elsif config[:esx_migration_list]!="Selected_by_DRS" + hosts = config[:esx_migration_list].split(' ') + relocate_spec_params[:host] = hosts.sample + end + end + + relocate_spec = RbVmomi::VIM.VirtualMachineRelocateSpec(relocate_spec_params) @item.RelocateVM_Task(spec: relocate_spec, priority: "defaultPriority").wait_for_completion else @@ -2956,7 +2898,13 @@ class VirtualMachine < VCenterDriver::Template return one_vm end - def self.migrate_routine(vm_id, src_host, dst_host, ds = nil) + # Migrate a VM to another cluster and/or datastore + # @params [int] vm_id ID of the VM to be migrated + # params [String] src_host Name of the source cluster + # params [String] dst_host Name of the target cluster + # params [Bool] hot_ds Wether this is a DS migration with the VM running or not + # params [int] Destination datastore ID + def self.migrate_routine(vm_id, src_host, dst_host, hot_ds = false, ds = nil) one_client = OpenNebula::Client.new pool = OpenNebula::HostPool.new(one_client) pool.info @@ -2981,6 +2929,8 @@ class VirtualMachine < VCenterDriver::Template vm.info dst_host.info + esx_migration_list = dst_host['/HOST/TEMPLATE/ESX_MIGRATION_LIST'] + # required vcenter objects vc_vm = VCenterDriver::VirtualMachine.new_without_id(vi_client, vm['/VM/DEPLOY_ID']) ccr_ref = dst_host['/HOST/TEMPLATE/VCENTER_CCR_REF'] @@ -2989,6 +2939,12 @@ class VirtualMachine < VCenterDriver::Template config = { :cluster => vc_host } config[:datastore] = datastore if datastore + if hot_ds + config[:esx_migration_list] = esx_migration_list if esx_migration_list + else + config[:esx_migration_list] = "Selected_by_DRS" + end + vc_vm.migrate(config) vm.replace({ 'VCENTER_CCR_REF' => ccr_ref}) diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/vm_template.rb b/src/vmm_mad/remotes/lib/vcenter_driver/vm_template.rb index dceea916fe..a0dc9c31d8 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/vm_template.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/vm_template.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -229,6 +229,7 @@ class Template #Get disks and info required vc_disks = get_vcenter_disks + vc_disks.sort_by! {|d| d[:device].unitNumber} # Track allocated images allocated_images = [] @@ -592,6 +593,8 @@ class Template if is_disk_or_iso?(device) disk[:device] = device + + raise "datastore not found for VM's device" unless device.backing.datastore disk[:datastore] = device.backing.datastore disk[:path] = device.backing.fileName disk[:path_wo_ds]= disk[:path].sub(/^\[(.*?)\] /, "") diff --git a/src/vmm_mad/remotes/lxd/attach_disk b/src/vmm_mad/remotes/lxd/attach_disk index 7b59e68048..2aea592a01 100755 --- a/src/vmm_mad/remotes/lxd/attach_disk +++ b/src/vmm_mad/remotes/lxd/attach_disk @@ -1,7 +1,7 @@ #!/usr/bin/ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/lxd/attach_nic b/src/vmm_mad/remotes/lxd/attach_nic index 71d877a412..852ab2de94 100755 --- a/src/vmm_mad/remotes/lxd/attach_nic +++ b/src/vmm_mad/remotes/lxd/attach_nic @@ -1,7 +1,7 @@ #!/usr/bin/ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/lxd/cancel b/src/vmm_mad/remotes/lxd/cancel index 15bb414975..0d5ab5a6af 100755 --- a/src/vmm_mad/remotes/lxd/cancel +++ b/src/vmm_mad/remotes/lxd/cancel @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/lxd/deploy b/src/vmm_mad/remotes/lxd/deploy index b68b1d641f..700a3a525b 100755 --- a/src/vmm_mad/remotes/lxd/deploy +++ b/src/vmm_mad/remotes/lxd/deploy @@ -1,7 +1,7 @@ #!/usr/bin/ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/lxd/detach_disk b/src/vmm_mad/remotes/lxd/detach_disk index 45efe8b308..46e6e7e697 100755 --- a/src/vmm_mad/remotes/lxd/detach_disk +++ b/src/vmm_mad/remotes/lxd/detach_disk @@ -1,7 +1,7 @@ #!/usr/bin/ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/lxd/detach_nic b/src/vmm_mad/remotes/lxd/detach_nic index a2a126c7ad..e98808ee2d 100755 --- a/src/vmm_mad/remotes/lxd/detach_nic +++ b/src/vmm_mad/remotes/lxd/detach_nic @@ -1,7 +1,7 @@ #!/usr/bin/ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/lxd/lxdrc b/src/vmm_mad/remotes/lxd/lxdrc index c68c3d78eb..eb0ea19d34 100644 --- a/src/vmm_mad/remotes/lxd/lxdrc +++ b/src/vmm_mad/remotes/lxd/lxdrc @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/lxd/poll b/src/vmm_mad/remotes/lxd/poll index 0aa09a57ab..e51202a439 100755 --- a/src/vmm_mad/remotes/lxd/poll +++ b/src/vmm_mad/remotes/lxd/poll @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -130,9 +130,16 @@ module LXD state end + def lxc_path(vm_name) + path = 'lxc/' + vm_name + path = "#{ENV['LXC_CGROUP_PREFIX']}#{path}" if ENV['LXC_CGROUP_PREFIX'] + end + def get_memory(vm_name) - stat = File.read('/sys/fs/cgroup/memory/lxc/' + vm_name + '/memory.usage_in_bytes').to_i + stat = File.read('/sys/fs/cgroup/memory/' + lxc_path(vm_name) + '/memory.usage_in_bytes').to_i stat / 1024 + rescue StandardError + 0 end def get_net_statistics(vmd) @@ -167,7 +174,7 @@ module LXD cpu_jiffies = get_cpu_jiffies - start_cpu_jiffies vm_names.each do |vm_name| - cpu_used[vm_name] = (get_process_jiffies(vm_name).to_f - + cpu_used[vm_name] = (get_process_jiffies(vm_name).to_f - cpu_used[vm_name]) / cpu_jiffies cpu_used[vm_name] = (cpu_used[vm_name] * multiplier).round(2) @@ -196,7 +203,8 @@ module LXD def get_process_jiffies(vm_name) begin jiffies = 0 - stat = File.read('/sys/fs/cgroup/cpu,cpuacct/lxc/' + vm_name + '/cpuacct.stat') + + stat = File.read('/sys/fs/cgroup/cpu,cpuacct/' + lxc_path(vm_name) + '/cpuacct.stat') stat.lines.each {|line| jiffies += line.split(' ')[1] } rescue StandardError return 0 @@ -222,20 +230,19 @@ module LXD arch = container.architecture capacity = container.expanded_config - cpu = "" - vcpu= "" - mem = "" + cpu = '' + vcpu = '' + mem = '' if capacity cpu = capacity['limits.cpu.allowance'] vcpu = capacity['limits.cpu'] - mem = capacity['limits.memory'] + mem = capacity['limits.memory'] end - cpu = "50%" if !cpu || cpu.empty? - vcpu = "1" if !vcpu || vcpu.empty? - mem = "512M" if !mem || mem.empty? - + cpu = '50%' if !cpu || cpu.empty? + vcpu = '1' if !vcpu || vcpu.empty? + mem = '512MB' if !mem || mem.empty? cpu = cpu.chomp('%').to_f / 100 mem = parse_memory(mem) diff --git a/src/vmm_mad/remotes/lxd/prereconfigure b/src/vmm_mad/remotes/lxd/prereconfigure index 6ad067905e..8770d64d9e 100755 --- a/src/vmm_mad/remotes/lxd/prereconfigure +++ b/src/vmm_mad/remotes/lxd/prereconfigure @@ -1,7 +1,7 @@ #!/usr/bin/ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/lxd/reboot b/src/vmm_mad/remotes/lxd/reboot index 4c89fd609e..280fc6682c 100755 --- a/src/vmm_mad/remotes/lxd/reboot +++ b/src/vmm_mad/remotes/lxd/reboot @@ -1,7 +1,7 @@ #!/usr/bin/ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/lxd/reconfigure b/src/vmm_mad/remotes/lxd/reconfigure index 6c3cc9a738..c6879684c5 100755 --- a/src/vmm_mad/remotes/lxd/reconfigure +++ b/src/vmm_mad/remotes/lxd/reconfigure @@ -1,7 +1,7 @@ #!/usr/bin/ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -29,17 +29,17 @@ vm_name = ARGV[0] iso_path = ARGV[2] vm_id = ARGV[3] -xml = STDIN.read +exit 0 if iso_path == '' # ------------------------------------------------------------------------------ # Setup Context for the container # ------------------------------------------------------------------------------ -if iso_path != '' - client = LXDClient.new - container = Container.get(vm_name, xml, client) +xml = STDIN.read +client = LXDClient.new +container = Container.get(vm_name, xml, client) - raise 'Failed to attach context' unless container.attach_context +raise 'Failed to attach context' unless container.attach_context - rc, _out, err = container.exec('one-contextd local') - OpenNebula.log_error "Failed to run contextualization\n#{err}" unless rc.zero? -end +rc, _out, err = container.exec('service one-context-reconfigure start') + +OpenNebula.log_error "Failed to run recontextualization service \n#{err}" unless rc.zero? diff --git a/src/vmm_mad/remotes/lxd/reset b/src/vmm_mad/remotes/lxd/reset index dc1e3335d1..a435cd466f 100755 --- a/src/vmm_mad/remotes/lxd/reset +++ b/src/vmm_mad/remotes/lxd/reset @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/lxd/shutdown b/src/vmm_mad/remotes/lxd/shutdown index 54fada3403..d56c1e681e 100755 --- a/src/vmm_mad/remotes/lxd/shutdown +++ b/src/vmm_mad/remotes/lxd/shutdown @@ -1,7 +1,7 @@ #!/usr/bin/ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/one/attach_nic b/src/vmm_mad/remotes/one/attach_nic index d415499ef5..9f65e99890 100755 --- a/src/vmm_mad/remotes/one/attach_nic +++ b/src/vmm_mad/remotes/one/attach_nic @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/one/cancel b/src/vmm_mad/remotes/one/cancel index 901898b61f..64a90c93ab 100755 --- a/src/vmm_mad/remotes/one/cancel +++ b/src/vmm_mad/remotes/one/cancel @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/one/deploy b/src/vmm_mad/remotes/one/deploy index 432a0ee9b1..2b089fcf6d 100755 --- a/src/vmm_mad/remotes/one/deploy +++ b/src/vmm_mad/remotes/one/deploy @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/one/detach_disk b/src/vmm_mad/remotes/one/detach_disk index d415499ef5..9f65e99890 100755 --- a/src/vmm_mad/remotes/one/detach_disk +++ b/src/vmm_mad/remotes/one/detach_disk @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/one/detach_nic b/src/vmm_mad/remotes/one/detach_nic index d415499ef5..9f65e99890 100755 --- a/src/vmm_mad/remotes/one/detach_nic +++ b/src/vmm_mad/remotes/one/detach_nic @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/one/migrate b/src/vmm_mad/remotes/one/migrate index d415499ef5..9f65e99890 100755 --- a/src/vmm_mad/remotes/one/migrate +++ b/src/vmm_mad/remotes/one/migrate @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/one/migrate_local b/src/vmm_mad/remotes/one/migrate_local index d415499ef5..9f65e99890 100755 --- a/src/vmm_mad/remotes/one/migrate_local +++ b/src/vmm_mad/remotes/one/migrate_local @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/one/opennebula_driver.rb b/src/vmm_mad/remotes/one/opennebula_driver.rb index 640be62be8..4353229efb 100755 --- a/src/vmm_mad/remotes/one/opennebula_driver.rb +++ b/src/vmm_mad/remotes/one/opennebula_driver.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/one/poll b/src/vmm_mad/remotes/one/poll index 1c62ff10fc..cb376168d5 100755 --- a/src/vmm_mad/remotes/one/poll +++ b/src/vmm_mad/remotes/one/poll @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/one/prereconfigure b/src/vmm_mad/remotes/one/prereconfigure index 5a43b6c920..33a3eb604d 100755 --- a/src/vmm_mad/remotes/one/prereconfigure +++ b/src/vmm_mad/remotes/one/prereconfigure @@ -1,7 +1,7 @@ #!/bin/sh # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/one/reboot b/src/vmm_mad/remotes/one/reboot index 349e333312..11ad21b0d7 100755 --- a/src/vmm_mad/remotes/one/reboot +++ b/src/vmm_mad/remotes/one/reboot @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/one/reconfigure b/src/vmm_mad/remotes/one/reconfigure index 5a43b6c920..33a3eb604d 100755 --- a/src/vmm_mad/remotes/one/reconfigure +++ b/src/vmm_mad/remotes/one/reconfigure @@ -1,7 +1,7 @@ #!/bin/sh # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/one/reset b/src/vmm_mad/remotes/one/reset index 8ba19050bc..86be1fbcdc 100755 --- a/src/vmm_mad/remotes/one/reset +++ b/src/vmm_mad/remotes/one/reset @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/one/restore b/src/vmm_mad/remotes/one/restore index 13449d59f4..d8a3a2449b 100755 --- a/src/vmm_mad/remotes/one/restore +++ b/src/vmm_mad/remotes/one/restore @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/one/save b/src/vmm_mad/remotes/one/save index f1ee4475d6..e5720328f6 100755 --- a/src/vmm_mad/remotes/one/save +++ b/src/vmm_mad/remotes/one/save @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/one/shutdown b/src/vmm_mad/remotes/one/shutdown index 920cca19b9..e3ca8c0f08 100755 --- a/src/vmm_mad/remotes/one/shutdown +++ b/src/vmm_mad/remotes/one/shutdown @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/one/snapshot_create b/src/vmm_mad/remotes/one/snapshot_create index d415499ef5..9f65e99890 100755 --- a/src/vmm_mad/remotes/one/snapshot_create +++ b/src/vmm_mad/remotes/one/snapshot_create @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/one/snapshot_delete b/src/vmm_mad/remotes/one/snapshot_delete index d415499ef5..9f65e99890 100755 --- a/src/vmm_mad/remotes/one/snapshot_delete +++ b/src/vmm_mad/remotes/one/snapshot_delete @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/one/snapshot_revert b/src/vmm_mad/remotes/one/snapshot_revert index d415499ef5..9f65e99890 100755 --- a/src/vmm_mad/remotes/one/snapshot_revert +++ b/src/vmm_mad/remotes/one/snapshot_revert @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/packet/cancel b/src/vmm_mad/remotes/packet/cancel index 7e29e0d130..e640f2867e 100755 --- a/src/vmm_mad/remotes/packet/cancel +++ b/src/vmm_mad/remotes/packet/cancel @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/packet/deploy b/src/vmm_mad/remotes/packet/deploy index 0a6667e652..b23025fa5f 100755 --- a/src/vmm_mad/remotes/packet/deploy +++ b/src/vmm_mad/remotes/packet/deploy @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/packet/packet_driver.default b/src/vmm_mad/remotes/packet/packet_driver.default index d5cd83f25a..a0abedb532 100644 --- a/src/vmm_mad/remotes/packet/packet_driver.default +++ b/src/vmm_mad/remotes/packet/packet_driver.default @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/packet/packet_driver.rb b/src/vmm_mad/remotes/packet/packet_driver.rb index 17c86f7b50..022b450bfb 100644 --- a/src/vmm_mad/remotes/packet/packet_driver.rb +++ b/src/vmm_mad/remotes/packet/packet_driver.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/packet/poll b/src/vmm_mad/remotes/packet/poll index a12e9040f4..0787df927b 100755 --- a/src/vmm_mad/remotes/packet/poll +++ b/src/vmm_mad/remotes/packet/poll @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/packet/reboot b/src/vmm_mad/remotes/packet/reboot index 9cefaadb19..2879b04d31 100755 --- a/src/vmm_mad/remotes/packet/reboot +++ b/src/vmm_mad/remotes/packet/reboot @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/packet/reset b/src/vmm_mad/remotes/packet/reset index b7f184512a..7b36d7db7d 100755 --- a/src/vmm_mad/remotes/packet/reset +++ b/src/vmm_mad/remotes/packet/reset @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/packet/shutdown b/src/vmm_mad/remotes/packet/shutdown index e75745a9c0..252d5f3e4e 100755 --- a/src/vmm_mad/remotes/packet/shutdown +++ b/src/vmm_mad/remotes/packet/shutdown @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/vcenter/attach_disk b/src/vmm_mad/remotes/vcenter/attach_disk index 8e8c457b4b..e7d481e53b 100755 --- a/src/vmm_mad/remotes/vcenter/attach_disk +++ b/src/vmm_mad/remotes/vcenter/attach_disk @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -53,9 +53,8 @@ rescue StandardError => e message = "Attach image for VM #{vm_ref} on vCenter cluster" \ "#{vc_cluster_name} failed due to \"#{e.message}\"\n" OpenNebula.log_error(message) - if vi_client.get_property_vcenter_conf(:debug_information) - STDERR.puts "#{message} #{e.backtrace}" - end + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit(-1) ensure vi_client.close_connection if vi_client diff --git a/src/vmm_mad/remotes/vcenter/attach_nic b/src/vmm_mad/remotes/vcenter/attach_nic index 2fec221dba..b34b28e203 100755 --- a/src/vmm_mad/remotes/vcenter/attach_nic +++ b/src/vmm_mad/remotes/vcenter/attach_nic @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -52,9 +52,8 @@ rescue StandardError => e message = "Attach NIC for VM #{vm_ref} on vCenter cluster "\ "#{vc_cluster_name} failed due to \"#{e.message}\"\n" OpenNebula.log_error(message) - if vi_client.get_property_vcenter_conf(:debug_information) - STDERR.puts "#{message} #{e.backtrace}" - end + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit(-1) ensure vi_client.close_connection if vi_client diff --git a/src/vmm_mad/remotes/vcenter/cancel b/src/vmm_mad/remotes/vcenter/cancel index 0319194363..06e0134612 100755 --- a/src/vmm_mad/remotes/vcenter/cancel +++ b/src/vmm_mad/remotes/vcenter/cancel @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -51,9 +51,8 @@ rescue StandardError => e message = "Cancel VM #{vm_ref} failed due to "\ "\"#{e.message}\"\n#{e.backtrace.join("\n")}" OpenNebula.log_error(message) - if vi_client.get_property_vcenter_conf(:debug_information) - STDERR.puts "#{message} #{e.backtrace}" - end + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit(-1) ensure vi_client.close_connection if vi_client diff --git a/src/vmm_mad/remotes/vcenter/deploy b/src/vmm_mad/remotes/vcenter/deploy index bb8f472518..f2d8dd1848 100755 --- a/src/vmm_mad/remotes/vcenter/deploy +++ b/src/vmm_mad/remotes/vcenter/deploy @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -70,9 +70,8 @@ rescue StandardError => e message = "Deploy of VM #{vm_id} on vCenter cluster #{cluster_name} " \ "with #{dfile} failed due to \"#{e.message}\"." OpenNebula.log_error(message) - if vi_client.get_property_vcenter_conf(:debug_information) - STDERR.puts "#{message} #{e.backtrace}" - end + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit(-1) ensure vi_client.close_connection if vi_client diff --git a/src/vmm_mad/remotes/vcenter/detach_disk b/src/vmm_mad/remotes/vcenter/detach_disk index 2994f3821c..f9704d0e41 100755 --- a/src/vmm_mad/remotes/vcenter/detach_disk +++ b/src/vmm_mad/remotes/vcenter/detach_disk @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -52,9 +52,8 @@ rescue StandardError => e message = "Detach DISK for VM #{vm_ref} on vCenter cluster " \ "#{vc_cluster_name} failed due to \"#{e.message}\"." OpenNebula.log_error(message) - if vi_client.get_property_vcenter_conf(:debug_information) - STDERR.puts "#{message} #{e.backtrace}" - end + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit(-1) ensure vi_client.close_connection if vi_client diff --git a/src/vmm_mad/remotes/vcenter/detach_nic b/src/vmm_mad/remotes/vcenter/detach_nic index faada2ed61..fd225cc958 100755 --- a/src/vmm_mad/remotes/vcenter/detach_nic +++ b/src/vmm_mad/remotes/vcenter/detach_nic @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -51,9 +51,8 @@ rescue StandardError => e message = "Detach NIC for VM #{vm_ref} on vCenter cluster " \ "#{vc_cluster_name} failed due to \"#{e.message}\"." OpenNebula.log_error(message) - if vi_client.get_property_vcenter_conf(:debug_information) - STDERR.puts "#{message} #{e.backtrace}" - end + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit(-1) ensure vi_client.close_connection if vi_client diff --git a/src/vmm_mad/remotes/vcenter/migrate b/src/vmm_mad/remotes/vcenter/migrate index 57fd79f6f6..c175bc7d68 100755 --- a/src/vmm_mad/remotes/vcenter/migrate +++ b/src/vmm_mad/remotes/vcenter/migrate @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -19,9 +19,9 @@ ONE_LOCATION = ENV['ONE_LOCATION'] unless defined?(ONE_LOCATION) if !ONE_LOCATION - RUBY_LIB_LOCATION = '/usr/lib/one/ruby' unless defined?(RUBY_LIB_LOCATION) + RUBY_LIB_LOCATION ||= '/usr/lib/one/ruby' else - RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby' unless defined?(RUBY_LIB_LOCATION) + RUBY_LIB_LOCATION ||= ONE_LOCATION + '/lib/ruby' end $LOAD_PATH << RUBY_LIB_LOCATION @@ -29,22 +29,40 @@ $LOAD_PATH << File.dirname(__FILE__) require 'vcenter_driver' +d_id = ARGV[0] vm_id = ARGV[-2] src_host = ARGV[-3] dst_host = ARGV[-4] +drv_action = OpenNebula::XMLElement.new +drv_action.initialize_xml(Base64.decode64(STDIN.read), 'VMM_DRIVER_ACTION_DATA') + +dst_ds = drv_action['VM/HISTORY_RECORDS/HISTORY/DS_ID'] +src_ds = drv_action['DATASTORE/ID'] + begin - # TODO: grab destination ds - VCenterDriver::VirtualMachine.migrate_routine(vm_id, - src_host, - dst_host) + vi_client = VCenterDriver::VIClient.new_from_host(src_host) + vm = VCenterDriver::VirtualMachine.new(vi_client, d_id, vm_id) + new_ds = dst_ds != src_ds + + error = !vm.disks_each(:managed?).empty? && new_ds + raise 'live migration with managed disk is not supported' if error + + if new_ds + VCenterDriver::VirtualMachine + .migrate_routine(vm_id, src_host, dst_host, true, dsid) + else + VCenterDriver::VirtualMachine.migrate_routine(vm_id, src_host, dst_host) + end rescue StandardError => e message = "Cannot migrate for VM #{vm_id}"\ 'failed due to '\ "\"#{e.message}\"." OpenNebula.log_error(message) - if vi_client.get_property_vcenter_conf(:debug_information) + + if VCenterDriver::CONFIG[:debug_information] STDERR.puts "#{message} #{e.backtrace}" end + exit(-1) end diff --git a/src/vmm_mad/remotes/vcenter/poll b/src/vmm_mad/remotes/vcenter/poll index 92c7d43721..7e70fbbb13 100755 --- a/src/vmm_mad/remotes/vcenter/poll +++ b/src/vmm_mad/remotes/vcenter/poll @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -49,9 +49,8 @@ rescue StandardError => e " on vCenter cluster #{vc_cluster_name} failed due to " \ "\"#{e.message}\"." OpenNebula.log_error(message) - if vi_client.get_property_vcenter_conf(:debug_information) - STDERR.puts "#{message} #{e.backtrace}" - end + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit(-1) ensure vi_client.close_connection if vi_client diff --git a/src/vmm_mad/remotes/vcenter/prereconfigure b/src/vmm_mad/remotes/vcenter/prereconfigure index 78f0007093..07a7b691ba 100755 --- a/src/vmm_mad/remotes/vcenter/prereconfigure +++ b/src/vmm_mad/remotes/vcenter/prereconfigure @@ -1,7 +1,7 @@ #!/bin/sh # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vmm_mad/remotes/vcenter/reboot b/src/vmm_mad/remotes/vcenter/reboot index d7c247c8ef..7335f5a7db 100755 --- a/src/vmm_mad/remotes/vcenter/reboot +++ b/src/vmm_mad/remotes/vcenter/reboot @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -47,9 +47,8 @@ rescue StandardError => e "#{vc_cluster_name} failed due to "\ "\"#{e.message}\"\n#{e.backtrace.join("\n")}" OpenNebula.log_error(message) - if vi_client.get_property_vcenter_conf(:debug_information) - STDERR.puts "#{message} #{e.backtrace}" - end + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit(-1) ensure vi_client.close_connection if vi_client diff --git a/src/vmm_mad/remotes/vcenter/reconfigure b/src/vmm_mad/remotes/vcenter/reconfigure index 1e8a70f53d..6accc6f6c3 100755 --- a/src/vmm_mad/remotes/vcenter/reconfigure +++ b/src/vmm_mad/remotes/vcenter/reconfigure @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -50,9 +50,8 @@ rescue StandardErrord => e "#{vc_cluster_name} failed due to "\ "\"#{e.message}\"." STDERR.puts error_message(message) - if vi_client.get_property_vcenter_conf(:debug_information) - STDERR.puts "#{e.backtrace}" - end + STDERR.puts "#{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit(-1) ensure vi_client.close_connection if vi_client diff --git a/src/vmm_mad/remotes/vcenter/reset b/src/vmm_mad/remotes/vcenter/reset index b04c730d3e..225a79a5d0 100755 --- a/src/vmm_mad/remotes/vcenter/reset +++ b/src/vmm_mad/remotes/vcenter/reset @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -46,9 +46,8 @@ rescue StandardError => e "#{vc_cluster_name} failed due to "\ "\"#{e.message}\"." OpenNebula.log_error(message) - if vi_client.get_property_vcenter_conf(:debug_information) - STDERR.puts "#{message} #{e.backtrace}" - end + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit(-1) ensure vi_client.close_connection if vi_client diff --git a/src/vmm_mad/remotes/vcenter/restore b/src/vmm_mad/remotes/vcenter/restore index 3442777f44..5015879952 100755 --- a/src/vmm_mad/remotes/vcenter/restore +++ b/src/vmm_mad/remotes/vcenter/restore @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -47,9 +47,8 @@ rescue StandardError => e "#{vc_cluster_name} failed due to "\ "\"#{e.message}\"." OpenNebula.log_error(message) - if vi_client.get_property_vcenter_conf(:debug_information) - STDERR.puts "#{message} #{e.backtrace}" - end + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit(-1) ensure vi_client.close_connection if vi_client diff --git a/src/vmm_mad/remotes/vcenter/save b/src/vmm_mad/remotes/vcenter/save index cbfadfaa44..c0ac3c6264 100755 --- a/src/vmm_mad/remotes/vcenter/save +++ b/src/vmm_mad/remotes/vcenter/save @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -61,9 +61,8 @@ rescue StandardError => e "#{vc_cluster_name} failed due to "\ "\"#{e.message}\"\n#{e.backtrace.join("\n")}" OpenNebula.log_error(message) - if vi_client.get_property_vcenter_conf(:debug_information) - STDERR.puts "#{message} #{e.backtrace}" - end + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit(-1) ensure vi_client.close_connection if vi_client diff --git a/src/vmm_mad/remotes/vcenter/shutdown b/src/vmm_mad/remotes/vcenter/shutdown index ba5935bf27..80f347f777 100755 --- a/src/vmm_mad/remotes/vcenter/shutdown +++ b/src/vmm_mad/remotes/vcenter/shutdown @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -68,9 +68,8 @@ rescue StandardError => e "#{vc_cluster_name} failed due to "\ "\"#{e.message}\"\n#{e.backtrace.join("\n")}" OpenNebula.log_error(message) - if vi_client.get_property_vcenter_conf(:debug_information) - STDERR.puts "#{message} #{e.backtrace}" - end + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit(-1) ensure vi_client.close_connection if vi_client diff --git a/src/vmm_mad/remotes/vcenter/snapshot_create b/src/vmm_mad/remotes/vcenter/snapshot_create index 0abbd96f92..bc71311e16 100755 --- a/src/vmm_mad/remotes/vcenter/snapshot_create +++ b/src/vmm_mad/remotes/vcenter/snapshot_create @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -63,9 +63,8 @@ rescue StandardError => e "#{vc_cluster_name} failed due to "\ "\"#{e.message}\"\n" OpenNebula.log_error(message) - if vi_client.get_property_vcenter_conf(:debug_information) - STDERR.puts "#{message} #{e.backtrace}" - end + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit(-1) ensure vi_client.close_connection if vi_client diff --git a/src/vmm_mad/remotes/vcenter/snapshot_delete b/src/vmm_mad/remotes/vcenter/snapshot_delete index 7e06052835..4ac741db88 100755 --- a/src/vmm_mad/remotes/vcenter/snapshot_delete +++ b/src/vmm_mad/remotes/vcenter/snapshot_delete @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -46,9 +46,8 @@ rescue StandardError => e "#{vc_cluster_name} could not be deleted due to "\ "\"#{e.message}\"\n" OpenNebula.log_error(message) - if vi_client.get_property_vcenter_conf(:debug_information) - STDERR.puts "#{message} #{e.backtrace}" - end + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit(-1) ensure vi_client.close_connection if vi_client diff --git a/src/vmm_mad/remotes/vcenter/snapshot_revert b/src/vmm_mad/remotes/vcenter/snapshot_revert index b9257cdd17..f82e35065e 100755 --- a/src/vmm_mad/remotes/vcenter/snapshot_revert +++ b/src/vmm_mad/remotes/vcenter/snapshot_revert @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -47,9 +47,8 @@ rescue StandardError => e "#{vc_cluster_name} could not be reverted due "\ "to \"#{e.message}\"\n" OpenNebula.log_error(message) - if vi_client.get_property_vcenter_conf(:debug_information) - STDERR.puts "#{message} #{e.backtrace}" - end + STDERR.puts "#{message} #{e.backtrace}" if VCenterDriver::CONFIG[:debug_information] + exit(-1) ensure vi_client.close_connection if vi_client diff --git a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb index 546adc212a..3e99004d3c 100644 --- a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb +++ b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb @@ -1,5 +1,5 @@ # ---------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -40,13 +40,15 @@ $LOAD_PATH << LIB_LOCATION + '/ruby/vcenter_driver' class VCenterConf < Hash DEFAULT_CONFIGURATION = { - delete_images: false + delete_images: false, + vm_poweron_wait_default: 300, + debug_information: false } def initialize self.replace(DEFAULT_CONFIGURATION) begin - self.merge!(YAML.load_file("#{VAR_LOCATION}/remotes/etc/vmm/vcenter/vcenterc")) + self.merge!(YAML.load_file("#{VAR_LOCATION}/remotes/etc/vmm/vcenter/vcenterrc")) rescue end end diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/vcenter_driver.conf b/src/vmm_mad/remotes/vcenter/vcenterrc similarity index 81% rename from src/vmm_mad/remotes/lib/vcenter_driver/vcenter_driver.conf rename to src/vmm_mad/remotes/vcenter/vcenterrc index 38a106eaf8..ab04548245 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/vcenter_driver.conf +++ b/src/vmm_mad/remotes/vcenter/vcenterrc @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -14,9 +14,10 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -#******************************************************************************* -# vCenter Driver Configuration file -#******************************************************************************* +# no : VCENTER_IMPORTED attribute will be set on imported images +# this attribute prevents the image to be deleted. +# yes : You can delete the images using OpenNebula. +:delete_images: no # Default timeout to complete deploy :vm_poweron_wait_default: 300 diff --git a/src/vn_template/SConstruct b/src/vn_template/SConstruct index 4643a024f6..80b36d8bb8 100644 --- a/src/vn_template/SConstruct +++ b/src/vn_template/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/vn_template # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vn_template/VNTemplate.cc b/src/vn_template/VNTemplate.cc index bcbc23254f..64dd96bc93 100644 --- a/src/vn_template/VNTemplate.cc +++ b/src/vn_template/VNTemplate.cc @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/vn_template/VNTemplatePool.cc b/src/vn_template/VNTemplatePool.cc index 511ec3e091..db6a05316a 100644 --- a/src/vn_template/VNTemplatePool.cc +++ b/src/vn_template/VNTemplatePool.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/vnm/AddressRange.cc b/src/vnm/AddressRange.cc index 5839b0e16c..9a9e27efb3 100644 --- a/src/vnm/AddressRange.cc +++ b/src/vnm/AddressRange.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/vnm/AddressRangeIPAM.cc b/src/vnm/AddressRangeIPAM.cc index f9dfb3ea4c..a5b95c7c17 100644 --- a/src/vnm/AddressRangeIPAM.cc +++ b/src/vnm/AddressRangeIPAM.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ @@ -26,13 +26,13 @@ int AddressRangeIPAM::from_vattr(VectorAttribute * attr, std::string& error_msg) { + std::ostringstream oss; + IPAMManager * ipamm = Nebula::instance().get_ipamm(); - std::string * ar_xml = attr->to_xml(); + attr->to_xml(oss); - IPAMRequest ir(*ar_xml); - - free(ar_xml); + IPAMRequest ir(oss.str()); ipamm->trigger(IPMAction::REGISTER_ADDRESS_RANGE, &ir); diff --git a/src/vnm/AddressRangeInternal.cc b/src/vnm/AddressRangeInternal.cc index 65c368cfdb..0edd91a881 100644 --- a/src/vnm/AddressRangeInternal.cc +++ b/src/vnm/AddressRangeInternal.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/vnm/AddressRangePool.cc b/src/vnm/AddressRangePool.cc index f924d14482..132691954d 100644 --- a/src/vnm/AddressRangePool.cc +++ b/src/vnm/AddressRangePool.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/vnm/SConstruct b/src/vnm/SConstruct index 4728486617..c5bcb576a7 100644 --- a/src/vnm/SConstruct +++ b/src/vnm/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/vnm # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm/VirtualNetwork.cc b/src/vnm/VirtualNetwork.cc index 35f1573943..7be4b05780 100644 --- a/src/vnm/VirtualNetwork.cc +++ b/src/vnm/VirtualNetwork.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/vnm/VirtualNetworkPool.cc b/src/vnm/VirtualNetworkPool.cc index 8222c37b3a..09d72d4c06 100644 --- a/src/vnm/VirtualNetworkPool.cc +++ b/src/vnm/VirtualNetworkPool.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/vnm/VirtualNetworkTemplate.cc b/src/vnm/VirtualNetworkTemplate.cc index 8a4c5c6881..d0980148cc 100644 --- a/src/vnm/VirtualNetworkTemplate.cc +++ b/src/vnm/VirtualNetworkTemplate.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/vnm_mad/one_vnm.rb b/src/vnm_mad/one_vnm.rb index 9149fabe35..e7789fb4f2 100644 --- a/src/vnm_mad/one_vnm.rb +++ b/src/vnm_mad/one_vnm.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/802.1Q/clean b/src/vnm_mad/remotes/802.1Q/clean index f90300d7bf..be6c1c80cb 100755 --- a/src/vnm_mad/remotes/802.1Q/clean +++ b/src/vnm_mad/remotes/802.1Q/clean @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/802.1Q/post b/src/vnm_mad/remotes/802.1Q/post index f3eb780de5..232c9126af 100755 --- a/src/vnm_mad/remotes/802.1Q/post +++ b/src/vnm_mad/remotes/802.1Q/post @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2019, OpenNebula Project (OpenNebula.org), C12G Labs # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/802.1Q/pre b/src/vnm_mad/remotes/802.1Q/pre index a6855e8c73..672d830f5e 100755 --- a/src/vnm_mad/remotes/802.1Q/pre +++ b/src/vnm_mad/remotes/802.1Q/pre @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/802.1Q/update_sg b/src/vnm_mad/remotes/802.1Q/update_sg index b807b95f10..3101e95eae 100755 --- a/src/vnm_mad/remotes/802.1Q/update_sg +++ b/src/vnm_mad/remotes/802.1Q/update_sg @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/802.1Q/vlan_tag_driver.rb b/src/vnm_mad/remotes/802.1Q/vlan_tag_driver.rb index e6c4a59476..de8e54f41c 100644 --- a/src/vnm_mad/remotes/802.1Q/vlan_tag_driver.rb +++ b/src/vnm_mad/remotes/802.1Q/vlan_tag_driver.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/OpenNebulaNetwork.conf b/src/vnm_mad/remotes/OpenNebulaNetwork.conf index 973eadd521..7ade3265e0 100644 --- a/src/vnm_mad/remotes/OpenNebulaNetwork.conf +++ b/src/vnm_mad/remotes/OpenNebulaNetwork.conf @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/bridge/clean b/src/vnm_mad/remotes/bridge/clean index 70c28ecbd0..45aaba232d 100755 --- a/src/vnm_mad/remotes/bridge/clean +++ b/src/vnm_mad/remotes/bridge/clean @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/bridge/post b/src/vnm_mad/remotes/bridge/post index b3570d8b45..65b76ef2ee 100755 --- a/src/vnm_mad/remotes/bridge/post +++ b/src/vnm_mad/remotes/bridge/post @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/bridge/pre b/src/vnm_mad/remotes/bridge/pre index 10d4bba33c..b1c511c1ce 100755 --- a/src/vnm_mad/remotes/bridge/pre +++ b/src/vnm_mad/remotes/bridge/pre @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/bridge/update_sg b/src/vnm_mad/remotes/bridge/update_sg index b3570d8b45..65b76ef2ee 100755 --- a/src/vnm_mad/remotes/bridge/update_sg +++ b/src/vnm_mad/remotes/bridge/update_sg @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/common/dummy.sh b/src/vnm_mad/remotes/common/dummy.sh index d24d2a262b..f6c157c95f 100755 --- a/src/vnm_mad/remotes/common/dummy.sh +++ b/src/vnm_mad/remotes/common/dummy.sh @@ -1,7 +1,7 @@ #!/bin/sh # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/dummy/clean b/src/vnm_mad/remotes/dummy/clean index b72c78c910..09cd3f1371 100755 --- a/src/vnm_mad/remotes/dummy/clean +++ b/src/vnm_mad/remotes/dummy/clean @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/dummy/post b/src/vnm_mad/remotes/dummy/post index b72c78c910..09cd3f1371 100755 --- a/src/vnm_mad/remotes/dummy/post +++ b/src/vnm_mad/remotes/dummy/post @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/dummy/pre b/src/vnm_mad/remotes/dummy/pre index b72c78c910..09cd3f1371 100755 --- a/src/vnm_mad/remotes/dummy/pre +++ b/src/vnm_mad/remotes/dummy/pre @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/dummy/update_sg b/src/vnm_mad/remotes/dummy/update_sg index b72c78c910..09cd3f1371 100755 --- a/src/vnm_mad/remotes/dummy/update_sg +++ b/src/vnm_mad/remotes/dummy/update_sg @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/ebtables/Ebtables.rb b/src/vnm_mad/remotes/ebtables/Ebtables.rb index 2130145c03..7a184569ca 100644 --- a/src/vnm_mad/remotes/ebtables/Ebtables.rb +++ b/src/vnm_mad/remotes/ebtables/Ebtables.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/ebtables/clean b/src/vnm_mad/remotes/ebtables/clean index ea8a2ab50e..f1cfb0402b 100755 --- a/src/vnm_mad/remotes/ebtables/clean +++ b/src/vnm_mad/remotes/ebtables/clean @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/ebtables/post b/src/vnm_mad/remotes/ebtables/post index e29a33d421..b111949ee1 100755 --- a/src/vnm_mad/remotes/ebtables/post +++ b/src/vnm_mad/remotes/ebtables/post @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/ebtables/pre b/src/vnm_mad/remotes/ebtables/pre index 6289c03e04..2e69a98479 100755 --- a/src/vnm_mad/remotes/ebtables/pre +++ b/src/vnm_mad/remotes/ebtables/pre @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/ebtables/update_sg b/src/vnm_mad/remotes/ebtables/update_sg index fccd163ebd..4bf2061148 100755 --- a/src/vnm_mad/remotes/ebtables/update_sg +++ b/src/vnm_mad/remotes/ebtables/update_sg @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/fw/clean b/src/vnm_mad/remotes/fw/clean index 3a558d4080..8edb14275c 100755 --- a/src/vnm_mad/remotes/fw/clean +++ b/src/vnm_mad/remotes/fw/clean @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/fw/post b/src/vnm_mad/remotes/fw/post index 9d665aa005..2b2c1144e4 100755 --- a/src/vnm_mad/remotes/fw/post +++ b/src/vnm_mad/remotes/fw/post @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/fw/pre b/src/vnm_mad/remotes/fw/pre index 40fa055e02..708c2ca168 100755 --- a/src/vnm_mad/remotes/fw/pre +++ b/src/vnm_mad/remotes/fw/pre @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/fw/update_sg b/src/vnm_mad/remotes/fw/update_sg index dad77b3732..7676b4f015 100755 --- a/src/vnm_mad/remotes/fw/update_sg +++ b/src/vnm_mad/remotes/fw/update_sg @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/lib/address.rb b/src/vnm_mad/remotes/lib/address.rb index ba478e02ed..8634736268 100644 --- a/src/vnm_mad/remotes/lib/address.rb +++ b/src/vnm_mad/remotes/lib/address.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/lib/command.rb b/src/vnm_mad/remotes/lib/command.rb index c62166b30e..38b0161400 100644 --- a/src/vnm_mad/remotes/lib/command.rb +++ b/src/vnm_mad/remotes/lib/command.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/lib/nic.rb b/src/vnm_mad/remotes/lib/nic.rb index c719315b7b..edc9e84f64 100644 --- a/src/vnm_mad/remotes/lib/nic.rb +++ b/src/vnm_mad/remotes/lib/nic.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -110,7 +110,12 @@ module VNMMAD end if deploy_id && vm.vm_info[:dumpxml].nil? - vm.vm_info[:dumpxml] = YAML.safe_load(`lxc config show #{deploy_id} 2>/dev/null`) + cmd = "lxc config show #{deploy_id} 2>/dev/null" + + config = YAML.safe_load(`#{cmd}`) + config = YAML.safe_load(`sudo #{cmd}`) if config.nil? + + vm.vm_info[:dumpxml] = config vm.vm_info.each_key do |k| vm.vm_info[k] = nil if vm.vm_info[k].to_s.strip.empty? diff --git a/src/vnm_mad/remotes/lib/no_vlan.rb b/src/vnm_mad/remotes/lib/no_vlan.rb index 7088be8907..8b4ee07753 100644 --- a/src/vnm_mad/remotes/lib/no_vlan.rb +++ b/src/vnm_mad/remotes/lib/no_vlan.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/lib/security_groups.rb b/src/vnm_mad/remotes/lib/security_groups.rb index ce41ad6db8..44a66117e2 100644 --- a/src/vnm_mad/remotes/lib/security_groups.rb +++ b/src/vnm_mad/remotes/lib/security_groups.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/lib/security_groups_iptables.rb b/src/vnm_mad/remotes/lib/security_groups_iptables.rb index d7e2f11223..b5d3a24c70 100644 --- a/src/vnm_mad/remotes/lib/security_groups_iptables.rb +++ b/src/vnm_mad/remotes/lib/security_groups_iptables.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/lib/sg_driver.rb b/src/vnm_mad/remotes/lib/sg_driver.rb index 60d83aab03..05272b1ed0 100644 --- a/src/vnm_mad/remotes/lib/sg_driver.rb +++ b/src/vnm_mad/remotes/lib/sg_driver.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/lib/vlan.rb b/src/vnm_mad/remotes/lib/vlan.rb index bd14ec7054..a431c7f290 100644 --- a/src/vnm_mad/remotes/lib/vlan.rb +++ b/src/vnm_mad/remotes/lib/vlan.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/lib/vm.rb b/src/vnm_mad/remotes/lib/vm.rb index 5a4bb2799f..4a32ea5978 100644 --- a/src/vnm_mad/remotes/lib/vm.rb +++ b/src/vnm_mad/remotes/lib/vm.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/lib/vnm_driver.rb b/src/vnm_mad/remotes/lib/vnm_driver.rb index 77ed73a40d..3b07160469 100644 --- a/src/vnm_mad/remotes/lib/vnm_driver.rb +++ b/src/vnm_mad/remotes/lib/vnm_driver.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/lib/vnmmad.rb b/src/vnm_mad/remotes/lib/vnmmad.rb index 178e0b618e..dc6fb4a36e 100644 --- a/src/vnm_mad/remotes/lib/vnmmad.rb +++ b/src/vnm_mad/remotes/lib/vnmmad.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb b/src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb index 01bfe80d83..1bd32f253e 100644 --- a/src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb +++ b/src/vnm_mad/remotes/ovswitch/OpenvSwitch.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -391,7 +391,7 @@ private def create_bridge return if @bridges.keys.include? @nic[:bridge] - OpenNebula.exec_and_log("#{command(:ovs_vsctl)} add-br #{@nic[:bridge]}") + OpenNebula.exec_and_log("#{command(:ovs_vsctl)} --may-exist add-br #{@nic[:bridge]}") set_bridge_options diff --git a/src/vnm_mad/remotes/ovswitch/clean b/src/vnm_mad/remotes/ovswitch/clean index e0115b8929..a7194870d5 100755 --- a/src/vnm_mad/remotes/ovswitch/clean +++ b/src/vnm_mad/remotes/ovswitch/clean @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/ovswitch/post b/src/vnm_mad/remotes/ovswitch/post index 729d39c538..b7f89b086b 100755 --- a/src/vnm_mad/remotes/ovswitch/post +++ b/src/vnm_mad/remotes/ovswitch/post @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/ovswitch/pre b/src/vnm_mad/remotes/ovswitch/pre index 98b99b450b..854556373b 100755 --- a/src/vnm_mad/remotes/ovswitch/pre +++ b/src/vnm_mad/remotes/ovswitch/pre @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/ovswitch/update_sg b/src/vnm_mad/remotes/ovswitch/update_sg index c604b3134e..1e3d8ab236 100755 --- a/src/vnm_mad/remotes/ovswitch/update_sg +++ b/src/vnm_mad/remotes/ovswitch/update_sg @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/ovswitch_vxlan/OpenvSwitchVXLAN.rb b/src/vnm_mad/remotes/ovswitch_vxlan/OpenvSwitchVXLAN.rb index 75e719345e..44c0c0a9dc 100644 --- a/src/vnm_mad/remotes/ovswitch_vxlan/OpenvSwitchVXLAN.rb +++ b/src/vnm_mad/remotes/ovswitch_vxlan/OpenvSwitchVXLAN.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/ovswitch_vxlan/clean b/src/vnm_mad/remotes/ovswitch_vxlan/clean index bcbd30a601..6c0634472d 100755 --- a/src/vnm_mad/remotes/ovswitch_vxlan/clean +++ b/src/vnm_mad/remotes/ovswitch_vxlan/clean @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/ovswitch_vxlan/post b/src/vnm_mad/remotes/ovswitch_vxlan/post index ad8fbdb3bc..99b0c06f46 100755 --- a/src/vnm_mad/remotes/ovswitch_vxlan/post +++ b/src/vnm_mad/remotes/ovswitch_vxlan/post @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/ovswitch_vxlan/pre b/src/vnm_mad/remotes/ovswitch_vxlan/pre index 49db5bd618..ef02a8a73a 100755 --- a/src/vnm_mad/remotes/ovswitch_vxlan/pre +++ b/src/vnm_mad/remotes/ovswitch_vxlan/pre @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/ovswitch_vxlan/update_sg b/src/vnm_mad/remotes/ovswitch_vxlan/update_sg index c604b3134e..1e3d8ab236 100755 --- a/src/vnm_mad/remotes/ovswitch_vxlan/update_sg +++ b/src/vnm_mad/remotes/ovswitch_vxlan/update_sg @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/vxlan/clean b/src/vnm_mad/remotes/vxlan/clean index ab2151fcf6..7f69550471 100755 --- a/src/vnm_mad/remotes/vxlan/clean +++ b/src/vnm_mad/remotes/vxlan/clean @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/vxlan/post b/src/vnm_mad/remotes/vxlan/post index 4fe36da3a3..8938445110 100755 --- a/src/vnm_mad/remotes/vxlan/post +++ b/src/vnm_mad/remotes/vxlan/post @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project (OpenNebula.org), C12G Labs # +# Copyright 2002-2019, OpenNebula Project (OpenNebula.org), C12G Labs # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/vxlan/pre b/src/vnm_mad/remotes/vxlan/pre index 90faaf3ee5..aaf3e07ed9 100755 --- a/src/vnm_mad/remotes/vxlan/pre +++ b/src/vnm_mad/remotes/vxlan/pre @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/vxlan/update_sg b/src/vnm_mad/remotes/vxlan/update_sg index 3a9dcaa24f..51c228be4a 100755 --- a/src/vnm_mad/remotes/vxlan/update_sg +++ b/src/vnm_mad/remotes/vxlan/update_sg @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vnm_mad/remotes/vxlan/vxlan.rb b/src/vnm_mad/remotes/vxlan/vxlan.rb index 88063af932..1c67d467e4 100644 --- a/src/vnm_mad/remotes/vxlan/vxlan.rb +++ b/src/vnm_mad/remotes/vxlan/vxlan.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -65,9 +65,11 @@ module VXLAN ip_link_conf << "#{option} #{value} " end + # `ip link add ...` returns 2 when vxlan device already exists + # allow it to prevent race conditions OpenNebula.exec_and_log("#{command(:ip)} link add #{@nic[@attr_vlan_dev]}"\ " #{mtu} type vxlan id #{@nic[@attr_vlan_id]} #{group} #{ttl}"\ - " #{tep} #{ip_link_conf}") + " #{tep} #{ip_link_conf}", nil, 2) OpenNebula.exec_and_log("#{command(:ip)} link set #{@nic[@attr_vlan_dev]} up") end diff --git a/src/vnm_mad/remotes/vxlan/vxlan_driver.rb b/src/vnm_mad/remotes/vxlan/vxlan_driver.rb index 110aed7d7f..4c46090185 100644 --- a/src/vnm_mad/remotes/vxlan/vxlan_driver.rb +++ b/src/vnm_mad/remotes/vxlan/vxlan_driver.rb @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vrouter/SConstruct b/src/vrouter/SConstruct index 2587b1dc67..1f9e2e1924 100644 --- a/src/vrouter/SConstruct +++ b/src/vrouter/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/document # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/vrouter/VirtualRouter.cc b/src/vrouter/VirtualRouter.cc index f438681d57..6188962dc4 100644 --- a/src/vrouter/VirtualRouter.cc +++ b/src/vrouter/VirtualRouter.cc @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/xml/ObjectXML.cc b/src/xml/ObjectXML.cc index fa0a04c3a9..9878affbcf 100644 --- a/src/xml/ObjectXML.cc +++ b/src/xml/ObjectXML.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/xml/SConstruct b/src/xml/SConstruct index 6eb55cceb4..d8de1fa371 100644 --- a/src/xml/SConstruct +++ b/src/xml/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/xml # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/zone/SConstruct b/src/zone/SConstruct index 216cd3c236..6248982171 100644 --- a/src/zone/SConstruct +++ b/src/zone/SConstruct @@ -1,7 +1,7 @@ # SConstruct for src/zone # -------------------------------------------------------------------------- # -# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # diff --git a/src/zone/Zone.cc b/src/zone/Zone.cc index 7ea034c498..444f3d4d97 100644 --- a/src/zone/Zone.cc +++ b/src/zone/Zone.cc @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------ */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */ diff --git a/src/zone/ZonePool.cc b/src/zone/ZonePool.cc index 6a67469373..701e875173 100644 --- a/src/zone/ZonePool.cc +++ b/src/zone/ZonePool.cc @@ -1,5 +1,5 @@ /* -------------------------------------------------------------------------- */ -/* Copyright 2002-2018, OpenNebula Project, OpenNebula Systems */ +/* Copyright 2002-2019, OpenNebula Project, OpenNebula Systems */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); you may */ /* not use this file except in compliance with the License. You may obtain */