package org.opendaylight.controller.packetcable.provider;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Address;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.PortNumber;
-import org.opendaylight.yang.gen.v1.urn.packetcable.rev150327.ServiceClassName;
-import org.opendaylight.yang.gen.v1.urn.packetcable.rev150327.ServiceFlowDirection;
-import org.opendaylight.yang.gen.v1.urn.packetcable.rev150327.TosByte;
-import org.opendaylight.yang.gen.v1.urn.packetcable.rev150327.TpProtocol;
-import org.opendaylight.yang.gen.v1.urn.packetcable.rev150327.ccap.Ccaps;
-import org.opendaylight.yang.gen.v1.urn.packetcable.rev150327.ccap.attributes.AmId;
-import org.opendaylight.yang.gen.v1.urn.packetcable.rev150327.ccap.attributes.Connection;
-import org.opendaylight.yang.gen.v1.urn.packetcable.rev150327.pcmm.qos.classifier.Classifier;
-import org.opendaylight.yang.gen.v1.urn.packetcable.rev150327.pcmm.qos.gate.spec.GateSpec;
-import org.opendaylight.yang.gen.v1.urn.packetcable.rev150327.pcmm.qos.gates.apps.subs.Gates;
-import org.opendaylight.yang.gen.v1.urn.packetcable.rev150327.pcmm.qos.traffic.profile.TrafficProfile;
+import org.opendaylight.yang.gen.v1.urn.packetcable.rev151026.ServiceClassName;
+import org.opendaylight.yang.gen.v1.urn.packetcable.rev151026.ServiceFlowDirection;
+import org.opendaylight.yang.gen.v1.urn.packetcable.rev151026.TosByte;
+import org.opendaylight.yang.gen.v1.urn.packetcable.rev151026.TpProtocol;
+import org.opendaylight.yang.gen.v1.urn.packetcable.rev151026.ccap.attributes.AmId;
+import org.opendaylight.yang.gen.v1.urn.packetcable.rev151026.ccap.attributes.Connection;
+import org.opendaylight.yang.gen.v1.urn.packetcable.rev151026.ccaps.Ccap;
+import org.opendaylight.yang.gen.v1.urn.packetcable.rev151026.pcmm.qos.classifier.Classifier;
+import org.opendaylight.yang.gen.v1.urn.packetcable.rev151026.pcmm.qos.gate.spec.GateSpec;
+import org.opendaylight.yang.gen.v1.urn.packetcable.rev151026.pcmm.qos.gates.apps.app.subscribers.subscriber.gates.Gate;
+import org.opendaylight.yang.gen.v1.urn.packetcable.rev151026.pcmm.qos.traffic.profile.TrafficProfile;
import org.pcmm.PCMMPdpAgent;
import org.pcmm.gates.IGateSpec.Direction;
import org.pcmm.gates.IPCMMGate;
import org.pcmm.rcd.IPCMMClient;
import org.pcmm.rcd.impl.CMTS;
-import org.umu.cops.stack.*;
+import org.umu.cops.stack.COPSClientSI;
+import org.umu.cops.stack.COPSContext;
import org.umu.cops.stack.COPSContext.RType;
+import org.umu.cops.stack.COPSData;
+import org.umu.cops.stack.COPSDecision;
import org.umu.cops.stack.COPSDecision.Command;
import org.umu.cops.stack.COPSDecision.DecisionFlag;
+import org.umu.cops.stack.COPSDecisionMsg;
+import org.umu.cops.stack.COPSHandle;
+import org.umu.cops.stack.COPSMsg;
+import org.umu.cops.stack.COPSMsgParser;
import org.umu.cops.stack.COPSObjHeader.CNum;
import org.umu.cops.stack.COPSObjHeader.CType;
-import java.io.*;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
/**
* Tests the PCMMService's ability to connect to a CMTS. Gate additions will not properly work as there is currently
* not any other means to receive acknowledgements. This functionality must be tested by the PCMMService's client
/**
* Defines the CMTS to add to the PCMMService
*/
- private Ccaps ccap;
+ private Ccap ccap;
/**
* The class under test
@Before
public void setup() throws IOException {
- final Set<String> upGates = new HashSet<>();
- upGates.add("extrm_up");
- final Set<String> dnGates = new HashSet<>();
- dnGates.add("extrm_dn");
- final Map<Direction, Set<String>> gates = new HashMap<>();
- gates.put(Direction.UPSTREAM, upGates);
- gates.put(Direction.DOWNSTREAM, dnGates);
-
srcAddr = new Ipv4Address("10.10.10.0");
dstAddr = new Ipv4Address("10.32.99.99");
if (realCmts) {
- cmAddrInet = InetAddress.getByAddress(new byte[] {10, 32, 110, (byte)180});
+ cmAddrInet = InetAddress.getByAddress(new byte[] {10, 32, 110, (byte)172});
invalidCmAddrInet = InetAddress.getByAddress(new byte[] {99, 99, 99, 99});
// Use me when testing against a CMTS or emulator not running in the same JVM
cmtsAddr = new Ipv4Address("10.32.10.3");
- ccap = makeCcapsObj(PCMMPdpAgent.WELL_KNOWN_PDP_PORT, cmtsAddr, ccapId);
+ ccap = makeCcapObj(PCMMPdpAgent.WELL_KNOWN_PDP_PORT, cmtsAddr, ccapId);
} else {
cmAddrInet = InetAddress.getByAddress(new byte[] {10, 32, 110, (byte)180});
invalidCmAddrInet = InetAddress.getByAddress(new byte[] {99, 99, 99, 99});
// Use me for automated testing and the CMTS emulator running in the same JVM
cmtsAddr = new Ipv4Address("127.0.0.1");
+ final Set<String> upGate = new HashSet<>();
+ upGate.add("extrm_up");
+ final Set<String> dnGate = new HashSet<>();
+ dnGate.add("extrm_dn");
+ final Map<Direction, Set<String>> gates = new HashMap<>();
+ gates.put(Direction.UPSTREAM, upGate);
+ gates.put(Direction.DOWNSTREAM, dnGate);
+
final Map<String, Boolean> cmStatus = new HashMap<>();
cmStatus.put(cmAddrInet.getHostAddress(), true);
cmStatus.put(invalidCmAddrInet.getHostAddress(), false);
icmts = new CMTS(gates, cmStatus);
icmts.startServer();
- ccap = makeCcapsObj(icmts.getPort(), cmtsAddr, ccapId);
+ ccap = makeCcapObj(icmts.getPort(), cmtsAddr, ccapId);
}
service = new PCMMService(IPCMMClient.CLIENT_TYPE, ccap);
connectToCmts(service);
}
- @Test
- public void testAddInvalidCcapBadHost() {
- cmtsAddr = new Ipv4Address("0.0.0.0");
- ccap = makeCcapsObj(PCMMPdpAgent.WELL_KNOWN_PDP_PORT, cmtsAddr, ccapId);
- service = new PCMMService(IPCMMClient.CLIENT_TYPE, ccap);
- final String message = service.addCcap();
- Assert.assertNotNull(message);
- final String expectedMsg = "404 Not Found - CCAP " + ccapId + " failed to connect @ " + cmtsAddr.getValue()
- + ':' + PCMMPdpAgent.WELL_KNOWN_PDP_PORT + " - Connection refused";
- Assert.assertEquals(expectedMsg, message);
- }
-
@Test
public void testAddInvalidCcapBadPort() {
- ccap = makeCcapsObj(1234, cmtsAddr, ccapId);
+ final int port;
+ if (icmts != null) port = icmts.getPort() + 1;
+ else port = PCMMPdpAgent.WELL_KNOWN_PDP_PORT + 1;
+ ccap = makeCcapObj(port, cmtsAddr, ccapId);
service = new PCMMService(IPCMMClient.CLIENT_TYPE, ccap);
final String message = service.addCcap();
Assert.assertNotNull(message);
final String expectedMsg = "404 Not Found - CCAP " + ccapId + " failed to connect @ " + cmtsAddr.getValue()
- + ":1234 - Connection refused";
- Assert.assertEquals(expectedMsg, message);
+ + ':' + port + " - ";
+ Assert.assertTrue(expectedMsg, message.startsWith(expectedMsg));
}
@Test
final Socket socket = new MockSocket();
final ServiceFlowDirection direction = ServiceFlowDirection.Us;
- final Gates gate = makeGateObj("extrm_up", cmtsAddr, direction, new Ipv4Address("127.0.0.1"));
+ final Gate gate = makeGateObj("extrm_up", cmtsAddr, direction, new Ipv4Address("127.0.0.1"));
final IPCMMGate gateReq = makeGateRequest(ccap, gate, InetAddress.getByName("localhost"), direction);
final byte[] data = gateReq.getData();
final Ipv4Address dstAddr, final ServiceFlowDirection direction,
final InetAddress cmAddrInet, final String gatePath,
final String expGateSetMsgStart) {
- final Gates gate = makeGateObj(scnName, srcAddr, direction, dstAddr);
+ final Gate gate = makeGateObj(scnName, srcAddr, direction, dstAddr);
+
+// final String gateSetMsg = service.sendGateSet(gatePath, cmAddrInet, gate, direction);
+// Assert.assertNotNull(gateSetMsg);
+// Assert.assertTrue(gateSetMsg, gateSetMsg.startsWith(expGateSetMsgStart));
- final String gateSetMsg = service.sendGateSet(gatePath, cmAddrInet, gate, direction);
- Assert.assertNotNull(gateSetMsg);
- Assert.assertTrue(gateSetMsg, gateSetMsg.startsWith(expGateSetMsgStart));
+ // TODO update this method for the new GateSetStatus object
+ PCMMService.GateSetStatus status = service.sendGateSet(gatePath, cmAddrInet, gate, direction);
+ Assert.assertNotNull(status);
+ Assert.assertTrue(status.getMessage().startsWith(expGateSetMsgStart));
// TODO - add validation to the PCMMGateReq contained within the map
Assert.assertNotNull(service.gateRequests.get(gatePath));
}
/**
- * Creates a mock Ccaps object that can be used for connecting to a CMTS
+ * Creates a mock Ccap object that can be used for connecting to a CMTS
* @param inPort - the CMTS port number
* @param ipAddr - the CMTS IPv4 address string
* @param ccapId - the ID of the CCAP
- * @return - the mock Ccaps object
+ * @return - the mock Ccap object
*/
- private Ccaps makeCcapsObj(final int inPort, final Ipv4Address ipAddr, final String ccapId) {
- final Ccaps ccap = Mockito.mock(Ccaps.class);
+ private Ccap makeCcapObj(final int inPort, final Ipv4Address ipAddr, final String ccapId) {
+ final Ccap ccap = Mockito.mock(Ccap.class);
final Connection conn = Mockito.mock(Connection.class);
Mockito.when(ccap.getConnection()).thenReturn(conn);
final PortNumber port = Mockito.mock(PortNumber.class);
}
/**
- * Creates a mock Gates object
+ * Creates a mock Gate object
* @param scnValue - the service class name defined on the CMTS
* @param dstAddr - the CM address this gate should be set against
* @return - the gate request
*/
- private Gates makeGateObj(final String scnValue, final Ipv4Address srcAddr, final ServiceFlowDirection direction,
+ private Gate makeGateObj(final String scnValue, final Ipv4Address srcAddr, final ServiceFlowDirection direction,
final Ipv4Address dstAddr) {
- final Gates gate = Mockito.mock(Gates.class);
+ final Gate gate = Mockito.mock(Gate.class);
final GateSpec gateSpec = Mockito.mock(GateSpec.class);
Mockito.when(gate.getGateSpec()).thenReturn(gateSpec);
Mockito.when(gateSpec.getDirection()).thenReturn(direction);
Mockito.when(classifier.getSrcIp()).thenReturn(srcAddr);
final PortNumber srcPort = new PortNumber(1234);
Mockito.when(classifier.getSrcPort()).thenReturn(srcPort);
- final TosByte tosByte = new TosByte((short)160);
+
+ // TODO - Can this value be any other value than 0 or 1 (See TosByte enumeration)
+ final TosByte tosByte = new TosByte((short)0);
Mockito.when(classifier.getTosByte()).thenReturn(tosByte);
final TosByte tosMask = new TosByte((short)224);
Mockito.when(classifier.getTosMask()).thenReturn(tosMask);
return gate;
}
- private IPCMMGate makeGateRequest(final Ccaps ccap, final Gates gateReq, final InetAddress addrSubId,
+ private IPCMMGate makeGateRequest(final Ccap ccap, final Gate gateReq, final InetAddress addrSubId,
final ServiceFlowDirection direction) {
final PCMMGateReqBuilder gateBuilder = new PCMMGateReqBuilder();
- gateBuilder.build(ccap.getAmId());
- gateBuilder.build(addrSubId);
+ gateBuilder.setAmId(ccap.getAmId());
+ gateBuilder.setSubscriberId(addrSubId);
// force gateSpec.Direction to align with SCN direction
final ServiceClassName scn = gateReq.getTrafficProfile().getServiceClassName();
if (scn != null) {
- gateBuilder.build(gateReq.getGateSpec(), direction);
+ gateBuilder.setGateSpec(gateReq.getGateSpec(), direction);
} else {
// not an SCN gate
- gateBuilder.build(gateReq.getGateSpec(), null);
+ gateBuilder.setGateSpec(gateReq.getGateSpec(), null);
}
- gateBuilder.build(gateReq.getTrafficProfile());
+ gateBuilder.setTrafficProfile(gateReq.getTrafficProfile());
// pick a classifier type (only one for now)
if (gateReq.getClassifier() != null) {
- gateBuilder.build(gateReq.getClassifier());
+ gateBuilder.setClassifier(gateReq.getClassifier());
} else if (gateReq.getExtClassifier() != null) {
- gateBuilder.build(gateReq.getExtClassifier());
+ gateBuilder.setExtClassifier(gateReq.getExtClassifier());
} else if (gateReq.getIpv6Classifier() != null) {
- gateBuilder.build(gateReq.getIpv6Classifier());
+ gateBuilder.setIpv6Classifier(gateReq.getIpv6Classifier());
}
// assemble the final gate request
- return gateBuilder.getGateReq();
+ return gateBuilder.build();
}
private class MockSocket extends Socket {
Code Review / packetcable.git / blobdiff