import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.osgi.framework.ServiceReference;
-import org.powermock.api.mockito.PowerMockito;
import org.powermock.api.support.membermodification.MemberModifier;
import org.powermock.modules.junit4.PowerMockRunner;
/**
* Unit test for {@link AbstractServiceInstance}
*/
-//@PrepareForTest(ServiceHelper.class)
@RunWith(PowerMockRunner.class)
@SuppressWarnings("unchecked")
public class AbstractServiceInstanceTest {
verify(abstractServiceInstance, times(1)).writeFlow(any(FlowBuilder.class), any(NodeBuilder.class));
}
-// @Test TODO - re-activate test
+ @Test
public void testSetDependencies() throws Exception {
PipelineOrchestrator pipelineOrchestrator = mock(PipelineOrchestrator.class);
Southbound southbound = mock(Southbound.class);
- PowerMockito.mockStatic(ServiceHelper.class);
- PowerMockito.when(ServiceHelper.getGlobalInstance(PipelineOrchestrator.class, abstractServiceInstance)).thenReturn(pipelineOrchestrator);
- PowerMockito.when(ServiceHelper.getGlobalInstance(Southbound.class, abstractServiceInstance)).thenReturn(southbound);
+ ServiceHelper.overrideGlobalInstance(PipelineOrchestrator.class, pipelineOrchestrator);
+ ServiceHelper.overrideGlobalInstance(Southbound.class, southbound);
abstractServiceInstance.setDependencies(mock(ServiceReference.class), mock(AbstractServiceInstance.class));
- assertEquals("Error, did not return the correct object", getField("pipelineOrchestrator"), pipelineOrchestrator);
+ assertEquals("Error, did not return the correct object", getField("orchestrator"), pipelineOrchestrator);
assertEquals("Error, did not return the correct object", getField("southbound"), southbound);
}
/*
- * Copyright (c) 2015 Inocybe Technologies. All rights reserved.
+ * Copyright (c) 2015, 2016 Inocybe Technologies. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
SecurityServicesManager securityServicesManager = mock(SecurityServicesManager.class);
Southbound southbound = mock(Southbound.class);
- PowerMockito.mockStatic(ServiceHelper.class);
- PowerMockito.when(ServiceHelper.getGlobalInstance(ConfigurationService.class, of13Provider)).thenReturn(configurationService);
- PowerMockito.when(ServiceHelper.getGlobalInstance(TenantNetworkManager.class, of13Provider)).thenReturn(tenantNetworkManager);
- PowerMockito.when(ServiceHelper.getGlobalInstance(BridgeConfigurationManager.class, of13Provider)).thenReturn(bridgeConfigurationManager);
- PowerMockito.when(ServiceHelper.getGlobalInstance(NodeCacheManager.class, of13Provider)).thenReturn(nodeCacheManager);
- PowerMockito.when(ServiceHelper.getGlobalInstance(ClassifierProvider.class, of13Provider)).thenReturn(classifierProvider);
- PowerMockito.when(ServiceHelper.getGlobalInstance(IngressAclProvider.class, of13Provider)).thenReturn(ingressAclProvider);
- PowerMockito.when(ServiceHelper.getGlobalInstance(EgressAclProvider.class, of13Provider)).thenReturn(egressAclProvider);
- PowerMockito.when(ServiceHelper.getGlobalInstance(L2ForwardingProvider.class, of13Provider)).thenReturn(l2ForwardingProvider);
- PowerMockito.when(ServiceHelper.getGlobalInstance(SecurityServicesManager.class, of13Provider)).thenReturn(securityServicesManager);
- PowerMockito.when(ServiceHelper.getGlobalInstance(Southbound.class, of13Provider)).thenReturn(southbound);
+ ServiceHelper.overrideGlobalInstance(ConfigurationService.class, configurationService);
+ ServiceHelper.overrideGlobalInstance(TenantNetworkManager.class, tenantNetworkManager);
+ ServiceHelper.overrideGlobalInstance(BridgeConfigurationManager.class, bridgeConfigurationManager);
+ ServiceHelper.overrideGlobalInstance(NodeCacheManager.class, nodeCacheManager);
+ ServiceHelper.overrideGlobalInstance(ClassifierProvider.class, classifierProvider);
+ ServiceHelper.overrideGlobalInstance(IngressAclProvider.class, ingressAclProvider);
+ ServiceHelper.overrideGlobalInstance(EgressAclProvider.class, egressAclProvider);
+ ServiceHelper.overrideGlobalInstance(L2ForwardingProvider.class, l2ForwardingProvider);
+ ServiceHelper.overrideGlobalInstance(SecurityServicesManager.class, securityServicesManager);
+ ServiceHelper.overrideGlobalInstance(Southbound.class, southbound);
of13Provider.setDependencies(mock(BundleContext.class), mock(ServiceReference.class));
/*
- * Copyright (c) 2015 Inocybe Technologies. All rights reserved.
+ * Copyright (c) 2015, 2016 Inocybe Technologies. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
import org.opendaylight.ovsdb.openstack.netvirt.api.NodeCacheManager;
import org.opendaylight.ovsdb.openstack.netvirt.api.Southbound;
import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
/**
* Unit test for {@link PipelineOrchestratorImplTest}
*/
-@PrepareForTest(ServiceHelper.class)
-@RunWith(PowerMockRunner.class)
+@RunWith(MockitoJUnitRunner.class)
public class PipelineOrchestratorImplTest {
@InjectMocks private PipelineOrchestratorImpl orchestrator;
NodeCacheManager nodeCacheManager = mock(NodeCacheManager.class);
Southbound southbound = mock(Southbound.class);
- PowerMockito.mockStatic(ServiceHelper.class);
- PowerMockito.when(ServiceHelper.getGlobalInstance(NodeCacheManager.class, orchestrator)).thenReturn(nodeCacheManager);
- PowerMockito.when(ServiceHelper.getGlobalInstance(Southbound.class, orchestrator)).thenReturn(southbound);
+ ServiceHelper.overrideGlobalInstance(NodeCacheManager.class, nodeCacheManager);
+ ServiceHelper.overrideGlobalInstance(Southbound.class, southbound);
orchestrator.setDependencies(mock(BundleContext.class), mock(ServiceReference.class));
<?xml version="1.0" encoding="UTF-8"?>
<!-- vi: set et smarttab sw=4 tabstop=4: -->
<!--
-Copyright © 2015 Red Hat, Inc. and others. All rights reserved.
+Copyright © 2015, 2016 Red Hat, Inc. and others. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v1.0 which accompanies this distribution,
<properties>
<openflowplugin.version>0.3.0-SNAPSHOT</openflowplugin.version>
- <powermock.version>1.6.4</powermock.version>
<sfc.version>0.3.0-SNAPSHOT</sfc.version>
<sonar.jacoco.itReportPath>../it/target/jacoco-it.exec</sonar.jacoco.itReportPath>
</properties>
<version>1.10.19</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-core</artifactId>
- <version>${powermock.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>${powermock.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- <version>${powermock.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
</properties>
</configuration>
</plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>default-instrument</id>
- <goals>
- <goal>instrument</goal>
- </goals>
- </execution>
- <execution>
- <id>default-restore-instrumented-classes</id>
- <goals>
- <goal>restore-instrumented-classes</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
/*
- * Copyright © 2015 Red Hat, Inc. and others. All rights reserved.
+ * Copyright © 2015, 2016 Red Hat, Inc. and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netvirt.sfc.rev141210;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import java.util.Dictionary;
+
+import javax.management.ObjectName;
+
import org.junit.Test;
-import org.junit.runner.RunWith;
import org.opendaylight.controller.config.api.DependencyResolver;
import org.opendaylight.controller.config.api.JmxAttribute;
import org.opendaylight.controller.config.api.ModuleIdentifier;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
+import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
import org.opendaylight.ovsdb.openstack.netvirt.api.Southbound;
import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.AbstractServiceInstance;
import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.PipelineOrchestrator;
import org.opendaylight.ovsdb.openstack.netvirt.sfc.NetvirtSfcProvider;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
-
-import javax.management.ObjectName;
import org.opendaylight.ovsdb.openstack.netvirt.sfc.standalone.openflow13.services.SfcClassifierService;
import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-@PrepareForTest(ServiceHelper.class)
-@RunWith(PowerMockRunner.class)
public class NetvirtSfcModuleTest {
@Test
public void testCustomValidation() {
NetvirtSfcModule module = new NetvirtSfcModule(mock(ModuleIdentifier.class), dependencyResolver);
// getInstance calls resolveInstance to get the broker dependency and then calls createInstance
BundleContext bundleContext = mock(BundleContext.class);
- PowerMockito.mockStatic(ServiceHelper.class);
PipelineOrchestrator pipelineOrchestrator = mock(PipelineOrchestrator.class);
- PowerMockito.when(ServiceHelper.getGlobalInstance(eq(PipelineOrchestrator.class), any(AbstractServiceInstance.class)))
- .thenReturn(pipelineOrchestrator);
- PowerMockito.when(ServiceHelper.getGlobalInstance(eq(Southbound.class), any(AbstractServiceInstance.class)))
- .thenReturn(mock(Southbound.class));
+ ServiceHelper.overrideGlobalInstance(PipelineOrchestrator.class, pipelineOrchestrator);
+ ServiceHelper.overrideGlobalInstance(Southbound.class, mock(Southbound.class));
doNothing().when(pipelineOrchestrator).registerService(any(ServiceReference.class),
any(AbstractServiceInstance.class));
/*
- * Copyright (c) 2015 Inocybe and others. All rights reserved.
+ * Copyright (c) 2015, 2016 Inocybe and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mockito;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.opendaylight.ovsdb.openstack.netvirt.api.EventDispatcher;
import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronFirewall;
import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronFirewallPolicy;
import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronFirewallRule;
-import org.opendaylight.ovsdb.openstack.netvirt.api.EventDispatcher;
import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper;
import org.osgi.framework.ServiceReference;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
/**
* Unit test for {@link FWaasHandler}
*/
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(ServiceHelper.class)
+@RunWith(MockitoJUnitRunner.class)
public class FWaasHandlerTest {
@InjectMocks FWaasHandler fwaasHandler;
public void testSetDependencies() {
EventDispatcher eventDispatcher = mock(EventDispatcher.class);
- PowerMockito.mockStatic(ServiceHelper.class);
- PowerMockito.when(ServiceHelper.getGlobalInstance(EventDispatcher.class, fwaasHandler)).thenReturn(eventDispatcher);
+ ServiceHelper.overrideGlobalInstance(EventDispatcher.class, eventDispatcher);
fwaasHandler.setDependencies(mock(ServiceReference.class));
/*
- * Copyright (c) 2015 Inocybe and others. All rights reserved.
+ * Copyright (c) 2015, 2016 Inocybe and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronFloatingIP;
import org.opendaylight.ovsdb.openstack.netvirt.api.Action;
import org.opendaylight.ovsdb.openstack.netvirt.api.EventDispatcher;
import org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter;
import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper;
import org.osgi.framework.ServiceReference;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
/**
* Unit test for {@link FloatingIPHandler}
*/
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(ServiceHelper.class)
+@RunWith(MockitoJUnitRunner.class)
public class FloatingIPHandlerTest {
@InjectMocks FloatingIPHandler floatingHandler;
EventDispatcher eventDispatcher = mock(EventDispatcher.class);
NeutronL3Adapter neutronL3Adapter = mock(NeutronL3Adapter.class);
- PowerMockito.mockStatic(ServiceHelper.class);
- PowerMockito.when(ServiceHelper.getGlobalInstance(EventDispatcher.class, floatingHandler)).thenReturn(eventDispatcher);
- PowerMockito.when(ServiceHelper.getGlobalInstance(NeutronL3Adapter.class, floatingHandler)).thenReturn(neutronL3Adapter);
+ ServiceHelper.overrideGlobalInstance(EventDispatcher.class, eventDispatcher);
+ ServiceHelper.overrideGlobalInstance(NeutronL3Adapter.class, neutronL3Adapter);
floatingHandler.setDependencies(mock(ServiceReference.class));
- assertEquals("Error, did not return the correct object", floatingHandler.eventDispatcher, eventDispatcher);
- assertEquals("Error, did not return the correct object", getNeutronL3Adapter(), neutronL3Adapter);
+ assertEquals("Error, did not return the correct object", eventDispatcher, floatingHandler.eventDispatcher);
+ assertEquals("Error, did not return the correct object", neutronL3Adapter, getNeutronL3Adapter());
}
private NeutronL3Adapter getNeutronL3Adapter() throws Exception {
/*
- * Copyright (c) 2015 Inocybe and others. All rights reserved.
+ * Copyright (c) 2015, 2016 Inocybe and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.same;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import java.lang.reflect.Field;
import java.net.HttpURLConnection;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.opendaylight.ovsdb.openstack.netvirt.api.Action;
+import org.opendaylight.ovsdb.openstack.netvirt.api.EventDispatcher;
+import org.opendaylight.ovsdb.openstack.netvirt.api.LoadBalancerConfiguration;
+import org.opendaylight.ovsdb.openstack.netvirt.api.LoadBalancerConfiguration.LoadBalancerPoolMember;
+import org.opendaylight.ovsdb.openstack.netvirt.api.LoadBalancerProvider;
+import org.opendaylight.ovsdb.openstack.netvirt.api.NodeCacheManager;
import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronLoadBalancer;
import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronLoadBalancerPool;
import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronLoadBalancerPoolMember;
+import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronNetwork;
+import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronPort;
+import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronSubnet;
+import org.opendaylight.ovsdb.openstack.netvirt.translator.Neutron_IPs;
import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronLoadBalancerCRUD;
import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronLoadBalancerPoolCRUD;
import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronNetworkCRUD;
import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronPortCRUD;
import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronSubnetCRUD;
-import org.opendaylight.ovsdb.openstack.netvirt.api.Action;
-import org.opendaylight.ovsdb.openstack.netvirt.api.EventDispatcher;
-import org.opendaylight.ovsdb.openstack.netvirt.api.LoadBalancerConfiguration;
-import org.opendaylight.ovsdb.openstack.netvirt.api.LoadBalancerConfiguration.LoadBalancerPoolMember;
-import org.opendaylight.ovsdb.openstack.netvirt.api.LoadBalancerProvider;
-import org.opendaylight.ovsdb.openstack.netvirt.api.NodeCacheManager;
import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
-
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology
+ .Node;
import org.osgi.framework.ServiceReference;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
/**
* Unit test for {@link LBaaSHandler}
*/
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({NeutronCacheUtils.class, ServiceHelper.class})
+@RunWith(MockitoJUnitRunner.class)
public class LBaaSHandlerTest {
@InjectMocks private LBaaSHandler lbaasHandler;
@Mock private LoadBalancerProvider loadBalancerProvider;
@Mock private NodeCacheManager nodeCacheManager;
@Mock private NeutronLoadBalancer neutronLB;
+ @Mock private INeutronSubnetCRUD neutronSubnetCache;
+ @Mock private INeutronNetworkCRUD neutronNetworkCache;
+ @Mock private INeutronPortCRUD neutronPortCache;
@Before
public void setUp(){
when(providerInfo.getKey()).thenReturn("key");
when(providerInfo.getValue()).thenReturn("value");
- PowerMockito.mockStatic(NeutronCacheUtils.class);
- when(NeutronCacheUtils.getProviderInformation(any(INeutronNetworkCRUD.class), any(INeutronSubnetCRUD.class), anyString())).thenReturn(providerInfo);
- when(NeutronCacheUtils.getMacAddress(any(INeutronPortCRUD.class), anyString(), anyString())).thenReturn("mac_address");
+ lbaasHandler.setDependencies(neutronPortCache);
+ final NeutronPort neutronPort = new NeutronPort();
+ final Neutron_IPs neutronIP1 = new Neutron_IPs();
+ neutronIP1.setSubnetUUID("pool_member_subnetID");
+ neutronIP1.setIpAddress("pool_member_address");
+ final Neutron_IPs neutronIP2 = new Neutron_IPs();
+ neutronIP2.setSubnetUUID("subnetID");
+ neutronIP2.setIpAddress("vip_address");
+ final Neutron_IPs neutronIP3 = new Neutron_IPs();
+ neutronIP3.setSubnetUUID("subnetID");
+ neutronIP3.setIpAddress("pool_member_address");
+ final List<Neutron_IPs> neutronIPs = new ArrayList<>();
+ neutronIPs.add(neutronIP1);
+ neutronIPs.add(neutronIP2);
+ neutronIPs.add(neutronIP3);
+ neutronPort.setFixedIPs(neutronIPs);
+ neutronPort.setMacAddress("mac_address");
+ when(neutronPortCache.getAllPorts()).thenReturn(Collections.singletonList(neutronPort));
+
+ lbaasHandler.setDependencies(neutronSubnetCache);
+ final NeutronSubnet neutronSubnet1 = new NeutronSubnet();
+ neutronSubnet1.setID("pool_member_subnetID");
+ neutronSubnet1.setNetworkUUID("pool_member_networkUUID");
+ final NeutronSubnet neutronSubnet2 = new NeutronSubnet();
+ neutronSubnet2.setID("subnetID");
+ neutronSubnet2.setNetworkUUID("pool_member_networkUUID");
+ List<NeutronSubnet> neutronSubnets = new ArrayList<>();
+ neutronSubnets.add(neutronSubnet1);
+ neutronSubnets.add(neutronSubnet2);
+ when(neutronSubnetCache.getAllSubnets()).thenReturn(neutronSubnets);
+
+ lbaasHandler.setDependencies(neutronNetworkCache);
+ final NeutronNetwork neutronNetwork = new NeutronNetwork();
+ neutronNetwork.setNetworkUUID("pool_member_networkUUID");
+ neutronNetwork.setProviderNetworkType("key");
+ neutronNetwork.setProviderSegmentationID("value");
+ when(neutronNetworkCache.getAllNetworks()).thenReturn(Collections.singletonList(neutronNetwork));
when(neutronLBPoolMember.getPoolMemberAdminStateIsUp()).thenReturn(true);
when(neutronLBPoolMember.getPoolMemberSubnetID()).thenReturn("subnetID");
@Test
public void testCanCreateNeutronLoadBalancer(){
- assertEquals("Error, canCreateNeutronLoadBalancer() did not return the correct value ", HttpURLConnection.HTTP_OK, lbaasHandler.canCreateNeutronLoadBalancer(any(NeutronLoadBalancer.class)));
+ assertEquals("Error, canCreateNeutronLoadBalancer() did not return the correct value ", HttpURLConnection.HTTP_OK, lbaasHandler.canCreateNeutronLoadBalancer(null));
}
@Test
public void testCanUpdateNeutronLoadBalancer(){
- assertEquals("Error, canUpdateNeutronLoadBalancer() did not return the correct value ", HttpURLConnection.HTTP_OK, lbaasHandler.canUpdateNeutronLoadBalancer(any(NeutronLoadBalancer.class), any(NeutronLoadBalancer.class)));
+ assertEquals("Error, canUpdateNeutronLoadBalancer() did not return the correct value ", HttpURLConnection.HTTP_OK, lbaasHandler.canUpdateNeutronLoadBalancer(null, null));
}
@Test
public void testCanDeleteNeutronLoadBalancer(){
- assertEquals("Error, canDeleteNeutronLoadBalancer() did not return the correct value ", HttpURLConnection.HTTP_OK, lbaasHandler.canDeleteNeutronLoadBalancer(any(NeutronLoadBalancer.class)));
+ assertEquals("Error, canDeleteNeutronLoadBalancer() did not return the correct value ", HttpURLConnection.HTTP_OK, lbaasHandler.canDeleteNeutronLoadBalancer(null));
}
/**
LoadBalancerProvider loadBalancerProvider = mock(LoadBalancerProvider.class);
NodeCacheManager nodeCacheManager = mock(NodeCacheManager.class);
- PowerMockito.mockStatic(ServiceHelper.class);
- PowerMockito.when(ServiceHelper.getGlobalInstance(EventDispatcher.class, lbaasHandler)).thenReturn(eventDispatcher);
- PowerMockito.when(ServiceHelper.getGlobalInstance(LoadBalancerProvider.class, lbaasHandler)).thenReturn(loadBalancerProvider);
- PowerMockito.when(ServiceHelper.getGlobalInstance(NodeCacheManager.class, lbaasHandler)).thenReturn(nodeCacheManager);
+ ServiceHelper.overrideGlobalInstance(EventDispatcher.class, eventDispatcher);
+ ServiceHelper.overrideGlobalInstance(LoadBalancerProvider.class, loadBalancerProvider);
+ ServiceHelper.overrideGlobalInstance(NodeCacheManager.class, nodeCacheManager);
lbaasHandler.setDependencies(mock(ServiceReference.class));
/*
- * Copyright (c) 2015 Inocybe and others. All rights reserved.
+ * Copyright (c) 2015, 2016 Inocybe and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
package org.opendaylight.ovsdb.openstack.netvirt;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import java.lang.reflect.Field;
import java.net.HttpURLConnection;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
import org.junit.Before;
import org.junit.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.opendaylight.ovsdb.openstack.netvirt.api.Action;
+import org.opendaylight.ovsdb.openstack.netvirt.api.EventDispatcher;
+import org.opendaylight.ovsdb.openstack.netvirt.api.LoadBalancerConfiguration;
+import org.opendaylight.ovsdb.openstack.netvirt.api.LoadBalancerConfiguration.LoadBalancerPoolMember;
+import org.opendaylight.ovsdb.openstack.netvirt.api.LoadBalancerProvider;
+import org.opendaylight.ovsdb.openstack.netvirt.api.NodeCacheManager;
import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronLoadBalancer;
import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronLoadBalancerPool;
import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronLoadBalancerPoolMember;
+import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronNetwork;
+import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronPort;
+import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronSubnet;
+import org.opendaylight.ovsdb.openstack.netvirt.translator.Neutron_IPs;
import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronLoadBalancerCRUD;
import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronLoadBalancerPoolCRUD;
import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronNetworkCRUD;
import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronPortCRUD;
import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronSubnetCRUD;
-import org.opendaylight.ovsdb.openstack.netvirt.api.Action;
-import org.opendaylight.ovsdb.openstack.netvirt.api.EventDispatcher;
-import org.opendaylight.ovsdb.openstack.netvirt.api.LoadBalancerConfiguration;
-import org.opendaylight.ovsdb.openstack.netvirt.api.LoadBalancerConfiguration.LoadBalancerPoolMember;
-import org.opendaylight.ovsdb.openstack.netvirt.api.LoadBalancerProvider;
-import org.opendaylight.ovsdb.openstack.netvirt.api.NodeCacheManager;
import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
-
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology
+ .Node;
import org.osgi.framework.ServiceReference;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
/**
* Unit test for {@link LBaaSPoolMemberHandler}
*/
-@PrepareForTest({NeutronCacheUtils.class, ServiceHelper.class})
-@RunWith(PowerMockRunner.class)
+@RunWith(MockitoJUnitRunner.class)
public class LBaaSPoolHandlerTest {
@InjectMocks LBaaSPoolHandler lBaaSPoolHandler;
@Mock private NodeCacheManager nodeCacheManager;
@Mock private NeutronLoadBalancerPool neutronLBPool;
+ @Mock private INeutronSubnetCRUD neutronSubnetCache;
+ @Mock private INeutronNetworkCRUD neutronNetworkCache;
+ @Mock private INeutronPortCRUD neutronPortCache;
@Before
public void setUp() {
when(neutronLBPool.getLoadBalancerPoolProtocol()).thenReturn(LoadBalancerConfiguration.PROTOCOL_HTTP);
+ lBaaSPoolHandler.setDependencies(neutronPortCache);
+ final NeutronPort neutronPort = new NeutronPort();
+ final Neutron_IPs neutronIP1 = new Neutron_IPs();
+ neutronIP1.setSubnetUUID("pool_member_subnetID");
+ neutronIP1.setIpAddress("pool_member_address");
+ final Neutron_IPs neutronIP2 = new Neutron_IPs();
+ neutronIP2.setSubnetUUID("subnetID");
+ neutronIP2.setIpAddress("vip_address");
+ final Neutron_IPs neutronIP3 = new Neutron_IPs();
+ neutronIP3.setSubnetUUID("subnetID");
+ neutronIP3.setIpAddress("pool_member_address");
+ final List<Neutron_IPs> neutronIPs = new ArrayList<>();
+ neutronIPs.add(neutronIP1);
+ neutronIPs.add(neutronIP2);
+ neutronIPs.add(neutronIP3);
+ neutronPort.setFixedIPs(neutronIPs);
+ neutronPort.setMacAddress("mac_address");
+ when(neutronPortCache.getAllPorts()).thenReturn(Collections.singletonList(neutronPort));
+
+ lBaaSPoolHandler.setDependencies(neutronSubnetCache);
+ final NeutronSubnet neutronSubnet1 = new NeutronSubnet();
+ neutronSubnet1.setID("pool_member_subnetID");
+ neutronSubnet1.setNetworkUUID("pool_member_networkUUID");
+ final NeutronSubnet neutronSubnet2 = new NeutronSubnet();
+ neutronSubnet2.setID("subnetID");
+ neutronSubnet2.setNetworkUUID("pool_member_networkUUID");
+ List<NeutronSubnet> neutronSubnets = new ArrayList<>();
+ neutronSubnets.add(neutronSubnet1);
+ neutronSubnets.add(neutronSubnet2);
+ when(neutronSubnetCache.getAllSubnets()).thenReturn(neutronSubnets);
+
+ lBaaSPoolHandler.setDependencies(neutronNetworkCache);
+ final NeutronNetwork neutronNetwork = new NeutronNetwork();
+ neutronNetwork.setNetworkUUID("pool_member_networkUUID");
+ neutronNetwork.setProviderNetworkType("key");
+ neutronNetwork.setProviderSegmentationID("value");
+ when(neutronNetworkCache.getAllNetworks()).thenReturn(Collections.singletonList(neutronNetwork));
+
List<NeutronLoadBalancerPoolMember> members = new ArrayList<>();
NeutronLoadBalancerPoolMember neutronLBPoolMember = mock(NeutronLoadBalancerPoolMember.class);
when(neutronLBPoolMember.getPoolMemberAdminStateIsUp()).thenReturn(true);
when(neutronLB.getLoadBalancerVipSubnetID()).thenReturn("subnetID");
list_neutronLB.add(neutronLB);
when(neutronLBCache.getAllNeutronLoadBalancers()).thenReturn(list_neutronLB);
-
- Map.Entry<String,String> providerInfo = mock(Entry.class);
- when(providerInfo.getKey()).thenReturn("key");
- when(providerInfo.getValue()).thenReturn("value");
-
- PowerMockito.mockStatic(NeutronCacheUtils.class);
- when(NeutronCacheUtils.getMacAddress(any(INeutronPortCRUD.class), anyString(), anyString())).thenReturn("mac_address");
- when(NeutronCacheUtils.getProviderInformation(any(INeutronNetworkCRUD.class), any(INeutronSubnetCRUD.class), anyString())).thenReturn(providerInfo);
}
/**
@Test
public void testExtractLBConfiguration() {
List<LoadBalancerConfiguration> list_lbConfig = lBaaSPoolHandler.extractLBConfiguration(neutronLBPool);
+ assertFalse(list_lbConfig.isEmpty());
LoadBalancerConfiguration lbConfig = list_lbConfig.get(0);
verify(neutronLBCache, times(1)).getAllNeutronLoadBalancers();
LoadBalancerProvider loadBalancerProvider = mock(LoadBalancerProvider.class);
NodeCacheManager nodeCacheManager = mock(NodeCacheManager.class);
- PowerMockito.mockStatic(ServiceHelper.class);
- PowerMockito.when(ServiceHelper.getGlobalInstance(EventDispatcher.class, lBaaSPoolHandler)).thenReturn(eventDispatcher);
- PowerMockito.when(ServiceHelper.getGlobalInstance(LoadBalancerProvider.class, lBaaSPoolHandler)).thenReturn(loadBalancerProvider);
- PowerMockito.when(ServiceHelper.getGlobalInstance(NodeCacheManager.class, lBaaSPoolHandler)).thenReturn(nodeCacheManager);
+ ServiceHelper.overrideGlobalInstance(EventDispatcher.class, eventDispatcher);
+ ServiceHelper.overrideGlobalInstance(LoadBalancerProvider.class, loadBalancerProvider);
+ ServiceHelper.overrideGlobalInstance(NodeCacheManager.class, nodeCacheManager);
lBaaSPoolHandler.setDependencies(mock(ServiceReference.class));
/*
- * Copyright (c) 2015 Inocybe and others. All rights reserved.
+ * Copyright (c) 2015, 2016 Inocybe and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
import java.lang.reflect.Field;
import java.net.HttpURLConnection;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
import org.junit.Before;
import org.junit.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.opendaylight.ovsdb.openstack.netvirt.api.Action;
+import org.opendaylight.ovsdb.openstack.netvirt.api.EventDispatcher;
+import org.opendaylight.ovsdb.openstack.netvirt.api.LoadBalancerConfiguration;
+import org.opendaylight.ovsdb.openstack.netvirt.api.LoadBalancerConfiguration.LoadBalancerPoolMember;
+import org.opendaylight.ovsdb.openstack.netvirt.api.LoadBalancerProvider;
+import org.opendaylight.ovsdb.openstack.netvirt.api.NodeCacheManager;
import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronLoadBalancer;
import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronLoadBalancerPool;
import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronLoadBalancerPoolMember;
+import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronNetwork;
+import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronPort;
+import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronSubnet;
+import org.opendaylight.ovsdb.openstack.netvirt.translator.Neutron_IPs;
import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronLoadBalancerCRUD;
import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronLoadBalancerPoolCRUD;
import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronNetworkCRUD;
import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronPortCRUD;
import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronSubnetCRUD;
-import org.opendaylight.ovsdb.openstack.netvirt.api.Action;
-import org.opendaylight.ovsdb.openstack.netvirt.api.EventDispatcher;
-import org.opendaylight.ovsdb.openstack.netvirt.api.LoadBalancerConfiguration;
-import org.opendaylight.ovsdb.openstack.netvirt.api.LoadBalancerConfiguration.LoadBalancerPoolMember;
-import org.opendaylight.ovsdb.openstack.netvirt.api.LoadBalancerProvider;
-import org.opendaylight.ovsdb.openstack.netvirt.api.NodeCacheManager;
import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
import org.osgi.framework.ServiceReference;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
/**
* Unit test for {@link LBaaSPoolMemberHandler}
*/
-@PrepareForTest({NeutronCacheUtils.class, ServiceHelper.class})
-@RunWith(PowerMockRunner.class)
+@RunWith(MockitoJUnitRunner.class)
public class LBaaSPoolMemberHandlerTest {
@InjectMocks LBaaSPoolMemberHandler lBaaSPoolMemberHandler;
@Mock private INeutronLoadBalancerCRUD neutronLBCache;
@Mock private LoadBalancerProvider loadBalancerProvider;
@Mock private NodeCacheManager nodeCacheManager;
+ @Mock private INeutronPortCRUD neutronPortCache;
+ @Mock private INeutronNetworkCRUD neutronNetworkCache;
+ @Mock private INeutronSubnetCRUD neutronSubnetCache;
private NeutronLoadBalancerPoolMember neutronLBMember;
@Before
public void setUp() {
- neutronLBMember = mock(NeutronLoadBalancerPoolMember.class);
- when(neutronLBMember.getID()).thenReturn("pool_memberID");
- when(neutronLBMember.getPoolMemberAddress()).thenReturn("pool_member_address");
- when(neutronLBMember.getPoolMemberSubnetID()).thenReturn("pool_member_subnetID");
- when(neutronLBMember.getPoolMemberProtoPort()).thenReturn(1);
- when(neutronLBMember.getPoolID()).thenReturn("poolID");
-
- Map.Entry<String,String> providerInfo = mock(Entry.class);
- when(providerInfo.getKey()).thenReturn("key");
- when(providerInfo.getValue()).thenReturn("value");
-
- PowerMockito.mockStatic(NeutronCacheUtils.class);
- when(NeutronCacheUtils.getMacAddress(any(INeutronPortCRUD.class), anyString(), anyString())).thenReturn("mac_address");
- when(NeutronCacheUtils.getProviderInformation(any(INeutronNetworkCRUD.class), any(INeutronSubnetCRUD.class), anyString())).thenReturn(providerInfo);
+ neutronLBMember = new NeutronLoadBalancerPoolMember();
+ neutronLBMember.setID("pool_memberID");
+ neutronLBMember.setPoolMemberAddress("pool_member_address");
+ neutronLBMember.setPoolMemberSubnetID("pool_member_subnetID");
+ neutronLBMember.setPoolMemberProtoPort(1);
+ neutronLBMember.setPoolID("poolID");
+
+ lBaaSPoolMemberHandler.setDependencies(neutronPortCache);
+ final NeutronPort neutronPort = new NeutronPort();
+ final Neutron_IPs neutronIP1 = new Neutron_IPs();
+ neutronIP1.setSubnetUUID("pool_member_subnetID");
+ neutronIP1.setIpAddress("pool_member_address");
+ final Neutron_IPs neutronIP2 = new Neutron_IPs();
+ neutronIP2.setSubnetUUID("pool_member_subnetID");
+ neutronIP2.setIpAddress("vip_address");
+ final List<Neutron_IPs> neutronIPs = new ArrayList<>();
+ neutronIPs.add(neutronIP1);
+ neutronIPs.add(neutronIP2);
+ neutronPort.setFixedIPs(neutronIPs);
+ neutronPort.setMacAddress("mac_address");
+ when(neutronPortCache.getAllPorts()).thenReturn(Collections.singletonList(neutronPort));
+
+ lBaaSPoolMemberHandler.setDependencies(neutronSubnetCache);
+ final NeutronSubnet neutronSubnet = new NeutronSubnet();
+ neutronSubnet.setID("pool_member_subnetID");
+ neutronSubnet.setNetworkUUID("pool_member_networkUUID");
+ when(neutronSubnetCache.getAllSubnets()).thenReturn(Collections.singletonList(neutronSubnet));
+
+ lBaaSPoolMemberHandler.setDependencies(neutronNetworkCache);
+ final NeutronNetwork neutronNetwork = new NeutronNetwork();
+ neutronNetwork.setNetworkUUID("pool_member_networkUUID");
+ neutronNetwork.setProviderNetworkType("key");
+ neutronNetwork.setProviderSegmentationID("value");
+ when(neutronNetworkCache.getAllNetworks()).thenReturn(Collections.singletonList(neutronNetwork));
List<NeutronLoadBalancerPoolMember> members = new ArrayList<>();
- NeutronLoadBalancerPoolMember neutronLBPoolMember = mock(NeutronLoadBalancerPoolMember.class);
- when(neutronLBPoolMember.getPoolMemberAdminStateIsUp()).thenReturn(true);
- when(neutronLBPoolMember.getPoolMemberSubnetID()).thenReturn("subnetID");
- when(neutronLBPoolMember.getID()).thenReturn("pool_memberID1");
- when(neutronLBPoolMember.getPoolMemberProtoPort()).thenReturn(1);
+ NeutronLoadBalancerPoolMember neutronLBPoolMember = new NeutronLoadBalancerPoolMember();
+ neutronLBPoolMember.setPoolMemberAdminStateIsUp(true);
+ neutronLBPoolMember.setPoolMemberSubnetID("pool_member_subnetID");
+ neutronLBPoolMember.setID("pool_memberID1");
+ neutronLBPoolMember.setPoolMemberProtoPort(1);
members.add(neutronLBPoolMember);
- NeutronLoadBalancerPool neutronLBPool = mock(NeutronLoadBalancerPool.class);
- when(neutronLBPool.getLoadBalancerPoolProtocol()).thenReturn(LoadBalancerConfiguration.PROTOCOL_TCP);
- when(neutronLBPool.getLoadBalancerPoolMembers()).thenReturn(members);
+ NeutronLoadBalancerPool neutronLBPool = new NeutronLoadBalancerPool();
+ neutronLBPool.setLoadBalancerPoolProtocol(LoadBalancerConfiguration.PROTOCOL_TCP);
+ neutronLBPool.setLoadBalancerPoolMembers(members);
when(neutronLBPoolCache.getNeutronLoadBalancerPool(anyString())).thenReturn(neutronLBPool);
- List<NeutronLoadBalancer> list_neutronLB = new ArrayList<>();
- NeutronLoadBalancer neutronLB = mock(NeutronLoadBalancer.class);
- when(neutronLB.getLoadBalancerName()).thenReturn("load_balancer_name");
- when(neutronLB.getLoadBalancerVipAddress()).thenReturn("vip_address");
- when(neutronLB.getLoadBalancerVipSubnetID()).thenReturn("subnetID");
- list_neutronLB.add(neutronLB);
- when(neutronLBCache.getAllNeutronLoadBalancers()).thenReturn(list_neutronLB);
+ NeutronLoadBalancer neutronLB = new NeutronLoadBalancer();
+ neutronLB.setLoadBalancerName("load_balancer_name");
+ neutronLB.setLoadBalancerVipAddress("vip_address");
+ neutronLB.setLoadBalancerVipSubnetID("pool_member_subnetID");
+ when(neutronLBCache.getAllNeutronLoadBalancers()).thenReturn(Collections.singletonList(neutronLB));
}
/**
*/
@Test
public void testCanCreateNeutronLoadBalancerPoolMember() {
- when(neutronLBMember.getPoolID())
- .thenReturn(null) // to test HTTP_BAD_REQUEST
- .thenReturn("poolID"); // to test HTTP_OK
-
- Map.Entry<String,String> providerInfo = mock(Entry.class);
- when(providerInfo.getKey()).thenReturn("key");
- when(providerInfo.getValue()).thenReturn("value");
- when(NeutronCacheUtils.getProviderInformation(any(INeutronNetworkCRUD.class), any(INeutronSubnetCRUD.class), anyString()))
- .thenReturn(providerInfo)
- .thenReturn(null); // to test HTTP_NOT_ACCEPTABLE
-
-
+ // HTTP_BAD_REQUEST
+ neutronLBMember.setPoolID(null);
assertEquals("Error, canCreateNeutronLoadBalancerPoolMember() didn't return the correct HTTP flag", HttpURLConnection.HTTP_BAD_REQUEST, lBaaSPoolMemberHandler.canCreateNeutronLoadBalancerPoolMember(neutronLBMember));
+
+ // HTTP_OK
+ neutronLBMember.setPoolID("poolID");
assertEquals("Error, canCreateNeutronLoadBalancerPoolMember() didn't return the correct HTTP flag", HttpURLConnection.HTTP_OK, lBaaSPoolMemberHandler.canCreateNeutronLoadBalancerPoolMember(neutronLBMember));
+
+ // HTTP_NOT_ACCEPTABLE
+ when(neutronNetworkCache.getAllNetworks()).thenReturn(Collections.<NeutronNetwork>emptyList());
assertEquals("Error, canCreateNeutronLoadBalancerPoolMember() didn't return the correct HTTP flag", HttpURLConnection.HTTP_NOT_ACCEPTABLE, lBaaSPoolMemberHandler.canCreateNeutronLoadBalancerPoolMember(neutronLBMember));
}
*/
@Test
public void testCanUpdateNeutronLoadBalancerPoolMember() {
- assertEquals("Error, did not return the correct HTTP flag", HttpURLConnection.HTTP_NOT_IMPLEMENTED, lBaaSPoolMemberHandler.canUpdateNeutronLoadBalancerPoolMember(any(NeutronLoadBalancerPoolMember.class), any(NeutronLoadBalancerPoolMember.class)));
+ assertEquals("Error, did not return the correct HTTP flag", HttpURLConnection.HTTP_NOT_IMPLEMENTED, lBaaSPoolMemberHandler.canUpdateNeutronLoadBalancerPoolMember(null, null));
}
/**
*/
@Test
public void testCanDeleteNeutronLoadBalancerPoolMember() {
- when(neutronLBMember.getPoolID())
- .thenReturn(null) // to test HTTP_BAD_REQUEST
- .thenReturn("poolID"); // to test HTTP_OK
-
- Map.Entry<String,String> providerInfo = mock(Entry.class);
- when(providerInfo.getKey()).thenReturn("key");
- when(providerInfo.getValue()).thenReturn("value");
- when(NeutronCacheUtils.getProviderInformation(any(INeutronNetworkCRUD.class), any(INeutronSubnetCRUD.class), anyString()))
- .thenReturn(providerInfo)
- .thenReturn(null); // to test HTTP_NOT_ACCEPTABLE
-
-
+ // HTTP_BAD_REQUEST
+ neutronLBMember.setPoolID(null);
assertEquals("Error, canDeleteNeutronLoadBalancerPoolMember() didn't return the correct HTTP flag", HttpURLConnection.HTTP_BAD_REQUEST, lBaaSPoolMemberHandler.canDeleteNeutronLoadBalancerPoolMember(neutronLBMember));
+
+ // HTTP_OK
+ neutronLBMember.setPoolID("poolID");
assertEquals("Error, canDeleteNeutronLoadBalancerPoolMember() didn't return the correct HTTP flag", HttpURLConnection.HTTP_OK, lBaaSPoolMemberHandler.canDeleteNeutronLoadBalancerPoolMember(neutronLBMember));
+
+ // HTTP_NOT_ACCEPTABLE
+ when(neutronNetworkCache.getAllNetworks()).thenReturn(Collections.<NeutronNetwork>emptyList());
assertEquals("Error, canDeleteNeutronLoadBalancerPoolMember() didn't return the correct HTTP flag", HttpURLConnection.HTTP_NOT_ACCEPTABLE, lBaaSPoolMemberHandler.canDeleteNeutronLoadBalancerPoolMember(neutronLBMember));
}
public void testExtractLBConfiguration() {
LoadBalancerConfiguration lbConfig = lBaaSPoolMemberHandler.extractLBConfiguration(neutronLBMember);
- verify(neutronLBPoolCache, times(1)).getNeutronLoadBalancerPool(anyString());
- verify(neutronLBCache, times(1)).getAllNeutronLoadBalancers();
-
// make sure the load balancer configuration was correctly populated
assertEquals("Error, did not return the correct value", "key", lbConfig.getProviderNetworkType());
assertEquals("Error, did not return the correct value", "value", lbConfig.getProviderSegmentationId());
LoadBalancerProvider loadBalancerProvider = mock(LoadBalancerProvider.class);
NodeCacheManager nodeCacheManager = mock(NodeCacheManager.class);
- PowerMockito.mockStatic(ServiceHelper.class);
- PowerMockito.when(ServiceHelper.getGlobalInstance(EventDispatcher.class, lBaaSPoolMemberHandler)).thenReturn(eventDispatcher);
- PowerMockito.when(ServiceHelper.getGlobalInstance(LoadBalancerProvider.class, lBaaSPoolMemberHandler)).thenReturn(loadBalancerProvider);
- PowerMockito.when(ServiceHelper.getGlobalInstance(NodeCacheManager.class, lBaaSPoolMemberHandler)).thenReturn(nodeCacheManager);
+ ServiceHelper.overrideGlobalInstance(EventDispatcher.class, eventDispatcher);
+ ServiceHelper.overrideGlobalInstance(LoadBalancerProvider.class, loadBalancerProvider);
+ ServiceHelper.overrideGlobalInstance(NodeCacheManager.class, nodeCacheManager);
lBaaSPoolMemberHandler.setDependencies(mock(ServiceReference.class));
/*
- * Copyright (c) 2015 Inocybe and others. All rights reserved.
+ * Copyright (c) 2015, 2016 Inocybe and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronNetwork;
-import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronNetworkCRUD;
+import org.mockito.runners.MockitoJUnitRunner;
import org.opendaylight.ovsdb.openstack.netvirt.api.Action;
import org.opendaylight.ovsdb.openstack.netvirt.api.BridgeConfigurationManager;
import org.opendaylight.ovsdb.openstack.netvirt.api.EventDispatcher;
import org.opendaylight.ovsdb.openstack.netvirt.api.Southbound;
import org.opendaylight.ovsdb.openstack.netvirt.api.TenantNetworkManager;
import org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter;
+import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronNetwork;
+import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronNetworkCRUD;
import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
-
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105
+ .OvsdbTerminationPointAugmentation;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology
+ .Node;
import org.osgi.framework.ServiceReference;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
/**
* Unit test for {@link NetworkHandler}
*/
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(ServiceHelper.class)
+@RunWith(MockitoJUnitRunner.class)
public class NetworkHandlerTest {
@InjectMocks private NetworkHandler networkHandler;
EventDispatcher eventDispatcher = mock(EventDispatcher.class);
- PowerMockito.mockStatic(ServiceHelper.class);
- PowerMockito.when(ServiceHelper.getGlobalInstance(TenantNetworkManager.class, networkHandler)).thenReturn(tenantNetworkManager);
- PowerMockito.when(ServiceHelper.getGlobalInstance(BridgeConfigurationManager.class, networkHandler)).thenReturn(bridgeConfigurationManager);
- PowerMockito.when(ServiceHelper.getGlobalInstance(NodeCacheManager.class, networkHandler)).thenReturn(nodeCacheManager);
- PowerMockito.when(ServiceHelper.getGlobalInstance(NeutronL3Adapter.class, networkHandler)).thenReturn(neutronL3Adapter);
- PowerMockito.when(ServiceHelper.getGlobalInstance(Southbound.class, networkHandler)).thenReturn(southbound);
- PowerMockito.when(ServiceHelper.getGlobalInstance(EventDispatcher.class, networkHandler)).thenReturn(eventDispatcher);
+ ServiceHelper.overrideGlobalInstance(TenantNetworkManager.class, tenantNetworkManager);
+ ServiceHelper.overrideGlobalInstance(BridgeConfigurationManager.class, bridgeConfigurationManager);
+ ServiceHelper.overrideGlobalInstance(NodeCacheManager.class, nodeCacheManager);
+ ServiceHelper.overrideGlobalInstance(NeutronL3Adapter.class, neutronL3Adapter);
+ ServiceHelper.overrideGlobalInstance(Southbound.class, southbound);
+ ServiceHelper.overrideGlobalInstance(EventDispatcher.class, eventDispatcher);
networkHandler.setDependencies(mock(ServiceReference.class));
/*
- * Copyright (c) 2015 Inocybe and others. All rights reserved.
+ * Copyright (c) 2015, 2016 Inocybe and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
import java.util.Map;
import org.junit.Test;
-import org.junit.runner.RunWith;
import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronNetwork;
import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronPort;
import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronSubnet;
import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronNetworkCRUD;
import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronPortCRUD;
import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronSubnetCRUD;
-import org.powermock.modules.junit4.PowerMockRunner;
/**
* Unit test for {@link NeutronCacheUtils}
*/
-@RunWith(PowerMockRunner.class)
public class NeutronCacheUtilsTest {
/**
/*
- * Copyright (c) 2015 Inocybe and others. All rights reserved.
+ * Copyright (c) 2015, 2016 Inocybe and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronPort;
+import org.mockito.runners.MockitoJUnitRunner;
import org.opendaylight.ovsdb.openstack.netvirt.api.Action;
import org.opendaylight.ovsdb.openstack.netvirt.api.EventDispatcher;
import org.opendaylight.ovsdb.openstack.netvirt.api.NodeCacheManager;
import org.opendaylight.ovsdb.openstack.netvirt.api.Southbound;
import org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter;
+import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronPort;
import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
-
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105
+ .OvsdbTerminationPointAugmentation;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology
+ .Node;
import org.osgi.framework.ServiceReference;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
/**
* Unit test fort {@link PortHandler}
*/
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(ServiceHelper.class)
+@RunWith(MockitoJUnitRunner.class)
public class PortHandlerTest {
@InjectMocks private PortHandler portHandler;
Southbound southbound = mock(Southbound.class);
EventDispatcher eventDispatcher = mock(EventDispatcher.class);
- PowerMockito.mockStatic(ServiceHelper.class);
- PowerMockito.when(ServiceHelper.getGlobalInstance(NodeCacheManager.class, portHandler)).thenReturn(nodeCacheManager);
- PowerMockito.when(ServiceHelper.getGlobalInstance(NeutronL3Adapter.class, portHandler)).thenReturn(neutronL3Adapter);
- PowerMockito.when(ServiceHelper.getGlobalInstance(Southbound.class, portHandler)).thenReturn(southbound);
- PowerMockito.when(ServiceHelper.getGlobalInstance(EventDispatcher.class, portHandler)).thenReturn(eventDispatcher);
+ ServiceHelper.overrideGlobalInstance(NodeCacheManager.class, nodeCacheManager);
+ ServiceHelper.overrideGlobalInstance(NeutronL3Adapter.class, neutronL3Adapter);
+ ServiceHelper.overrideGlobalInstance(Southbound.class, southbound);
+ ServiceHelper.overrideGlobalInstance(EventDispatcher.class, eventDispatcher);
portHandler.setDependencies(mock(ServiceReference.class));
/*
- * Copyright (c) 2015 Inocybe and others. All rights reserved.
+ * Copyright (c) 2015, 2016 Inocybe and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.opendaylight.ovsdb.openstack.netvirt.api.EventDispatcher;
import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronSecurityGroup;
import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronSecurityRule;
-import org.opendaylight.ovsdb.openstack.netvirt.api.EventDispatcher;
import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper;
import org.osgi.framework.ServiceReference;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
/**
* Unit test {@link PortSecurityHandler}
*/
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(ServiceHelper.class)
+@RunWith(MockitoJUnitRunner.class)
public class PortSecurityHandlerTest {
@InjectMocks private PortSecurityHandler portSecurityHandler;
public void testSetDependencies() throws Exception {
EventDispatcher eventDispatcher = mock(EventDispatcher.class);
- PowerMockito.mockStatic(ServiceHelper.class);
- PowerMockito.when(ServiceHelper.getGlobalInstance(EventDispatcher.class, portSecurityHandler)).thenReturn(eventDispatcher);
+ ServiceHelper.overrideGlobalInstance(EventDispatcher.class, eventDispatcher);
portSecurityHandler.setDependencies(mock(ServiceReference.class));
/*
- * Copyright (c) 2015 Inocybe and others. All rights reserved.
+ * Copyright (c) 2015, 2016 Inocybe and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronRouter;
-import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronRouter_Interface;
+import org.mockito.runners.MockitoJUnitRunner;
import org.opendaylight.ovsdb.openstack.netvirt.api.Action;
import org.opendaylight.ovsdb.openstack.netvirt.api.EventDispatcher;
import org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter;
+import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronRouter;
+import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronRouter_Interface;
import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper;
import org.osgi.framework.ServiceReference;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
/**
* Unit test fort {@link RouterHandler}
*/
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(ServiceHelper.class)
+@RunWith(MockitoJUnitRunner.class)
public class RouterHandlerTest {
@InjectMocks RouterHandler routerHandler;
NeutronL3Adapter neutronL3Adapter = mock(NeutronL3Adapter.class);
EventDispatcher eventDispatcher = mock(EventDispatcher.class);
- PowerMockito.mockStatic(ServiceHelper.class);
- PowerMockito.when(ServiceHelper.getGlobalInstance(NeutronL3Adapter.class, routerHandler)).thenReturn(neutronL3Adapter);
- PowerMockito.when(ServiceHelper.getGlobalInstance(EventDispatcher.class, routerHandler)).thenReturn(eventDispatcher);
+ ServiceHelper.overrideGlobalInstance(NeutronL3Adapter.class, neutronL3Adapter);
+ ServiceHelper.overrideGlobalInstance(EventDispatcher.class, eventDispatcher);
routerHandler.setDependencies(mock(ServiceReference.class));
/*
- * Copyright (c) 2015 Inocybe and others. All rights reserved.
+ * Copyright (c) 2015, 2016 Inocybe and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
+import org.mockito.runners.MockitoJUnitRunner;
import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronNetwork;
import org.opendaylight.ovsdb.openstack.netvirt.SouthboundEvent.Type;
import org.opendaylight.ovsdb.openstack.netvirt.api.Action;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPoint;
import org.opendaylight.yangtools.yang.binding.DataObject;
import org.osgi.framework.ServiceReference;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
/**
* Unit test fort {@link SouthboundHandler}
*/
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(ServiceHelper.class)
+@RunWith(MockitoJUnitRunner.class)
public class SouthboundHandlerTest {
@InjectMocks private SouthboundHandler southboundHandler;
EventDispatcher eventDispatcher = mock(EventDispatcher.class);
OvsdbInventoryService ovsdbInventoryService = mock(OvsdbInventoryService.class);
- PowerMockito.mockStatic(ServiceHelper.class);
- PowerMockito.when(ServiceHelper.getGlobalInstance(ConfigurationService.class, southboundHandler)).thenReturn(configurationService);
- PowerMockito.when(ServiceHelper.getGlobalInstance(NetworkingProviderManager.class, southboundHandler)).thenReturn(networkingProviderManager);
- PowerMockito.when(ServiceHelper.getGlobalInstance(TenantNetworkManager.class, southboundHandler)).thenReturn(tenantNetworkManager);
- PowerMockito.when(ServiceHelper.getGlobalInstance(BridgeConfigurationManager.class, southboundHandler)).thenReturn(bridgeConfigurationManager);
- PowerMockito.when(ServiceHelper.getGlobalInstance(NodeCacheManager.class, southboundHandler)).thenReturn(nodeCacheManager);
- PowerMockito.when(ServiceHelper.getGlobalInstance(NeutronL3Adapter.class, southboundHandler)).thenReturn(neutronL3Adapter);
- PowerMockito.when(ServiceHelper.getGlobalInstance(Southbound.class, southboundHandler)).thenReturn(southbound);
- PowerMockito.when(ServiceHelper.getGlobalInstance(EventDispatcher.class, southboundHandler)).thenReturn(eventDispatcher);
- PowerMockito.when(ServiceHelper.getGlobalInstance(OvsdbInventoryService.class, southboundHandler)).thenReturn(ovsdbInventoryService);
+ ServiceHelper.overrideGlobalInstance(ConfigurationService.class, configurationService);
+ ServiceHelper.overrideGlobalInstance(NetworkingProviderManager.class, networkingProviderManager);
+ ServiceHelper.overrideGlobalInstance(TenantNetworkManager.class, tenantNetworkManager);
+ ServiceHelper.overrideGlobalInstance(BridgeConfigurationManager.class, bridgeConfigurationManager);
+ ServiceHelper.overrideGlobalInstance(NodeCacheManager.class, nodeCacheManager);
+ ServiceHelper.overrideGlobalInstance(NeutronL3Adapter.class, neutronL3Adapter);
+ ServiceHelper.overrideGlobalInstance(Southbound.class, southbound);
+ ServiceHelper.overrideGlobalInstance(EventDispatcher.class, eventDispatcher);
+ ServiceHelper.overrideGlobalInstance(OvsdbInventoryService.class, ovsdbInventoryService);
southboundHandler.setDependencies(mock(ServiceReference.class));
assertEquals("Error, did not return the correct object", getField("configurationService"), configurationService);
/*
- * Copyright (c) 2015 Inocybe and others. All rights reserved.
+ * Copyright (c) 2015, 2016 Inocybe and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronSubnet;
+import org.mockito.runners.MockitoJUnitRunner;
import org.opendaylight.ovsdb.openstack.netvirt.api.Action;
import org.opendaylight.ovsdb.openstack.netvirt.api.EventDispatcher;
import org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter;
+import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronSubnet;
import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper;
import org.osgi.framework.ServiceReference;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
/**
* Unit test fort {@link SubnetHandler}
*/
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(ServiceHelper.class)
+@RunWith(MockitoJUnitRunner.class)
public class SubnetHandlerTest {
@InjectMocks private SubnetHandler subnetHandler;
NeutronL3Adapter neutronL3Adapter = mock(NeutronL3Adapter.class);
EventDispatcher eventDispatcher = mock(EventDispatcher.class);
- PowerMockito.mockStatic(ServiceHelper.class);
- PowerMockito.when(ServiceHelper.getGlobalInstance(NeutronL3Adapter.class, subnetHandler)).thenReturn(neutronL3Adapter);
- PowerMockito.when(ServiceHelper.getGlobalInstance(EventDispatcher.class, subnetHandler)).thenReturn(eventDispatcher);
+ ServiceHelper.overrideGlobalInstance(NeutronL3Adapter.class, neutronL3Adapter);
+ ServiceHelper.overrideGlobalInstance(EventDispatcher.class, eventDispatcher);
subnetHandler.setDependencies(mock(ServiceReference.class));
/*
-* Copyright (c) 2014 Intel Corp. and others. All rights reserved.
+* Copyright (c) 2014, 2016 Intel Corp. and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.invocation.InvocationOnMock;
+import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.stubbing.Answer;
-import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronNetwork;
import org.opendaylight.ovsdb.openstack.netvirt.api.ConfigurationService;
import org.opendaylight.ovsdb.openstack.netvirt.api.NetworkingProviderManager;
import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbTables;
import org.opendaylight.ovsdb.openstack.netvirt.api.Southbound;
-import org.opendaylight.ovsdb.utils.config.ConfigProperties;
+import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronNetwork;
import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.DatapathTypeSystem;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
-
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105
+ .OvsdbTerminationPointAugmentation;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology
+ .Node;
import org.osgi.framework.ServiceReference;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
/**
* Test class for BridgeConfigurationManagerImpl
* @author Alexis de Talhouet
* @author Sam Hague (shague@redhat.com)
*/
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ServiceHelper.class, ConfigProperties.class})
+@RunWith(MockitoJUnitRunner.class)
public class BridgeConfigurationManagerImplTest {
@Mock private Node node;
@Mock private OvsdbBridgeAugmentation bridge;
.thenReturn(bridge);
BridgeConfigurationManagerImpl bridgeConfigurationManagerImplSpy =
- PowerMockito.spy(new BridgeConfigurationManagerImpl());
+ spy(new BridgeConfigurationManagerImpl());
doReturn(false).when(bridgeConfigurationManagerImplSpy).isNodeNeutronReady(any(Node.class));
bridgeConfigurationManagerImplSpy.setConfigurationService(configurationService);
bridgeConfigurationManagerImplSpy.setSouthbound(southbound);
bridgeConfigurationManagerImpl.isNodeVlanReady(node, node, neutronNetwork));
BridgeConfigurationManagerImpl bridgeConfigurationManagerImplSpy =
- PowerMockito.spy(new BridgeConfigurationManagerImpl());
+ spy(new BridgeConfigurationManagerImpl());
doReturn(ETH1).when(bridgeConfigurationManagerImplSpy).getPhysicalInterfaceName(any(Node.class), anyString());
bridgeConfigurationManagerImplSpy.setConfigurationService(configurationService);
bridgeConfigurationManagerImplSpy.setSouthbound(southbound);
when(configurationService.getIntegrationBridgeName()).thenReturn(BR_INT);
when(southbound.isBridgeOnOvsdbNode(any(Node.class), anyString())).thenReturn(false);
- PowerMockito.mockStatic(ConfigProperties.class);
- when(ConfigProperties.getProperty(any(Class.class), anyString())).thenReturn(ADDRESS);
+ // TODO Figure out the strings
+ //when(ConfigProperties.getProperty(any(Class.class), anyString())).thenReturn(ADDRESS);
when(southbound.addBridge(any(Node.class), anyString(), anyList(), eq(DatapathTypeSystem.class))).thenReturn(true);
when(configurationService.isL3ForwardingEnabled()).thenReturn(true);
bridgeConfigurationManagerImpl.prepareNode(node);
+
+ // TODO This test doesn't verify anything
}
@Test
NeutronNetwork neutronNetworkMock = mock(NeutronNetwork.class, RETURNS_MOCKS);
String networkTypes[] = {"vlan", "vxlan", "gre"};
BridgeConfigurationManagerImpl bridgeConfigurationManagerImplSpy =
- PowerMockito.spy(new BridgeConfigurationManagerImpl());
+ spy(new BridgeConfigurationManagerImpl());
bridgeConfigurationManagerImplSpy.setConfigurationService(configurationService);
bridgeConfigurationManagerImplSpy.setSouthbound(southbound);
NetworkingProviderManager networkingProviderManager = mock(NetworkingProviderManager.class);
Southbound southbound = mock(Southbound.class);
- PowerMockito.mockStatic(ServiceHelper.class);
- PowerMockito.when(ServiceHelper.getGlobalInstance(ConfigurationService.class, bridgeConfigurationManagerImpl)).thenReturn(configurationService);
- PowerMockito.when(ServiceHelper.getGlobalInstance(NetworkingProviderManager.class, bridgeConfigurationManagerImpl)).thenReturn(networkingProviderManager);
- PowerMockito.when(ServiceHelper.getGlobalInstance(Southbound.class, bridgeConfigurationManagerImpl)).thenReturn(southbound);
+ ServiceHelper.overrideGlobalInstance(ConfigurationService.class, configurationService);
+ ServiceHelper.overrideGlobalInstance(NetworkingProviderManager.class, networkingProviderManager);
+ ServiceHelper.overrideGlobalInstance(Southbound.class, southbound);
bridgeConfigurationManagerImpl.setDependencies(mock(ServiceReference.class));
/*
- * Copyright (c) 2015 Inocybe and others. All rights reserved.
+ * Copyright (c) 2015, 2016 Inocybe and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
import org.opendaylight.ovsdb.openstack.netvirt.api.Constants;
import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbTables;
import org.opendaylight.ovsdb.openstack.netvirt.api.Southbound;
import org.opendaylight.ovsdb.utils.config.ConfigProperties;
import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
-
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology
+ .Node;
import org.osgi.framework.ServiceReference;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
/**
* Unit test for {@link ConfigurationServiceImpl}
*/
-@PrepareForTest({ConfigProperties.class, ServiceHelper.class})
-@RunWith(PowerMockRunner.class)
+@RunWith(MockitoJUnitRunner.class)
public class ConfigurationServiceImplTest {
@InjectMocks private ConfigurationServiceImpl configurationServiceImpl;
@Test
public void testIsL3FowardingEnable() {
- PowerMockito.mockStatic(ConfigProperties.class);
- when(ConfigProperties.getProperty(any(Class.class), eq("ovsdb.l3.fwd.enabled"))).thenReturn(IS_FOWARDING_ENABLE);
+ ConfigProperties.overrideProperty("ovsdb.l3.fwd.enabled", IS_FOWARDING_ENABLE);
assertTrue("Error, l3 fowarding should be activated", configurationServiceImpl.isL3ForwardingEnabled());
}
public void testGetDefaultGatewayMacAddress(){
Node node = mock(Node.class);
NodeId nodeId = mock(NodeId.class);
- PowerMockito.mockStatic(ConfigProperties.class);
when(node.getNodeId()).thenReturn(nodeId);
when(nodeId.getValue()).thenReturn("nodeIdValue");
- PowerMockito.when(ConfigProperties.getProperty(configurationServiceImpl.getClass(),
- "ovsdb.l3gateway.mac." + node.getNodeId().getValue())).thenReturn("gateway");
+ ConfigProperties.overrideProperty("ovsdb.l3gateway.mac." + node.getNodeId().getValue(), "gateway");
assertEquals("Error, did not return the defaultGatewayMacAddress of the node", "gateway",
configurationServiceImpl.getDefaultGatewayMacAddress(node));
public void testSetDependencies() throws Exception {
Southbound southbound = mock(Southbound.class);
- PowerMockito.mockStatic(ServiceHelper.class);
- PowerMockito.when(ServiceHelper.getGlobalInstance(Southbound.class, configurationServiceImpl)).thenReturn(southbound);
+ ServiceHelper.overrideGlobalInstance(Southbound.class, southbound);
configurationServiceImpl.setDependencies(mock(ServiceReference.class));
/*
- * Copyright (c) 2015 Inocybe and others. All rights reserved.
+ * Copyright (c) 2015, 2016 Inocybe and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
NodeCacheManager nodeCacheManager = mock(NodeCacheManager.class);
Southbound southbound = mock(Southbound.class);
- PowerMockito.mockStatic(ServiceHelper.class);
- PowerMockito.when(ServiceHelper.getGlobalInstance(EventDispatcher.class, neutronL3Adapter)).thenReturn(eventDispatcher);
- PowerMockito.when(ServiceHelper.getGlobalInstance(TenantNetworkManager.class, neutronL3Adapter)).thenReturn(tenantNetworkManager);
- PowerMockito.when(ServiceHelper.getGlobalInstance(ConfigurationService.class, neutronL3Adapter)).thenReturn(configurationService);
- PowerMockito.when(ServiceHelper.getGlobalInstance(ArpProvider.class, neutronL3Adapter)).thenReturn(arpProvider);
- PowerMockito.when(ServiceHelper.getGlobalInstance(InboundNatProvider.class, neutronL3Adapter)).thenReturn(inboundNatProvider);
- PowerMockito.when(ServiceHelper.getGlobalInstance(OutboundNatProvider.class, neutronL3Adapter)).thenReturn(outboundNatProvider);
- PowerMockito.when(ServiceHelper.getGlobalInstance(RoutingProvider.class, neutronL3Adapter)).thenReturn(routingProvider);
- PowerMockito.when(ServiceHelper.getGlobalInstance(L3ForwardingProvider.class, neutronL3Adapter)).thenReturn(l3ForwardingProvider);
- PowerMockito.when(ServiceHelper.getGlobalInstance(NodeCacheManager.class, neutronL3Adapter)).thenReturn(nodeCacheManager);
- PowerMockito.when(ServiceHelper.getGlobalInstance(Southbound.class, neutronL3Adapter)).thenReturn(southbound);
+ ServiceHelper.overrideGlobalInstance(EventDispatcher.class, eventDispatcher);
+ ServiceHelper.overrideGlobalInstance(TenantNetworkManager.class, tenantNetworkManager);
+ ServiceHelper.overrideGlobalInstance(ConfigurationService.class, configurationService);
+ ServiceHelper.overrideGlobalInstance(ArpProvider.class, arpProvider);
+ ServiceHelper.overrideGlobalInstance(InboundNatProvider.class, inboundNatProvider);
+ ServiceHelper.overrideGlobalInstance(OutboundNatProvider.class, outboundNatProvider);
+ ServiceHelper.overrideGlobalInstance(RoutingProvider.class, routingProvider);
+ ServiceHelper.overrideGlobalInstance(L3ForwardingProvider.class, l3ForwardingProvider);
+ ServiceHelper.overrideGlobalInstance(NodeCacheManager.class, nodeCacheManager);
+ ServiceHelper.overrideGlobalInstance(Southbound.class, southbound);
neutronL3Adapter.setDependencies(mock(ServiceReference.class));
/*
- * Copyright (c) 2015 Inocybe and others. All rights reserved.
+ * Copyright (c) 2015, 2016 Inocybe and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
*/
package org.opendaylight.ovsdb.openstack.netvirt.impl;
+
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import java.lang.reflect.Field;
import java.util.Map;
+import com.google.common.collect.Maps;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
+import org.mockito.runners.MockitoJUnitRunner;
import org.opendaylight.ovsdb.openstack.netvirt.NodeCacheManagerEvent;
import org.opendaylight.ovsdb.openstack.netvirt.api.Action;
import org.opendaylight.ovsdb.openstack.netvirt.api.EventDispatcher;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeAugmentation;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbNodeAugmentation;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
-
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology
+ .Node;
import org.osgi.framework.ServiceReference;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import com.google.common.collect.Maps;
/**
* Unit test for {@link NodeCacheManagerImpl}
*/
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(ServiceHelper.class)
+@RunWith(MockitoJUnitRunner.class)
public class NodeCacheManagerImplTest {
@InjectMocks private NodeCacheManagerImpl nodeCacheManagerImpl;
Southbound southbound = mock(Southbound.class);
EventDispatcher eventDispatcher = mock(EventDispatcher.class);
- PowerMockito.mockStatic(ServiceHelper.class);
- PowerMockito.when(ServiceHelper.getGlobalInstance(Southbound.class, nodeCacheManagerImpl)).thenReturn(southbound);
- PowerMockito.when(ServiceHelper.getGlobalInstance(EventDispatcher.class, nodeCacheManagerImpl)).thenReturn(eventDispatcher);
+ ServiceHelper.overrideGlobalInstance(Southbound.class, southbound);
+ ServiceHelper.overrideGlobalInstance(EventDispatcher.class, eventDispatcher);
nodeCacheManagerImpl.setDependencies(mock(ServiceReference.class));
/*
- * Copyright (c) 2015 Inocybe and others. All rights reserved.
+ * Copyright (c) 2015, 2016 Inocybe and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
import java.util.HashMap;
import java.util.Map;
+import com.google.common.collect.Maps;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
+import org.mockito.runners.MockitoJUnitRunner;
import org.opendaylight.ovsdb.openstack.netvirt.api.NetworkingProvider;
import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbInventoryService;
import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
-
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology
+ .Node;
import org.osgi.framework.ServiceReference;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import com.google.common.collect.Maps;
/**
* Unit test for {@link ProviderNetworkManagerImpl}
*/
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(ServiceHelper.class)
+@RunWith(MockitoJUnitRunner.class)
public class ProviderNetworkManagerImplTest {
@InjectMocks private ProviderNetworkManagerImpl providerNetworkManagerImpl;
public void testSetDependencies() throws Exception {
OvsdbInventoryService ovsdbInventoryService = mock(OvsdbInventoryService.class);
- PowerMockito.mockStatic(ServiceHelper.class);
- PowerMockito.when(ServiceHelper.getGlobalInstance(OvsdbInventoryService.class, providerNetworkManagerImpl)).thenReturn(ovsdbInventoryService);
+ ServiceHelper.overrideGlobalInstance(OvsdbInventoryService.class, ovsdbInventoryService);
providerNetworkManagerImpl.setDependencies(mock(ServiceReference.class));
/*
- * Copyright (c) 2015 Hewlett-Packard Enterprise and others. All rights reserved.
+ * Copyright (c) 2015, 2016 Hewlett-Packard Enterprise and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
import org.opendaylight.ovsdb.openstack.netvirt.api.SecurityServicesManager;
import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronPort;
import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronSecurityGroup;
import org.opendaylight.ovsdb.openstack.netvirt.translator.Neutron_IPs;
import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronPortCRUD;
import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronSecurityGroupCRUD;
-import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
/**
* Unit test fort {@link SecurityGroupCacheManagerImpl}
*/
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(ServiceHelper.class)
+@RunWith(MockitoJUnitRunner.class)
public class SecurityGroupCacheManagerImplTest {
@InjectMocks private SecurityGroupCacheManagerImpl securityGroupCacheManagerImpl;
/*
- * Copyright (c) 2015 Inocybe and others. All rights reserved.
+ * Copyright (c) 2015, 2016 Inocybe and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.opendaylight.ovsdb.openstack.netvirt.api.ConfigurationService;
+import org.opendaylight.ovsdb.openstack.netvirt.api.EgressAclProvider;
+import org.opendaylight.ovsdb.openstack.netvirt.api.IngressAclProvider;
+import org.opendaylight.ovsdb.openstack.netvirt.api.Southbound;
import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronNetwork;
import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronPort;
import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronSecurityGroup;
import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronNetworkCRUD;
import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronPortCRUD;
import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronSubnetCRUD;
-import org.opendaylight.ovsdb.openstack.netvirt.api.ConfigurationService;
-import org.opendaylight.ovsdb.openstack.netvirt.api.EgressAclProvider;
-import org.opendaylight.ovsdb.openstack.netvirt.api.IngressAclProvider;
-import org.opendaylight.ovsdb.openstack.netvirt.api.Southbound;
import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105
+ .OvsdbTerminationPointAugmentation;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology
+ .Node;
import org.osgi.framework.ServiceReference;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
/**
* Unit test for {@link SecurityServicesImpl}
*/
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(ServiceHelper.class)
+@RunWith(MockitoJUnitRunner.class)
public class SecurityServicesImplTest {
@InjectMocks private SecurityServicesImpl securityServicesImpl;
public void testSetDependencies() throws Exception {
Southbound southbound = mock(Southbound.class);
- PowerMockito.mockStatic(ServiceHelper.class);
- PowerMockito.when(ServiceHelper.getGlobalInstance(Southbound.class, securityServicesImpl)).thenReturn(southbound);
+ ServiceHelper.overrideGlobalInstance(Southbound.class, southbound);
securityServicesImpl.setDependencies(mock(ServiceReference.class));
/*
- * Copyright (c) 2015 Inocybe and others. All rights reserved.
+ * Copyright (c) 2015, 2016 Inocybe and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.opendaylight.ovsdb.openstack.netvirt.api.NetworkingProviderManager;
+import org.opendaylight.ovsdb.openstack.netvirt.api.Southbound;
+import org.opendaylight.ovsdb.openstack.netvirt.api.VlanConfigurationCache;
import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronNetwork;
import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronPort;
import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronNetworkCRUD;
import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronPortCRUD;
-import org.opendaylight.ovsdb.openstack.netvirt.api.NetworkingProviderManager;
-import org.opendaylight.ovsdb.openstack.netvirt.api.Southbound;
-import org.opendaylight.ovsdb.openstack.netvirt.api.VlanConfigurationCache;
import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
-
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105
+ .OvsdbTerminationPointAugmentation;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology
+ .Node;
import org.osgi.framework.ServiceReference;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
/**
* Unit test for {@link TenantNetworkManagerImpl}
*/
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(ServiceHelper.class)
+@RunWith(MockitoJUnitRunner.class)
public class TenantNetworkManagerImplTest {
@InjectMocks private TenantNetworkManagerImpl tenantNetworkManagerImpl;
}
/**
- * Test method {@link TenantNetworkManagerImpl#reclaimInternalVlan(Node, String, NeutronNetwork)}
+ * Test method {@link TenantNetworkManagerImpl#reclaimInternalVlan(Node, NeutronNetwork)}
*/
@Test
public void testReclaimInternalVlan() {
}
/**
- * Test method {@link TenantNetworkManagerImpl#programInternalVlan(Node, String, NeutronNetwork)}
+ * Test method {@link TenantNetworkManagerImpl#programInternalVlan(Node, OvsdbTerminationPointAugmentation, NeutronNetwork)}
*/
@Test
public void testProgramInternalVlan(){
}
/**
- * Test method {@link TenantNetworkManagerImpl#getTenantNetwork(Interface)}
+ * Test method {@link TenantNetworkManagerImpl#getTenantNetwork(OvsdbTerminationPointAugmentation)}
*/
@Test
public void testGetTenantNetwork() {
VlanConfigurationCache vlanConfigurationCache = mock(VlanConfigurationCache.class);
Southbound southbound = mock(Southbound.class);
- PowerMockito.mockStatic(ServiceHelper.class);
- PowerMockito.when(ServiceHelper.getGlobalInstance(VlanConfigurationCache.class, tenantNetworkManagerImpl)).thenReturn(vlanConfigurationCache);
- PowerMockito.when(ServiceHelper.getGlobalInstance(Southbound.class, tenantNetworkManagerImpl)).thenReturn(southbound);
+ ServiceHelper.overrideGlobalInstance(VlanConfigurationCache.class, vlanConfigurationCache);
+ ServiceHelper.overrideGlobalInstance(Southbound.class, southbound);
tenantNetworkManagerImpl.setDependencies(mock(ServiceReference.class));
/*
- * Copyright (c) 2015 Inocybe and others. All rights reserved.
+ * Copyright (c) 2015, 2016 Inocybe and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronNetwork;
+import org.mockito.runners.MockitoJUnitRunner;
import org.opendaylight.ovsdb.openstack.netvirt.api.Southbound;
import org.opendaylight.ovsdb.openstack.netvirt.api.TenantNetworkManager;
+import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronNetwork;
import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper;
import org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.VlanId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
-
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105
+ .OvsdbTerminationPointAugmentation;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology
+ .Node;
import org.osgi.framework.ServiceReference;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
/**
* Unit test for {@link VlanConfigurationCacheImpl}
*/
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(ServiceHelper.class)
+@RunWith(MockitoJUnitRunner.class)
public class VlanConfigurationCacheImplTest {
@InjectMocks public VlanConfigurationCacheImpl vlanConfigurationCacheImpl;
TenantNetworkManager tenantNetworkManager = mock(TenantNetworkManager.class);
Southbound southbound = mock(Southbound.class);
- PowerMockito.mockStatic(ServiceHelper.class);
- PowerMockito.when(ServiceHelper.getGlobalInstance(TenantNetworkManager.class, vlanConfigurationCacheImpl)).thenReturn(tenantNetworkManager);
- PowerMockito.when(ServiceHelper.getGlobalInstance(Southbound.class, vlanConfigurationCacheImpl)).thenReturn(southbound);
+ ServiceHelper.overrideGlobalInstance(TenantNetworkManager.class, tenantNetworkManager);
+ ServiceHelper.overrideGlobalInstance(Southbound.class, southbound);
vlanConfigurationCacheImpl.setDependencies(mock(ServiceReference.class));
-/**
- * Copyright (c) 2015 NEC Corporation and others. All rights reserved.
+/*
+ * Copyright (c) 2015, 2016 NEC Corporation and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
-
-import static org.powermock.api.mockito.PowerMockito.mock;
-import static org.powermock.api.mockito.PowerMockito.when;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import java.util.ArrayList;
import java.util.List;
import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
import com.google.common.base.Optional;
import com.google.common.util.concurrent.CheckedFuture;
/**
* Unit test for {@link NeutronFloatingIPInterface}
*/
-@PrepareForTest({NeutronFloatingIPInterface.class})
-@RunWith(PowerMockRunner.class)
public class NeutronFloatingIPInterfaceTest {
/**
* UUID_VALUE used for testing different scenarios.
/*
- * Copyright (c) 2014, 2015 Red Hat, Inc. and others. All rights reserved.
+ * Copyright (c) 2014, 2016 Red Hat, Inc. and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
package org.opendaylight.ovsdb.utils.config;
+import java.util.HashMap;
+import java.util.Map;
+
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
public final class ConfigProperties {
+ private static final Map<String, String> OVERRIDES = new HashMap<>();
+
private ConfigProperties() {
// empty
}
}
public static String getProperty(Class<?> classParam, final String propertyStr, final String defaultValue) {
- String value = null;
+ String value = ConfigProperties.OVERRIDES.get(propertyStr);
+ if (value != null) {
+ return value;
+ }
+
Bundle bundle = FrameworkUtil.getBundle(classParam);
if (bundle != null) {
if (value == null) {
value = System.getProperty(propertyStr, defaultValue);
}
+
+ if (value == null) {
+ System.err.println("ConfigProperties missing a value for " + propertyStr);
+ }
+
return value;
}
+
+ public static void overrideProperty(String property, String value) {
+ ConfigProperties.OVERRIDES.put(property, value);
+ }
}
/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2013, 2016 Cisco Systems, Inc. and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-/**
- * @file ServiceHelper.java
- *
- * @brief This class verifies {@link ServiceHelper}
- */
package org.opendaylight.ovsdb.utils.servicehelper;
+import java.util.HashMap;
+import java.util.Map;
+
import org.osgi.framework.Bundle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
*/
public final class ServiceHelper {
private static final Logger LOG = LoggerFactory.getLogger(ServiceHelper.class);
+ private static final Map<Class<?>, Object> OVERRIDES = new HashMap<>();
+
+ /**
+ * Override a global instance. This should generally only be used for testing.
+ *
+ * @param clazz The target class.
+ * @param instance The instance to return for the class.
+ */
+ public static <T> void overrideGlobalInstance(Class<T> clazz, T instance) {
+ ServiceHelper.OVERRIDES.put(clazz, instance);
+ }
+
/**
* Retrieve global instance of a class via OSGI registry, if
* there are many only the first is returned.
*/
public static Object getGlobalInstance(Class<?> clazz, Object bundle,
String serviceFilter) {
+ if (OVERRIDES.containsKey(clazz)) {
+ return OVERRIDES.get(clazz);
+ }
Object[] instances = getGlobalInstances(clazz, bundle, serviceFilter);
if (instances != null && instances.length > 0) {
return instances[0];
* @param bundle The caller
* @param serviceFilter LDAP filter to be applied in the search
*/
- public static Object[] getGlobalInstances(Class<?> clazz, Object bundle,
+ private static Object[] getGlobalInstances(Class<?> clazz, Object bundle,
String serviceFilter) {
Object instances[] = null;
try {
Code Review / netvirt.git / commitdiff