From 39035f47827250b3d0d9ead7710b3f991a0e28c6 Mon Sep 17 00:00:00 2001 From: Hugo Trippaers Date: Mon, 3 Nov 2014 14:30:17 +0100 Subject: [PATCH] Fix test cases now ConfigHelper is gone --- .../VirtualRoutingResource.java | 1 + .../virtualnetwork/ConfigHelperTest.java | 28 +++++++++++++------ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java index f65b8a9c009..f3edc696759 100644 --- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java +++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java @@ -330,6 +330,7 @@ public class VirtualRoutingResource { * [TODO] Still have to migrate LoadBalancerConfigCommand and BumpUpPriorityCommand * [FIXME] Have a look at SetSourceNatConfigItem */ + s_logger.debug("Transforming " + cmd.getClass().getCanonicalName() + " to ConfigItems"); final AbstractConfigItemFacade configItemFacade = AbstractConfigItemFacade.getInstance(cmd.getClass()); diff --git a/core/test/com/cloud/agent/resource/virtualnetwork/ConfigHelperTest.java b/core/test/com/cloud/agent/resource/virtualnetwork/ConfigHelperTest.java index 40075e73adb..b13c10cb1db 100644 --- a/core/test/com/cloud/agent/resource/virtualnetwork/ConfigHelperTest.java +++ b/core/test/com/cloud/agent/resource/virtualnetwork/ConfigHelperTest.java @@ -29,6 +29,10 @@ import java.util.UUID; import org.junit.Test; +import com.google.gson.FieldNamingPolicy; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + import com.cloud.agent.api.routing.DeleteIpAliasCommand; import com.cloud.agent.api.routing.DnsMasqConfigCommand; import com.cloud.agent.api.routing.IpAliasTO; @@ -41,6 +45,7 @@ import com.cloud.agent.api.to.IpAddressTO; import com.cloud.agent.api.to.LoadBalancerTO; import com.cloud.agent.api.to.NicTO; import com.cloud.agent.api.to.PortForwardingRuleTO; +import com.cloud.agent.resource.virtualnetwork.facade.AbstractConfigItemFacade; import com.cloud.agent.resource.virtualnetwork.model.DhcpConfig; import com.cloud.agent.resource.virtualnetwork.model.DhcpConfigEntry; import com.cloud.agent.resource.virtualnetwork.model.ForwardingRule; @@ -52,9 +57,6 @@ import com.cloud.agent.resource.virtualnetwork.model.IpAssociation; import com.cloud.agent.resource.virtualnetwork.model.LoadBalancerRule; import com.cloud.agent.resource.virtualnetwork.model.LoadBalancerRules; import com.cloud.network.lb.LoadBalancingRule.LbDestination; -import com.google.gson.FieldNamingPolicy; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; public class ConfigHelperTest { @@ -67,7 +69,9 @@ public class ConfigHelperTest { final LoadBalancerConfigCommand command = generateLoadBalancerConfigCommand(); - final List config = ConfigHelper.generateCommandCfg(command); + final AbstractConfigItemFacade configItemFacade = AbstractConfigItemFacade.getInstance(command.getClass()); + + final List config = configItemFacade.generateConfig(command); assertTrue(config.size() > 0); final ConfigItem fileConfig = config.get(0); @@ -96,7 +100,9 @@ public class ConfigHelperTest { final SetPortForwardingRulesVpcCommand command = generateSetPortForwardingRulesVpcCommand(); - final List config = ConfigHelper.generateCommandCfg(command); + final AbstractConfigItemFacade configItemFacade = AbstractConfigItemFacade.getInstance(command.getClass()); + + final List config = configItemFacade.generateConfig(command); assertTrue(config.size() > 0); final ConfigItem fileConfig = config.get(0); @@ -125,7 +131,9 @@ public class ConfigHelperTest { final IpAssocVpcCommand command = generateIpAssocVpcCommand(); - final List config = ConfigHelper.generateCommandCfg(command); + final AbstractConfigItemFacade configItemFacade = AbstractConfigItemFacade.getInstance(command.getClass()); + + final List config = configItemFacade.generateConfig(command); assertTrue(config.size() > 0); final ConfigItem fileConfig = config.get(0); @@ -154,7 +162,9 @@ public class ConfigHelperTest { final DnsMasqConfigCommand command = generateDnsMasqConfigCommand(); - final List config = ConfigHelper.generateCommandCfg(command); + final AbstractConfigItemFacade configItemFacade = AbstractConfigItemFacade.getInstance(command.getClass()); + + final List config = configItemFacade.generateConfig(command); assertTrue(config.size() > 0); final ConfigItem fileConfig = config.get(0); @@ -183,7 +193,9 @@ public class ConfigHelperTest { final DeleteIpAliasCommand command = generateDeleteIpAliasCommand(); - final List config = ConfigHelper.generateCommandCfg(command); + final AbstractConfigItemFacade configItemFacade = AbstractConfigItemFacade.getInstance(command.getClass()); + + final List config = configItemFacade.generateConfig(command); assertTrue(config.size() > 0); final ConfigItem fileConfig = config.get(0);