Skip to content

Commit 53d617d

Browse files
sinvalmendessinvalmendes
committed
Removing DAO for ConfigurationResource
1 parent e68d6d1 commit 53d617d

7 files changed

Lines changed: 55 additions & 180 deletions

File tree

‎cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ case "$1" in
104104
mvn -Dnonoss -Pdeveloper,systemvm -Djava.awt.headless=true -Dsimulator install -DskipTests
105105
;;
106106
compile-quick)
107-
mvn -Dnonoss -Pdeveloper,systemvm -Djava.awt.headless=true -Dsimulator -pl :cloudstack-framework,:cloud-server,:cloud-api,:cloud-engine-components-api,:cloud-plugin-network-globonetwork,:cloud-plugin-network-globodns,:cloud-plugin-network-globoaclapi,:cloud-plugin-user-authenticator-oauth2,:cloud-client-ui install -DskipTests
107+
mvn -Dnonoss -Pdeveloper,systemvm -Djava.awt.headless=true -Dsimulator -pl :cloud-framework-config,:cloud-server,:cloud-api,:cloud-engine-components-api,:cloud-plugin-network-globonetwork,:cloud-plugin-network-globodns,:cloud-plugin-network-globoaclapi,:cloud-plugin-user-authenticator-oauth2,:cloud-client-ui install -DskipTests
108108
;;
109109
update-js)
110110
rm -R $STATIC_TARGET/*.js.gz ; rm -R $STATIC_TARGET/loadbalancer/*.js.gz ; rm -R $STATIC_TARGET/ui/*.js.gz ; rm -R $STATIC_TARGET/ui-custom/*.js.gz ; rm -R $STATIC_TARGET/ui/widgets/*.js.gz ; cp -R ui/scripts client/target/generated-webapp/ ; rm -R $STATIC_TARGET/../plugins/globoNetworkVipPlugin/*.js.gz ; cp -R ui/plugins client/target/generated-webapp/

‎framework/config/resources/META-INF/cloudstack/system/spring-framework-config-system-context.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
</property>
3737
</bean>
3838

39+
<!--<bean id="globoResourceConfigurationDaoImpl"-->
40+
<!--class="org.apache.cloudstack.framework.config.dao.GloboResourceConfigurationDaoImpl" />-->
41+
3942
<bean id="configDepot"
4043
class="org.apache.cloudstack.framework.config.impl.ConfigDepotImpl">
4144
<property name="scopedStorages"

‎framework/config/src/org/apache/cloudstack/framework/config/GloboResourceConfigurationVO.java‎

Lines changed: 0 additions & 57 deletions
This file was deleted.

‎framework/config/src/org/apache/cloudstack/framework/config/dao/GloboResourceConfigurationDao.java‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎framework/config/src/org/apache/cloudstack/framework/config/dao/GloboResourceConfigurationDaoImpl.java‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎plugins/network-elements/globonetwork/src/com/globo/globonetwork/cloudstack/manager/GloboNetworkManager.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@
5959
import com.globo.globonetwork.cloudstack.response.GloboNetworkCacheGroupsResponse;
6060
import com.globo.globonetwork.cloudstack.response.GloboNetworkPoolOptionResponse;
6161
import org.apache.cloudstack.acl.ControlledEntity.ACLType;
62-
import org.apache.cloudstack.framework.config.dao.GloboResourceConfigurationDao;
62+
//import org.apache.cloudstack.framework.config.GloboResourceConfigurationVO;
63+
//import org.apache.cloudstack.framework.config.dao.GloboResourceConfigurationDao;
6364
import org.apache.cloudstack.context.CallContext;
6465
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
6566
import org.apache.cloudstack.framework.config.ConfigKey;
@@ -329,6 +330,9 @@ public class GloboNetworkManager implements GloboNetworkService, PluggableServic
329330
UserIpv6AddressDao _ipv6AddrDao;
330331
@Inject
331332
LoadBalancerPortMapDao _lbPortMapDao;
333+
// @Inject
334+
// GloboResourceConfigurationDao _globoResourceConfigurationDao;
335+
332336

333337
// Managers
334338
@Inject
@@ -359,8 +363,6 @@ public class GloboNetworkManager implements GloboNetworkService, PluggableServic
359363
GloboDnsElementService _globoDnsService;
360364
@Inject
361365
LoadBalancerOptionsDao _lbOptionsDao;
362-
@Inject
363-
GloboResourceConfigurationDao _globoResourceConfigurationDao;
364366

365367
@Override
366368
public boolean canEnable(Long physicalNetworkId) {
@@ -2154,8 +2156,6 @@ private boolean isDnsProviderEnabledFor(Network network) {
21542156
// if(!Boolean.valueOf(isDnsRegistered)){
21552157
// _globoDnsService.createDnsRecordForLoadBalancer(lbDomain, lbRecord, rule.getSourceIp().addr(), network.getDataCenterId());
21562158
// }
2157-
// using exception for testing purpose
2158-
// throw new RuntimeException("DNS register problem");
21592159
// }
21602160
// } else if (rule.getState() == FirewallRule.State.Revoke) {
21612161
// _globoDnsService.removeDnsRecordForLoadBalancer(lbDomain, lbRecord, rule.getSourceIp().addr(), network.getDataCenterId());

‎plugins/network-elements/globonetwork/test/com/globo/globonetwork/cloudstack/manager/GloboNetworkManagerTest.java‎

Lines changed: 46 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434

3535
import com.cloud.host.Status;
3636
import com.cloud.network.dao.IPAddressVO;
37-
import com.cloud.network.rules.FirewallRule;
3837
import com.cloud.network.rules.LoadBalancer;
3938
import com.cloud.utils.net.Ip;
4039
import com.globo.globonetwork.cloudstack.GloboNetworkIpDetailVO;
@@ -630,52 +629,52 @@ public void testGetLbDomain() {
630629
assertEquals(anotherLbDomain, "stagging.test.com");
631630
}
632631

633-
@Test
634-
public void testRegisterLoadBalancerDomainName(){
635-
GloboNetworkManager manager = new GloboNetworkManager();
636-
637-
HostDao mock = mock(HostDao.class);
638-
HostVO host = createMockHost();
639-
when(mock.findByTypeNameAndZoneId(10l, Provider.GloboNetwork.getName(), Host.Type.L2Networking)).thenReturn(host);
640-
manager._hostDao = mock;
641-
642-
643-
LoadBalancingRulesService lbServiceMock = mock(LoadBalancingRulesService.class);
644-
LoadBalancerVO lb = new LoadBalancerVO(null,null,null,0l,0,0,null, 10, 0l,0l,"");
645-
646-
when(lbServiceMock.findById(123l)).thenReturn(lb);
647-
manager._lbService = lbServiceMock;
648-
649-
mockGetNetworkApiVipIp(lb, manager, 10001l);
650-
651-
AgentManager mockAgent = mock(AgentManager.class);
652-
653-
654-
GloboNetworkPoolResponse.Pool pool1 = mockPool("pool1", "round", 8080, 123l, "TCP");
655-
GloboNetworkPoolResponse poolResponseAnswer = new GloboNetworkPoolResponse(pool1);
656-
657-
658-
when(mockAgent.easySend(eq(host.getId()), any(GetPoolLBByIdCommand.class))).thenReturn(poolResponseAnswer);
659-
manager._agentMgr = mockAgent;
660-
661-
Network networkMock = mock(NetworkVO.class);
662-
when(networkMock.getDataCenterId()).thenReturn(123L);
663-
664-
LoadBalancingRule ruleMock = mock(LoadBalancingRule.class);
665-
when(ruleMock.getState()).thenReturn(FirewallRule.State.Add);
666-
Ip ipMock = mock(Ip.class);
667-
when(ipMock.addr()).thenReturn("0.0.0.0");
668-
when(ruleMock.getSourceIp()).thenReturn(ipMock);
669-
670-
boolean revokeAnyVM = false;
671-
String lbDomain = "";
672-
String lbRecord = "";
673-
674-
GloboDnsElementService globoDnsService = mock(GloboDnsElementService.class);
675-
when(globoDnsService.validateDnsRecordForLoadBalancer(lbDomain, lbRecord, ipMock.addr(), networkMock.getDataCenterId())).thenReturn(true);
676-
manager._globoDnsService = globoDnsService;
677-
//manager.auxRegisterLoadBalancerDomainName(networkMock, ruleMock, revokeAnyVM, lbDomain, lbRecord);
678-
}
632+
// @Test
633+
// public void testRegisterLoadBalancerDomainName(){
634+
// GloboNetworkManager manager = new GloboNetworkManager();
635+
//
636+
// HostDao mock = mock(HostDao.class);
637+
// HostVO host = createMockHost();
638+
// when(mock.findByTypeNameAndZoneId(10l, Provider.GloboNetwork.getName(), Host.Type.L2Networking)).thenReturn(host);
639+
// manager._hostDao = mock;
640+
//
641+
//
642+
// LoadBalancingRulesService lbServiceMock = mock(LoadBalancingRulesService.class);
643+
// LoadBalancerVO lb = new LoadBalancerVO(null,null,null,0l,0,0,null, 10, 0l,0l,"");
644+
//
645+
// when(lbServiceMock.findById(123l)).thenReturn(lb);
646+
// manager._lbService = lbServiceMock;
647+
//
648+
// mockGetNetworkApiVipIp(lb, manager, 10001l);
649+
//
650+
// AgentManager mockAgent = mock(AgentManager.class);
651+
//
652+
//
653+
// GloboNetworkPoolResponse.Pool pool1 = mockPool("pool1", "round", 8080, 123l, "TCP");
654+
// GloboNetworkPoolResponse poolResponseAnswer = new GloboNetworkPoolResponse(pool1);
655+
//
656+
//
657+
// when(mockAgent.easySend(eq(host.getId()), any(GetPoolLBByIdCommand.class))).thenReturn(poolResponseAnswer);
658+
// manager._agentMgr = mockAgent;
659+
//
660+
// Network networkMock = mock(NetworkVO.class);
661+
// when(networkMock.getDataCenterId()).thenReturn(123L);
662+
//
663+
// LoadBalancingRule ruleMock = mock(LoadBalancingRule.class);
664+
// when(ruleMock.getState()).thenReturn(FirewallRule.State.Add);
665+
// Ip ipMock = mock(Ip.class);
666+
// when(ipMock.addr()).thenReturn("0.0.0.0");
667+
// when(ruleMock.getSourceIp()).thenReturn(ipMock);
668+
//
669+
// boolean revokeAnyVM = false;
670+
// String lbDomain = "";
671+
// String lbRecord = "";
672+
//
673+
// GloboDnsElementService globoDnsService = mock(GloboDnsElementService.class);
674+
// when(globoDnsService.validateDnsRecordForLoadBalancer(lbDomain, lbRecord, ipMock.addr(), networkMock.getDataCenterId())).thenReturn(true);
675+
// manager._globoDnsService = globoDnsService;
676+
// manager.auxRegisterLoadBalancerDomainName(networkMock, ruleMock, revokeAnyVM, lbDomain, lbRecord);
677+
// }
679678

680679
private void registerConfigKey(String key, String valueMock) {
681680
ConfigDepotImpl mock = mock(ConfigDepotImpl.class);

0 commit comments

Comments
 (0)