apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

server: fix NPE when router.service.offering is set due to service/disk offering refactoring (#6120)

Browse Source 
* server: move files in server/src/main/java/org/cloud/network/router/deployment/

* server: fix NPE when router.service.offering is set due to service/disk offering refactoring
This commit is contained in:
Wei Zhou 2022-03-21 03:40:30 +01:00 committed by GitHub
parent 7350067d43
commit 88d77c86a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/main/java/com/cloud/network/element/VirtualRouterElement.java
View File

@ -26,8 +26,6 @@ import javax.inject.Inject;
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.CreateVirtualRouterElement
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;

4
server/src/main/java/com/cloud/network/element/VpcVirtualRouterElement.java
View File

@ -72,11 +72,11 @@ import com.cloud.vm.VirtualMachine;
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;

4
server/src/main/java/com/cloud/network/router/NetworkHelper.java
View File

@ -20,8 +20,7 @@ import java.util.LinkedHashMap;
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.ResourceUnavailableException;
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;

2
server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java
View File

@ -29,12 +29,12 @@ import javax.inject.Inject;
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;

2
server/src/main/java/com/cloud/network/router/NicProfileHelper.java
View File

@ -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;

4
server/src/main/java/com/cloud/network/router/NicProfileHelperImpl.java
View File

@ -21,8 +21,7 @@ import java.net.URI;
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.VpcGateway;
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;

2
server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
View File

@ -63,13 +63,13 @@ import org.apache.cloudstack.framework.jobs.impl.AsyncJobVO;
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;

2
server/src/main/java/com/cloud/network/router/VpcNetworkHelperImpl.java
View File

@ -30,7 +30,7 @@ import javax.inject.Inject;
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;

2
server/src/main/java/org/cloud/network/router/deployment/RouterDeploymentDefinition.java → server/src/main/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinition.java
View File

@ -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;

6
server/src/main/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java → server/src/main/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionBuilder.java
View File

@ -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;
@ -47,6 +47,7 @@ import com.cloud.network.vpc.dao.VpcDao;
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 @@ public class RouterDeploymentDefinitionBuilder {
routerDeploymentDefinition.vrProviderDao = vrProviderDao;
routerDeploymentDefinition.networkOfferingDao = networkOfferingDao;
routerDeploymentDefinition.serviceOfferingDao = serviceOfferingDao;
routerDeploymentDefinition.diskOfferingDao = diskOfferingDao;
routerDeploymentDefinition.ipAddrMgr = ipAddrMgr;
routerDeploymentDefinition.vmDao = vmDao;
routerDeploymentDefinition.podDao = podDao;

2
server/src/main/java/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java → server/src/main/java/org/apache/cloudstack/network/router/deployment/VpcRouterDeploymentDefinition.java
View File

@ -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;

2
server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
View File

@ -238,7 +238,7 @@
class="com.cloud.network.router.NicProfileHelperImpl" />
<bean id="routerDeploymentDefinitionBuilder"
class="org.cloud.network.router.deployment.RouterDeploymentDefinitionBuilder" />
class="org.apache.cloudstack.network.router.deployment.RouterDeploymentDefinitionBuilder" />
<bean id="ApiAsyncJobDispatcher" class="com.cloud.api.ApiAsyncJobDispatcher">
<property name="name" value="ApiAsyncJobDispatcher" />

2
server/src/test/java/com/cloud/network/element/VirtualRouterElementTest.java
View File

@ -30,7 +30,7 @@ import java.util.List;
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;

2
server/src/test/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionTest.java → server/src/test/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionTest.java
View File

@ -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;

2
server/src/test/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionTestBase.java → server/src/test/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionTestBase.java
View File

@ -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;

2
server/src/test/java/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java → server/src/test/java/org/apache/cloudstack/network/router/deployment/VpcRouterDeploymentDefinitionTest.java
View File

@ -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;