You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2023/01/12 15:28:09 UTC

[cloudstack] branch 4.18-new-cipher-aead updated (279642781e9 -> 0449ba3122f)

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

weizhou pushed a change to branch 4.18-new-cipher-aead
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


    from 279642781e9 PR7003: migrate database if new encryptor version is set
     add ffccfc61729 Ensure Prometheus doesn't return values when the capacity_state is Disabled (#7007)
     add dc40ea130fc UI: fix ui test errors (#7030)
     add 9a18ea28dd2 .github: use ubuntu:22.04 for Sonar jacoco coverage checks
     add 1c2728da918 Semicolons not required (#7035)
     add 0bedb58fbe1 engine/orchestration: enable unit tests and fix errors (#7034)
     add 97c7a0743cc README: Replace Travis badge with Github Actions
     add d5f01005416 utils: fix NetUtils method to retrieve all IPs for a CIDR (#7026)
     add 194b0b4610b Merge remote-tracking branch 'apache/4.17' into main
     add 73a610da943 revert cleanup of test_acl_sharenetworks (#7033)
     add 4133f0e9799 Update usage when scaling vms (#7011)
     add a9b49f3ae90 Cleanup APIs getCommandName (#7022)
     add af59e76df6c add index to speed up querying IPs in the network-tab (#7028)
     add 4d76054377f Fix volume snapshot in VM with attached ISO (#7037)
     add 3044d63a8be Configurable MTU for VR (#6426)
     add 908981e8484 Allow download of System VM templates through the  UI (#7039)
     add 3ace9a514cd alter ordering of backup offerings (#7044)
     add e8aff6f4451 UI: user must specify the start of guest vlan range for advanced zone (#7038)
     add e952e032015 Merge release branch 4.17 to main
     add d0b34b75765 test: fix NetworkOrchestrator unit test failure (#7049)
     add 1380c604b1e server: add Host Control Plane State to uservm and systemvm response (#6946)
     add 89d4c7537fd utils: fix human-readable parsing failures (#7008)
     add 16ec8105e4a Merge release branch 4.17 to main
     add c2b75f4c81c README: revert project logo and update README
     add 20306d61292 Allow creating atmost 1 physical network with null tag (#6781)
     add 6790371fe2d fix merge diff display (#7047)
     add eb5c8a5a8c9 server: correctly list suitable hosts for migration with uefi capability (#7024)
     add 2d1d2944e53 merge release branch 4.17 into main
     add 76ec980c76e ui: remove max value (8) of maxsnaps because it might be greater than 8 (#7066)
     add a3289f8ac0c Merge remote-tracking branch 'apache/4.17' into main
     add 9009dd1db88 Emc networker b&r (#6550)
     add cc527523fa7 Allow users to inform timezones on APIs that have the date parameter (#7032)
     add 602f22a0d37 UI: fix cannot list lb rules if cidr_list is NULL (#7058)
     add d2bb6a2510e UI: support serviceofferingid when create vpc offering (#7054)
     add dffbc87278f escapes for injection prtection (#7069)
     add 03674ce1742 Merge release branch 4.16 to 4.17
     add f3e05543ccc Merge release branch 4.17 to main
     add 9cfebdf6e56 Allow domain admins to inform tags when creating offerings (#7052)
     add b392084950d Enable live volume migration for StorPool and small fixes (#6661)
     add df96af3de47 delete F5 and SRX plugins (#7023)
     add a85973a0cab ssvm: synchorise when adding iptables and routing rules (#6942)
     add 00426ede465 Add `pre-commit` workflow with 3 Git hooks (#6273)
     add c2350f96755 update owasp dep checker for 'column width bug' (#7068)
     add d33d84fa0fb server/UI: fix some issues with network offering details (#7057)
     add c1b17d2c42b Merge remote-tracking branch 'apache/4.17'
     add 08d54da938c tests: assess prerequisite before doing the actual test (#7040)
     add 44185744780 simulator: use ubuntu 22.04 in Dockerfile (#6978)
     add aad03530af9 Search for resource type efficiently (#6242)
     add c0a32d00b73 Use Super-Linter Slim Image (#6610)
     add 1dd064c8a9f server: fix cannot update vm if it uses unconstraint dynamic offering (#7077)
     add 4d80ea68465 UI: fix diskofferingstrictness is not passed when create compute offering (#7072)
     add e5158b29ee9 vmware: encode disk path for URL based access (#6989)
     add 0c925be44d7 merge LTS 4.17 in main
     add 0449ba3122f Merge remote-tracking branch 'apache/main' into 4.18-new-cipher-aead

No new revisions were added by this update.

Summary of changes:
 .github/workflows/build.yml                        |    2 +-
 .github/workflows/linter.yml                       |   24 +-
 .github/workflows/main-sonar-check.yml             |    4 +-
 .github/workflows/rat.yml                          |    2 +-
 .github/workflows/sonar-check.yml                  |    4 +-
 .github/workflows/ui.yml                           |    2 +-
 .../module.properties => .pre-commit-config.yaml   |   28 +-
 README.md                                          |   11 +-
 .../java/com/cloud/agent/api/to/IpAddressTO.java   |   18 +-
 .../main/java/com/cloud/agent/api/to/NicTO.java    |    9 +
 .../cloud/configuration/ConfigurationService.java  |    3 +
 .../src/main/java/com/cloud/host/ControlState.java |   75 +-
 api/src/main/java/com/cloud/network/Network.java   |    4 +
 .../java/com/cloud/network/NetworkProfile.java     |   12 +
 .../java/com/cloud/network/NetworkService.java     |   16 +
 api/src/main/java/com/cloud/network/vpc/Vpc.java   |    2 +
 .../java/com/cloud/network/vpc/VpcService.java     |    9 +-
 .../main/java/com/cloud/server/ResourceTag.java    |   15 +
 api/src/main/java/com/cloud/vm/Nic.java            |    2 +
 api/src/main/java/com/cloud/vm/NicProfile.java     |   11 +
 .../org/apache/cloudstack/alert/AlertService.java  |    2 +
 .../org/apache/cloudstack/api/ApiConstants.java    |    8 +
 .../java/org/apache/cloudstack/api/BaseCmd.java    |   40 +-
 .../command/admin/account/CreateAccountCmd.java    |    6 -
 .../command/admin/account/DeleteAccountCmd.java    |   10 -
 .../command/admin/account/DisableAccountCmd.java   |    6 -
 .../command/admin/account/EnableAccountCmd.java    |    6 -
 .../api/command/admin/account/LockAccountCmd.java  |    6 -
 .../command/admin/account/UpdateAccountCmd.java    |    6 -
 .../api/command/admin/acl/CreateRoleCmd.java       |    9 +-
 .../command/admin/acl/CreateRolePermissionCmd.java |    9 +-
 .../api/command/admin/acl/DeleteRoleCmd.java       |    8 +-
 .../command/admin/acl/DeleteRolePermissionCmd.java |    8 +-
 .../api/command/admin/acl/ImportRoleCmd.java       |    9 +-
 .../command/admin/acl/ListRolePermissionsCmd.java  |    8 +-
 .../api/command/admin/acl/ListRolesCmd.java        |    8 +-
 .../api/command/admin/acl/UpdateRoleCmd.java       |    8 +-
 .../command/admin/acl/UpdateRolePermissionCmd.java |   10 +-
 .../admin/acl/project/CreateProjectRoleCmd.java    |    8 +-
 .../project/CreateProjectRolePermissionCmd.java    |    8 +-
 .../admin/acl/project/DeleteProjectRoleCmd.java    |    8 +-
 .../project/DeleteProjectRolePermissionCmd.java    |    8 +-
 .../acl/project/ListProjectRolePermissionsCmd.java |    8 +-
 .../admin/acl/project/ListProjectRolesCmd.java     |    8 +-
 .../admin/acl/project/UpdateProjectRoleCmd.java    |    8 +-
 .../project/UpdateProjectRolePermissionCmd.java    |    8 +-
 .../api/command/admin/alert/GenerateAlertCmd.java  |    8 +-
 .../command/admin/annotation/AddAnnotationCmd.java |    8 +-
 .../admin/annotation/ListAnnotationsCmd.java       |   11 +-
 .../admin/annotation/RemoveAnnotationCmd.java      |    8 +-
 .../annotation/UpdateAnnotationVisibilityCmd.java  |    8 +-
 .../command/admin/autoscale/DeleteCounterCmd.java  |    6 -
 .../admin/backup/DeleteBackupOfferingCmd.java      |    8 +-
 .../admin/backup/ImportBackupOfferingCmd.java      |    8 +-
 .../backup/ListBackupProviderOfferingsCmd.java     |    7 +-
 .../admin/backup/ListBackupProvidersCmd.java       |    8 +-
 .../admin/backup/UpdateBackupOfferingCmd.java      |    8 +-
 .../api/command/admin/ca/IssueCertificateCmd.java  |    8 +-
 .../api/command/admin/ca/ListCAProvidersCmd.java   |    8 +-
 .../api/command/admin/ca/ListCaCertificateCmd.java |    8 +-
 .../command/admin/ca/ProvisionCertificateCmd.java  |    9 +-
 .../api/command/admin/ca/RevokeCertificateCmd.java |    8 +-
 .../api/command/admin/cluster/AddClusterCmd.java   |    6 -
 .../command/admin/cluster/DeleteClusterCmd.java    |    6 -
 .../api/command/admin/cluster/ListClustersCmd.java |    6 -
 .../command/admin/cluster/UpdateClusterCmd.java    |    6 -
 .../api/command/admin/config/ListCfgsByCmd.java    |    6 -
 .../admin/config/ListDeploymentPlannersCmd.java    |    6 -
 .../config/ListHypervisorCapabilitiesCmd.java      |    6 -
 .../api/command/admin/config/ResetCfgCmd.java      |    6 -
 .../api/command/admin/config/UpdateCfgCmd.java     |    6 -
 .../config/UpdateHypervisorCapabilitiesCmd.java    |    6 -
 .../admin/diagnostics/GetDiagnosticsDataCmd.java   |    8 +-
 .../admin/diagnostics/RunDiagnosticsCmd.java       |   11 +-
 .../ListTemplateDirectDownloadCertificatesCmd.java |    9 +-
 ...visionTemplateDirectDownloadCertificateCmd.java |    8 +-
 ...RevokeTemplateDirectDownloadCertificateCmd.java |   10 +-
 ...UploadTemplateDirectDownloadCertificateCmd.java |  240 +-
 .../api/command/admin/domain/CreateDomainCmd.java  |    6 -
 .../api/command/admin/domain/DeleteDomainCmd.java  |    6 -
 .../admin/domain/ListDomainChildrenCmd.java        |    6 -
 .../api/command/admin/domain/UpdateDomainCmd.java  |    6 -
 .../api/command/admin/guest/AddGuestOsCmd.java     |    6 -
 .../command/admin/guest/AddGuestOsMappingCmd.java  |    6 -
 .../command/admin/guest/ListGuestOsMappingCmd.java |    8 +-
 .../api/command/admin/guest/RemoveGuestOsCmd.java  |    6 -
 .../admin/guest/RemoveGuestOsMappingCmd.java       |    6 -
 .../api/command/admin/guest/UpdateGuestOsCmd.java  |    6 -
 .../admin/guest/UpdateGuestOsMappingCmd.java       |    6 -
 .../command/admin/ha/ConfigureHAForHostCmd.java    |    9 +-
 .../command/admin/ha/DisableHAForClusterCmd.java   |    8 +-
 .../api/command/admin/ha/DisableHAForHostCmd.java  |    9 +-
 .../api/command/admin/ha/DisableHAForZoneCmd.java  |    8 +-
 .../command/admin/ha/EnableHAForClusterCmd.java    |    8 +-
 .../api/command/admin/ha/EnableHAForHostCmd.java   |    9 +-
 .../api/command/admin/ha/EnableHAForZoneCmd.java   |    8 +-
 .../command/admin/ha/ListHostHAProvidersCmd.java   |    8 +-
 .../command/admin/ha/ListHostHAResourcesCmd.java   |    8 +-
 .../api/command/admin/host/AddHostCmd.java         |    6 -
 .../command/admin/host/AddSecondaryStorageCmd.java |    6 -
 .../admin/host/CancelHostAsDegradedCmd.java        |    5 -
 .../command/admin/host/CancelMaintenanceCmd.java   |    6 -
 .../admin/host/DeclareHostAsDegradedCmd.java       |    5 -
 .../api/command/admin/host/DeleteHostCmd.java      |    6 -
 .../admin/host/FindHostsForMigrationCmd.java       |    6 -
 .../api/command/admin/host/ListHostTagsCmd.java    |    8 +-
 .../api/command/admin/host/ListHostsCmd.java       |    6 -
 .../admin/host/PrepareForMaintenanceCmd.java       |    6 -
 .../api/command/admin/host/ReconnectHostCmd.java   |    6 -
 .../admin/host/ReleaseHostReservationCmd.java      |    6 -
 .../api/command/admin/host/UpdateHostCmd.java      |    6 -
 .../command/admin/host/UpdateHostPasswordCmd.java  |    6 -
 .../ConfigureInternalLoadBalancerElementCmd.java   |    6 -
 .../CreateInternalLoadBalancerElementCmd.java      |    6 -
 .../ListInternalLoadBalancerElementsCmd.java       |    6 -
 .../api/command/admin/management/ListMgmtsCmd.java |    9 +-
 .../command/admin/network/AddNetworkDeviceCmd.java |    6 -
 .../network/AddNetworkServiceProviderCmd.java      |    6 -
 .../network/CreateGuestNetworkIpv6PrefixCmd.java   |    8 +-
 .../network/CreateManagementNetworkIpRangeCmd.java |    8 +-
 .../admin/network/CreateNetworkOfferingCmd.java    |   10 -
 .../admin/network/CreatePhysicalNetworkCmd.java    |    6 -
 .../network/CreateStorageNetworkIpRangeCmd.java    |    6 -
 .../admin/network/DedicateGuestVlanRangeCmd.java   |    6 -
 .../network/DeleteGuestNetworkIpv6PrefixCmd.java   |    8 +-
 .../network/DeleteManagementNetworkIpRangeCmd.java |   10 +-
 .../admin/network/DeleteNetworkDeviceCmd.java      |    6 -
 .../admin/network/DeleteNetworkOfferingCmd.java    |    6 -
 .../network/DeleteNetworkServiceProviderCmd.java   |    6 -
 .../admin/network/DeletePhysicalNetworkCmd.java    |    6 -
 .../network/DeleteStorageNetworkIpRangeCmd.java    |    6 -
 .../network/ListDedicatedGuestVlanRangesCmd.java   |    6 -
 .../network/ListGuestNetworkIpv6PrefixesCmd.java   |    8 +-
 .../command/admin/network/ListGuestVlansCmd.java   |    8 +-
 .../network/ListNetworkIsolationMethodsCmd.java    |    6 -
 .../network/ListNetworkServiceProvidersCmd.java    |    6 -
 .../admin/network/ListPhysicalNetworksCmd.java     |    6 -
 .../network/ListStorageNetworkIpRangeCmd.java      |    5 -
 .../network/ListSupportedNetworkServicesCmd.java   |    6 -
 .../command/admin/network/MigrateNetworkCmd.java   |    9 +-
 .../api/command/admin/network/MigrateVPCCmd.java   |    9 +-
 .../network/ReleaseDedicatedGuestVlanRangeCmd.java |    6 -
 .../admin/network/UpdateNetworkOfferingCmd.java    |    6 -
 .../network/UpdateNetworkServiceProviderCmd.java   |    6 -
 .../admin/network/UpdatePhysicalNetworkCmd.java    |    6 -
 .../UpdatePodManagementNetworkIpRangeCmd.java      |    8 +-
 .../network/UpdateStorageNetworkIpRangeCmd.java    |    6 -
 .../admin/offering/CreateDiskOfferingCmd.java      |    6 -
 .../admin/offering/CreateServiceOfferingCmd.java   |    6 -
 .../admin/offering/DeleteDiskOfferingCmd.java      |    6 -
 .../admin/offering/DeleteServiceOfferingCmd.java   |    6 -
 ...AccountAllowedToCreateOfferingsWithTagsCmd.java |   56 +
 .../admin/offering/UpdateDiskOfferingCmd.java      |    8 -
 .../admin/offering/UpdateServiceOfferingCmd.java   |    9 -
 .../ChangeOutOfBandManagementPasswordCmd.java      |    9 +-
 .../ConfigureOutOfBandManagementCmd.java           |    8 +-
 .../DisableOutOfBandManagementForClusterCmd.java   |    8 +-
 .../DisableOutOfBandManagementForHostCmd.java      |    8 +-
 .../DisableOutOfBandManagementForZoneCmd.java      |    8 +-
 .../EnableOutOfBandManagementForClusterCmd.java    |    8 +-
 .../EnableOutOfBandManagementForHostCmd.java       |    8 +-
 .../EnableOutOfBandManagementForZoneCmd.java       |    8 +-
 .../IssueOutOfBandManagementPowerActionCmd.java    |    9 +-
 .../api/command/admin/pod/CreatePodCmd.java        |    8 -
 .../api/command/admin/pod/DeletePodCmd.java        |    6 -
 .../api/command/admin/pod/ListPodsByCmd.java       |    6 -
 .../api/command/admin/pod/UpdatePodCmd.java        |    6 -
 .../api/command/admin/region/AddRegionCmd.java     |    6 -
 .../admin/region/CreatePortableIpRangeCmd.java     |    6 -
 .../api/command/admin/region/RemoveRegionCmd.java  |    6 -
 .../api/command/admin/region/UpdateRegionCmd.java  |    6 -
 .../command/admin/resource/ArchiveAlertsCmd.java   |    6 -
 .../command/admin/resource/DeleteAlertsCmd.java    |    6 -
 .../api/command/admin/resource/ListAlertsCmd.java  |    6 -
 .../command/admin/resource/ListCapacityCmd.java    |    6 -
 .../admin/resource/StartRollingMaintenanceCmd.java |   11 +-
 .../admin/resource/UploadCustomCertificateCmd.java |    6 -
 .../admin/resource/icon/DeleteResourceIconCmd.java |    6 -
 .../admin/resource/icon/ListResourceIconCmd.java   |    6 -
 .../admin/resource/icon/UploadResourceIconCmd.java |    6 -
 .../admin/router/ConfigureOvsElementCmd.java       |    6 -
 .../router/ConfigureVirtualRouterElementCmd.java   |    6 -
 .../router/CreateVirtualRouterElementCmd.java      |    6 -
 .../api/command/admin/router/DestroyRouterCmd.java |    6 -
 .../router/GetRouterHealthCheckResultsCmd.java     |    8 +-
 .../command/admin/router/ListOvsElementsCmd.java   |    6 -
 .../api/command/admin/router/ListRoutersCmd.java   |    6 -
 .../admin/router/ListVirtualRouterElementsCmd.java |    6 -
 .../api/command/admin/router/RebootRouterCmd.java  |    6 -
 .../api/command/admin/router/StartRouterCmd.java   |    6 -
 .../api/command/admin/router/StopRouterCmd.java    |    6 -
 .../api/command/admin/router/UpgradeRouterCmd.java |    6 -
 .../admin/router/UpgradeRouterTemplateCmd.java     |    6 -
 .../command/admin/storage/AddImageStoreCmd.java    |    6 -
 .../storage/CreateSecondaryStagingStoreCmd.java    |    6 -
 .../admin/storage/CreateStoragePoolCmd.java        |    6 -
 .../command/admin/storage/DeleteImageStoreCmd.java |    6 -
 .../api/command/admin/storage/DeletePoolCmd.java   |    6 -
 .../storage/DeleteSecondaryStagingStoreCmd.java    |    6 -
 .../storage/FindStoragePoolsForMigrationCmd.java   |    6 -
 .../command/admin/storage/ListImageStoresCmd.java  |    6 -
 .../command/admin/storage/ListStoragePoolsCmd.java |    6 -
 .../admin/storage/ListStorageProvidersCmd.java     |    6 -
 .../command/admin/storage/ListStorageTagsCmd.java  |    6 -
 .../storage/MigrateSecondaryStorageDataCmd.java    |   10 +-
 .../command/admin/storage/SyncStoragePoolCmd.java  |    8 +-
 .../storage/UpdateCloudToUseObjectStoreCmd.java    |    6 -
 .../storage/UpdateStorageCapabilitiesCmd.java      |    9 +-
 .../admin/storage/UpdateStoragePoolCmd.java        |    6 -
 .../api/command/admin/swift/AddSwiftCmd.java       |    6 -
 .../api/command/admin/swift/ListSwiftsCmd.java     |    6 -
 .../command/admin/systemvm/DestroySystemVmCmd.java |    6 -
 .../command/admin/systemvm/ListSystemVMsCmd.java   |    6 -
 .../command/admin/systemvm/MigrateSystemVMCmd.java |    6 -
 .../command/admin/systemvm/PatchSystemVMCmd.java   |    9 +-
 .../command/admin/systemvm/RebootSystemVmCmd.java  |    6 -
 .../command/admin/systemvm/StartSystemVMCmd.java   |    6 -
 .../command/admin/systemvm/StopSystemVmCmd.java    |    6 -
 .../command/admin/systemvm/UpgradeSystemVMCmd.java |    6 -
 .../command/admin/template/PrepareTemplateCmd.java |    6 -
 .../command/admin/usage/AddTrafficMonitorCmd.java  |    6 -
 .../api/command/admin/usage/AddTrafficTypeCmd.java |    6 -
 .../admin/usage/DeleteTrafficMonitorCmd.java       |    6 -
 .../command/admin/usage/DeleteTrafficTypeCmd.java  |    6 -
 .../admin/usage/GenerateUsageRecordsCmd.java       |    6 -
 .../admin/usage/ListTrafficMonitorsCmd.java        |    6 -
 .../usage/ListTrafficTypeImplementorsCmd.java      |    5 -
 .../command/admin/usage/ListTrafficTypesCmd.java   |    6 -
 .../command/admin/usage/ListUsageRecordsCmd.java   |    9 +-
 .../api/command/admin/usage/ListUsageTypesCmd.java |    6 -
 .../admin/usage/RemoveRawUsageRecordsCmd.java      |    6 -
 .../command/admin/usage/UpdateTrafficTypeCmd.java  |    6 -
 .../api/command/admin/user/CreateUserCmd.java      |    6 -
 .../api/command/admin/user/DeleteUserCmd.java      |    6 -
 .../api/command/admin/user/DisableUserCmd.java     |    6 -
 .../api/command/admin/user/EnableUserCmd.java      |    6 -
 .../api/command/admin/user/GetUserCmd.java         |    6 -
 .../api/command/admin/user/GetUserKeysCmd.java     |   11 +-
 .../api/command/admin/user/ListUsersCmd.java       |    6 -
 .../api/command/admin/user/LockUserCmd.java        |    6 -
 .../api/command/admin/user/MoveUserCmd.java        |    6 -
 .../api/command/admin/user/RegisterCmd.java        |    6 -
 .../api/command/admin/user/UpdateUserCmd.java      |    6 -
 .../command/admin/vlan/CreateVlanIpRangeCmd.java   |    6 -
 .../admin/vlan/DedicatePublicIpRangeCmd.java       |    6 -
 .../command/admin/vlan/DeleteVlanIpRangeCmd.java   |    6 -
 .../command/admin/vlan/ListVlanIpRangesCmd.java    |    6 -
 .../admin/vlan/ReleasePublicIpRangeCmd.java        |    6 -
 .../command/admin/vlan/UpdateVlanIpRangeCmd.java   |   10 +-
 .../api/command/admin/vm/AssignVMCmd.java          |    6 -
 .../api/command/admin/vm/ExpungeVMCmd.java         |    6 -
 .../api/command/admin/vm/GetVMUserDataCmd.java     |    5 -
 .../admin/vm/ImportUnmanagedInstanceCmd.java       |    8 +-
 .../admin/vm/ListUnmanagedInstancesCmd.java        |    9 +-
 .../api/command/admin/vm/MigrateVMCmd.java         |    6 -
 .../vm/MigrateVirtualMachineWithVolumeCmd.java     |    6 -
 .../api/command/admin/vm/RecoverVMCmd.java         |    6 -
 .../command/admin/vm/UnmanageVMInstanceCmd.java    |   10 +-
 .../admin/vpc/CreatePrivateGatewayByAdminCmd.java  |    2 +-
 .../command/admin/vpc/CreateVPCOfferingCmd.java    |    6 -
 .../command/admin/vpc/DeletePrivateGatewayCmd.java |    6 -
 .../command/admin/vpc/DeleteVPCOfferingCmd.java    |    6 -
 .../command/admin/vpc/UpdateVPCOfferingCmd.java    |    6 -
 .../api/command/admin/zone/CreateZoneCmd.java      |    6 -
 .../api/command/admin/zone/DeleteZoneCmd.java      |    6 -
 .../admin/zone/MarkDefaultZoneForAccountCmd.java   |    6 -
 .../api/command/admin/zone/UpdateZoneCmd.java      |    6 -
 .../user/account/AddAccountToProjectCmd.java       |    6 -
 .../command/user/account/AddUserToProjectCmd.java  |    8 +-
 .../user/account/DeleteAccountFromProjectCmd.java  |    6 -
 .../user/account/DeleteUserFromProjectCmd.java     |    8 +-
 .../user/account/ListProjectAccountsCmd.java       |    6 -
 .../user/address/DisassociateIPAddrCmd.java        |    6 -
 .../api/command/user/address/ReleaseIPAddrCmd.java |    6 -
 .../api/command/user/address/ReserveIPAddrCmd.java |    6 -
 .../api/command/user/address/UpdateIPAddrCmd.java  |    8 +-
 .../user/affinitygroup/CreateAffinityGroupCmd.java |    6 -
 .../user/affinitygroup/DeleteAffinityGroupCmd.java |    6 -
 .../affinitygroup/ListAffinityGroupTypesCmd.java   |    6 -
 .../user/affinitygroup/ListAffinityGroupsCmd.java  |    6 -
 .../user/autoscale/DeleteAutoScalePolicyCmd.java   |    6 -
 .../user/autoscale/DeleteAutoScaleVmGroupCmd.java  |    6 -
 .../autoscale/DeleteAutoScaleVmProfileCmd.java     |    6 -
 .../command/user/autoscale/DeleteConditionCmd.java |    6 -
 .../user/autoscale/ListAutoScalePoliciesCmd.java   |    6 -
 .../user/autoscale/ListAutoScaleVmGroupsCmd.java   |    6 -
 .../user/autoscale/ListAutoScaleVmProfilesCmd.java |    6 -
 .../command/user/autoscale/ListConditionsCmd.java  |    6 -
 .../user/autoscale/UpdateAutoScalePolicyCmd.java   |    6 -
 .../user/autoscale/UpdateAutoScaleVmGroupCmd.java  |    6 -
 .../autoscale/UpdateAutoScaleVmProfileCmd.java     |    6 -
 .../command/user/autoscale/UpdateConditionCmd.java |    9 +-
 .../AssignVirtualMachineToBackupOfferingCmd.java   |   11 +-
 .../api/command/user/backup/CreateBackupCmd.java   |    9 +-
 .../user/backup/CreateBackupScheduleCmd.java       |    8 +-
 .../api/command/user/backup/DeleteBackupCmd.java   |    9 +-
 .../user/backup/DeleteBackupScheduleCmd.java       |    8 +-
 .../user/backup/ListBackupOfferingsCmd.java        |    7 +-
 .../command/user/backup/ListBackupScheduleCmd.java |   10 +-
 .../api/command/user/backup/ListBackupsCmd.java    |    9 +-
 .../RemoveVirtualMachineFromBackupOfferingCmd.java |   11 +-
 .../api/command/user/backup/RestoreBackupCmd.java  |    9 +-
 .../RestoreVolumeFromBackupAndAttachToVMCmd.java   |    9 +-
 .../user/backup/UpdateBackupScheduleCmd.java       |    3 +-
 .../command/user/config/ListCapabilitiesCmd.java   |    6 -
 .../consoleproxy/CreateConsoleEndpointCmd.java     |    8 +-
 .../api/command/user/event/ArchiveEventsCmd.java   |    6 -
 .../api/command/user/event/DeleteEventsCmd.java    |    6 -
 .../api/command/user/event/ListEventTypesCmd.java  |    6 -
 .../api/command/user/event/ListEventsCmd.java      |    6 -
 .../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 -
 .../user/firewall/ListEgressFirewallRulesCmd.java  |    6 -
 .../user/firewall/ListFirewallRulesCmd.java        |    6 -
 .../user/firewall/ListPortForwardingRulesCmd.java  |    6 -
 .../user/firewall/UpdateEgressFirewallRuleCmd.java |    6 -
 .../user/firewall/UpdateFirewallRuleCmd.java       |    8 +-
 .../user/firewall/UpdatePortForwardingRuleCmd.java |    6 -
 .../user/guest/ListGuestOsCategoriesCmd.java       |    6 -
 .../api/command/user/guest/ListGuestOsCmd.java     |    6 -
 .../user/ipv6/CreateIpv6FirewallRuleCmd.java       |    8 +-
 .../user/ipv6/DeleteIpv6FirewallRuleCmd.java       |    8 +-
 .../user/ipv6/ListIpv6FirewallRulesCmd.java        |    8 +-
 .../user/ipv6/UpdateIpv6FirewallRuleCmd.java       |    8 +-
 .../api/command/user/iso/DeleteIsoCmd.java         |   10 -
 .../api/command/user/iso/ExtractIsoCmd.java        |   10 -
 .../api/command/user/job/ListAsyncJobsCmd.java     |    8 +-
 .../command/user/job/QueryAsyncJobResultCmd.java   |    6 -
 .../loadbalancer/AssignCertToLoadBalancerCmd.java  |    6 -
 .../loadbalancer/AssignToLoadBalancerRuleCmd.java  |    6 -
 .../CreateApplicationLoadBalancerCmd.java          |    6 -
 .../loadbalancer/CreateLBHealthCheckPolicyCmd.java |    6 -
 .../loadbalancer/CreateLoadBalancerRuleCmd.java    |    6 -
 .../DeleteApplicationLoadBalancerCmd.java          |    6 -
 .../loadbalancer/DeleteLBHealthCheckPolicyCmd.java |    6 -
 .../loadbalancer/DeleteLoadBalancerRuleCmd.java    |    6 -
 .../user/loadbalancer/DeleteSslCertCmd.java        |    8 +-
 .../ListApplicationLoadBalancersCmd.java           |    6 -
 .../loadbalancer/ListLBHealthCheckPoliciesCmd.java |    6 -
 .../loadbalancer/ListLBStickinessPoliciesCmd.java  |    6 -
 .../loadbalancer/ListLoadBalancerRulesCmd.java     |    6 -
 .../command/user/loadbalancer/ListSslCertsCmd.java |    6 -
 .../RemoveCertFromLoadBalancerCmd.java             |    6 -
 .../RemoveFromLoadBalancerRuleCmd.java             |    6 -
 .../UpdateApplicationLoadBalancerCmd.java          |    6 -
 .../loadbalancer/UpdateLBHealthCheckPolicyCmd.java |    6 -
 .../loadbalancer/UpdateLBStickinessPolicyCmd.java  |    6 -
 .../loadbalancer/UpdateLoadBalancerRuleCmd.java    |    6 -
 .../user/loadbalancer/UploadSslCertCmd.java        |    6 -
 .../user/nat/CreateIpForwardingRuleCmd.java        |    6 -
 .../user/nat/DeleteIpForwardingRuleCmd.java        |    6 -
 .../api/command/user/nat/DisableStaticNatCmd.java  |    6 -
 .../api/command/user/nat/EnableStaticNatCmd.java   |    6 -
 .../command/user/nat/ListIpForwardingRulesCmd.java |    6 -
 .../command/user/network/CreateNetworkACLCmd.java  |    6 -
 .../user/network/CreateNetworkACLListCmd.java      |    6 -
 .../api/command/user/network/CreateNetworkCmd.java |   16 +
 .../user/network/CreateNetworkPermissionsCmd.java  |    8 +-
 .../command/user/network/DeleteNetworkACLCmd.java  |    6 -
 .../user/network/DeleteNetworkACLListCmd.java      |    6 -
 .../api/command/user/network/DeleteNetworkCmd.java |    6 -
 .../user/network/ListNetworkACLListsCmd.java       |    6 -
 .../command/user/network/ListNetworkACLsCmd.java   |    6 -
 .../user/network/ListNetworkOfferingsCmd.java      |    6 -
 .../user/network/ListNetworkPermissionsCmd.java    |    8 +-
 .../user/network/RemoveNetworkPermissionsCmd.java  |    8 +-
 .../user/network/ReplaceNetworkACLListCmd.java     |    6 -
 .../user/network/ResetNetworkPermissionsCmd.java   |    8 +-
 .../command/user/network/RestartNetworkCmd.java    |    6 -
 .../user/network/UpdateNetworkACLListCmd.java      |    6 -
 .../api/command/user/network/UpdateNetworkCmd.java |   18 +-
 .../user/offering/ListDiskOfferingsCmd.java        |    6 -
 .../user/offering/ListServiceOfferingsCmd.java     |    6 -
 .../api/command/user/project/CreateProjectCmd.java |    6 -
 .../api/command/user/project/DeleteProjectCmd.java |    6 -
 .../user/project/DeleteProjectInvitationCmd.java   |    6 -
 .../user/project/ListProjectInvitationsCmd.java    |    6 -
 .../api/command/user/project/ListProjectsCmd.java  |    6 -
 .../command/user/project/SuspendProjectCmd.java    |    6 -
 .../api/command/user/project/UpdateProjectCmd.java |    6 -
 .../user/project/UpdateProjectInvitationCmd.java   |    6 -
 .../api/command/user/region/ListRegionsCmd.java    |    6 -
 .../ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java |    6 -
 .../ha/gslb/CreateGlobalLoadBalancerRuleCmd.java   |    6 -
 .../ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java   |    6 -
 .../ha/gslb/ListGlobalLoadBalancerRuleCmd.java     |    6 -
 .../ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java   |    6 -
 .../user/resource/GetCloudIdentifierCmd.java       |    6 -
 .../user/resource/ListDetailOptionsCmd.java        |    8 +-
 .../command/user/resource/ListHypervisorsCmd.java  |    6 -
 .../user/resource/ListResourceLimitsCmd.java       |    6 -
 .../user/resource/UpdateResourceCountCmd.java      |    6 -
 .../user/resource/UpdateResourceLimitCmd.java      |    6 -
 .../AuthorizeSecurityGroupEgressCmd.java           |    6 -
 .../AuthorizeSecurityGroupIngressCmd.java          |    6 -
 .../user/securitygroup/CreateSecurityGroupCmd.java |    6 -
 .../user/securitygroup/DeleteSecurityGroupCmd.java |    6 -
 .../user/securitygroup/ListSecurityGroupsCmd.java  |    6 -
 .../RevokeSecurityGroupEgressCmd.java              |    6 -
 .../RevokeSecurityGroupIngressCmd.java             |    6 -
 .../user/securitygroup/UpdateSecurityGroupCmd.java |    9 +-
 .../command/user/snapshot/CreateSnapshotCmd.java   |    6 -
 .../snapshot/CreateSnapshotFromVMSnapshotCmd.java  |    6 -
 .../user/snapshot/CreateSnapshotPolicyCmd.java     |    6 -
 .../command/user/snapshot/DeleteSnapshotCmd.java   |    6 -
 .../user/snapshot/DeleteSnapshotPoliciesCmd.java   |    6 -
 .../user/snapshot/ListSnapshotPoliciesCmd.java     |    6 -
 .../command/user/snapshot/ListSnapshotsCmd.java    |    6 -
 .../command/user/snapshot/RevertSnapshotCmd.java   |    6 -
 .../user/snapshot/UpdateSnapshotPolicyCmd.java     |    8 +-
 .../api/command/user/ssh/CreateSSHKeyPairCmd.java  |    5 -
 .../api/command/user/ssh/DeleteSSHKeyPairCmd.java  |    6 -
 .../api/command/user/ssh/ListSSHKeyPairsCmd.java   |    6 -
 .../command/user/ssh/RegisterSSHKeyPairCmd.java    |    6 -
 .../api/command/user/tag/CreateTagsCmd.java        |    6 -
 .../api/command/user/tag/DeleteTagsCmd.java        |    6 -
 .../api/command/user/tag/ListTagsCmd.java          |    6 -
 .../command/user/template/DeleteTemplateCmd.java   |   10 -
 .../command/user/template/ExtractTemplateCmd.java  |   10 -
 .../command/user/userdata/DeleteUserDataCmd.java   |    6 -
 .../user/userdata/LinkUserDataToTemplateCmd.java   |    6 -
 .../api/command/user/userdata/ListUserDataCmd.java |    6 -
 .../command/user/userdata/RegisterUserDataCmd.java |    5 -
 .../api/command/user/vm/GetVMPasswordCmd.java      |    5 -
 .../api/command/user/vm/ListNicsCmd.java           |    6 -
 .../api/command/user/vm/RemoveIpFromVmNicCmd.java  |    6 -
 .../api/command/user/vm/UpdateVmNicIpCmd.java      |    6 -
 .../api/command/user/vmgroup/CreateVMGroupCmd.java |    6 -
 .../api/command/user/vmgroup/DeleteVMGroupCmd.java |    6 -
 .../api/command/user/vmgroup/ListVMGroupsCmd.java  |    6 -
 .../api/command/user/vmgroup/UpdateVMGroupCmd.java |    6 -
 .../user/vmsnapshot/CreateVMSnapshotCmd.java       |    6 -
 .../user/vmsnapshot/DeleteVMSnapshotCmd.java       |    6 -
 .../command/user/vmsnapshot/ListVMSnapshotCmd.java |    6 -
 .../command/user/volume/AddResourceDetailCmd.java  |    6 -
 .../user/volume/ChangeOfferingForVolumeCmd.java    |    8 +-
 .../api/command/user/volume/DeleteVolumeCmd.java   |    6 -
 .../api/command/user/volume/ExtractVolumeCmd.java  |   10 -
 .../user/volume/ListResourceDetailsCmd.java        |    6 -
 .../user/volume/RemoveResourceDetailCmd.java       |    6 -
 .../api/command/user/vpc/CreateStaticRouteCmd.java |    6 -
 .../api/command/user/vpc/CreateVPCCmd.java         |    9 +
 .../api/command/user/vpc/DeleteStaticRouteCmd.java |    6 -
 .../api/command/user/vpc/DeleteVPCCmd.java         |    6 -
 .../command/user/vpc/ListPrivateGatewaysCmd.java   |    6 -
 .../api/command/user/vpc/ListStaticRoutesCmd.java  |    6 -
 .../api/command/user/vpc/ListVPCOfferingsCmd.java  |    6 -
 .../api/command/user/vpc/RestartVPCCmd.java        |    6 -
 .../api/command/user/vpc/UpdateVPCCmd.java         |   10 +-
 .../api/command/user/vpn/AddVpnUserCmd.java        |    6 -
 .../command/user/vpn/CreateRemoteAccessVpnCmd.java |    6 -
 .../command/user/vpn/CreateVpnConnectionCmd.java   |    6 -
 .../user/vpn/CreateVpnCustomerGatewayCmd.java      |    6 -
 .../api/command/user/vpn/CreateVpnGatewayCmd.java  |    6 -
 .../command/user/vpn/DeleteRemoteAccessVpnCmd.java |    6 -
 .../command/user/vpn/DeleteVpnConnectionCmd.java   |    6 -
 .../user/vpn/DeleteVpnCustomerGatewayCmd.java      |    6 -
 .../api/command/user/vpn/DeleteVpnGatewayCmd.java  |    6 -
 .../command/user/vpn/ListRemoteAccessVpnsCmd.java  |    6 -
 .../command/user/vpn/ListVpnConnectionsCmd.java    |    6 -
 .../user/vpn/ListVpnCustomerGatewaysCmd.java       |    6 -
 .../api/command/user/vpn/ListVpnGatewaysCmd.java   |    6 -
 .../api/command/user/vpn/ListVpnUsersCmd.java      |    6 -
 .../api/command/user/vpn/RemoveVpnUserCmd.java     |    6 -
 .../command/user/vpn/ResetVpnConnectionCmd.java    |    6 -
 .../command/user/vpn/UpdateRemoteAccessVpnCmd.java |    8 +-
 .../command/user/vpn/UpdateVpnConnectionCmd.java   |    6 -
 .../user/vpn/UpdateVpnCustomerGatewayCmd.java      |    6 -
 .../api/command/user/vpn/UpdateVpnGatewayCmd.java  |    6 -
 .../api/response/DomainRouterResponse.java         |    8 +
 ...ntAllowedToCreateOfferingsWithTagsResponse.java |   22 +-
 .../cloudstack/api/response/NetworkResponse.java   |   24 +
 .../cloudstack/api/response/NicResponse.java       |   16 +-
 .../cloudstack/api/response/SystemVmResponse.java  |   12 +
 .../cloudstack/api/response/UserVmResponse.java    |   12 +
 .../cloudstack/api/response/VpcResponse.java       |    8 +
 .../cloudstack/api/response/ZoneResponse.java      |   24 +
 .../test/java/com/cloud/host/ControlStateTest.java |  109 +
 .../api/command/test/AddHostCmdTest.java           |    3 +-
 .../command/test/AddSecondaryStorageCmdTest.java   |    3 +-
 .../command/user/network/CreateNetworkCmdTest.java |  298 ++
 .../command/user/network/UpdateNetworkCmdTest.java |  176 +
 .../api/command/user/vpc/CreateVPCCmdTest.java     |  165 +
 .../api/command/user/vpc/UpdateVPCCmdTest.java     |   94 +
 client/pom.xml                                     |   20 +-
 .../agent/api/routing/UpdateNetworkCommand.java    |   59 +
 .../agent/resource/virtualnetwork/VRScripts.java   |    2 +
 .../virtualnetwork/VirtualRoutingResource.java     |   54 +
 .../facade/IpAssociationConfigItem.java            |    1 +
 .../facade/SetGuestNetworkConfigItem.java          |    4 +-
 .../virtualnetwork/model/GuestNetwork.java         |   10 +
 .../resource/virtualnetwork/model/IpAddress.java   |    9 +-
 .../service/NetworkOrchestrationService.java       |    2 +-
 .../java/com/cloud/network/vpc/VpcManager.java     |    3 +-
 engine/orchestration/pom.xml                       |    3 -
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |    5 +-
 .../engine/orchestration/NetworkOrchestrator.java  |  111 +-
 .../cloud/vm/VirtualMachineManagerImplTest.java    |   96 +-
 .../orchestration/NetworkOrchestratorTest.java     |    2 +
 .../engine/provisioning/test/ProvisioningTest.java |   63 +-
 .../src/test/resources/provisioningContext.xml     |   47 -
 .../java/com/cloud/host/dao/HostDetailsDao.java    |    3 +
 .../com/cloud/host/dao/HostDetailsDaoImpl.java     |   13 +-
 .../java/com/cloud/network/dao/IPAddressDao.java   |    2 +
 .../com/cloud/network/dao/IPAddressDaoImpl.java    |    8 +
 .../java/com/cloud/network/dao/NetworkDaoImpl.java |    2 +-
 .../main/java/com/cloud/network/dao/NetworkVO.java |   26 +
 .../src/main/java/com/cloud/network/vpc/VpcVO.java |   11 +
 .../java/com/cloud/service/ServiceOfferingVO.java  |    2 +-
 .../schema/src/main/java/com/cloud/vm/NicVO.java   |   12 +
 .../src/main/java/com/cloud/vm/dao/NicDao.java     |    4 +
 .../src/main/java/com/cloud/vm/dao/NicDaoImpl.java |   16 +
 .../resources/META-INF/db/schema-41720to41800.sql  |  134 +
 .../src/test/java/com/cloud/host/HostVOTest.java   |  122 +-
 .../api/command/user/discovery/ListApisCmd.java    |    6 -
 .../command/admin/ratelimit/ResetApiLimitCmd.java  |    6 -
 .../api/command/user/ratelimit/GetApiLimitCmd.java |    6 -
 .../admin/solidfire/GetPathForVolumeCmd.java       |    6 -
 .../admin/solidfire/GetSolidFireAccountIdCmd.java  |    6 -
 .../GetSolidFireVolumeAccessGroupIdsCmd.java       |    8 +-
 .../admin/solidfire/GetSolidFireVolumeSizeCmd.java |    8 +-
 .../solidfire/GetVolumeSnapshotDetailsCmd.java     |    8 +-
 .../admin/solidfire/GetVolumeiScsiNameCmd.java     |    8 +-
 .../api/command/admin/sioc/UpdateSiocInfoCmd.java  |    8 +-
 plugins/backup/networker/pom.xml                   |   54 +
 .../cloudstack/backup/NetworkerBackupProvider.java |  639 ++++
 .../backup/networker/NetworkerBackupOffering.java  |   76 +
 .../backup/networker/NetworkerClient.java          |  351 ++
 .../backup/networker/NetworkerObject.java}         |   53 +-
 .../cloudstack/backup/networker/api/Action.java    |  350 ++
 .../backup/networker/api/ActionSpecificData.java   |  107 +
 .../cloudstack/backup/networker/api/Attribute.java |   92 +
 .../backup/networker/api/BackupSpecificData.java   |   75 +
 .../networker/api/CompletionNotification.java      |   91 +
 .../cloudstack/backup/networker/api/Expire.java    |   47 +
 .../cloudstack/backup/networker/api/Instance.java  |  124 +
 .../cloudstack/backup/networker/api/Link.java      |   91 +
 .../backup/networker/api/NetworkerBackup.java      |  334 ++
 .../backup/networker/api/NetworkerBackups.java     |   92 +
 .../backup/networker/api/ProtectionPolicies.java   |   92 +
 .../backup/networker/api/ProtectionPolicy.java     |  175 +
 .../backup/networker/api/ResourceId.java           |   91 +
 .../backup/networker/api/ServerBackup.java         |  140 +
 .../cloudstack/backup/networker/api/Size.java      |   90 +
 .../backup/networker/api/SummaryNotification.java  |   91 +
 .../backup/networker/api/Traditional.java          |  238 ++
 .../cloudstack/networker}/module.properties        |    4 +-
 .../networker/spring-backup-networker-context.xml} |   21 +-
 .../backup/networker/NetworkerClientTest.java      |  732 ++++
 .../cloudstack/api/command/QuotaBalanceCmd.java    |    6 -
 .../cloudstack/api/command/QuotaCreditsCmd.java    |    6 -
 .../api/command/QuotaEmailTemplateListCmd.java     |    5 -
 .../api/command/QuotaEmailTemplateUpdateCmd.java   |    6 -
 .../cloudstack/api/command/QuotaEnabledCmd.java    |    6 -
 .../cloudstack/api/command/QuotaStatementCmd.java  |    6 -
 .../cloudstack/api/command/QuotaSummaryCmd.java    |    6 -
 .../api/command/QuotaTariffCreateCmd.java          |    8 +-
 .../api/command/QuotaTariffDeleteCmd.java          |    8 +-
 .../cloudstack/api/command/QuotaTariffListCmd.java |    6 -
 .../api/command/QuotaTariffUpdateCmd.java          |    6 -
 .../cloudstack/api/command/QuotaUpdateCmd.java     |    6 -
 .../api/commands/DedicateClusterCmd.java           |    6 -
 .../cloudstack/api/commands/DedicateHostCmd.java   |    6 -
 .../cloudstack/api/commands/DedicatePodCmd.java    |    6 -
 .../cloudstack/api/commands/DedicateZoneCmd.java   |    6 -
 .../api/commands/ListDedicatedClustersCmd.java     |    6 -
 .../api/commands/ListDedicatedHostsCmd.java        |    6 -
 .../api/commands/ListDedicatedPodsCmd.java         |    6 -
 .../api/commands/ListDedicatedZonesCmd.java        |    6 -
 .../api/commands/ReleaseDedicatedClusterCmd.java   |    6 -
 .../api/commands/ReleaseDedicatedHostCmd.java      |    6 -
 .../api/commands/ReleaseDedicatedPodCmd.java       |    6 -
 .../api/commands/ReleaseDedicatedZoneCmd.java      |    6 -
 .../cloud/baremetal/database/BaremetalRctDao.java  |   52 +-
 .../baremetal/database/BaremetalRctDaoImpl.java    |   52 +-
 .../cloud/baremetal/database/BaremetalRctVO.java   |  164 +-
 .../com/cloud/baremetal/manager/BaremetalRct.java  |  250 +-
 .../baremetal/manager/BaremetalVlanManager.java    |   86 +-
 .../manager/BaremetalVlanManagerImpl.java          |  544 +--
 .../networkservice/BaremetalRctResponse.java       |  110 +-
 .../networkservice/BaremetalSwitchBackend.java     |   68 +-
 .../BaremetalVirtualRouterCommands.java            |  244 +-
 .../networkservice/BaremetalVlanStruct.java        |  184 +-
 .../Force10BaremetalSwitchBackend.java             |  332 +-
 .../apache/cloudstack/api/AddBaremetalDhcpCmd.java |    6 -
 .../apache/cloudstack/api/AddBaremetalRctCmd.java  |  166 +-
 .../cloudstack/api/DeleteBaremetalRctCmd.java      |  164 +-
 .../cloudstack/api/ListBaremetalDhcpCmd.java       |    6 -
 .../cloudstack/api/ListBaremetalPxeServersCmd.java |    5 -
 .../apache/cloudstack/api/ListBaremetalRctCmd.java |    6 -
 .../security_group_agent/cs_sg_agent.py            |  472 +--
 .../security_group_agent/xmlobject.py              |  194 +-
 .../kvm/resource/LibvirtDomainXMLParser.java       |    2 +-
 .../hypervisor/kvm/resource/LibvirtVMDef.java      |   28 +-
 .../api/AssociateUcsProfileToBladeCmd.java         |    5 -
 .../cloud/api/commands/DeleteCiscoNexusVSMCmd.java |    6 -
 .../api/commands/DisableCiscoNexusVSMCmd.java      |    6 -
 .../cloud/api/commands/EnableCiscoNexusVSMCmd.java |    6 -
 .../api/command/admin/zone/AddVmwareDcCmd.java     |    6 -
 .../zone/ImportVsphereStoragePoliciesCmd.java      |    8 +-
 .../api/command/admin/zone/ListVmwareDcsCmd.java   |    6 -
 .../admin/zone/ListVsphereStoragePoliciesCmd.java  |    8 +-
 ...ListVsphereStoragePolicyCompatiblePoolsCmd.java |    8 +-
 .../api/command/admin/zone/RemoveVmwareDcCmd.java  |    6 -
 .../api/command/admin/zone/UpdateVmwareDcCmd.java  |   10 +-
 .../cloudian/api/CloudianIsEnabledCmd.java         |   10 +-
 .../cloudian/api/CloudianSsoLoginCmd.java          |   10 +-
 .../cluster/KubernetesClusterManagerImpl.java      |    2 +-
 .../version/AddKubernetesSupportedVersionCmd.java  |    8 +-
 .../DeleteKubernetesSupportedVersionCmd.java       |    8 +-
 .../UpdateKubernetesSupportedVersionCmd.java       |    8 +-
 .../cluster/CreateKubernetesClusterCmd.java        |    8 +-
 .../cluster/DeleteKubernetesClusterCmd.java        |    8 +-
 .../cluster/GetKubernetesClusterConfigCmd.java     |    8 +-
 .../cluster/ListKubernetesClustersCmd.java         |    8 +-
 .../cluster/ScaleKubernetesClusterCmd.java         |    8 +-
 .../cluster/StartKubernetesClusterCmd.java         |    8 +-
 .../cluster/StopKubernetesClusterCmd.java          |    8 +-
 .../cluster/UpgradeKubernetesClusterCmd.java       |    8 +-
 .../ListKubernetesSupportedVersionsCmd.java        |    8 +-
 .../cloudstack/metrics/PrometheusExporterImpl.java |    7 +-
 .../cloudstack/api/ListClustersMetricsCmd.java     |    8 +-
 .../apache/cloudstack/api/ListDbMetricsCmd.java    |    8 +-
 .../apache/cloudstack/api/ListHostsMetricsCmd.java |    8 +-
 .../cloudstack/api/ListInfrastructureCmd.java      |    8 +-
 .../apache/cloudstack/api/ListMgmtsMetricsCmd.java |    8 +-
 .../cloudstack/api/ListStoragePoolsMetricsCmd.java |    8 +-
 .../cloudstack/api/ListUsageServerMetricsCmd.java  |    8 +-
 .../cloudstack/api/ListVMsMetricsCmdByAdmin.java   |    2 +-
 .../cloudstack/api/ListVMsUsageHistoryCmd.java     |   10 +-
 .../cloudstack/api/ListVolumesMetricsCmd.java      |    8 +-
 .../apache/cloudstack/api/ListZonesMetricsCmd.java |    8 +-
 .../api/commands/AddBigSwitchBcfDeviceCmd.java     |    6 -
 .../api/commands/DeleteBigSwitchBcfDeviceCmd.java  |    6 -
 .../cloud/api/commands/AddBrocadeVcsDeviceCmd.java |    6 -
 .../api/commands/DeleteBrocadeVcsDeviceCmd.java    |    6 -
 plugins/network-elements/f5/pom.xml                |   41 -
 .../api/commands/AddExternalLoadBalancerCmd.java   |  118 -
 .../cloud/api/commands/AddF5LoadBalancerCmd.java   |  143 -
 .../api/commands/ConfigureF5LoadBalancerCmd.java   |  124 -
 .../commands/DeleteExternalLoadBalancerCmd.java    |   96 -
 .../api/commands/DeleteF5LoadBalancerCmd.java      |  112 -
 .../api/commands/ListExternalLoadBalancersCmd.java |   90 -
 .../commands/ListF5LoadBalancerNetworksCmd.java    |  108 -
 .../cloud/api/commands/ListF5LoadBalancersCmd.java |  112 -
 .../cloud/api/response/F5LoadBalancerResponse.java |  109 -
 .../element/F5ExternalLoadBalancerElement.java     |  538 ---
 .../F5ExternalLoadBalancerElementService.java      |   97 -
 .../cloud/network/resource/F5BigIpResource.java    | 1176 ------
 .../cloudstack/api/AddGloboDnsHostCmd.java         |    6 -
 .../api/command/CreateServiceInstanceCmd.java      |    6 -
 plugins/network-elements/juniper-srx/pom.xml       |   37 -
 .../cloud/api/commands/AddExternalFirewallCmd.java |  116 -
 .../com/cloud/api/commands/AddSrxFirewallCmd.java  |  141 -
 .../api/commands/ConfigureSrxFirewallCmd.java      |  123 -
 .../api/commands/DeleteExternalFirewallCmd.java    |   90 -
 .../cloud/api/commands/DeleteSrxFirewallCmd.java   |  111 -
 .../api/commands/ListExternalFirewallsCmd.java     |   89 -
 .../api/commands/ListSrxFirewallNetworksCmd.java   |  107 -
 .../cloud/api/commands/ListSrxFirewallsCmd.java    |  109 -
 .../cloud/api/response/SrxFirewallResponse.java    |  159 -
 .../element/JuniperSRXExternalFirewallElement.java |  551 ---
 .../element/JuniperSRXFirewallElementService.java  |   95 -
 .../cloud/network/resource/JuniperSrxResource.java | 3795 --------------------
 .../META-INF/cloudstack/srx/spring-srx-context.xml |   35 -
 .../api/commands/AddNetscalerLoadBalancerCmd.java  |    6 -
 .../ConfigureNetscalerLoadBalancerCmd.java         |    6 -
 .../commands/DeleteNetscalerLoadBalancerCmd.java   |    6 -
 .../ListNetscalerLoadBalancerNetworksCmd.java      |    5 -
 .../RegisterNetscalerControlCenterCmd.java         |   12 +-
 .../cloud/api/commands/AddNiciraNvpDeviceCmd.java  |    6 -
 .../api/commands/DeleteNiciraNvpDeviceCmd.java     |    6 -
 .../cloud/api/commands/AddPaloAltoFirewallCmd.java |    6 -
 .../api/commands/ConfigurePaloAltoFirewallCmd.java |    6 -
 .../api/commands/DeletePaloAltoFirewallCmd.java    |    6 -
 .../commands/ListPaloAltoFirewallNetworksCmd.java  |    5 -
 plugins/pom.xml                                    |   12 +-
 plugins/storage/volume/storpool/pom.xml            |   10 +
 .../StorPoolDownloadTemplateCommandWrapper.java    |    5 +
 .../StorPoolModifyStorageCommandWrapper.java       |    4 +-
 .../kvm/storage/StorPoolStorageAdaptor.java        |   95 +-
 .../driver/StorPoolPrimaryDataStoreDriver.java     |  251 +-
 .../datastore/provider/StorPoolHostListener.java   |   39 +-
 .../storage/datastore/util/StorPoolUtil.java       |   71 +-
 .../snapshot/StorPoolVMSnapshotStrategy.java       |    2 +-
 .../driver/StorPoolPrimaryDataStoreDriverTest.java |  245 ++
 .../cloudstack/api/command/LDAPConfigCmd.java      |    6 -
 .../cloudstack/api/command/LDAPRemoveCmd.java      |    6 -
 .../api/command/LinkAccountToLdapCmd.java          |   10 +-
 .../api/command/LinkDomainToLdapCmd.java           |    6 -
 .../cloudstack/ldap/OpenLdapUserManagerImpl.java   |    6 +-
 .../api/command/LinkAccountToLdapCmdTest.java      |    3 +-
 .../api/command/AuthorizeSAMLSSOCmd.java           |    8 +-
 .../api/command/ListAndSwitchSAMLAccountCmd.java   |    8 +-
 .../apache/cloudstack/api/command/ListIdpsCmd.java |    9 +-
 pom.xml                                            |    2 +-
 scripts/vm/hypervisor/kvm/nsrkvmbackup.sh          |  260 ++
 scripts/vm/hypervisor/kvm/nsrkvmrestore.sh         |  223 ++
 .../main/java/com/cloud/api/ApiResponseHelper.java |    8 +-
 server/src/main/java/com/cloud/api/ApiServlet.java |    3 +-
 .../api/auth/DefaultLoginAPIAuthenticatorCmd.java  |    8 +-
 .../api/auth/DefaultLogoutAPIAuthenticatorCmd.java |    9 +-
 .../com/cloud/api/dispatch/ParamProcessWorker.java |   57 +-
 .../cloud/api/query/dao/DataCenterJoinDaoImpl.java |   15 +-
 .../cloud/api/query/dao/DomainRouterJoinDao.java   |    3 +
 .../api/query/dao/DomainRouterJoinDaoImpl.java     |   26 +-
 .../com/cloud/api/query/dao/UserVmJoinDaoImpl.java |    4 +
 .../com/cloud/api/query/vo/DomainRouterJoinVO.java |   23 +
 .../java/com/cloud/api/query/vo/UserVmJoinVO.java  |   18 +-
 .../configuration/ConfigurationManagerImpl.java    |   82 +-
 .../com/cloud/hypervisor/HypervisorGuruBase.java   |    1 +
 .../main/java/com/cloud/hypervisor/KVMGuru.java    |  127 +-
 .../network/ExternalFirewallDeviceManager.java     |    2 +-
 .../com/cloud/network/IpAddressManagerImpl.java    |    3 +-
 .../cloud/network/NetworkMigrationManagerImpl.java |    3 +-
 .../java/com/cloud/network/NetworkModelImpl.java   |   45 +-
 .../java/com/cloud/network/NetworkServiceImpl.java |  325 +-
 .../com/cloud/network/guru/DirectNetworkGuru.java  |    8 +
 .../com/cloud/network/guru/GuestNetworkGuru.java   |    2 +
 .../cloud/network/router/CommandSetupHelper.java   |   44 +-
 .../router/VirtualNetworkApplianceManagerImpl.java |   25 +-
 .../VpcVirtualNetworkApplianceManagerImpl.java     |    7 +-
 .../java/com/cloud/network/vpc/VpcManagerImpl.java |  229 +-
 .../com/cloud/server/ManagementServerImpl.java     |  432 +--
 .../com/cloud/storage/VolumeApiServiceImpl.java    |   17 +-
 .../com/cloud/storage/upload/UploadListener.java   |    7 +-
 .../com/cloud/tags/ResourceManagerUtilImpl.java    |   10 +-
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  |    4 +-
 .../cloud/network/CreatePrivateNetworkTest.java    |    3 +-
 .../com/cloud/network/NetworkServiceImplTest.java  |  310 +-
 .../com/cloud/network/vpc/VpcManagerImplTest.java  |  209 +-
 .../com/cloud/server/ManagementServerImplTest.java |  135 +-
 .../cloud/vpc/MockConfigurationManagerImpl.java    |    6 +
 .../java/com/cloud/vpc/MockNetworkManagerImpl.java |    2 +-
 .../resource/NfsSecondaryStorageResource.java      |    8 +-
 systemvm/debian/opt/cloud/bin/cs/CsAddress.py      |    9 +
 systemvm/debian/opt/cloud/bin/cs/CsDhcp.py         |    9 +-
 systemvm/debian/opt/cloud/bin/cs/CsHelper.py       |   10 +-
 systemvm/debian/opt/cloud/bin/cs_ip.py             |    2 +
 systemvm/debian/opt/cloud/bin/merge.py             |    1 +
 systemvm/debian/opt/cloud/bin/setup/common.sh      |   14 +
 systemvm/debian/opt/cloud/bin/update_config.py     |    2 -
 .../opt/cloud/bin/update_interface_config.sh       |   63 +
 .../component/test_acl_sharednetwork.py            |  311 +-
 test/integration/component/test_host.py            |  400 +--
 .../component/test_multi_tag_support.py            |  434 +--
 .../test_multiple_physical_network_creation.py     |  405 +++
 .../component/test_ncc_integration_dedicated.py    |  538 +--
 .../component/test_ncc_integration_shared.py       |  646 ++--
 test/integration/component/test_network_mtu.py     |  395 ++
 test/integration/component/test_tags.py            |   68 +-
 .../plugins/storpool/MigrateVolumeToStorPool.py    |    7 +
 test/integration/plugins/storpool/sp_util.py       |   31 +
 test/integration/smoke/test_host_control_state.py  |  252 ++
 test/integration/smoke/test_network.py             |   99 +-
 test/metadata/func/srxstresswithportfwd.xml        |  595 ---
 tools/docker/Dockerfile                            |    6 +-
 tools/git/git-fwd-merge                            |    7 +-
 tools/marvin/marvin/configGenerator.py             |   33 +-
 tools/marvin/marvin/lib/base.py                    |   26 +-
 ui/public/config.json                              |    2 +-
 ui/public/locales/en.json                          |   12 +
 ui/src/components/view/BulkActionProgress.vue      |    2 +-
 ui/src/components/view/BulkActionView.vue          |    2 +-
 ui/src/components/view/DetailsTab.vue              |   16 +-
 ui/src/components/view/SettingsTab.vue             |   24 +-
 ui/src/components/view/StatsTab.vue                |   41 +-
 ui/src/components/widgets/Console.vue              |    2 +-
 ui/src/config/section/compute.js                   |   10 +-
 ui/src/config/section/image.js                     |    6 +-
 ui/src/config/section/infra/ilbvms.js              |    4 +-
 ui/src/config/section/infra/routers.js             |    4 +-
 ui/src/config/section/infra/systemVms.js           |    4 +-
 ui/src/config/section/network.js                   |    6 +-
 ui/src/views/AutogenView.vue                       |   10 +
 ui/src/views/infra/network/ServiceProvidersTab.vue |   59 -
 .../infra/network/providers/AddSrxFirewall.vue     |  381 --
 .../infra/network/providers/ProviderListView.vue   |    9 -
 .../views/infra/zone/AdvancedGuestTrafficForm.vue  |    4 +-
 ui/src/views/network/CreateIsolatedNetworkForm.vue |   75 +-
 ui/src/views/network/CreateSharedNetworkForm.vue   |   73 +-
 ui/src/views/network/CreateVpc.vue                 |   48 +-
 ui/src/views/network/LoadBalancing.vue             |    2 +-
 ui/src/views/network/UpdateNetwork.vue             |   82 +-
 ui/src/views/network/VpcTiersTab.vue               |   40 +-
 ui/src/views/offering/AddComputeOffering.vue       |   26 +-
 ui/src/views/offering/AddDiskOffering.vue          |   23 +-
 ui/src/views/offering/AddNetworkOffering.vue       |    4 +-
 ui/src/views/offering/AddVpcOffering.vue           |   52 +
 ui/src/views/storage/FormSchedule.vue              |    3 +-
 ui/tests/mockData/AutogenView.mock.json            |    6 +-
 ui/tests/unit/components/view/ActionButton.spec.js |    3 +
 ui/tests/unit/views/AutogenView.spec.js            |   14 +-
 .../java/com/cloud/utils/HumanReadableJson.java    |   26 +-
 .../main/java/com/cloud/utils/net/NetUtils.java    |    6 +-
 .../com/cloud/utils/HumanReadableJsonTest.java     |   12 +-
 .../java/com/cloud/utils/net/NetUtilsTest.java     |   52 +
 .../hypervisor/vmware/util/VmwareContext.java      |   52 +-
 802 files changed, 13862 insertions(+), 17045 deletions(-)
 rename plugins/network-elements/juniper-srx/src/main/resources/META-INF/cloudstack/srx/module.properties => .pre-commit-config.yaml (51%)
 copy plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalSwitchBackend.java => api/src/main/java/com/cloud/host/ControlState.java (51%)
 mode change 100755 => 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificateCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/offering/IsAccountAllowedToCreateOfferingsWithTagsCmd.java
 copy engine/schema/src/main/java/com/cloud/host/dao/HostDetailsDao.java => api/src/main/java/org/apache/cloudstack/api/response/IsAccountAllowedToCreateOfferingsWithTagsResponse.java (58%)
 create mode 100644 api/src/test/java/com/cloud/host/ControlStateTest.java
 create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/network/CreateNetworkCmdTest.java
 create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmdTest.java
 create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmdTest.java
 create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmdTest.java
 create mode 100644 core/src/main/java/com/cloud/agent/api/routing/UpdateNetworkCommand.java
 delete mode 100644 engine/orchestration/src/test/resources/provisioningContext.xml
 create mode 100644 plugins/backup/networker/pom.xml
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/NetworkerBackupProvider.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/NetworkerBackupOffering.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/NetworkerClient.java
 copy plugins/{hypervisors/baremetal/src/main/java/com/cloud/baremetal/database/BaremetalRctDao.java => backup/networker/src/main/java/org/apache/cloudstack/backup/networker/NetworkerObject.java} (77%)
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/Action.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/ActionSpecificData.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/Attribute.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/BackupSpecificData.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/CompletionNotification.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/Expire.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/Instance.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/Link.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/NetworkerBackup.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/NetworkerBackups.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/ProtectionPolicies.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/ProtectionPolicy.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/ResourceId.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/ServerBackup.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/Size.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/SummaryNotification.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/Traditional.java
 rename plugins/{network-elements/f5/src/main/resources/META-INF/cloudstack/f5 => backup/networker/src/main/resources/META-INF/cloudstack/networker}/module.properties (96%)
 rename plugins/{network-elements/f5/src/main/resources/META-INF/cloudstack/f5/spring-f5-context.xml => backup/networker/src/main/resources/META-INF/cloudstack/networker/spring-backup-networker-context.xml} (57%)
 create mode 100644 plugins/backup/networker/src/test/java/org/apache/backup/networker/NetworkerClientTest.java
 delete mode 100644 plugins/network-elements/f5/pom.xml
 delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/api/commands/AddExternalLoadBalancerCmd.java
 delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/api/commands/AddF5LoadBalancerCmd.java
 delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/api/commands/ConfigureF5LoadBalancerCmd.java
 delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/api/commands/DeleteExternalLoadBalancerCmd.java
 delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/api/commands/DeleteF5LoadBalancerCmd.java
 delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/api/commands/ListExternalLoadBalancersCmd.java
 delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/api/commands/ListF5LoadBalancerNetworksCmd.java
 delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/api/commands/ListF5LoadBalancersCmd.java
 delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/api/response/F5LoadBalancerResponse.java
 delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/network/element/F5ExternalLoadBalancerElement.java
 delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/network/element/F5ExternalLoadBalancerElementService.java
 delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/network/resource/F5BigIpResource.java
 delete mode 100644 plugins/network-elements/juniper-srx/pom.xml
 delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/AddExternalFirewallCmd.java
 delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/AddSrxFirewallCmd.java
 delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ConfigureSrxFirewallCmd.java
 delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/DeleteExternalFirewallCmd.java
 delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/DeleteSrxFirewallCmd.java
 delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ListExternalFirewallsCmd.java
 delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ListSrxFirewallNetworksCmd.java
 delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ListSrxFirewallsCmd.java
 delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/response/SrxFirewallResponse.java
 delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
 delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/network/element/JuniperSRXFirewallElementService.java
 delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/network/resource/JuniperSrxResource.java
 delete mode 100644 plugins/network-elements/juniper-srx/src/main/resources/META-INF/cloudstack/srx/spring-srx-context.xml
 create mode 100644 plugins/storage/volume/storpool/src/test/java/org/apache/cloudstack/storage/datastore/driver/StorPoolPrimaryDataStoreDriverTest.java
 create mode 100755 scripts/vm/hypervisor/kvm/nsrkvmbackup.sh
 create mode 100755 scripts/vm/hypervisor/kvm/nsrkvmrestore.sh
 create mode 100644 systemvm/debian/opt/cloud/bin/update_interface_config.sh
 create mode 100644 test/integration/component/test_multiple_physical_network_creation.py
 create mode 100644 test/integration/component/test_network_mtu.py
 create mode 100644 test/integration/smoke/test_host_control_state.py
 delete mode 100644 test/metadata/func/srxstresswithportfwd.xml
 delete mode 100644 ui/src/views/infra/network/providers/AddSrxFirewall.vue