You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2021/04/01 09:36:15 UTC
[cloudstack] branch master updated (61977fa -> d4635e3)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 61977fa README: Remove IRC references and update bug reporting link (#4879)
add 03ad702 server: Set free memory to zero if greater than total memory (#4571)
add 5b986be ui: fix the style of zone wizard on mobile view (#4764)
add fd4bc61 ui: assignVM: Set isrecursive to false when fetching accounts (#4867)
add 69825f6 ui: Display root disk size in Compute offering details (#4862)
add 02abb87 server: allow copy cross-zone templates to other zone (#4804)
add 76ba5c6 server: Fix displaying public IP address of shared networks (#4675)
add 63c91c1 server: Fix network statistics for vpc (#3944)
add dc5b9ec systemvm: remove logrotate config for wtmp and btmp (#4872)
add 2513683 ui: allow docHelp override using config.json (#4745)
add d4ba004 VR: fix rsyslog compresses log files but not release disk space in VR (#4869)
add 575e18c ui: Restored the Basic Networking (#4882)
add 95cd937 server: fix hahost value in listHosts (#4789)
add 2cdde87 Merge remote-tracking branch 'origin/4.14' into 4.15
new d4635e3 Merge remote-tracking branch 'origin/4.15'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.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(-)
create mode 100644 systemvm/debian/etc/logrotate.d/btmp
create mode 100644 systemvm/debian/etc/logrotate.d/wtmp
create mode 100644 test/integration/component/test_public_ip.py
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.15'
Posted by ro...@apache.org.
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 <ro...@shapeblue.com>
AuthorDate: Thu Apr 1 14:35:01 2021 +0530
Merge remote-tracking branch 'origin/4.15'
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
.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