This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit d4635e3442eab8d482e8a61131e951a1b6219b55 Merge: 61977fa 2cdde87 Author: Rohit Yadav <[email protected]> AuthorDate: Thu Apr 1 14:35:01 2021 +0530 Merge remote-tracking branch 'origin/4.15' Signed-off-by: Rohit Yadav <[email protected]> .travis.yml | 1 + .../network/VirtualNetworkApplianceService.java | 3 + .../api/response/HostForMigrationResponse.java | 7 +- .../cloudstack/api/response/UserVmResponse.java | 2 +- .../java/com/cloud/network/IpAddressManager.java | 17 + .../java/com/cloud/vm/dao/DomainRouterDaoImpl.java | 14 +- server/src/main/java/com/cloud/api/ApiDBUtils.java | 14 + .../main/java/com/cloud/api/ApiResponseHelper.java | 39 + .../com/cloud/api/query/dao/HostJoinDaoImpl.java | 57 +- .../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 7 +- .../com/cloud/network/IpAddressManagerImpl.java | 112 +-- .../router/VirtualNetworkApplianceManagerImpl.java | 113 +-- .../com/cloud/network/rules/NicPlugInOutRules.java | 8 + .../rules/VirtualNetworkApplianceFactory.java | 7 + .../com/cloud/server/ManagementServerImpl.java | 232 +++++- .../com/cloud/template/TemplateManagerImpl.java | 2 - .../vpc/MockVpcVirtualNetworkApplianceManager.java | 9 +- systemvm/debian/etc/logrotate.conf | 12 - systemvm/debian/etc/logrotate.d/btmp | 7 + systemvm/debian/etc/logrotate.d/rsyslog | 4 +- systemvm/debian/etc/logrotate.d/wtmp | 8 + systemvm/debian/opt/cloud/bin/cs/CsAddress.py | 9 +- test/integration/component/test_public_ip.py | 870 +++++++++++++++++++++ test/integration/smoke/test_network.py | 9 +- ui/public/config.json | 4 +- ui/public/locales/en.json | 1 + ui/src/components/view/ActionButton.vue | 3 + ui/src/components/view/DetailsTab.vue | 5 + ui/src/config/router.js | 8 +- ui/src/config/section/offering.js | 4 + ui/src/main.js | 4 +- ui/src/utils/plugins.js | 18 + ui/src/views/compute/AssignInstance.vue | 17 +- .../views/infra/zone/AdvancedGuestTrafficForm.vue | 3 +- ui/src/views/infra/zone/IpAddressRangeForm.vue | 146 ++-- ui/src/views/infra/zone/StaticInputsForm.vue | 3 +- ui/src/views/infra/zone/ZoneWizard.vue | 37 +- ui/src/views/infra/zone/ZoneWizardAddResources.vue | 39 +- .../infra/zone/ZoneWizardNetworkSetupStep.vue | 36 +- .../zone/ZoneWizardPhysicalNetworkSetupStep.vue | 10 +- ui/src/views/infra/zone/ZoneWizardZoneTypeStep.vue | 15 +- ui/tests/common/index.js | 3 +- 42 files changed, 1579 insertions(+), 340 deletions(-) diff --cc api/src/main/java/com/cloud/network/VirtualNetworkApplianceService.java index 92a664f,39756ef..c47500c --- a/api/src/main/java/com/cloud/network/VirtualNetworkApplianceService.java +++ b/api/src/main/java/com/cloud/network/VirtualNetworkApplianceService.java @@@ -26,7 -26,7 +26,8 @@@ import com.cloud.exception.Insufficient import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.router.VirtualRouter; import com.cloud.user.Account; +import com.cloud.utils.Pair; + import com.cloud.vm.Nic; public interface VirtualNetworkApplianceService { /** @@@ -74,5 -74,7 +75,7 @@@ * @param routerId id of the router * @return */ - boolean performRouterHealthChecks(long routerId); + Pair<Boolean, String> performRouterHealthChecks(long routerId); + + <T extends VirtualRouter> void collectNetworkStatistics(T router, Nic nic); } diff --cc server/src/test/java/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java index e734fdf,176fd8e..fa14f81 --- a/server/src/test/java/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java +++ b/server/src/test/java/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java @@@ -39,9 -39,9 +39,10 @@@ import com.cloud.network.router.VpcVirt import com.cloud.network.vpc.PrivateGateway; import com.cloud.user.Account; import com.cloud.user.User; +import com.cloud.utils.Pair; import com.cloud.utils.component.ManagerBase; import com.cloud.vm.DomainRouterVO; + import com.cloud.vm.Nic; import com.cloud.vm.VirtualMachineProfile; @Component
