This is an automated email from the ASF dual-hosted git repository.
harikrishna pushed a change to branch UserDataAsFirstClassResource
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
omit 3e79e0dcbb Small fixes and added userdata to updateVM flow
omit b0c4111afb Added userdata params to registeruserdata UI form
omit 787c963738 Added userdata list to deploy VM form
omit ff9326c83c UI: added userdata id to deloyvm wizard
omit 003cedbda9 Updated template response and views
omit 4c827bea8b Write userdata details into metadata VR
omit e274928aa1 Added userdata details to the deployVM cmd flow
omit 7a5ad62f21 UI: added a new section for userdata
omit 8af7e51439 Fixed userdata append scenario between template userdata
and user provided userdata
omit 123f50ae2b Added userdata id in deploy VM flow
omit 3607d45f86 Few fixes
omit 3b819d4518 UserData as first clas resource
add 8a1b1250e8 ui: remove mandatory rule on root disk controller field
while registering / updating a template (#6279)
add 365966dd0a UI: Fix custom unconstrained for a zone does not show CPU
speed (#6285)
add 334891a4b9 Merge branch '4.16'
add a5014a28a6 New feature: give access permission of networks to other
accounts in same domain (#5769)
add b2338f7158 Updated reset configuration, to return the updated config
value in the response (#6284)
add 7ea0dea479 Merge branch '4.16'
add 4313c3def7 Allow users to view reserved System VM IPs, if they're
already allocated to user (#5902)
add c339f6eef9 ui: Fix bulk deletion of ssh key pairs (#6286)
add ccac1a383f Feat/add vdisk UUID to list volume (#5848)
add 40193a04eb .github: fix coverage issue, don't kick pkging automatically
add 9f076ff10d UI: checksum field is optional for direct-download
templates on kvm (#6290)
add 25f92c50f0 ui: Fix Internal LB LB rule column and missing translation
(#6288)
add 56fb7ac128 UI: hide Virtual Routers tab for domain admins (#6289)
add 5cf8064467 Fix: Prevent NPE on disk offering search while listing VMs
(#6287)
add 18d9c6dfc6 fix mismatching between db uuids and custom attributes
uuids (#5382)
add 830f3061bc SystemVM optimizations (#5831)
add debfb455ea Added configuration and Integration test to restrict public
template … (#4774)
add 974e57a7c2 Added attach and detach features to UI for ROOT disks as
well as deviceID for ROOT and DATADISK (#6201)
add 54a181fe6b ui: Toggle Theme to default(light) on login (#6299)
add 9a53bada19 UI: fix netmask is not passed to api when create share
network (#6300)
add 545e89c1cb Mshost stats (#5588)
add f4e95e3105 Fix VM stats inconsistencies (#6245)
add bba38fa2ea DB: fix duplicated changes in schema-41610to41700.sql
(#6306)
add 4525f8c8e7 KVM: Enable SSL if keystore exists (#6200)
add 293517ad72 server: fix NPE in travis and merge #6305 (#6303)
add 48f7f10089 xen: Fix volume snapshot deletion when it has child
snapshots (#6296)
add f97562212c server: do not display 'Default Egress Policy' for vpc
tiers (#6301)
add 5fa8fa5580 Fix upload volume format (#6297)
add d0f918d8e6 Merge branch '4.16'
add aef4916e1c UI: Fix Usage Server stats date display (#6308)
add 3f7b879513 UI: Fix upload resource icon button (#6309)
add 523805c8bc schema,server,api: events improvement (#5997)
add 6471f8418a Fixes InfraMammary screen not display when at least one
section doesn't meet the display condition (#6312)
add a0ee0dcd8a fix the issue of waring when building (#6311)
add a9bbcf8700 remove superfluent counter and fix log message (#6313)
add 4a914aa88d network: ipv6 static routes (#5786)
add 7233c38567 .github: enable PR sonar integration
add 9f27c992da .github: skip coverage data when string is empty
add 05e4f9515e .github: fix sonarcloud integration
add a2abd7fdc2 .github: fix typo in passing merge branch name
add 4cc830d04a [VMWare] error when detaching volume (#6283)
add e53ed9e350 network: fix event, acl, firewall for ipv6 nw (#6314)
add f8920b9312 ui,api: fix api resourcename and user/project event
resource (#6315)
add 453bb57fd2 Disable creating StorPool logs when there isn't StorPool
primary storage (#6317)
add 06e2c38679 Fix user shared networks tests (#6319)
add d039753994 ui: add route for network acl event resource (#6322)
add c315724e76 Fix grammatical errors on en.json (#6281)
add c379430dab .github: sonarcloud integration fixes
add 87a402cc2b UI: Fix filter width to fix options (#6325)
add b85d5e491a ui: Fix groupaction for nw cleanup and Notify when
groupaction fails (#6333)
add fd8dfa108e Added allowuserdrivenbackups toggle to the edit backup
offering button (#6323)
add 923a5a4425 Improve log when live patching fails (#6324)
add 23f6db7735 test: fix ipv6 network test for xenserver (#6329)
add e0487c43fb UI: Fix detail settings (#6335)
add 3bd723ca06 Change patch path during live patching of systemVMs (#6328)
add 76b3066d52 ui: Fix migrate systemVM icon when stopped (#6337)
add 3c63e57590 UI: show startip and endip if network offering support
specified ip ranges (#6336)
add 887153197d ui: Fix template delete issue (#6340)
add 53e00360ba UserData as first clas resource
add 4a8b4ca326 Few fixes
add 72a1fa274f Added userdata id in deploy VM flow
add 8a83f5c8eb Fixed userdata append scenario between template userdata
and user provided userdata
add 284d147de8 UI: added a new section for userdata
add 3f23e85d23 Added userdata details to the deployVM cmd flow
add 238a3cf093 Write userdata details into metadata VR
add ffc10256b6 Updated template response and views
add 4c8baa5dd9 UI: added userdata id to deloyvm wizard
add e8b2b6f554 Added userdata list to deploy VM form
add 30b6289ed2 Added userdata params to registeruserdata UI form
add f5225becff Small fixes and added userdata to updateVM flow
add 1631632974 Fixed unit tests and imports
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 (3e79e0dcbb)
\
N -- N -- N refs/heads/UserDataAsFirstClassResource (1631632974)
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:
.github/workflows/coverage-check.yml | 56 +-
.travis.yml | 5 +-
agent/src/main/java/com/cloud/agent/Agent.java | 2 +
.../src/main/java/com/cloud/agent/AgentShell.java | 23 +
.../com/cloud/agent/api/to/FirewallRuleTO.java | 3 +
.../java/com/cloud/agent/api/to/NetworkTO.java | 9 +
api/src/main/java/com/cloud/capacity/Capacity.java | 1 +
.../cloud/configuration/ConfigurationService.java | 19 +
.../DataCenterGuestIpv6Prefix.java} | 18 +-
api/src/main/java/com/cloud/event/ActionEvent.java | 4 +
api/src/main/java/com/cloud/event/Event.java | 4 +
api/src/main/java/com/cloud/event/EventTypes.java | 36 +-
api/src/main/java/com/cloud/network/GuestVlan.java | 19 +-
.../{GuestVlan.java => GuestVlanRange.java} | 2 +-
...n.java => Ipv6GuestPrefixSubnetNetworkMap.java} | 17 +-
.../main/java/com/cloud/network/Ipv6Service.java | 94 +
api/src/main/java/com/cloud/network/Network.java | 35 +-
.../main/java/com/cloud/network/NetworkModel.java | 5 +
.../{GuestVlan.java => NetworkPermission.java} | 12 +-
.../java/com/cloud/network/NetworkService.java | 23 +-
.../com/cloud/network/router/VirtualRouter.java | 2 +
.../java/com/cloud/network/rules/FirewallRule.java | 2 +-
.../cloud/network/vpc/VpcProvisioningService.java | 3 +-
.../java/com/cloud/network/vpc/VpcService.java | 6 +-
.../com/cloud/network/vpn/Site2SiteVpnService.java | 2 +
.../java/com/cloud/offering/NetworkOffering.java | 7 +-
.../cloud/server/ManagementServerHostStats.java | 113 +
.../java/com/cloud/server/ManagementService.java | 2 +
api/src/main/java/com/cloud/storage/Volume.java | 4 +
.../org/apache/cloudstack/alert/AlertService.java | 1 +
.../cloudstack/api/ApiCommandResourceType.java | 118 +
.../org/apache/cloudstack/api/ApiConstants.java | 30 +-
.../org/apache/cloudstack/api/BaseAsyncCmd.java | 15 -
.../java/org/apache/cloudstack/api/BaseCmd.java | 30 +-
.../org/apache/cloudstack/api/BaseListCmd.java | 5 -
...java => BaseResponseWithAssociatedNetwork.java} | 60 +-
.../org/apache/cloudstack/api/IBaseListCmd.java | 2 -
.../apache/cloudstack/api/ResponseGenerator.java | 20 +-
.../command/admin/account/CreateAccountCmd.java | 6 +
.../command/admin/account/DeleteAccountCmd.java | 8 +-
.../command/admin/account/DisableAccountCmd.java | 11 +-
.../command/admin/account/EnableAccountCmd.java | 11 +
.../command/admin/account/UpdateAccountCmd.java | 11 +
.../api/command/admin/acl/CreateRoleCmd.java | 9 +-
.../api/command/admin/acl/DeleteRoleCmd.java | 16 +-
.../api/command/admin/acl/UpdateRoleCmd.java | 14 +-
.../command/admin/autoscale/CreateCounterCmd.java | 6 +-
.../command/admin/autoscale/DeleteCounterCmd.java | 6 +-
.../admin/backup/UpdateBackupOfferingCmd.java | 11 +
.../command/admin/ca/ProvisionCertificateCmd.java | 6 +-
.../api/command/admin/cluster/AddClusterCmd.java | 6 +
.../command/admin/cluster/DeleteClusterCmd.java | 11 +
.../command/admin/cluster/UpdateClusterCmd.java | 11 +
.../admin/diagnostics/GetDiagnosticsDataCmd.java | 20 +-
.../admin/diagnostics/RunDiagnosticsCmd.java | 21 +-
.../api/command/admin/domain/CreateDomainCmd.java | 6 +
.../api/command/admin/domain/DeleteDomainCmd.java | 11 +
.../api/command/admin/domain/UpdateDomainCmd.java | 11 +
.../api/command/admin/guest/AddGuestOsCmd.java | 6 +-
.../command/admin/guest/AddGuestOsMappingCmd.java | 6 +-
.../api/command/admin/guest/RemoveGuestOsCmd.java | 6 +-
.../admin/guest/RemoveGuestOsMappingCmd.java | 6 +-
.../api/command/admin/guest/UpdateGuestOsCmd.java | 6 +-
.../admin/guest/UpdateGuestOsMappingCmd.java | 6 +-
.../admin/host/CancelHostAsDegradedCmd.java | 8 +-
.../command/admin/host/CancelMaintenanceCmd.java | 8 +-
.../admin/host/DeclareHostAsDegradedCmd.java | 8 +-
.../api/command/admin/host/ListHostTagsCmd.java | 6 +-
.../api/command/admin/host/ListHostsCmd.java | 6 +-
.../admin/host/PrepareForMaintenanceCmd.java | 8 +-
.../api/command/admin/host/ReconnectHostCmd.java | 8 +-
.../admin/host/ReleaseHostReservationCmd.java | 8 +-
.../admin/internallb/ListInternalLBVMsCmd.java | 6 +-
.../admin/internallb/StartInternalLBVMCmd.java | 8 +-
.../admin/internallb/StopInternalLBVMCmd.java | 8 +-
.../api/command/admin/management/ListMgmtsCmd.java | 6 +-
.../network/AddNetworkServiceProviderCmd.java | 6 +-
...d.java => CreateGuestNetworkIpv6PrefixCmd.java} | 106 +-
.../network/CreateManagementNetworkIpRangeCmd.java | 2 +-
.../admin/network/CreateNetworkOfferingCmd.java | 10 +
.../admin/network/CreatePhysicalNetworkCmd.java | 6 +-
.../admin/network/DedicateGuestVlanRangeCmd.java | 4 +-
...d.java => DeleteGuestNetworkIpv6PrefixCmd.java} | 80 +-
.../network/DeleteNetworkServiceProviderCmd.java | 6 +-
.../admin/network/DeletePhysicalNetworkCmd.java | 11 +-
.../network/ListDedicatedGuestVlanRangesCmd.java | 6 +-
.../network/ListGuestNetworkIpv6PrefixesCmd.java | 88 +
.../command/admin/network/ListGuestVlansCmd.java | 113 +
.../admin/network/ListNetworksCmdByAdmin.java | 16 +-
.../network/ReleaseDedicatedGuestVlanRangeCmd.java | 6 +-
.../admin/network/UpdateNetworkOfferingCmd.java | 11 +
.../network/UpdateNetworkServiceProviderCmd.java | 6 +-
.../admin/network/UpdatePhysicalNetworkCmd.java | 6 +-
.../admin/offering/CreateDiskOfferingCmd.java | 6 +
.../admin/offering/UpdateDiskOfferingCmd.java | 11 +
.../admin/offering/UpdateServiceOfferingCmd.java | 11 +
.../IssueOutOfBandManagementPowerActionCmd.java | 6 +-
.../api/command/admin/pod/CreatePodCmd.java | 8 +
.../api/command/admin/pod/DeletePodCmd.java | 11 +
.../api/command/admin/pod/UpdatePodCmd.java | 11 +
.../admin/region/CreatePortableIpRangeCmd.java | 6 +-
.../admin/region/DeletePortableIpRangeCmd.java | 6 +-
.../admin/resource/StartRollingMaintenanceCmd.java | 57 +-
.../admin/router/ConfigureOvsElementCmd.java | 8 +-
.../router/ConfigureVirtualRouterElementCmd.java | 8 +-
.../api/command/admin/router/DestroyRouterCmd.java | 8 +-
.../api/command/admin/router/ListRoutersCmd.java | 6 +-
.../api/command/admin/router/RebootRouterCmd.java | 8 +-
.../api/command/admin/router/StartRouterCmd.java | 8 +-
.../api/command/admin/router/StopRouterCmd.java | 8 +-
.../admin/router/UpgradeRouterTemplateCmd.java | 6 +-
.../CancelPrimaryStorageMaintenanceCmd.java | 8 +-
.../storage/FindStoragePoolsForMigrationCmd.java | 6 +-
.../command/admin/storage/ListStoragePoolsCmd.java | 6 +-
.../command/admin/storage/ListStorageTagsCmd.java | 6 +-
.../storage/MigrateSecondaryStorageDataCmd.java | 11 +
.../PreparePrimaryStorageForMaintenanceCmd.java | 8 +-
.../admin/storage/UpdateStoragePoolCmd.java | 11 +
.../command/admin/systemvm/DestroySystemVmCmd.java | 8 +-
.../command/admin/systemvm/ListSystemVMsCmd.java | 6 +-
.../PatchSystemVMCmd.java} | 86 +-
.../command/admin/systemvm/RebootSystemVmCmd.java | 8 +-
.../command/admin/systemvm/StartSystemVMCmd.java | 8 +-
.../command/admin/systemvm/StopSystemVmCmd.java | 8 +-
.../api/command/admin/usage/AddTrafficTypeCmd.java | 6 +-
.../command/admin/usage/DeleteTrafficTypeCmd.java | 6 +-
.../command/admin/usage/UpdateTrafficTypeCmd.java | 6 +-
.../api/command/admin/user/CreateUserCmd.java | 6 +
.../api/command/admin/user/DeleteUserCmd.java | 11 +
.../api/command/admin/user/DisableUserCmd.java | 6 +-
.../api/command/admin/user/MoveUserCmd.java | 20 +-
.../api/command/admin/user/RegisterCmd.java | 11 +
.../api/command/admin/user/UpdateUserCmd.java | 11 +
.../api/command/admin/vm/AssignVMCmd.java | 10 +
.../api/command/admin/vm/ExpungeVMCmd.java | 8 +-
.../api/command/admin/vm/MigrateVMCmd.java | 11 +
.../vm/MigrateVirtualMachineWithVolumeCmd.java | 11 +
.../api/command/admin/vm/RecoverVMCmd.java | 11 +
.../command/admin/vm/UnmanageVMInstanceCmd.java | 8 +-
.../admin/vpc/CreatePrivateGatewayByAdminCmd.java | 74 +
.../command/admin/vpc/CreateVPCOfferingCmd.java | 16 +-
.../command/admin/vpc/DeletePrivateGatewayCmd.java | 10 +-
.../command/admin/vpc/DeleteVPCOfferingCmd.java | 10 +
.../command/admin/vpc/UpdateVPCOfferingCmd.java | 11 +
.../admin/zone/MarkDefaultZoneForAccountCmd.java | 12 +-
.../user/account/AddAccountToProjectCmd.java | 11 +
.../command/user/account/AddUserToProjectCmd.java | 13 +-
.../user/account/DeleteAccountFromProjectCmd.java | 11 +
.../user/account/DeleteUserFromProjectCmd.java | 11 +
.../api/command/user/account/ListAccountsCmd.java | 15 +-
.../user/account/ListProjectAccountsCmd.java | 6 +
.../command/user/address/AssociateIPAddrCmd.java | 6 +-
.../user/address/DisassociateIPAddrCmd.java | 8 +-
.../user/address/ListPublicIpAddressesCmd.java | 6 +-
.../api/command/user/address/ReserveIPAddrCmd.java | 10 +
.../api/command/user/address/UpdateIPAddrCmd.java | 11 +
.../user/affinitygroup/CreateAffinityGroupCmd.java | 6 +-
.../user/affinitygroup/DeleteAffinityGroupCmd.java | 11 +-
.../user/affinitygroup/ListAffinityGroupsCmd.java | 6 +-
.../affinitygroup/UpdateVMAffinityGroupCmd.java | 6 +-
.../user/autoscale/CreateAutoScalePolicyCmd.java | 6 +-
.../user/autoscale/CreateAutoScaleVmGroupCmd.java | 6 +-
.../autoscale/CreateAutoScaleVmProfileCmd.java | 6 +-
.../command/user/autoscale/CreateConditionCmd.java | 6 +-
.../user/autoscale/DeleteAutoScalePolicyCmd.java | 6 +-
.../user/autoscale/DeleteAutoScaleVmGroupCmd.java | 6 +-
.../autoscale/DeleteAutoScaleVmProfileCmd.java | 6 +-
.../command/user/autoscale/DeleteConditionCmd.java | 6 +-
.../user/autoscale/DisableAutoScaleVmGroupCmd.java | 6 +-
.../user/autoscale/EnableAutoScaleVmGroupCmd.java | 6 +-
.../user/autoscale/UpdateAutoScalePolicyCmd.java | 6 +-
.../user/autoscale/UpdateAutoScaleVmGroupCmd.java | 6 +-
.../autoscale/UpdateAutoScaleVmProfileCmd.java | 6 +-
.../api/command/user/backup/CreateBackupCmd.java | 6 +-
.../api/command/user/event/ListEventsCmd.java | 17 +-
.../user/firewall/CreateEgressFirewallRuleCmd.java | 6 +-
.../user/firewall/CreateFirewallRuleCmd.java | 6 +-
.../user/firewall/CreatePortForwardingRuleCmd.java | 6 +-
.../user/firewall/DeleteEgressFirewallRuleCmd.java | 6 +-
.../user/firewall/DeleteFirewallRuleCmd.java | 6 +-
.../user/firewall/DeletePortForwardingRuleCmd.java | 6 +-
.../CreateIpv6FirewallRuleCmd.java} | 160 +-
.../DeleteIpv6FirewallRuleCmd.java} | 48 +-
.../user/ipv6/ListIpv6FirewallRulesCmd.java | 118 +
.../UpdateIpv6FirewallRuleCmd.java} | 90 +-
.../api/command/user/iso/AttachIsoCmd.java | 11 +
.../api/command/user/iso/DeleteIsoCmd.java | 8 +-
.../api/command/user/iso/DetachIsoCmd.java | 11 +
.../api/command/user/iso/ExtractIsoCmd.java | 8 +-
.../api/command/user/iso/ListIsosCmd.java | 6 +-
.../api/command/user/iso/RegisterIsoCmd.java | 6 +
.../api/command/user/iso/UpdateIsoCmd.java | 11 +
.../CreateApplicationLoadBalancerCmd.java | 6 +-
.../loadbalancer/CreateLoadBalancerRuleCmd.java | 6 +-
.../DeleteApplicationLoadBalancerCmd.java | 6 +-
.../loadbalancer/DeleteLoadBalancerRuleCmd.java | 6 +-
.../user/nat/CreateIpForwardingRuleCmd.java | 6 +-
.../user/nat/DeleteIpForwardingRuleCmd.java | 6 +-
.../api/command/user/nat/DisableStaticNatCmd.java | 15 +
.../api/command/user/nat/EnableStaticNatCmd.java | 10 +
.../command/user/network/CreateNetworkACLCmd.java | 7 +
.../user/network/CreateNetworkACLListCmd.java | 11 +
.../api/command/user/network/CreateNetworkCmd.java | 35 +-
.../user/network/CreateNetworkPermissionsCmd.java | 130 +
.../command/user/network/DeleteNetworkACLCmd.java | 11 +
.../user/network/DeleteNetworkACLListCmd.java | 11 +
.../api/command/user/network/DeleteNetworkCmd.java | 11 +-
.../user/network/ListNetworkPermissionsCmd.java | 94 +
.../api/command/user/network/ListNetworksCmd.java | 26 +
.../user/network/MoveNetworkAclItemCmd.java | 6 +
.../user/network/RemoveNetworkPermissionsCmd.java | 129 +
.../network/ResetNetworkPermissionsCmd.java} | 89 +-
.../command/user/network/RestartNetworkCmd.java | 21 +-
.../user/network/UpdateNetworkACLItemCmd.java | 11 +
.../user/network/UpdateNetworkACLListCmd.java | 11 +
.../api/command/user/network/UpdateNetworkCmd.java | 11 +
.../ha/gslb/CreateGlobalLoadBalancerRuleCmd.java | 6 +-
.../ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java | 6 +-
.../AuthorizeSecurityGroupEgressCmd.java | 8 +-
.../AuthorizeSecurityGroupIngressCmd.java | 8 +-
.../user/securitygroup/ListSecurityGroupsCmd.java | 6 +-
.../RevokeSecurityGroupEgressCmd.java | 8 +-
.../RevokeSecurityGroupIngressCmd.java | 8 +-
.../command/user/snapshot/CreateSnapshotCmd.java | 6 +-
.../snapshot/CreateSnapshotFromVMSnapshotCmd.java | 6 +-
.../user/snapshot/CreateSnapshotPolicyCmd.java | 11 +
.../command/user/snapshot/DeleteSnapshotCmd.java | 8 +-
.../command/user/snapshot/ListSnapshotsCmd.java | 6 +-
.../command/user/snapshot/RevertSnapshotCmd.java | 8 +-
.../user/snapshot/UpdateSnapshotPolicyCmd.java | 2 +-
.../api/command/user/template/CopyTemplateCmd.java | 13 +-
.../command/user/template/CreateTemplateCmd.java | 6 +-
.../command/user/template/DeleteTemplateCmd.java | 8 +-
.../command/user/template/ExtractTemplateCmd.java | 13 +-
.../command/user/template/ListTemplatesCmd.java | 6 +-
.../command/user/template/RegisterTemplateCmd.java | 6 +-
.../command/user/template/UpdateTemplateCmd.java | 11 +
.../api/command/user/vm/AddIpToVmNicCmd.java | 6 +-
.../api/command/user/vm/AddNicToVMCmd.java | 16 +-
.../api/command/user/vm/DeployVMCmd.java | 6 +-
.../api/command/user/vm/DestroyVMCmd.java | 8 +-
.../api/command/user/vm/ListNicsCmd.java | 6 +-
.../cloudstack/api/command/user/vm/ListVMsCmd.java | 21 +-
.../api/command/user/vm/RebootVMCmd.java | 8 +-
.../api/command/user/vm/RemoveIpFromVmNicCmd.java | 6 +-
.../api/command/user/vm/ResetVMPasswordCmd.java | 8 +-
.../api/command/user/vm/ResetVMSSHKeyCmd.java | 8 +-
.../api/command/user/vm/RestoreVMCmd.java | 11 +
.../cloudstack/api/command/user/vm/ScaleVMCmd.java | 16 +-
.../cloudstack/api/command/user/vm/StartVMCmd.java | 8 +-
.../cloudstack/api/command/user/vm/StopVMCmd.java | 8 +-
.../api/command/user/vm/UpdateVMCmd.java | 11 +
.../api/command/user/vm/UpdateVmNicIpCmd.java | 6 +-
.../user/vmsnapshot/CreateVMSnapshotCmd.java | 10 +-
.../user/vmsnapshot/DeleteVMSnapshotCmd.java | 10 +
.../user/vmsnapshot/RevertToVMSnapshotCmd.java | 10 +
.../api/command/user/volume/AttachVolumeCmd.java | 15 +-
.../api/command/user/volume/CreateVolumeCmd.java | 6 +-
.../api/command/user/volume/DeleteVolumeCmd.java | 11 +
.../api/command/user/volume/DestroyVolumeCmd.java | 8 +-
.../api/command/user/volume/DetachVolumeCmd.java | 8 +-
.../api/command/user/volume/ExtractVolumeCmd.java | 8 +-
.../api/command/user/volume/ListVolumesCmd.java | 7 +-
.../api/command/user/volume/MigrateVolumeCmd.java | 13 +-
.../api/command/user/volume/RecoverVolumeCmd.java | 11 +
.../user/volume/RemoveResourceDetailCmd.java | 6 +-
.../api/command/user/volume/ResizeVolumeCmd.java | 11 +-
.../api/command/user/volume/UpdateVolumeCmd.java | 8 +-
.../api/command/user/volume/UploadVolumeCmd.java | 10 +-
.../vpc/CreatePrivateGatewayCmd.java | 70 +-
.../api/command/user/vpc/CreateStaticRouteCmd.java | 6 +-
.../api/command/user/vpc/DeleteStaticRouteCmd.java | 6 +-
.../api/command/user/vpc/DeleteVPCCmd.java | 11 +
.../api/command/user/vpc/RestartVPCCmd.java | 18 +
.../api/command/user/vpc/UpdateVPCCmd.java | 11 +
.../command/user/vpn/CreateRemoteAccessVpnCmd.java | 11 +
.../user/vpn/CreateVpnCustomerGatewayCmd.java | 29 +-
.../command/user/vpn/DeleteRemoteAccessVpnCmd.java | 10 +
.../user/vpn/DeleteVpnCustomerGatewayCmd.java | 11 +
.../user/vpn/UpdateVpnCustomerGatewayCmd.java | 11 +
.../DataCenterGuestIpv6PrefixResponse.java | 87 +
.../api/response/DomainRouterResponse.java | 12 +
.../cloudstack/api/response/EventResponse.java | 39 +-
.../cloudstack/api/response/FirewallResponse.java | 8 +
.../api/response/GuestVlanRangeResponse.java | 4 +-
...anRangeResponse.java => GuestVlanResponse.java} | 98 +-
.../cloudstack/api/response/IpRangeResponse.java | 27 +-
...tServerResponse.java => Ipv6RouteResponse.java} | 49 +-
.../api/response/ManagementServerResponse.java | 103 +-
.../api/response/NetworkOfferingResponse.java | 12 +
...sponse.java => NetworkPermissionsResponse.java} | 73 +-
.../cloudstack/api/response/NetworkResponse.java | 50 +-
.../api/response/PrivateGatewayResponse.java | 5 +-
.../cloudstack/api/response/StatsResponse.java | 28 +-
.../cloudstack/api/response/UserVmResponse.java | 24 +-
.../api/response/VlanIpRangeResponse.java | 21 +-
.../cloudstack/api/response/VolumeResponse.java | 24 +-
.../api/response/VpcOfferingResponse.java | 12 +
.../cloudstack/api/response/VpcResponse.java | 9 +
.../org/apache/cloudstack/context/CallContext.java | 19 +
.../cloudstack/diagnostics/DiagnosticsType.java | 2 +-
.../management/ManagementServerStatus.java} | 29 +-
.../org/apache/cloudstack/query/QueryService.java | 3 +
.../cloudstack/api/ApiCommandResourceTypeTest.java | 71 +
.../admin/systemvm/PatchSystemVMCmdTest.java | 92 +
.../cloudstack/api/response/StatsResponseTest.java | 4 +-
client/pom.xml | 26 -
client/src/main/webapp/WEB-INF/web.xml | 3 +
.../com/cloud/agent/api/PatchSystemVmAnswer.java | 38 +-
.../com/cloud/agent/api/PatchSystemVmCommand.java | 58 +
.../cloud/agent/api/SetupGuestNetworkCommand.java | 45 +
.../java/com/cloud/agent/api/VmStatsEntry.java | 8 +-
.../java/com/cloud/agent/api/VmStatsEntryBase.java | 8 +-
.../api/routing/SetIpv6FirewallRulesAnswer.java | 29 +-
.../api/routing/SetIpv6FirewallRulesCommand.java | 54 +-
.../agent/api/routing/SetNetworkACLCommand.java | 16 +-
.../agent/resource/virtualnetwork/VRScripts.java | 2 +
.../virtualnetwork/VirtualRoutingResource.java | 23 +-
.../facade/AbstractConfigItemFacade.java | 3 +
.../facade/SetGuestNetworkConfigItem.java | 24 +-
...em.java => SetIpv6FirewallRulesConfigItem.java} | 46 +-
.../facade/SetNetworkAclConfigItem.java | 4 +-
.../resource/virtualnetwork/model/ConfigBase.java | 1 +
.../virtualnetwork/model/FirewallRule.java | 8 +
.../virtualnetwork/model/GuestNetwork.java | 75 +-
.../resource/virtualnetwork/model/NetworkACL.java | 9 +
.../java/com/cloud/resource/ServerResource.java | 7 +
debian/cloudstack-common.install | 2 +-
debian/rules | 4 +-
.../main/java/com/cloud/vm/VirtualMachineGuru.java | 25 +
.../service/NetworkOrchestrationService.java | 6 +-
.../main/java/com/cloud/alert/AlertManager.java | 6 +
.../cloud/configuration/ConfigurationManager.java | 6 +-
.../java/com/cloud/network/vpc/VpcManager.java | 2 +-
.../cloud/agent/manager/ConnectedAgentAttache.java | 2 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 22 +-
.../engine/orchestration/NetworkOrchestrator.java | 142 +-
.../main/java/com/cloud/capacity/CapacityVO.java | 1 +
.../DataCenterGuestIpv6PrefixVO.java} | 72 +-
.../main/java/com/cloud/dc/DataCenterVnetVO.java | 9 +-
.../schema/src/main/java/com/cloud/dc/VlanVO.java | 2 +-
.../cloud/dc/dao/DataCenterGuestIpv6PrefixDao.java | 16 +-
.../dc/dao/DataCenterGuestIpv6PrefixDaoImpl.java | 30 +-
.../src/main/java/com/cloud/dc/dao/VlanDao.java | 4 +
.../main/java/com/cloud/dc/dao/VlanDaoImpl.java | 47 +
.../src/main/java/com/cloud/event/EventVO.java | 24 +
.../src/main/java/com/cloud/host/dao/HostDao.java | 7 +
.../main/java/com/cloud/host/dao/HostDaoImpl.java | 12 +
.../network/Ipv6GuestPrefixSubnetNetworkMapVO.java | 129 +
.../cloud/network/dao/AccountGuestVlanMapVO.java | 4 +-
.../Ipv6GuestPrefixSubnetNetworkMapDao.java} | 17 +-
.../Ipv6GuestPrefixSubnetNetworkMapDaoImpl.java | 111 +
.../com/cloud/network/dao/NetworkDetailsDao.java | 2 +-
.../cloud/network/dao/NetworkDetailsDaoImpl.java | 7 +
.../main/java/com/cloud/network/dao/NetworkVO.java | 4 +-
.../com/cloud/network/vpc/dao/VpcOfferingDao.java | 5 +
.../cloud/network/vpc/dao/VpcOfferingDaoImpl.java | 19 +
.../network/vpc/dao/VpcOfferingDetailsDao.java | 1 +
.../network/vpc/dao/VpcOfferingDetailsDaoImpl.java | 26 +
.../com/cloud/offerings/NetworkOfferingVO.java | 4 +-
.../cloud/offerings/dao/NetworkOfferingDao.java | 7 +
.../offerings/dao/NetworkOfferingDaoImpl.java | 23 +
.../src/main/java/com/cloud/storage/VolumeVO.java | 15 +
.../upgrade/SystemVmTemplateRegistration.java | 4 +-
.../com/cloud/upgrade/dao/Upgrade41520to41600.java | 1 +
.../com/cloud/upgrade/dao/Upgrade41610to41700.java | 28 +
.../src/main/java/com/cloud/vm/DomainRouterVO.java | 11 +
.../java/com/cloud/vm/dao/ConsoleProxyDaoImpl.java | 2 +-
.../java/com/cloud/vm/dao/DomainRouterDao.java | 2 +-
.../java/com/cloud/vm/dao/DomainRouterDaoImpl.java | 9 +-
.../src/main/java/com/cloud/vm/dao/NicDao.java | 2 +
.../src/main/java/com/cloud/vm/dao/NicDaoImpl.java | 11 +
.../cloudstack/network/NetworkPermissionVO.java | 61 +
.../network/dao/NetworkPermissionDao.java | 65 +
.../network/dao/NetworkPermissionDaoImpl.java | 98 +
.../spring-engine-schema-core-daos-context.xml | 5 +
.../resources/META-INF/db/schema-41610to41700.sql | 309 +-
.../storage/snapshot/SnapshotObject.java | 2 +-
.../cloudstack/storage/volume/VolumeObject.java | 10 +
.../java/com/cloud/cluster/ClusterManager.java | 52 +-
.../java/com/cloud/cluster/ClusterManagerImpl.java | 56 +-
.../java/com/cloud/cluster/ClusterServicePdu.java | 1 +
.../cloud/cluster/ManagementServerStatusVO.java | 184 +
.../cloud/cluster/dao/ManagementServerHostDao.java | 7 +-
.../cluster/dao/ManagementServerStatusDao.java | 18 +-
.../cluster/dao/ManagementServerStatusDaoImpl.java | 48 +
.../main/java/com/cloud/dao/EntityManagerImpl.java | 9 +-
.../src/main/java/com/cloud/utils/db/DbUtil.java | 42 +-
.../framework/jobs/impl/AsyncJobManagerImpl.java | 4 +-
.../web/CloudStackContextLoaderListener.java | 3 +-
packaging/centos7/cloud.spec | 6 +-
packaging/centos8/cloud.spec | 6 +-
packaging/suse15/cloud.spec | 6 +-
.../kvm/resource/LibvirtComputingResource.java | 72 +-
.../LibvirtPatchSystemVmCommandWrapper.java | 112 +
.../wrapper/LibvirtStartCommandWrapper.java | 19 +-
.../kvm/resource/LibvirtComputingResourceTest.java | 35 +-
.../cloud/agent/manager/MockNetworkManager.java | 3 +
.../agent/manager/MockNetworkManagerImpl.java | 12 +
.../cloud/agent/manager/SimulatorManagerImpl.java | 15 +-
.../hypervisor/vmware/resource/VmwareResource.java | 133 +-
.../resource/VmwareStorageLayoutHelper.java | 24 +-
.../storage/resource/VmwareStorageProcessor.java | 2 +
.../xenserver/resource/CitrixResourceBase.java | 55 +-
.../xenbase/CitrixCheckSshCommandWrapper.java | 2 +-
.../CitrixNetworkElementCommandWrapper.java | 3 +-
.../xenbase/CitrixPatchSystemVmCommandWrapper.java | 111 +
.../xenbase/CitrixRebootRouterCommandWrapper.java | 2 +-
.../wrapper/xenbase/CitrixStartCommandWrapper.java | 32 +
.../cluster/KubernetesClusterManagerImpl.java | 5 +-
.../KubernetesClusterActionWorker.java | 1 +
...ernetesClusterResourceModifierActionWorker.java | 2 +
.../cluster/CreateKubernetesClusterCmd.java | 20 +-
.../main/resources/conf/k8s-control-node-add.yml | 2 +-
.../src/main/resources/conf/k8s-control-node.yml | 3 +-
.../src/main/resources/conf/k8s-node.yml | 2 +-
.../apache/cloudstack/api/ListDbMetricsCmd.java | 56 +
.../apache/cloudstack/api/ListMgmtsMetricsCmd.java | 56 +
.../cloudstack/api/ListUsageServerMetricsCmd.java | 57 +
.../org/apache/cloudstack/api/MetricConstants.java | 56 +
.../apache/cloudstack/metrics/MetricsService.java | 8 +
.../cloudstack/metrics/MetricsServiceImpl.java | 381 +-
.../response/ClusterMetricsResponse.java | 2 +-
.../cloudstack/response/DbMetricsResponse.java | 107 +
.../cloudstack/response/HostMetricsSummary.java | 51 +
.../response/ManagementServerMetricsResponse.java | 211 +
.../response/UsageServerMetricsResponse.java | 68 +
.../cloudstack/response/VmMetricsResponse.java | 10 +-
.../cloudstack/response/VolumeMetricsResponse.java | 2 +-
.../cloudstack/response/ZoneMetricsResponse.java | 2 +-
.../cloudstack/metrics/MetricsServiceImplTest.java | 2 +
.../network/guru/BigSwitchBcfGuestNetworkGuru.java | 3 +-
.../api/command/CreateServiceInstanceCmd.java | 5 +
.../contrail/management/ContrailManagerImpl.java | 24 +-
.../com/cloud/api/commands/StopNetScalerVMCmd.java | 8 +-
.../cloud/network/guru/OvsGuestNetworkGuru.java | 15 +-
.../cloud/network/guru/VxlanGuestNetworkGuru.java | 10 +-
.../collector/StorPoolAbandonObjectsCollector.java | 6 +-
.../driver/StorPoolPrimaryDataStoreDriver.java | 2 +-
.../storage/snapshot/StorPoolSnapshotStrategy.java | 6 +-
.../api/command/LinkAccountToLdapCmd.java | 26 +-
.../api/command/ListAndSwitchSAMLAccountCmd.java | 48 +-
pom.xml | 2 +-
scripts/installer/export-templates.sh | 192 +
scripts/util/keystore-cert-import | 42 +-
scripts/vm/hypervisor/xenserver/vmops | 20 +-
scripts/vm/hypervisor/xenserver/xcposs/patch | 4 +-
scripts/vm/hypervisor/xenserver/xcpserver/patch | 4 +-
scripts/vm/hypervisor/xenserver/xenserver56/patch | 4 +-
.../vm/hypervisor/xenserver/xenserver56fp1/patch | 4 +-
scripts/vm/hypervisor/xenserver/xenserver60/patch | 4 +-
scripts/vm/hypervisor/xenserver/xenserver62/patch | 4 +-
scripts/vm/hypervisor/xenserver/xenserver65/patch | 4 +-
scripts/vm/network/vnet/modifyvlan.sh | 6 +
scripts/vm/systemvm/injectkeys.sh | 8 -
server/pom.xml | 10 +
.../src/main/java/com/cloud/acl/DomainChecker.java | 40 +
.../java/com/cloud/alert/AlertManagerImpl.java | 55 +-
.../java/com/cloud/api/ApiAsyncJobDispatcher.java | 8 +-
server/src/main/java/com/cloud/api/ApiDBUtils.java | 66 +-
.../src/main/java/com/cloud/api/ApiDispatcher.java | 15 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 220 +-
server/src/main/java/com/cloud/api/ApiServer.java | 14 +-
.../java/com/cloud/api/ApiSessionListener.java | 83 +
.../com/cloud/api/ResponseObjectTypeAdapter.java | 4 +
.../com/cloud/api/dispatch/ParamProcessWorker.java | 13 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 137 +-
.../api/query/dao/DomainRouterJoinDaoImpl.java | 18 +-
.../api/query/dao/ManagementServerJoinDao.java | 17 +-
.../api/query/dao/ManagementServerJoinDaoImpl.java | 17 +-
.../api/query/dao/NetworkOfferingJoinDaoImpl.java | 16 +-
.../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 1 +
.../api/query/dao/VpcOfferingJoinDaoImpl.java | 7 +
.../com/cloud/api/query/vo/AsyncJobJoinVO.java | 8 +-
.../com/cloud/api/query/vo/DomainRouterJoinVO.java | 7 +
.../java/com/cloud/api/query/vo/EventJoinVO.java | 14 +
.../cloud/api/query/vo/ManagementServerJoinVO.java | 173 +
.../cloud/api/query/vo/NetworkOfferingJoinVO.java | 6 +
.../java/com/cloud/api/query/vo/VolumeJoinVO.java | 11 +
.../com/cloud/api/query/vo/VpcOfferingJoinVO.java | 7 +
.../configuration/ConfigurationManagerImpl.java | 371 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 15 +-
.../com/cloud/event/ActionEventInterceptor.java | 40 +-
.../java/com/cloud/event/ActionEventUtils.java | 238 +-
.../java/com/cloud/event/dao/EventJoinDaoImpl.java | 43 +-
.../com/cloud/hypervisor/HypervisorGuruBase.java | 1 +
.../kvm/discoverer/LibvirtServerDiscoverer.java | 74 +-
.../network/ExternalFirewallDeviceManagerImpl.java | 2 +-
.../ExternalLoadBalancerDeviceManagerImpl.java | 2 +-
.../com/cloud/network/IpAddressManagerImpl.java | 34 +-
.../com/cloud/network/Ipv6AddressManagerImpl.java | 16 +-
.../java/com/cloud/network/Ipv6ServiceImpl.java | 708 +
.../cloud/network/NetworkMigrationManagerImpl.java | 3 +-
.../java/com/cloud/network/NetworkModelImpl.java | 162 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 1224 +-
.../network/firewall/FirewallManagerImpl.java | 51 +-
.../network/guru/ExternalGuestNetworkGuru.java | 32 +-
.../com/cloud/network/guru/GuestNetworkGuru.java | 79 +-
.../com/cloud/network/guru/PrivateNetworkGuru.java | 2 +-
.../com/cloud/network/guru/PublicNetworkGuru.java | 5 +
.../network/lb/LoadBalancingRulesManagerImpl.java | 7 +-
.../cloud/network/router/CommandSetupHelper.java | 121 +-
.../com/cloud/network/router/NetworkHelper.java | 1 +
.../cloud/network/router/NetworkHelperImpl.java | 36 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 70 +-
.../com/cloud/network/rules/RulesManagerImpl.java | 18 +-
.../cloud/network/vpc/NetworkACLManagerImpl.java | 15 +-
.../cloud/network/vpc/NetworkACLServiceImpl.java | 2 +-
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 318 +-
.../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 8 +-
.../com/cloud/resource/ResourceManagerImpl.java | 5 +-
.../resource/RollingMaintenanceManagerImpl.java | 47 +-
.../resourceicon/ResourceIconManagerImpl.java | 43 +-
.../com/cloud/server/ConfigurationServerImpl.java | 10 +-
.../java/com/cloud/server/DbStatsCollection.java | 25 +-
.../java/com/cloud/server/ManagementServer.java | 3 +
.../server/ManagementServerHostStatsEntry.java | 456 +
.../com/cloud/server/ManagementServerImpl.java | 192 +-
.../main/java/com/cloud/server/StatsCollector.java | 808 +-
.../java/com/cloud/storage/StorageManagerImpl.java | 15 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 60 +-
.../storage/snapshot/SnapshotManagerImpl.java | 10 +-
.../storage/snapshot/SnapshotSchedulerImpl.java | 10 +-
.../com/cloud/tags/ResourceManagerUtilImpl.java | 36 +-
.../com/cloud/template/TemplateManagerImpl.java | 3 +
.../java/com/cloud/user/AccountManagerImpl.java | 32 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 23 +-
.../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 11 +-
.../org/apache/cloudstack/acl/RoleManagerImpl.java | 4 +-
.../affinity/AffinityGroupServiceImpl.java | 6 +-
.../annotation/AnnotationManagerImpl.java | 89 +-
.../cloudstack/backup/BackupManagerImpl.java | 9 +-
.../org/apache/cloudstack/ca/CAManagerImpl.java | 16 +-
.../direct/download/DirectDownloadManagerImpl.java | 3 +-
.../org/apache/cloudstack/ha/HAManagerImpl.java | 7 +-
.../network/topology/BasicNetworkVisitor.java | 6 +
.../OutOfBandManagementServiceImpl.java | 59 +-
.../outofbandmanagement/PowerOperationTask.java | 8 +-
.../core/spring-server-core-managers-context.xml | 2 +
server/src/test/async-job-component.xml | 1 +
.../test/java/com/cloud/api/ApiDispatcherTest.java | 94 +
.../com/cloud/api/query/QueryManagerImplTest.java | 190 +
...lsTest.java => ActionEventInterceptorTest.java} | 162 +-
.../java/com/cloud/event/ActionEventUtilsTest.java | 202 +-
.../com/cloud/event/dao/EventJoinDaoImplTest.java | 69 +
.../cloud/network/CreatePrivateNetworkTest.java | 14 +-
.../cloud/network/DedicateGuestVlanRangesTest.java | 18 +-
.../com/cloud/network/MockNetworkModelImpl.java | 11 +
.../cloud/network/UpdatePhysicalNetworkTest.java | 2 +-
.../cloud/network/lb/AssignLoadBalancerTest.java | 54 +-
.../cloud/resource/ResourceManagerImplTest.java | 6 +-
.../resourceicon/ResourceIconManagerImplTest.java | 133 +
.../com/cloud/server/ManagementServerImplTest.java | 114 +
.../java/com/cloud/server/StatsCollectorTest.java | 53 +-
.../com/cloud/storage/dao/AsyncJobJoinDaoTest.java | 4 +-
.../java/com/cloud/vm/UserVmManagerImplTest.java | 11 +-
.../cloud/vpc/MockConfigurationManagerImpl.java | 35 +-
.../java/com/cloud/vpc/MockNetworkManagerImpl.java | 53 +-
.../java/com/cloud/vpc/MockNetworkModelImpl.java | 11 +
.../com/cloud/vpc/MockSite2SiteVpnManagerImpl.java | 9 +
.../java/com/cloud/vpc/NetworkACLManagerTest.java | 10 +
.../com/cloud/vpc/dao/MockVpcOfferingDaoImpl.java | 10 +
.../annotation/AnnotationManagerImplTest.java | 193 +
.../networkoffering/CreateNetworkOfferingTest.java | 24 +-
.../cloudstack/privategw/AclOnPrivateGwTest.java | 2 +-
.../src/test/resources/createNetworkOffering.xml | 7 +
.../java/com/cloud/consoleproxy/ConsoleProxy.java | 9 +-
.../SecondaryStorageManagerImpl.java | 13 +-
systemvm/debian/etc/radvd.conf.tmpl | 12 +
.../etc/systemd/system/cloud-early-config.service | 7 +-
.../etc/systemd/system/cloud-postinit.service | 1 -
...-early-config.service => cloud-preinit.service} | 4 +-
systemvm/debian/opt/cloud/bin/checkrouter.sh | 4 +-
systemvm/debian/opt/cloud/bin/configure.py | 310 +-
systemvm/debian/opt/cloud/bin/cs/CsAddress.py | 39 +
systemvm/debian/opt/cloud/bin/cs/CsConfig.py | 20 +-
systemvm/debian/opt/cloud/bin/cs/CsDatabag.py | 81 +
systemvm/debian/opt/cloud/bin/cs/CsNetfilter.py | 45 +
systemvm/debian/opt/cloud/bin/cs/CsRedundant.py | 105 +
systemvm/debian/opt/cloud/bin/cs/CsRoute.py | 50 +
.../debian/opt/cloud/bin/cs/CsVpcGuestNetwork.py | 116 +
systemvm/debian/opt/cloud/bin/diagnostics.py | 12 +
systemvm/debian/opt/cloud/bin/merge.py | 5 +
.../opt/cloud/bin/{setup/ilbvm.sh => patched.sh} | 30 +-
systemvm/debian/opt/cloud/bin/setup/bootstrap.sh | 134 +-
systemvm/debian/opt/cloud/bin/setup/cksnode.sh | 2 +-
.../debian/opt/cloud/bin/setup/cloud-early-config | 91 +-
systemvm/debian/opt/cloud/bin/setup/common.sh | 132 +-
.../debian/opt/cloud/bin/setup/consoleproxy.sh | 13 +-
systemvm/debian/opt/cloud/bin/setup/dhcpsrvr.sh | 9 -
systemvm/debian/opt/cloud/bin/setup/elbvm.sh | 9 -
systemvm/debian/opt/cloud/bin/setup/ilbvm.sh | 1 -
.../opt/cloud/bin/setup/{bootstrap.sh => init.sh} | 147 +-
systemvm/debian/opt/cloud/bin/setup/postinit.sh | 16 +-
systemvm/debian/opt/cloud/bin/setup/router.sh | 20 +-
systemvm/debian/opt/cloud/bin/setup/secstorage.sh | 9 -
systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh | 2 -
systemvm/patch-sysvms.sh | 135 +
systemvm/pom.xml | 31 +-
.../component/test_network_permissions.py | 760 +
.../test_template_access_across_domains.py | 626 +
.../component/test_user_private_gateway.py | 425 +
.../component/test_user_shared_network.py | 631 +
test/integration/smoke/test_events_resource.py | 197 +
test/integration/smoke/test_list_ids_parameter.py | 4 +-
test/integration/smoke/test_metrics_api.py | 229 +-
test/integration/smoke/test_network_ipv6.py | 1261 +
test/integration/smoke/test_pvlan.py | 17 +-
.../scripts/configure_systemvm_services.sh | 4 +-
tools/appliance/systemvmtemplate/template.json | 4 +-
tools/marvin/marvin/config/test_data.py | 9 +
tools/marvin/marvin/lib/base.py | 79 +-
.../sandbox/demo/simulator/testcase/libs/base.py | 19 +-
ui/package-lock.json | 32845 ++++++++++++++++++-
ui/public/locales/ar.json | 6 +-
ui/public/locales/ca.json | 6 +-
ui/public/locales/de_DE.json | 6 +-
ui/public/locales/el_GR.json | 7 +-
ui/public/locales/en.json | 3479 +-
ui/public/locales/es.json | 6 +-
ui/public/locales/fr_FR.json | 6 +-
ui/public/locales/hu.json | 6 +-
ui/public/locales/it_IT.json | 6 +-
ui/public/locales/ja_JP.json | 2 +-
ui/public/locales/ko_KR.json | 6 +-
ui/public/locales/nb_NO.json | 6 +-
ui/public/locales/nl_NL.json | 6 +-
ui/public/locales/pl.json | 6 +-
ui/public/locales/pt_BR.json | 8 +-
ui/public/locales/ru_RU.json | 2 +-
ui/public/locales/zh_CN.json | 2 +-
ui/src/components/view/DetailSettings.vue | 4 +-
ui/src/components/view/DetailsTab.vue | 22 +-
ui/src/components/view/EventsTab.vue | 171 +
ui/src/components/view/InfoCard.vue | 36 +-
ui/src/components/view/ListView.vue | 21 +-
ui/src/components/view/ResourceView.vue | 11 +-
ui/src/components/view/SearchView.vue | 56 +-
ui/src/components/view/TreeView.vue | 15 +
ui/src/components/view/UploadResourceIcon.vue | 2 +-
ui/src/components/widgets/ResourceLabel.vue | 69 +
ui/src/components/widgets/TooltipButton.vue | 10 +-
ui/src/config/section/account.js | 6 +
ui/src/config/section/compute.js | 12 +-
ui/src/config/section/domain.js | 9 +-
ui/src/config/section/event.js | 6 +-
ui/src/config/section/image.js | 12 +
ui/src/config/section/infra.js | 13 +-
ui/src/config/section/infra/ilbvms.js | 4 +-
ui/src/config/section/infra/managementServers.js | 41 +
ui/src/config/section/infra/pods.js | 7 +
ui/src/config/section/infra/primaryStorages.js | 5 +
ui/src/config/section/infra/routers.js | 46 +-
ui/src/config/section/infra/secondaryStorages.js | 5 +
ui/src/config/section/infra/systemVms.js | 21 +-
ui/src/config/section/infra/zones.js | 5 +
ui/src/config/section/network.js | 67 +-
ui/src/config/section/offering.js | 6 +-
ui/src/config/section/project.js | 6 +
ui/src/config/section/storage.js | 13 +-
ui/src/config/section/user.js | 13 +
ui/src/core/lazy_lib/icons_use.js | 8 +
ui/src/permission.js | 1 +
ui/src/utils/plugins.js | 82 +-
ui/src/views/AutogenView.vue | 24 +-
ui/src/views/compute/DeployVM.vue | 7 +-
ui/src/views/compute/InstanceTab.vue | 7 +-
ui/src/views/dashboard/CapacityDashboard.vue | 8 +-
ui/src/views/dashboard/UsageDashboard.vue | 5 +-
ui/src/views/image/RegisterOrUploadTemplate.vue | 6 +-
ui/src/views/image/TemplateZones.vue | 2 +-
ui/src/views/image/UpdateTemplate.vue | 1 -
ui/src/views/infra/InfraSummary.vue | 5 +-
ui/src/views/infra/Metrics.vue | 235 +
ui/src/views/infra/network/IpRangesTabGuest.vue | 198 +-
ui/src/views/infra/network/IpRangesTabPublic.vue | 155 +-
ui/src/views/network/CreateIsolatedNetworkForm.vue | 22 +
ui/src/views/network/CreateNetwork.vue | 6 +-
ui/src/views/network/CreateNetworkPermission.vue | 247 +
ui/src/views/network/CreateSharedNetworkForm.vue | 384 +-
ui/src/views/network/GuestVlanNetworksTab.vue | 135 +
ui/src/views/network/Ipv6FirewallRulesTab.vue | 535 +
ui/src/views/network/NetworkPermissions.vue | 207 +
ui/src/views/network/VpcTab.vue | 64 +-
ui/src/views/offering/AddNetworkOffering.vue | 55 +-
ui/src/views/offering/AddVpcOffering.vue | 44 +-
ui/src/views/storage/AttachVolume.vue | 25 +-
utils/src/main/java/com/cloud/utils/FileUtil.java | 28 +
utils/src/main/java/com/cloud/utils/LogUtils.java | 40 +-
.../java/com/cloud/utils/db/EntityManager.java | 2 +
.../main/java/com/cloud/utils/net/NetUtils.java | 51 +-
.../main/java/com/cloud/utils/script/Script.java | 2 +-
.../main/java/com/cloud/utils/ssh/SshHelper.java | 42 +
.../ChecksumUtil.java} | 22 +-
.../cloudstack/utils/security/DigestHelper.java | 7 +-
.../cloudstack/utils/security/KeyStoreUtils.java | 1 +
.../test/java/com/cloud/utils/FileUtilTest.java | 69 +
.../cloud/utils/validation/ChecksumUtilTest.java | 62 +
.../hypervisor/vmware/mo/VirtualMachineMO.java | 18 +
699 files changed, 57768 insertions(+), 6020 deletions(-)
copy api/src/main/java/com/cloud/{network/GuestVlan.java =>
dc/DataCenterGuestIpv6Prefix.java} (76%)
copy api/src/main/java/com/cloud/network/{GuestVlan.java =>
GuestVlanRange.java} (93%)
copy api/src/main/java/com/cloud/network/{GuestVlan.java =>
Ipv6GuestPrefixSubnetNetworkMap.java} (71%)
create mode 100644 api/src/main/java/com/cloud/network/Ipv6Service.java
copy api/src/main/java/com/cloud/network/{GuestVlan.java =>
NetworkPermission.java} (77%)
create mode 100644
api/src/main/java/com/cloud/server/ManagementServerHostStats.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/ApiCommandResourceType.java
rename api/src/main/java/org/apache/cloudstack/api/{ApiCommandJobType.java =>
BaseResponseWithAssociatedNetwork.java} (50%)
mode change 100644 => 100755
copy
api/src/main/java/org/apache/cloudstack/api/command/admin/network/{CreateManagementNetworkIpRangeCmd.java
=> CreateGuestNetworkIpv6PrefixCmd.java} (52%)
copy
api/src/main/java/org/apache/cloudstack/api/command/admin/network/{DeleteNetworkServiceProviderCmd.java
=> DeleteGuestNetworkIpv6PrefixCmd.java} (56%)
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListGuestNetworkIpv6PrefixesCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListGuestVlansCmd.java
copy
api/src/main/java/org/apache/cloudstack/api/command/admin/{host/ReleaseHostReservationCmd.java
=> systemvm/PatchSystemVMCmd.java} (58%)
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayByAdminCmd.java
copy
api/src/main/java/org/apache/cloudstack/api/command/user/{network/CreateNetworkACLCmd.java
=> ipv6/CreateIpv6FirewallRuleCmd.java} (55%)
copy
api/src/main/java/org/apache/cloudstack/api/command/user/{network/DeleteNetworkACLCmd.java
=> ipv6/DeleteIpv6FirewallRuleCmd.java} (65%)
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/ListIpv6FirewallRulesCmd.java
copy
api/src/main/java/org/apache/cloudstack/api/command/user/{network/UpdateNetworkACLItemCmd.java
=> ipv6/UpdateIpv6FirewallRuleCmd.java} (62%)
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkPermissionsCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkPermissionsCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/user/network/RemoveNetworkPermissionsCmd.java
copy
api/src/main/java/org/apache/cloudstack/api/command/{admin/autoscale/DeleteCounterCmd.java
=> user/network/ResetNetworkPermissionsCmd.java} (54%)
rename api/src/main/java/org/apache/cloudstack/api/command/{admin =>
user}/vpc/CreatePrivateGatewayCmd.java (79%)
create mode 100644
api/src/main/java/org/apache/cloudstack/api/response/DataCenterGuestIpv6PrefixResponse.java
copy
api/src/main/java/org/apache/cloudstack/api/response/{GuestVlanRangeResponse.java
=> GuestVlanResponse.java} (50%)
copy
api/src/main/java/org/apache/cloudstack/api/response/{ManagementServerResponse.java
=> Ipv6RouteResponse.java} (50%)
copy
api/src/main/java/org/apache/cloudstack/api/response/{GuestVlanRangeResponse.java
=> NetworkPermissionsResponse.java} (57%)
copy api/src/main/java/{com/cloud/network/GuestVlan.java =>
org/apache/cloudstack/management/ManagementServerStatus.java} (67%)
create mode 100644
api/src/test/java/org/apache/cloudstack/api/ApiCommandResourceTypeTest.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/admin/systemvm/PatchSystemVMCmdTest.java
copy api/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsType.java
=> core/src/main/java/com/cloud/agent/api/PatchSystemVmAnswer.java (54%)
create mode 100644
core/src/main/java/com/cloud/agent/api/PatchSystemVmCommand.java
copy api/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsType.java
=>
core/src/main/java/com/cloud/agent/api/routing/SetIpv6FirewallRulesAnswer.java
(59%)
copy api/src/main/java/com/cloud/network/router/VirtualRouter.java =>
core/src/main/java/com/cloud/agent/api/routing/SetIpv6FirewallRulesCommand.java
(50%)
copy
core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/{SetGuestNetworkConfigItem.java
=> SetIpv6FirewallRulesConfigItem.java} (50%)
copy
engine/schema/src/main/java/com/cloud/{network/dao/AccountGuestVlanMapVO.java
=> dc/DataCenterGuestIpv6PrefixVO.java} (55%)
copy api/src/main/java/org/apache/cloudstack/api/IBaseListCmd.java =>
engine/schema/src/main/java/com/cloud/dc/dao/DataCenterGuestIpv6PrefixDao.java
(72%)
copy server/src/test/java/com/cloud/vpc/dao/MockVpcOfferingDaoImpl.java =>
engine/schema/src/main/java/com/cloud/dc/dao/DataCenterGuestIpv6PrefixDaoImpl.java
(55%)
create mode 100644
engine/schema/src/main/java/com/cloud/network/Ipv6GuestPrefixSubnetNetworkMapVO.java
copy
engine/schema/src/main/java/com/cloud/network/{vpc/dao/VpcOfferingDetailsDao.java
=> dao/Ipv6GuestPrefixSubnetNetworkMapDao.java} (55%)
create mode 100644
engine/schema/src/main/java/com/cloud/network/dao/Ipv6GuestPrefixSubnetNetworkMapDaoImpl.java
create mode 100644
engine/schema/src/main/java/org/apache/cloudstack/network/NetworkPermissionVO.java
create mode 100644
engine/schema/src/main/java/org/apache/cloudstack/network/dao/NetworkPermissionDao.java
create mode 100644
engine/schema/src/main/java/org/apache/cloudstack/network/dao/NetworkPermissionDaoImpl.java
create mode 100644
framework/cluster/src/main/java/com/cloud/cluster/ManagementServerStatusVO.java
copy api/src/main/java/org/apache/cloudstack/api/IBaseListCmd.java =>
framework/cluster/src/main/java/com/cloud/cluster/dao/ManagementServerStatusDao.java
(74%)
create mode 100644
framework/cluster/src/main/java/com/cloud/cluster/dao/ManagementServerStatusDaoImpl.java
create mode 100644
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPatchSystemVmCommandWrapper.java
create mode 100644
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPatchSystemVmCommandWrapper.java
create mode 100644
plugins/metrics/src/main/java/org/apache/cloudstack/api/ListDbMetricsCmd.java
create mode 100644
plugins/metrics/src/main/java/org/apache/cloudstack/api/ListMgmtsMetricsCmd.java
create mode 100644
plugins/metrics/src/main/java/org/apache/cloudstack/api/ListUsageServerMetricsCmd.java
create mode 100644
plugins/metrics/src/main/java/org/apache/cloudstack/api/MetricConstants.java
create mode 100644
plugins/metrics/src/main/java/org/apache/cloudstack/response/DbMetricsResponse.java
create mode 100644
plugins/metrics/src/main/java/org/apache/cloudstack/response/HostMetricsSummary.java
create mode 100644
plugins/metrics/src/main/java/org/apache/cloudstack/response/ManagementServerMetricsResponse.java
create mode 100644
plugins/metrics/src/main/java/org/apache/cloudstack/response/UsageServerMetricsResponse.java
create mode 100644 scripts/installer/export-templates.sh
create mode 100644 server/src/main/java/com/cloud/api/ApiSessionListener.java
copy api/src/main/java/org/apache/cloudstack/api/IBaseListCmd.java =>
server/src/main/java/com/cloud/api/query/dao/ManagementServerJoinDao.java (76%)
copy api/src/main/java/org/apache/cloudstack/api/IBaseListCmd.java =>
server/src/main/java/com/cloud/api/query/dao/ManagementServerJoinDaoImpl.java
(75%)
create mode 100644
server/src/main/java/com/cloud/api/query/vo/ManagementServerJoinVO.java
create mode 100644 server/src/main/java/com/cloud/network/Ipv6ServiceImpl.java
copy api/src/main/java/org/apache/cloudstack/api/IBaseListCmd.java =>
server/src/main/java/com/cloud/server/DbStatsCollection.java (64%)
create mode 100644
server/src/main/java/com/cloud/server/ManagementServerHostStatsEntry.java
create mode 100644 server/src/test/java/com/cloud/api/ApiDispatcherTest.java
create mode 100644
server/src/test/java/com/cloud/api/query/QueryManagerImplTest.java
copy server/src/test/java/com/cloud/event/{ActionEventUtilsTest.java =>
ActionEventInterceptorTest.java} (55%)
create mode 100644
server/src/test/java/com/cloud/event/dao/EventJoinDaoImplTest.java
create mode 100644
server/src/test/java/com/cloud/resourceicon/ResourceIconManagerImplTest.java
create mode 100644
server/src/test/java/org/apache/cloudstack/annotation/AnnotationManagerImplTest.java
create mode 100644 systemvm/debian/etc/radvd.conf.tmpl
copy systemvm/debian/etc/systemd/system/{cloud-early-config.service =>
cloud-preinit.service} (67%)
create mode 100755 systemvm/debian/opt/cloud/bin/cs/CsVpcGuestNetwork.py
copy systemvm/debian/opt/cloud/bin/{setup/ilbvm.sh => patched.sh} (55%)
mode change 100755 => 100644
copy systemvm/debian/opt/cloud/bin/setup/{bootstrap.sh => init.sh} (67%)
mode change 100755 => 100644
create mode 100644 systemvm/patch-sysvms.sh
create mode 100644 test/integration/component/test_network_permissions.py
create mode 100644
test/integration/component/test_template_access_across_domains.py
create mode 100644 test/integration/component/test_user_private_gateway.py
create mode 100644 test/integration/component/test_user_shared_network.py
create mode 100644 test/integration/smoke/test_events_resource.py
create mode 100644 test/integration/smoke/test_network_ipv6.py
create mode 100644 ui/src/components/view/EventsTab.vue
create mode 100644 ui/src/components/widgets/ResourceLabel.vue
create mode 100644 ui/src/config/section/infra/managementServers.js
create mode 100644 ui/src/views/infra/Metrics.vue
create mode 100644 ui/src/views/network/CreateNetworkPermission.vue
create mode 100644 ui/src/views/network/GuestVlanNetworksTab.vue
create mode 100644 ui/src/views/network/Ipv6FirewallRulesTab.vue
create mode 100644 ui/src/views/network/NetworkPermissions.vue
copy utils/src/main/java/com/cloud/utils/{FileUtil.java =>
validation/ChecksumUtil.java} (56%)
create mode 100644 utils/src/test/java/com/cloud/utils/FileUtilTest.java
create mode 100644
utils/src/test/java/com/cloud/utils/validation/ChecksumUtilTest.java
