[SEBA-144] Operational Status DHCP L2 Relay.
Cherry-picked from dhcpl2relay-1.6
Change-Id: I58aab083152793af36dfd34fa91cd78385fd2ed7
Signed-off-by: Marcos Aurelio Carrero <mcarrero@furukawalatam.com>
diff --git a/app/src/test/java/org/opencord/dhcpl2relay/impl/DhcpL2RelayTest.java b/app/src/test/java/org/opencord/dhcpl2relay/impl/DhcpL2RelayTest.java
index 17fb417..9841953 100755
--- a/app/src/test/java/org/opencord/dhcpl2relay/impl/DhcpL2RelayTest.java
+++ b/app/src/test/java/org/opencord/dhcpl2relay/impl/DhcpL2RelayTest.java
@@ -19,80 +19,33 @@
import java.nio.ByteBuffer;
import java.util.List;
-import java.util.Set;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.TimeUnit;
import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.onlab.junit.TestUtils;
-import org.onlab.osgi.ComponentContextAdapter;
-import org.onlab.packet.ChassisId;
import org.onlab.packet.DHCP;
import org.onlab.packet.Ethernet;
import org.onlab.packet.IPv4;
-import org.onlab.packet.Ip4Address;
-import org.onlab.packet.IpAddress;
-import org.onlab.packet.MacAddress;
import org.onlab.packet.UDP;
-import org.onlab.packet.VlanId;
import org.onlab.packet.dhcp.DhcpOption;
-import org.onosproject.cfg.ComponentConfigService;
-import org.onosproject.common.event.impl.TestEventDispatcher;
-import org.onosproject.mastership.MastershipServiceAdapter;
-import org.onosproject.net.AnnotationKeys;
-import org.onosproject.net.Annotations;
-import org.onosproject.net.ConnectPoint;
-import org.onosproject.net.DefaultAnnotations;
-import org.onosproject.net.DefaultDevice;
-import org.onosproject.net.DefaultHost;
-import org.onosproject.net.Device;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.Element;
-import org.onosproject.net.Host;
-import org.onosproject.net.HostId;
-import org.onosproject.net.HostLocation;
-import org.onosproject.net.Port;
-import org.onosproject.net.PortNumber;
-import org.onosproject.net.config.Config;
-import org.onosproject.net.config.NetworkConfigRegistryAdapter;
-import org.onosproject.net.device.DeviceServiceAdapter;
-import org.onosproject.net.flowobjective.FlowObjectiveServiceAdapter;
-import org.onosproject.net.host.HostServiceAdapter;
-import org.onosproject.net.provider.ProviderId;
-import org.opencord.dhcpl2relay.impl.packet.DhcpOption82;
-import org.opencord.sadis.SubscriberAndDeviceInformation;
-import org.opencord.sadis.BandwidthProfileInformation;
-import org.opencord.sadis.BaseInformationService;
-import org.opencord.sadis.SadisService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.google.common.collect.ImmutableSet;
+import org.onosproject.cfg.ComponentConfigService;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.flowobjective.FlowObjectiveServiceAdapter;
+import org.opencord.dhcpl2relay.DhcpL2RelayEvent;
+import org.opencord.dhcpl2relay.impl.packet.DhcpOption82;
+
import com.google.common.collect.Lists;
public class DhcpL2RelayTest extends DhcpL2RelayTestBase {
- private final Logger log = LoggerFactory.getLogger(getClass());
-
private DhcpL2Relay dhcpL2Relay;
-
- private static final MacAddress CLIENT_MAC = MacAddress.valueOf("00:00:00:00:00:01");
- private static final VlanId CLIENT_C_TAG = VlanId.vlanId((short) 999);
- private static final VlanId CLIENT_S_TAG = VlanId.vlanId((short) 111);
- private static final String CLIENT_NAS_PORT_ID = "PON 1/1";
- private static final String CLIENT_CIRCUIT_ID = "CIR-PON 1/1";
-
- private static final String OLT_DEV_ID = "of:00000000000000aa";
- private static final MacAddress OLT_MAC_ADDRESS = MacAddress.valueOf("01:02:03:04:05:06");
- private static final DeviceId DEVICE_ID_1 = DeviceId.deviceId(OLT_DEV_ID);
-
- private static final ConnectPoint SERVER_CONNECT_POINT =
- ConnectPoint.deviceConnectPoint("of:0000000000000001/5");
-
- private static final String SCHEME_NAME = "dhcpl2relay";
- private static final DefaultAnnotations DEVICE_ANNOTATIONS = DefaultAnnotations.builder()
- .set(AnnotationKeys.PROTOCOL, SCHEME_NAME.toUpperCase()).build();
+ private SimpleDhcpL2RelayCountersStore store;
ComponentConfigService mockConfigService =
EasyMock.createMock(ComponentConfigService.class);
@@ -103,7 +56,7 @@
@Before
public void setUp() {
dhcpL2Relay = new DhcpL2Relay();
- dhcpL2Relay.cfgService = new TestNetworkConfigRegistry();
+ dhcpL2Relay.cfgService = new DhcpL2RelayConfigTest.TestNetworkConfigRegistry();
dhcpL2Relay.coreService = new MockCoreServiceAdapter();
dhcpL2Relay.flowObjectiveService = new FlowObjectiveServiceAdapter();
dhcpL2Relay.packetService = new MockPacketService();
@@ -113,7 +66,12 @@
dhcpL2Relay.hostService = new MockHostService();
dhcpL2Relay.mastershipService = new MockMastershipService();
TestUtils.setField(dhcpL2Relay, "eventDispatcher", new TestEventDispatcher());
- dhcpL2Relay.activate(new ComponentContextAdapter());
+ dhcpL2Relay.refreshService = new MockExecutor(dhcpL2Relay.refreshService);
+ dhcpL2Relay.activate(new DhcpL2RelayTestBase.MockComponentContext());
+ store = new SimpleDhcpL2RelayCountersStore();
+ TestUtils.setField(store, "eventDispatcher", new TestEventDispatcher());
+ store.activate();
+ dhcpL2Relay.dhcpL2RelayCounters = this.store;
}
/**
@@ -132,7 +90,6 @@
@Test
public void testDhcpDiscover() throws Exception {
// (1) Sending DHCP discover packet
- System.out.println("Sending pakcet");
Ethernet discoverPacket = constructDhcpDiscoverPacket(CLIENT_MAC);
sendPacket(discoverPacket, ConnectPoint.deviceConnectPoint(OLT_DEV_ID + "/" + 1));
@@ -149,7 +106,6 @@
@Test
public void testDhcpRequest() throws Exception {
// (1) Sending DHCP discover packet
- System.out.println("Sending pakcet");
Ethernet requestPacket = constructDhcpRequestPacket(CLIENT_MAC);
sendPacket(requestPacket, ConnectPoint.deviceConnectPoint(OLT_DEV_ID + "/" + 1));
@@ -166,9 +122,8 @@
@Test
public void testDhcpOffer() {
// (1) Sending DHCP discover packet
- System.out.println("Sending pakcet");
- Ethernet offerPacket = constructDhcpOfferPacket(MacAddress.valueOf("bb:bb:bb:bb:bb:bb"),
- CLIENT_MAC, "1.1.1.1", "2.2.2.2");
+ Ethernet offerPacket = constructDhcpOfferPacket(SERVER_MAC,
+ CLIENT_MAC, DESTINATION_ADDRESS_IP, DHCP_CLIENT_IP_ADDRESS);
sendPacket(offerPacket, ConnectPoint.deviceConnectPoint(OLT_DEV_ID + "/" + 1));
@@ -184,8 +139,8 @@
@Test
public void testDhcpAck() {
- Ethernet ackPacket = constructDhcpAckPacket(MacAddress.valueOf("bb:bb:bb:bb:bb:bb"),
- CLIENT_MAC, "1.1.1.1", "2.2.2.2");
+ Ethernet ackPacket = constructDhcpAckPacket(SERVER_MAC,
+ CLIENT_MAC, DESTINATION_ADDRESS_IP, DHCP_CLIENT_IP_ADDRESS);
sendPacket(ackPacket, ConnectPoint.deviceConnectPoint(OLT_DEV_ID + "/" + 1));
@@ -193,6 +148,95 @@
compareServerPackets(ackPacket, ackRelayed);
}
+ /**
+ * Tests the DHCP global counters.
+ */
+ @Test
+ public void testDhcpGlobalCounters() {
+ long discoveryValue = 0;
+ long offerValue = 0;
+ long requestValue = 0;
+ long ackValue = 0;
+
+ Ethernet discoverPacket = constructDhcpDiscoverPacket(CLIENT_MAC);
+ Ethernet offerPacket = constructDhcpOfferPacket(SERVER_MAC,
+ CLIENT_MAC, DESTINATION_ADDRESS_IP, DHCP_CLIENT_IP_ADDRESS);
+ Ethernet requestPacket = constructDhcpRequestPacket(CLIENT_MAC);
+ Ethernet ackPacket = constructDhcpAckPacket(SERVER_MAC,
+ CLIENT_MAC, DESTINATION_ADDRESS_IP, DHCP_CLIENT_IP_ADDRESS);
+
+ sendPacket(discoverPacket, ConnectPoint.deviceConnectPoint(OLT_DEV_ID + "/" + 1));
+ sendPacket(offerPacket, ConnectPoint.deviceConnectPoint(OLT_DEV_ID + "/" + 1));
+ sendPacket(requestPacket, ConnectPoint.deviceConnectPoint(OLT_DEV_ID + "/" + 1));
+ sendPacket(ackPacket, ConnectPoint.deviceConnectPoint(OLT_DEV_ID + "/" + 1));
+
+ Map<DhcpL2RelayCountersIdentifier, AtomicLong> countersMap = dhcpL2Relay.dhcpL2RelayCounters.getCountersMap();
+ discoveryValue = countersMap.get(new DhcpL2RelayCountersIdentifier(DhcpL2RelayEvent.GLOBAL_COUNTER,
+ DhcpL2RelayCounters.valueOf("DHCPDISCOVER"))).longValue();
+ offerValue = countersMap.get(new DhcpL2RelayCountersIdentifier(DhcpL2RelayEvent.GLOBAL_COUNTER,
+ DhcpL2RelayCounters.valueOf("DHCPOFFER"))).longValue();
+ requestValue = countersMap.get(new DhcpL2RelayCountersIdentifier(DhcpL2RelayEvent.GLOBAL_COUNTER,
+ DhcpL2RelayCounters.valueOf("DHCPREQUEST"))).longValue();
+ ackValue = countersMap.get(new DhcpL2RelayCountersIdentifier(DhcpL2RelayEvent.GLOBAL_COUNTER,
+ DhcpL2RelayCounters.valueOf("DHCPACK"))).longValue();
+
+ assertEquals((long) 1, discoveryValue);
+ assertEquals((long) 1, offerValue);
+ assertEquals((long) 1, requestValue);
+ assertEquals((long) 1, ackValue);
+ }
+
+ /**
+ * Tests the DHCP per subscriber counters.
+ *
+ */
+ @Test
+ public void testDhcpPerSubscriberCounters() {
+ long discoveryValue;
+ long offerValue;
+ long requestValue;
+ long ackValue;
+
+ Ethernet discoverPacket = constructDhcpDiscoverPacket(CLIENT_MAC);
+ Ethernet offerPacket = constructDhcpOfferPacket(SERVER_MAC,
+ CLIENT_MAC, DESTINATION_ADDRESS_IP, DHCP_CLIENT_IP_ADDRESS);
+ Ethernet requestPacket = constructDhcpRequestPacket(CLIENT_MAC);
+ Ethernet ackPacket = constructDhcpAckPacket(SERVER_MAC,
+ CLIENT_MAC, DESTINATION_ADDRESS_IP, DHCP_CLIENT_IP_ADDRESS);
+
+ sendPacket(discoverPacket, ConnectPoint.deviceConnectPoint(OLT_DEV_ID + "/" + 1));
+ sendPacket(offerPacket, ConnectPoint.deviceConnectPoint(OLT_DEV_ID + "/" + 1));
+ sendPacket(requestPacket, ConnectPoint.deviceConnectPoint(OLT_DEV_ID + "/" + 1));
+ sendPacket(ackPacket, ConnectPoint.deviceConnectPoint(OLT_DEV_ID + "/" + 1));
+
+ Map<DhcpL2RelayCountersIdentifier, AtomicLong> countersMap = dhcpL2Relay.dhcpL2RelayCounters.getCountersMap();
+ discoveryValue = countersMap.get(new DhcpL2RelayCountersIdentifier(CLIENT_ID_1,
+ DhcpL2RelayCounters.valueOf("DHCPDISCOVER"))).longValue();
+ offerValue = countersMap.get(new DhcpL2RelayCountersIdentifier(CLIENT_ID_1,
+ DhcpL2RelayCounters.valueOf("DHCPOFFER"))).longValue();
+ requestValue = countersMap.get(new DhcpL2RelayCountersIdentifier(CLIENT_ID_1,
+ DhcpL2RelayCounters.valueOf("DHCPREQUEST"))).longValue();
+ ackValue = countersMap.get(new DhcpL2RelayCountersIdentifier(CLIENT_ID_1,
+ DhcpL2RelayCounters.valueOf("DHCPACK"))).longValue();
+
+ assertEquals((long) 1, discoveryValue);
+ assertEquals((long) 1, offerValue);
+ assertEquals((long) 1, requestValue);
+ assertEquals((long) 1, ackValue);
+ }
+
+ /**
+ * Tests the schedule function to publish the counters to kafka.
+ *
+ */
+ @Test
+ public void testSchedulePublishCountersToKafka() {
+ MockExecutor executor = new MockExecutor(dhcpL2Relay.refreshService);
+ dhcpL2Relay.refreshTask = executor.scheduleWithFixedDelay(
+ dhcpL2Relay.publishCountersToKafka, 0, 10, TimeUnit.SECONDS);
+ executor.assertLastMethodCalled("scheduleWithFixedDelay", 0, 10, TimeUnit.SECONDS);
+ }
+
public void compareClientPackets(Ethernet sent, Ethernet relayed) {
sent.setSourceMACAddress(OLT_MAC_ADDRESS);
sent.setQinQVID(CLIENT_S_TAG.toShort());
@@ -232,202 +276,4 @@
assertEquals(expectedPacket, relayed);
}
-
- private class MockDevice extends DefaultDevice {
-
- public MockDevice(ProviderId providerId, DeviceId id, Type type,
- String manufacturer, String hwVersion, String swVersion,
- String serialNumber, ChassisId chassisId, Annotations... annotations) {
- super(providerId, id, type, manufacturer, hwVersion, swVersion, serialNumber,
- chassisId, annotations);
- }
- }
-
- private class MockDeviceService extends DeviceServiceAdapter {
-
- private ProviderId providerId = new ProviderId("of", "foo");
- private final Device device1 = new MockDevice(providerId, DEVICE_ID_1, Device.Type.SWITCH,
- "foo.inc", "0", "0", OLT_DEV_ID, new ChassisId(),
- DEVICE_ANNOTATIONS);
-
- @Override
- public Device getDevice(DeviceId devId) {
- return device1;
-
- }
-
- @Override
- public Port getPort(ConnectPoint cp) {
- return new MockPort();
- }
-
- @Override
- public boolean isAvailable(DeviceId d) {
- return true;
- }
- }
-
- private class MockPort implements Port {
-
- @Override
- public boolean isEnabled() {
- return true;
- }
- @Override
- public long portSpeed() {
- return 1000;
- }
- @Override
- public Element element() {
- return null;
- }
- @Override
- public PortNumber number() {
- return null;
- }
- @Override
- public Annotations annotations() {
- return new MockAnnotations();
- }
- @Override
- public Type type() {
- return Port.Type.FIBER;
- }
-
- private class MockAnnotations implements Annotations {
-
- @Override
- public String value(String val) {
- return "PON 1/1";
- }
- @Override
- public Set<String> keys() {
- return null;
- }
- }
- }
-
- private class MockSadisService implements SadisService {
- @Override
- public BaseInformationService<SubscriberAndDeviceInformation> getSubscriberInfoService() {
- return new MockSubService();
- }
-
- @Override
- public BaseInformationService<BandwidthProfileInformation> getBandwidthProfileService() {
- return null;
- }
- }
-
- private class MockSubService implements BaseInformationService<SubscriberAndDeviceInformation> {
- MockSubscriberAndDeviceInformation device =
- new MockSubscriberAndDeviceInformation(OLT_DEV_ID, VlanId.NONE, VlanId.NONE, null, null,
- OLT_MAC_ADDRESS, Ip4Address.valueOf("10.10.10.10"));
- MockSubscriberAndDeviceInformation sub =
- new MockSubscriberAndDeviceInformation(CLIENT_NAS_PORT_ID, CLIENT_C_TAG,
- CLIENT_S_TAG, CLIENT_NAS_PORT_ID, CLIENT_CIRCUIT_ID, null, null);
- @Override
- public SubscriberAndDeviceInformation get(String id) {
- if (id.equals(OLT_DEV_ID)) {
- return device;
- } else {
- return sub;
- }
- }
-
- @Override
- public void invalidateAll() {}
- @Override
- public void invalidateId(String id) {}
- @Override
- public SubscriberAndDeviceInformation getfromCache(String id) {
- return null;
- }
- }
-
- private class MockMastershipService extends MastershipServiceAdapter {
- @Override
- public boolean isLocalMaster(DeviceId d) {
- return true;
- }
- }
-
- private class MockSubscriberAndDeviceInformation extends SubscriberAndDeviceInformation {
-
- MockSubscriberAndDeviceInformation(String id, VlanId ctag,
- VlanId stag, String nasPortId,
- String circuitId, MacAddress hardId,
- Ip4Address ipAddress) {
- this.setCTag(ctag);
- this.setHardwareIdentifier(hardId);
- this.setId(id);
- this.setIPAddress(ipAddress);
- this.setSTag(stag);
- this.setNasPortId(nasPortId);
- this.setCircuitId(circuitId);
- }
- }
-
- private class MockHostService extends HostServiceAdapter {
-
- @Override
- public Set<Host> getHostsByMac(MacAddress mac) {
-
- HostLocation loc = new HostLocation(DEVICE_ID_1, PortNumber.portNumber(22), 0);
-
- IpAddress ip = IpAddress.valueOf("10.100.200.10");
-
- Host h = new DefaultHost(ProviderId.NONE, HostId.hostId(mac, VlanId.NONE),
- mac, VlanId.NONE, loc, ImmutableSet.of(ip));
-
- return ImmutableSet.of(h);
- }
- }
-
-
- /**
- * Mocks the AAAConfig class to force usage of an unroutable address for the
- * RADIUS server.
- */
- static class MockDhcpL2RealyConfig extends DhcpL2RelayConfig {
- @Override
- public Set<ConnectPoint> getDhcpServerConnectPoint() {
- return ImmutableSet.of(SERVER_CONNECT_POINT);
- }
-
- @Override
- public boolean getModifySrcDstMacAddresses() {
- return true;
- }
- }
-
- /**
- * Mocks the network config registry.
- */
- @SuppressWarnings("unchecked")
- private static final class TestNetworkConfigRegistry
- extends NetworkConfigRegistryAdapter {
- @Override
- public <S, C extends Config<S>> C getConfig(S subject, Class<C> configClass) {
- DhcpL2RelayConfig dhcpConfig = new MockDhcpL2RealyConfig();
- return (C) dhcpConfig;
- }
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+}
\ No newline at end of file