From 68b4fd910dc3b37ba5ed539a7f7fa4dbfb1679f2 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Tue, 15 Mar 2022 11:03:45 +0100 Subject: [PATCH 1/2] server: move files in server/src/main/java/org/cloud/network/router/deployment/ --- .../java/com/cloud/network/element/VirtualRouterElement.java | 4 ++-- .../com/cloud/network/element/VpcVirtualRouterElement.java | 4 ++-- .../src/main/java/com/cloud/network/router/NetworkHelper.java | 4 ++-- .../main/java/com/cloud/network/router/NetworkHelperImpl.java | 2 +- .../main/java/com/cloud/network/router/NicProfileHelper.java | 2 +- .../java/com/cloud/network/router/NicProfileHelperImpl.java | 4 ++-- .../network/router/VirtualNetworkApplianceManagerImpl.java | 2 +- .../java/com/cloud/network/router/VpcNetworkHelperImpl.java | 2 +- .../network/router/deployment/RouterDeploymentDefinition.java | 2 +- .../router/deployment/RouterDeploymentDefinitionBuilder.java | 2 +- .../router/deployment/VpcRouterDeploymentDefinition.java | 2 +- .../cloudstack/core/spring-server-core-managers-context.xml | 2 +- .../com/cloud/network/element/VirtualRouterElementTest.java | 2 +- .../router/deployment/RouterDeploymentDefinitionTest.java | 2 +- .../router/deployment/RouterDeploymentDefinitionTestBase.java | 2 +- .../router/deployment/VpcRouterDeploymentDefinitionTest.java | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) rename server/src/main/java/org/{cloud => apache/cloudstack}/network/router/deployment/RouterDeploymentDefinition.java (99%) rename server/src/main/java/org/{cloud => apache/cloudstack}/network/router/deployment/RouterDeploymentDefinitionBuilder.java (99%) rename server/src/main/java/org/{cloud => apache/cloudstack}/network/router/deployment/VpcRouterDeploymentDefinition.java (99%) rename server/src/test/java/org/{cloud => apache/cloudstack}/network/router/deployment/RouterDeploymentDefinitionTest.java (99%) rename server/src/test/java/org/{cloud => apache/cloudstack}/network/router/deployment/RouterDeploymentDefinitionTestBase.java (98%) rename server/src/test/java/org/{cloud => apache/cloudstack}/network/router/deployment/VpcRouterDeploymentDefinitionTest.java (99%) diff --git a/server/src/main/java/com/cloud/network/element/VirtualRouterElement.java b/server/src/main/java/com/cloud/network/element/VirtualRouterElement.java index d101a5e4f607..0900509aad5c 100644 --- a/server/src/main/java/com/cloud/network/element/VirtualRouterElement.java +++ b/server/src/main/java/com/cloud/network/element/VirtualRouterElement.java @@ -26,8 +26,6 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.log4j.Logger; -import org.cloud.network.router.deployment.RouterDeploymentDefinition; -import org.cloud.network.router.deployment.RouterDeploymentDefinitionBuilder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -43,6 +41,8 @@ import org.apache.cloudstack.api.command.admin.router.ListOvsElementsCmd; import org.apache.cloudstack.api.command.admin.router.ListVirtualRouterElementsCmd; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; +import org.apache.cloudstack.network.router.deployment.RouterDeploymentDefinition; +import org.apache.cloudstack.network.router.deployment.RouterDeploymentDefinitionBuilder; import org.apache.cloudstack.network.topology.NetworkTopology; import org.apache.cloudstack.network.topology.NetworkTopologyContext; diff --git a/server/src/main/java/com/cloud/network/element/VpcVirtualRouterElement.java b/server/src/main/java/com/cloud/network/element/VpcVirtualRouterElement.java index b67469647c28..d740f80bd25b 100644 --- a/server/src/main/java/com/cloud/network/element/VpcVirtualRouterElement.java +++ b/server/src/main/java/com/cloud/network/element/VpcVirtualRouterElement.java @@ -72,11 +72,11 @@ import com.cloud.vm.VirtualMachineManager; import com.cloud.vm.VirtualMachineProfile; +import org.apache.cloudstack.network.router.deployment.RouterDeploymentDefinition; +import org.apache.cloudstack.network.router.deployment.RouterDeploymentDefinitionBuilder; import org.apache.cloudstack.network.topology.NetworkTopology; import org.apache.commons.collections.CollectionUtils; import org.apache.log4j.Logger; -import org.cloud.network.router.deployment.RouterDeploymentDefinition; -import org.cloud.network.router.deployment.RouterDeploymentDefinitionBuilder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/server/src/main/java/com/cloud/network/router/NetworkHelper.java b/server/src/main/java/com/cloud/network/router/NetworkHelper.java index 04604e19d783..9e4a5571b44e 100644 --- a/server/src/main/java/com/cloud/network/router/NetworkHelper.java +++ b/server/src/main/java/com/cloud/network/router/NetworkHelper.java @@ -20,8 +20,7 @@ import java.util.List; import java.util.Map; -import org.cloud.network.router.deployment.RouterDeploymentDefinition; -import com.cloud.network.lb.LoadBalancingRule; +import org.apache.cloudstack.network.router.deployment.RouterDeploymentDefinition; import com.cloud.agent.api.to.NicTO; import com.cloud.agent.manager.Commands; @@ -34,6 +33,7 @@ import com.cloud.exception.StorageUnavailableException; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.network.Network; +import com.cloud.network.lb.LoadBalancingRule; import com.cloud.storage.VMTemplateVO; import com.cloud.user.Account; import com.cloud.user.User; diff --git a/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java b/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java index cc947bd05031..1297d9cbeff1 100644 --- a/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java +++ b/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java @@ -29,12 +29,12 @@ import org.apache.cloudstack.api.ApiConstants; import org.apache.log4j.Logger; -import org.cloud.network.router.deployment.RouterDeploymentDefinition; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; import org.apache.cloudstack.framework.config.ConfigKey; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; +import org.apache.cloudstack.network.router.deployment.RouterDeploymentDefinition; import org.apache.cloudstack.utils.CloudStackVersion; import com.cloud.agent.AgentManager; diff --git a/server/src/main/java/com/cloud/network/router/NicProfileHelper.java b/server/src/main/java/com/cloud/network/router/NicProfileHelper.java index 580d78beec1c..caa4c79c7868 100644 --- a/server/src/main/java/com/cloud/network/router/NicProfileHelper.java +++ b/server/src/main/java/com/cloud/network/router/NicProfileHelper.java @@ -16,7 +16,7 @@ // under the License. package com.cloud.network.router; -import org.cloud.network.router.deployment.RouterDeploymentDefinition; +import org.apache.cloudstack.network.router.deployment.RouterDeploymentDefinition; import com.cloud.network.Network; import com.cloud.network.vpc.VpcGateway; diff --git a/server/src/main/java/com/cloud/network/router/NicProfileHelperImpl.java b/server/src/main/java/com/cloud/network/router/NicProfileHelperImpl.java index 6b4b4a842b7c..15c8a2b41556 100644 --- a/server/src/main/java/com/cloud/network/router/NicProfileHelperImpl.java +++ b/server/src/main/java/com/cloud/network/router/NicProfileHelperImpl.java @@ -21,8 +21,7 @@ import javax.inject.Inject; -import com.cloud.utils.exception.CloudRuntimeException; -import org.cloud.network.router.deployment.RouterDeploymentDefinition; +import org.apache.cloudstack.network.router.deployment.RouterDeploymentDefinition; import com.cloud.network.IpAddressManager; import com.cloud.network.Network; @@ -35,6 +34,7 @@ import com.cloud.network.vpc.VpcManager; import com.cloud.network.vpc.dao.PrivateIpDao; import com.cloud.utils.db.DB; +import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.NetUtils; import com.cloud.vm.Nic; import com.cloud.vm.NicProfile; diff --git a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index c81f06d0ab99..2aecafd040b7 100644 --- a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -63,13 +63,13 @@ import org.apache.cloudstack.lb.ApplicationLoadBalancerRuleVO; import org.apache.cloudstack.lb.dao.ApplicationLoadBalancerRuleDao; import org.apache.cloudstack.managed.context.ManagedContextRunnable; +import org.apache.cloudstack.network.router.deployment.RouterDeploymentDefinitionBuilder; import org.apache.cloudstack.network.topology.NetworkTopology; import org.apache.cloudstack.network.topology.NetworkTopologyContext; import org.apache.cloudstack.utils.identity.ManagementServerNode; import org.apache.cloudstack.utils.usage.UsageUtils; import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; -import org.cloud.network.router.deployment.RouterDeploymentDefinitionBuilder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/server/src/main/java/com/cloud/network/router/VpcNetworkHelperImpl.java b/server/src/main/java/com/cloud/network/router/VpcNetworkHelperImpl.java index 8b89f2057445..3eb1d432a859 100644 --- a/server/src/main/java/com/cloud/network/router/VpcNetworkHelperImpl.java +++ b/server/src/main/java/com/cloud/network/router/VpcNetworkHelperImpl.java @@ -30,7 +30,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; -import org.cloud.network.router.deployment.RouterDeploymentDefinition; +import org.apache.cloudstack.network.router.deployment.RouterDeploymentDefinition; import com.cloud.dc.dao.VlanDao; import com.cloud.exception.ConcurrentOperationException; diff --git a/server/src/main/java/org/cloud/network/router/deployment/RouterDeploymentDefinition.java b/server/src/main/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinition.java similarity index 99% rename from server/src/main/java/org/cloud/network/router/deployment/RouterDeploymentDefinition.java rename to server/src/main/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinition.java index 6c344e3cb653..088310dba407 100644 --- a/server/src/main/java/org/cloud/network/router/deployment/RouterDeploymentDefinition.java +++ b/server/src/main/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinition.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.cloud.network.router.deployment; +package org.apache.cloudstack.network.router.deployment; import java.util.ArrayList; import java.util.List; diff --git a/server/src/main/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java b/server/src/main/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionBuilder.java similarity index 99% rename from server/src/main/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java rename to server/src/main/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionBuilder.java index 3765537a1481..7e45b598c3bb 100644 --- a/server/src/main/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java +++ b/server/src/main/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionBuilder.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.cloud.network.router.deployment; +package org.apache.cloudstack.network.router.deployment; import java.util.ArrayList; import java.util.List; diff --git a/server/src/main/java/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java b/server/src/main/java/org/apache/cloudstack/network/router/deployment/VpcRouterDeploymentDefinition.java similarity index 99% rename from server/src/main/java/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java rename to server/src/main/java/org/apache/cloudstack/network/router/deployment/VpcRouterDeploymentDefinition.java index 91efecee9f53..23da0dddedb4 100644 --- a/server/src/main/java/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java +++ b/server/src/main/java/org/apache/cloudstack/network/router/deployment/VpcRouterDeploymentDefinition.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.cloud.network.router.deployment; +package org.apache.cloudstack.network.router.deployment; import java.util.ArrayList; import java.util.List; diff --git a/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml b/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml index 30248d73a364..7d17ec7de770 100644 --- a/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml +++ b/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml @@ -238,7 +238,7 @@ class="com.cloud.network.router.NicProfileHelperImpl" /> + class="org.apache.cloudstack.network.router.deployment.RouterDeploymentDefinitionBuilder" /> diff --git a/server/src/test/java/com/cloud/network/element/VirtualRouterElementTest.java b/server/src/test/java/com/cloud/network/element/VirtualRouterElementTest.java index 66898942d76f..47b11a0d0efb 100644 --- a/server/src/test/java/com/cloud/network/element/VirtualRouterElementTest.java +++ b/server/src/test/java/com/cloud/network/element/VirtualRouterElementTest.java @@ -30,7 +30,7 @@ import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import org.cloud.network.router.deployment.RouterDeploymentDefinitionBuilder; +import org.apache.cloudstack.network.router.deployment.RouterDeploymentDefinitionBuilder; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/server/src/test/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionTest.java b/server/src/test/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionTest.java similarity index 99% rename from server/src/test/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionTest.java rename to server/src/test/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionTest.java index 6fa1759884d9..bed558caa19b 100644 --- a/server/src/test/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionTest.java +++ b/server/src/test/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionTest.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.cloud.network.router.deployment; +package org.apache.cloudstack.network.router.deployment; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; diff --git a/server/src/test/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionTestBase.java b/server/src/test/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionTestBase.java similarity index 98% rename from server/src/test/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionTestBase.java rename to server/src/test/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionTestBase.java index 04778b9a7031..1b64a2c48407 100644 --- a/server/src/test/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionTestBase.java +++ b/server/src/test/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionTestBase.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.cloud.network.router.deployment; +package org.apache.cloudstack.network.router.deployment; import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.when; diff --git a/server/src/test/java/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java b/server/src/test/java/org/apache/cloudstack/network/router/deployment/VpcRouterDeploymentDefinitionTest.java similarity index 99% rename from server/src/test/java/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java rename to server/src/test/java/org/apache/cloudstack/network/router/deployment/VpcRouterDeploymentDefinitionTest.java index 68e147bf61b0..bbddc6e66ccc 100644 --- a/server/src/test/java/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java +++ b/server/src/test/java/org/apache/cloudstack/network/router/deployment/VpcRouterDeploymentDefinitionTest.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.cloud.network.router.deployment; +package org.apache.cloudstack.network.router.deployment; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; From 253def64f709288512a316792ffc53ac3bc61b66 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Tue, 15 Mar 2022 10:56:55 +0100 Subject: [PATCH 2/2] server: fix NPE when router.service.offering is set due to service/disk offering refactoring --- .../router/deployment/RouterDeploymentDefinitionBuilder.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/src/main/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionBuilder.java b/server/src/main/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionBuilder.java index 7e45b598c3bb..aab097115b95 100644 --- a/server/src/main/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionBuilder.java +++ b/server/src/main/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionBuilder.java @@ -47,6 +47,7 @@ import com.cloud.network.vpc.dao.VpcOfferingDao; import com.cloud.offerings.dao.NetworkOfferingDao; import com.cloud.service.dao.ServiceOfferingDao; +import com.cloud.storage.dao.DiskOfferingDao; import com.cloud.user.Account; import com.cloud.user.AccountManager; import com.cloud.vm.DomainRouterVO; @@ -72,6 +73,8 @@ public class RouterDeploymentDefinitionBuilder { @Inject private ServiceOfferingDao serviceOfferingDao; @Inject + private DiskOfferingDao diskOfferingDao; + @Inject private IpAddressManager ipAddrMgr; @Inject private VMInstanceDao vmDao; @@ -127,6 +130,7 @@ protected RouterDeploymentDefinition injectDependencies( routerDeploymentDefinition.vrProviderDao = vrProviderDao; routerDeploymentDefinition.networkOfferingDao = networkOfferingDao; routerDeploymentDefinition.serviceOfferingDao = serviceOfferingDao; + routerDeploymentDefinition.diskOfferingDao = diskOfferingDao; routerDeploymentDefinition.ipAddrMgr = ipAddrMgr; routerDeploymentDefinition.vmDao = vmDao; routerDeploymentDefinition.podDao = podDao;