You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bs...@apache.org on 2020/01/10 09:20:31 UTC

[cloudstack] branch smoke-tests-master updated (7bb2569 -> fea6d93)

This is an automated email from the ASF dual-hosted git repository.

bstoyanov pushed a change to branch smoke-tests-master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


    omit 7bb2569  Dummy commit
     add a65a931  ui: increase width of name field in UI (#3703)
     add e93f6bf  utils: use iproute to get default network interface (#3704)
     add 94474af  consoleproxy: Enable console for vms in Stopping/Migrating state (#3640)
     add b8676ae  Merge release branch 4.13 to master
     add 2427114  a conditional to prevent creation of a field (#3723)
     add f30b5ce  Fix resource count of expunged volume (#3669)
     add 07d64cb  [KVM] Agent LB Fix: Connections from disabled KVM host agents are refused (#3617)
     add 828405d  Merge branch '4.13'
     add e56fa31  ssh: Add support for ecdsa and ed25519 public keys (#3740)
     add 6f3694c  server: save SSH.PublicKey into user_vm_details regardless of password management (#3745)
     add 7a86ca7  ui: show memory usage in VM statistics (#3474)
     add 29e1bbc  server: rethrow takeVMSnapshot() exception instead of returning null (#3546)
     add 93aad24  storage: Handle RBD snapshot deletion (#3615)
     add 0d92b92  Fix OS category for some OS-es added in 4.13 (#3746)
     add da62cec  README: that time of the year! 🎄 (#3769)
     add 2e8c069  Load Average for KVM (#3738)
     add 16527f1  Add missing HA config keys (#3737)
     add a0efbf9  Fix virtual template size for managed storage for KVM / refactor cloud-install-sys-tmplt (#3371)
     add e319c8b  Revert "Fix virtual template size for managed storage for KVM / refactor cloud-install-sys-tmplt (#3371)" (#3771)
     add cf6e616  Revert "Add missing HA config keys (#3737)" (#3774)
     add 4b43c26  Better tracking host maintanence and handling of migration jobs (#3425)
     add 45503e1  Revert "Revert "Fix virtual template size for managed storage for KVM / refactor cloud-install-sys-tmplt (#3371)" (#3771)" (#3772)
     add c75c228  Honour promiscuous mode from networkOffering (#3765)
     add 0606039  Honour promiscuous mode from networkOffering (#3765) (#3781)
     add 482d0fd  4.13 (#3782)
     add 5afff61  create template from snapshot regression (partly reverted) (#3767)
     add 0b34971  Once again allow a VM to be on multiple networks from VPCs (#3754)
     add 90ce1d8  convert protocal names to be found as labels (#3747)
     add 3ac03c8  filter hosts to query on zone wide storage (#3733)
     add 2712dec  config: add isdynamic flag in configuration response (#3729)
     add 1003085  Added zone check for attach iso (#3755)
     add 06e1212  Merge release branch 4.13 to master
     add 482e7eb  New feature: Acquire specific public IP for network (#3775)
     add 8844f59  break session only on illegal origin (#3715)
     add 4fa7fad  Merge release branch 4.13 to master
     add d55a2af  Bug fix: Dont display empty item in free ip list (#3790)
     add 75ccb53  network: cleanup dhcp/dns entries while remove a nic from vm (#3721)
     add 809561a  Merge release branch 4.13 to master
     add 7e64945  kvm: Logrotate should not touch agent.log (#3597)
     add cca6608  ui: fix for truncated name for project accounts (#3793)
     add 74f5632  Merge release branch 4.13 to master
     add d868cd1  Simulator: Better VR Redundant Status Behaviour (#3313)
     add 8a55c93  Extract systemvm.iso using bsdtar (#3536)
     add 2ffc0c5  Increase DHCP lease time to infinite (#3662)
     add 02714f2  client: jetty session timeout set after server is started (#3658)
     add 701f606  ui: fix migrate host form no host popup (#3682)
     add d44dc07  only update powerstate if sure it is the latest (#3743)
     add 6e19c17  Merge release branch 4.13 to master
     add 7ceb82c  Revert "Simulator: Better VR Redundant Status Behaviour (#3313)" (#3796)
     add 005019b  Endless settings on templates and instances (#3778)
     add f2708d6  Merge release branch 4.13 to master
     add dfd950c  Add protocol number support for security group rules (#3736)
     add 70fcf75  Allow additional configuration metadata to VMs (#3510)
     add fea6d93  Dummy commit

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   (7bb2569)
            \
             N -- N -- N   refs/heads/smoke-tests-master (fea6d93)

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 +-
 ...edException.java => OriginDeniedException.java} |  34 +-
 api/src/main/java/com/cloud/host/HostStats.java    |   2 +-
 .../java/com/cloud/network/NetworkService.java     |   2 +-
 .../java/com/cloud/resource/ResourceState.java     |  41 +-
 .../org/apache/cloudstack/api/ApiConstants.java    |   2 +
 .../admin/host/PrepareForMaintenanceCmd.java       |  22 +-
 .../command/user/address/AssociateIPAddrCmd.java   |   9 +-
 .../AuthorizeSecurityGroupIngressCmd.java          |   2 +-
 .../api/command/user/vm/DeployVMCmd.java           |   5 +-
 .../api/command/user/vm/UpdateVMCmd.java           |   2 +-
 .../api/response/ConfigurationResponse.java        |  13 +
 .../cloudstack/api/response/HostResponse.java      |  12 +-
 .../com/cloud/agent/api/GetHostStatsAnswer.java    |   5 +
 .../java/com/cloud/agent/api/HostStatsEntry.java   |  11 +
 debian/control                                     |   4 +-
 .../java/com/cloud/ha/HighAvailabilityManager.java |   1 +
 .../java/com/cloud/network/IpAddressManager.java   |   2 +-
 .../java/com/cloud/resource/ResourceManager.java   |   7 +-
 .../java/com/cloud/agent/manager/AgentAttache.java |   3 +-
 .../com/cloud/agent/manager/AgentManagerImpl.java  |   8 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |  59 ++-
 .../cloud/vm/VirtualMachinePowerStateSyncImpl.java |  45 +-
 .../datacenter/entity/api/db/EngineHostVO.java     |  32 +-
 .../engine/orchestration/NetworkOrchestrator.java  |  20 +-
 .../src/main/java/com/cloud/host/HostVO.java       |  26 +-
 .../java/com/cloud/storage/dao/VolumeDaoImpl.java  |  13 +-
 .../main/java/com/cloud/vm/dao/VMInstanceDao.java  |   2 +-
 .../java/com/cloud/vm/dao/VMInstanceDaoImpl.java   |   6 +-
 .../META-INF/db/schema-41300to41400-cleanup.sql    |   1 +
 .../resources/META-INF/db/schema-41300to41400.sql  |  13 +
 .../storage/snapshot/CephSnapshotStrategy.java     |  11 +-
 .../storage/snapshot/CephSnapshotStrategyTest.java |   2 +
 packaging/centos7/cloud.spec                       |   4 +
 .../kvm/resource/LibvirtComputingResource.java     |   6 +-
 .../wrapper/LibvirtGetHostStatsCommandWrapper.java |   3 +-
 .../org/apache/cloudstack/utils/linux/CPUStat.java |  12 +
 .../hypervisor/vmware/resource/VmwareResource.java |   2 +-
 .../xenserver/resource/CitrixResourceBase.java     |  12 +-
 .../xenserver/ExtraConfigurationUtility.java       | 180 +++++++
 .../cloudstack/metrics/MetricsServiceImpl.java     |   1 +
 .../cloudstack/response/HostMetricsResponse.java   |  10 +
 .../cloud/network/element/CiscoVnmcElement.java    |   2 +-
 .../CloudStackPrimaryDataStoreDriverImpl.java      |   2 +-
 scripts/storage/secondary/cloud-install-sys-tmplt  | 280 +++++------
 scripts/storage/secondary/createtmplt.sh           |   1 -
 scripts/vm/network/security_group.py               |  21 +-
 scripts/vm/systemvm/injectkeys.sh                  |  47 +-
 .../main/java/com/cloud/api/ApiResponseHelper.java |   1 +
 server/src/main/java/com/cloud/api/ApiServer.java  |  15 +-
 .../com/cloud/api/query/dao/HostJoinDaoImpl.java   |   1 +
 .../consoleproxy/ConsoleProxyManagerImpl.java      |   5 +-
 .../com/cloud/ha/HighAvailabilityManagerImpl.java  |  84 +++-
 .../java/com/cloud/ha/dao/HighAvailabilityDao.java |   2 +
 .../com/cloud/ha/dao/HighAvailabilityDaoImpl.java  |  17 +
 .../com/cloud/network/IpAddressManagerImpl.java    |   6 +-
 .../java/com/cloud/network/NetworkServiceImpl.java |   6 +-
 .../network/security/SecurityGroupManagerImpl.java |  33 +-
 .../com/cloud/resource/ResourceManagerImpl.java    | 208 +++++---
 .../com/cloud/server/ManagementServerImpl.java     |   7 +-
 .../main/java/com/cloud/server/StatsCollector.java |   6 +-
 .../com/cloud/servlet/ConsoleProxyServlet.java     |  30 +-
 .../com/cloud/template/TemplateManagerImpl.java    |   6 +
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  | 267 ++++++++--
 .../cloud/vm/snapshot/VMSnapshotManagerImpl.java   |   2 +-
 .../agent/lb/IndirectAgentLBServiceImpl.java       |   2 +-
 .../cloud/resource/MockResourceManagerImpl.java    |   6 +-
 .../cloud/resource/ResourceManagerImplTest.java    | 248 +++++++---
 .../java/com/cloud/vm/UserVmManagerImplTest.java   |  19 +-
 .../java/com/cloud/vpc/MockNetworkManagerImpl.java |   2 +-
 .../component/test_acquire_specified_public_ip.py  | 486 ++++++++++++++++++
 .../test_protocol_number_security_group.py         | 460 +++++++++++++++++
 .../smoke/test_deploy_vm_extra_config_data.py      | 542 +++++++++++++++++++++
 test/integration/smoke/test_host_maintenance.py    | 392 +++++++++------
 tools/marvin/marvin/lib/base.py                    |  11 +-
 ui/css/cloudstack3.css                             |   7 +-
 ui/scripts/globalSettings.js                       |   4 +-
 ui/scripts/instances.js                            |  19 +-
 ui/scripts/metrics.js                              |   1 +
 ui/scripts/network.js                              | 163 ++++++-
 ui/scripts/sharedFunctions.js                      | 102 ++++
 ui/scripts/storage.js                              |   2 +-
 ui/scripts/system.js                               |  29 +-
 ui/scripts/templates.js                            |   7 +
 .../java/com/cloud/utils/SerialVersionUID.java     |   1 +
 .../main/java/com/cloud/utils/net/NetUtils.java    |  14 +-
 .../java/com/cloud/utils/ssh/SSHKeysHelper.java    |   8 +-
 87 files changed, 3474 insertions(+), 749 deletions(-)
 copy api/src/main/java/com/cloud/exception/{PermissionDeniedException.java => OriginDeniedException.java} (59%)
 create mode 100644 plugins/hypervisors/xenserver/src/main/java/org/apache/cloudstack/hypervisor/xenserver/ExtraConfigurationUtility.java
 create mode 100644 test/integration/component/test_acquire_specified_public_ip.py
 create mode 100644 test/integration/component/test_protocol_number_security_group.py
 create mode 100644 test/integration/smoke/test_deploy_vm_extra_config_data.py