This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch marvin3
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
discard 1958833 full disable of all systemvm related python installs
discard d57b772 Revert "david's pip"
discard 58117fd Revert "2.7"
discard 6634246 Revert "remove pyenv's preoccupation"
discard 87a25a4 Revert "local virtual env instead of in home"
omit 5217f31 local virtual env instead of in home
omit 3fe776d remove pyenv's preoccupation
omit 050ebbb 2.7
omit 5eb27e3 david's pip
omit d02c5f4 show explicitely
omit 5d1deca python versions before
omit c31804b Merge branch 'master' into marvin3
omit ef03468 remove pyenv from systemvm code
omit 818ce0b pip1
omit 104e161 test pyenv2 to install
omit c550b0f Merge branch 'master' into marvin3
omit 8561b4a put back in requirements travis doesn't have
omit fc48afd travis py2+py3 run guidance
omit d492bec activate called from specific version
omit ce041e0 move acitvate outside runtests
omit d3b0221 py2 install in before
omit 1504777 proper install
omit fe27c61 Remove unnecessary mysql-connector-python installation with
hardcoded version
omit e421f37 explicit install python2
omit d45e3c2 Fix issue at cloudstack-marvin.postinst by making it 'python3
-m pip install'
omit c014192 double python install
omit 98bfae1 ubuntu py3 deps for marvin
omit de8c2b6 try`n'hack python2/python3 mix in travis
omit c14afae disable nosetests on python2 code for now
omit 1823b3a force py2 nosetests on vr scripts
omit a445d03 better try/except than with
omit 37336b6 remove merge remnance
omit 7a134e5 fix delete test
omit d99b685 disable pylint3 running on py2 code (needs addressing and
reverting)
omit adb8b6b clean up VMs
omit 91f7183 more cleanup for test_accounts
omit 318381a syntax (suerfluent '.')
omit 0005550 no importing of False in python3 (or in sensible code)
omit 2a2521f cleanup of ip tests
omit 7493f1d format and cleanup internal lb tests
omit fd8c343 cleanup hygiene
omit c0d96d1 further cleanup of resource heavy test
omit 87ec451 test tag removed
omit 2bb27cd cleanup imports
omit c807a2d cleanup, indent, taberrors
omit 292dd8a another indentation issue identified
omit a19eb0e another network for cleanup
omit 8472219 cleanup incosistent passing test
omit 62e12a0 rigorous cleanup discipline
omit adc47d9 cleanup and indentation
omit 5d7f2e0 message attribute not available on exception
omit d227530 endodestring can't consume a string, needs bytes
omit b13c57b remove false copy-block
omit 52de8d4 encodestring() instead of b64encode()
omit 202cb97 cleanup and fix autoindent issues
omit d9e5d70 Revert python version change from 3.8 to 3.9
omit 297a18e Upgrade pip
omit 948d193 Change python version due to cryptography
omit 2c5a600 setuptools upgrade
omit 84739e2 nose to install (from before_install)
omit 0293767 skip lifemigration for centos
omit 441cdcc just to see
omit 8815a45 Update before_install.sh
omit ea8fe32 pylint cmd debug
omit 2a2a486 reformat because of indentation problems
omit 41a6319 cleanup and feedback from internal version
omit c3ab2c3 retries on ssh verification
omit 097b1e7 redundant braces removed
omit 5de9bc5 cleanup of tearDown(Class)
omit 2bfa45b cleanup of setup() (not sure why this would help)
omit 7c5ace8 socketserver take bytes
omit be38b4e inherritics
omit ea2215a 2to3 artifact/remnance removed
omit 4988b8c exception assert fix
omit 9709050 remove superfluent parentesis
omit c628111 str() when str() due
omit 24c8c64 foutje bedank: None vs 0
omit 7d277ba unittest method rename assertItemEqual to assertCountEqual
omit 64720a9 awkward encode-decode of userdata
omit 113b203 only fetchall for select statements
omit 1be2cd3 mysql connector does not properly defend against index out of
bounds
omit ea92e94 start on tabs in component tests :'(
omit a92a289 license exclude for pyenv
omit f8caa887 certificates as bytes arrays
omit 9427718 version output in travis svm tests
omit 0adfa1d separate python for systemvm (tests)
omit c59632d travis container does not inherit pylint either
omit f182e95 travis container does not inherit before_install stuff??
omit bf8d7be travis prefered python version
omit d1400b5 remove nose-json
omit 9afa00e run py checkers as modules
omit 1cf4f82 backquote error calling pyenv
omit 0931354 fix tags on test
omit 182991c channel result decode
omit 7e817a5 no decode on str in python3
omit cfabfd5 string checks in the nose plugin
omit dcd4e36 pycodestyle2 and -lint2 in travis
omit c2e3863 marvin deps on nose
omit cd7bdba python3 in marvin rpm
omit 3d5abd0 pyenv the right/requested version
omit b5a1438 pyton 3.9.1
omit 92c08a7 pyenv/travis alignment
omit bf10f09 travis scripts
omit 1be94e0 None check
omit 255bac1 add urllib3 to requirements in egg
omit a524b48 call codegenerator with python3
omit 3439bb0 python3 output on code generator
omit f7729e6 urllib3
omit 4b9c97a version3
omit 13be55b travis on python 3
omit d21a7e9 env run of python3
omit 36f9a97 remove redundant member value
omit b210eac expect explicit exception
omit 657c431 explicit import of unittest
omit f0e99ff init and sign
omit 6819c23 2to3tests
omit 066702e 2to3marvin
add f00b5fc server: Fix for the issue of recover VM not able to attach
the data disks which are there before destroy in case of VMware (#4493)
add 50da578 test: reduce vr traceroute hops (#4913)
add 8fec222 ui: fix not find tab name due to language other than English
(#4920)
add 0302750 vmware: Add support for VMware 7 (#4300)
add f420247 Merge remote-tracking branch 'origin/4.15'
add de55766 Migrate/Stop VMs with local storage when preparing host for
maintenance (#4212)
add 3c8a504 Improve logs on IpmitoolOutOfBandManagementDriver (#4702)
add 90fc5ac ui: Show diskoffering for create volume from ROOT volume
snaps (#4912)
add 0bbf114 ui: Support to update disk/network offering tags from UI
(#4923)
add 7da7c48 debian: remove duplicate agent jar copy (#4927)
add 8edd709 ui: disabled root disk size customization if Service Offering
has a fixed size (#4933)
add 5051fde server: Stat collector solidfire capacity fix (#4918)
add 585164a server: Add UnavailableCommandException at
ExceptionErrorCodeMap (#4926)
add 40a2ca4 cloudian: Set cloudian.connector.enabled as not dynamic
(#4938)
add a5e53dc ui: fix autogen form exec with action mapping options (#4909)
add e107f9a Merge remote-tracking branch 'origin/4.15'
add 49baa900 Readme: Fix broken API documentation link on Readme (#4942)
add b4ee4ac server: Fix volume state on migrate with
migrateVirtualMachineWithVolume API call (#4934)
add a30d518 vmware: fix stopped VM volume migration (#4758)
add f728287 server: Fix template garbage collection cleanup (#4944)
add bc2a6e8 ui: Fix error in adduser (#4950)
add f9ca881 ui: Show domain path instead of name (#4949)
add f8ba33d server: Some APIs should have access check (#4859)
add 42c83b0 Merge remote-tracking branch 'apache/4.15'
add c7db4f4 changed variable name to avoid collision in python3 (#4903)
add 96ccd6d ui: Show traffic type in physical networks tab (#4952)
add 04cdb50 debian: Adding net tools as a dependency (#4951)
add d4db101 marvin: fix test_scale_vm for xenserver/Xcp-ng (#4929)
add d68b098 UI: Show IPv6 address of Instance (#4948)
add 8e31d1e api: fix disk/service offering keys (#4946)
add 1e859a0 Merge remote-tracking branch 'origin/4.15'
add 277d9a2 2to3marvin
add 3ef4bf4 2to3tests
add 128e8e4 init and sign
add b26fd5e explicit import of unittest
add dea5bbb expect explicit exception
add eac67c3 remove redundant member value
add 68d1078 env run of python3
add be31f9a travis on python 3
add 4ba5ef7 version3
add 128781e urllib3
add 8ea13ae python3 output on code generator
add 23ef98c call codegenerator with python3
add 6fc2718 add urllib3 to requirements in egg
add 5acbe8a None check
add 3ea1ff6 travis scripts
add a8b37d7 pyenv/travis alignment
add 0113381 pyton 3.9.1
add b644072 pyenv the right/requested version
add 26c6a7e python3 in marvin rpm
add a9858ea marvin deps on nose
add 749606b pycodestyle2 and -lint2 in travis
add 38906c1 string checks in the nose plugin
add e812d67 no decode on str in python3
add 943aa56 channel result decode
add 006f937 fix tags on test
add e1be3f5 backquote error calling pyenv
add c979087 run py checkers as modules
add 6cd80c7 remove nose-json
add 4a77e5b travis prefered python version
add baa4d3d travis container does not inherit before_install stuff??
add 3291c6f travis container does not inherit pylint either
add 532db1b separate python for systemvm (tests)
add 8b66304 version output in travis svm tests
add 189e553 certificates as bytes arrays
add 444e910 license exclude for pyenv
add 3dd53c4 start on tabs in component tests :'(
add 612a67c mysql connector does not properly defend against index out of
bounds
add 0dcb1fe only fetchall for select statements
add c1627de awkward encode-decode of userdata
add 9023934 unittest method rename assertItemEqual to assertCountEqual
add 5406d6f foutje bedank: None vs 0
add 4cc1f80 str() when str() due
add 21436d0 remove superfluent parentesis
add 96659c8 exception assert fix
add 395a302 2to3 artifact/remnance removed
add 0c27a33 inherritics
add e9b5675 socketserver take bytes
add f2ce7a4 cleanup of setup() (not sure why this would help)
add 2108211 cleanup of tearDown(Class)
add f59905f redundant braces removed
add 5326a40 retries on ssh verification
add 8d4976d cleanup and feedback from internal version
add 7cd919a reformat because of indentation problems
add 73465e9 pylint cmd debug
add c34d662 Update before_install.sh
add af79302 just to see
add 7a61b1b nose to install (from before_install)
add d60ece5 setuptools upgrade
add 94e2dab Change python version due to cryptography
add 9ea4e65 Upgrade pip
add 129dfd9 Revert python version change from 3.8 to 3.9
add b71c6b5 cleanup and fix autoindent issues
add 8645e51 encodestring() instead of b64encode()
add 92627c3 remove false copy-block
add 205335a endodestring can't consume a string, needs bytes
add 32c1c2a message attribute not available on exception
add a14dfd4 cleanup and indentation
add f7dd470 rigorous cleanup discipline
add f13f6ab cleanup incosistent passing test
add b01d6e0 another network for cleanup
add f6a2ef8 another indentation issue identified
add dbc2c41 cleanup, indent, taberrors
add 8115995 cleanup imports
add bc5b3f3 test tag removed
add 1eda309 further cleanup of resource heavy test
add 06f85d6 cleanup hygiene
add c919dd2 format and cleanup internal lb tests
add 3289ec5 cleanup of ip tests
add 9ea59e7 no importing of False in python3 (or in sensible code)
add 821b38c syntax (suerfluent '.')
add abea365 more cleanup for test_accounts
add c5d1d36 disable pylint3 running on py2 code (needs addressing and
reverting)
add 057d95e fix delete test
add 7105c54 remove merge remnance
add 3ba579f better try/except than with
add efa4552 force py2 nosetests on vr scripts
add 837a7f3 disable nosetests on python2 code for now
add 207bfe0 try`n'hack python2/python3 mix in travis
add 6385262 ubuntu py3 deps for marvin
add 0001900 double python install
add 3bc5a5d Fix issue at cloudstack-marvin.postinst by making it 'python3
-m pip install'
add 88dd72a explicit install python2
add 2f47ef2 Remove unnecessary mysql-connector-python installation with
hardcoded version
add e58c9d8 proper install
add c59f0cd py2 install in before
add 1824074 move acitvate outside runtests
add ccd6883 activate called from specific version
add 7d350ec travis py2+py3 run guidance
add 1bd5305 put back in requirements travis doesn't have
add 56ff6f1 test pyenv2 to install
add 4efdc24 pip1
add d2dde16 remove pyenv from systemvm code
add 98df221 python versions before
add 1af0b6b show explicitely
add e08ac55 david's pip
add cd27370 2.7
add 5c2169e remove pyenv's preoccupation
add 5972368 local virtual env instead of in home
add e666ecc Revert "local virtual env instead of in home"
add 823a7e3 Revert "remove pyenv's preoccupation"
add 522fd6a Revert "2.7"
add 3ab71e8 Revert "david's pip"
add e4e5617 full disable of all systemvm related python installs
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (1958833)
\
N -- N -- N refs/heads/marvin3 (e4e5617)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
README.md | 2 +-
...ontrolAnswer.java => GetVmVncTicketAnswer.java} | 17 +--
...uterCommand.java => GetVmVncTicketCommand.java} | 19 ++--
.../agent/api/storage/MigrateVolumeCommand.java | 4 +-
debian/control | 2 +-
debian/rules | 2 +-
.../java/com/cloud/vm/VirtualMachineManager.java | 3 +
.../java/com/cloud/resource/ResourceManager.java | 8 ++
.../com/cloud/vm/VirtualMachineManagerImpl.java | 86 ++++++++-------
.../engine/orchestration/VolumeOrchestrator.java | 7 ++
.../resources/META-INF/db/schema-41500to41510.sql | 78 +++++++++++++-
.../storage/motion/DataMotionServiceImpl.java | 28 +++--
.../storage/image/TemplateDataFactoryImpl.java | 6 +-
.../java/com/cloud/hypervisor/guru/VMwareGuru.java | 49 +--------
.../hypervisor/vmware/resource/VmwareResource.java | 25 +++++
.../storage/resource/VmwareStorageProcessor.java | 19 ++--
.../motion/VmwareStorageMotionStrategy.java | 115 +++++++++++++-------
.../motion/VmwareStorageMotionStrategyTest.java | 45 ++++----
.../xenserver/resource/CitrixResourceBase.java | 2 +-
.../cloudstack/cloudian/CloudianConnector.java | 2 +-
.../IpmitoolOutOfBandManagementDriver.java | 38 +++++--
pom.xml | 2 +-
server/src/main/java/com/cloud/api/ApiDBUtils.java | 8 +-
.../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 16 +--
.../network/lb/LoadBalancingRulesManagerImpl.java | 4 +
.../com/cloud/resource/ResourceManagerImpl.java | 92 +++++++++++++++-
.../main/java/com/cloud/server/StatsCollector.java | 20 ++--
.../com/cloud/servlet/ConsoleProxyClientParam.java | 9 ++
.../com/cloud/servlet/ConsoleProxyServlet.java | 62 +++++++++++
.../com/cloud/storage/VolumeApiServiceImpl.java | 36 +++++--
.../storage/snapshot/SnapshotManagerImpl.java | 8 ++
.../com/cloud/template/TemplateManagerImpl.java | 6 ++
.../java/com/cloud/user/AccountManagerImpl.java | 3 +
.../src/main/java/com/cloud/vm/UserVmManager.java | 2 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 30 ++----
services/console-proxy/server/pom.xml | 5 +
.../java/com/cloud/consoleproxy/ConsoleProxy.java | 6 ++
.../consoleproxy/ConsoleProxyClientParam.java | 9 ++
.../ConsoleProxyHttpHandlerHelper.java | 4 +
.../consoleproxy/ConsoleProxyNoVNCHandler.java | 2 +
.../consoleproxy/ConsoleProxyNoVncClient.java | 105 +++++++++++-------
.../com/cloud/consoleproxy/vnc/NoVncClient.java | 37 ++++++-
.../websocket/WebSocketReverseProxy.java | 118 +++++++++++++++++++++
test/integration/smoke/test_accounts.py | 15 +--
test/integration/smoke/test_diagnostics.py | 12 +--
test/integration/smoke/test_scale_vm.py | 101 ++++++++++++++----
test/integration/smoke/test_vm_life_cycle.py | 1 -
tools/apidoc/gen_toc.py | 4 +-
ui/src/components/view/DedicateDomain.vue | 2 +-
ui/src/components/view/DetailsTab.vue | 16 +++
ui/src/components/view/InfoCard.vue | 17 +++
ui/src/components/view/ListView.vue | 10 ++
ui/src/config/section/compute.js | 2 +-
ui/src/config/section/offering.js | 4 +-
ui/src/config/section/storage.js | 8 +-
ui/src/views/AutogenView.vue | 4 +-
ui/src/views/compute/AssignInstance.vue | 2 +-
ui/src/views/compute/CreateSSHKeyPair.vue | 2 +-
ui/src/views/compute/DeployVM.vue | 17 ++-
ui/src/views/iam/AddAccount.vue | 2 +-
ui/src/views/iam/AddUser.vue | 4 +-
ui/src/views/infra/network/DedicatedVLANTab.vue | 2 +-
ui/src/views/infra/network/IpRangesTabPublic.vue | 4 +-
ui/src/views/infra/zone/PhysicalNetworksTab.vue | 26 ++++-
ui/src/views/network/CreateIsolatedNetworkForm.vue | 2 +-
ui/src/views/network/CreateL2NetworkForm.vue | 2 +-
ui/src/views/network/CreateSharedNetworkForm.vue | 2 +-
.../views/network/IngressEgressRuleConfigure.vue | 2 +-
.../utils/exception/CSExceptionErrorCode.java | 1 +
.../hypervisor/vmware/mo/VirtualMachineMO.java | 12 +++
70 files changed, 1070 insertions(+), 347 deletions(-)
copy core/src/main/java/com/cloud/agent/api/{AgentControlAnswer.java =>
GetVmVncTicketAnswer.java} (73%)
copy core/src/main/java/com/cloud/agent/api/{CheckRouterCommand.java =>
GetVmVncTicketCommand.java} (77%)
create mode 100644
services/console-proxy/server/src/main/java/com/cloud/consoleproxy/websocket/WebSocketReverseProxy.java
