Modified bgp file name according to naming convention.
Change-Id: I403139b53fbc1a2dba894dfd39720707a52ba7cd
diff --git a/bgp/ctl/src/test/java/org/onosproject/bgp/BGPControllerImplTest.java b/bgp/ctl/src/test/java/org/onosproject/bgp/BgpControllerImplTest.java
similarity index 92%
rename from bgp/ctl/src/test/java/org/onosproject/bgp/BGPControllerImplTest.java
rename to bgp/ctl/src/test/java/org/onosproject/bgp/BgpControllerImplTest.java
index 83583bb..36b1d6f 100755
--- a/bgp/ctl/src/test/java/org/onosproject/bgp/BGPControllerImplTest.java
+++ b/bgp/ctl/src/test/java/org/onosproject/bgp/BgpControllerImplTest.java
@@ -42,19 +42,19 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.onosproject.bgp.controller.BGPCfg;
-import org.onosproject.bgp.controller.impl.BGPControllerImpl;
-import org.onosproject.bgpio.types.BGPValueType;
+import org.onosproject.bgp.controller.BgpCfg;
+import org.onosproject.bgp.controller.impl.BgpControllerImpl;
+import org.onosproject.bgpio.types.BgpValueType;
import org.onosproject.bgpio.types.FourOctetAsNumCapabilityTlv;
import org.onosproject.bgpio.types.MultiProtocolExtnCapabilityTlv;
/**
* Test case for BGPControllerImpl.
*/
-public class BGPControllerImplTest {
+public class BgpControllerImplTest {
protected static final Logger log = LoggerFactory
- .getLogger(BGPControllerImplTest.class);
+ .getLogger(BgpControllerImplTest.class);
private static final String IP_LOOPBACK_ID1 = "127.0.0.1";
@@ -64,7 +64,7 @@
public short holdTime;
public int bgpId = InetAddresses.coerceToInteger(InetAddresses.forString(IP_LOOPBACK_ID1));
public boolean isLargeAsCapabilitySet = false;
- public LinkedList<BGPValueType> capabilityTlv = new LinkedList<>();
+ public LinkedList<BgpValueType> capabilityTlv = new LinkedList<>();
@Before
public void setUp() throws Exception {
@@ -72,7 +72,7 @@
holdTime, bgpId, isLargeAsCapabilitySet,
capabilityTlv);
- bgpControllerImpl = new BGPControllerImpl();
+ bgpControllerImpl = new BgpControllerImpl();
// NOTE: We use port 0 to bind on any available port
bgpControllerImpl.controller().setBgpPortNum();
@@ -90,7 +90,7 @@
bgpControllerImpl.getConfig().setRouterId("1.1.1.1");
bgpControllerImpl.getConfig().setAsNumber(200);
bgpControllerImpl.getConfig().setHoldTime((short) 120);
- bgpControllerImpl.getConfig().setState(BGPCfg.State.IP_AS_CONFIGURED);
+ bgpControllerImpl.getConfig().setState(BgpCfg.State.IP_AS_CONFIGURED);
bgpControllerImpl.getConfig().addPeer("127.0.0.1", 200);
}
@@ -101,7 +101,7 @@
bgpControllerImpl = null;
}
- private BGPControllerImpl bgpControllerImpl;
+ private BgpControllerImpl bgpControllerImpl;
BgpPeerTest peer1;
@@ -162,7 +162,7 @@
peer1.peerChannelHandler.version = 4;
peer1.peerChannelHandler.holdTime = 120;
peer1.peerChannelHandler.isLargeAsCapabilitySet = true;
- BGPValueType tempTlv = new FourOctetAsNumCapabilityTlv(766545);
+ BgpValueType tempTlv = new FourOctetAsNumCapabilityTlv(766545);
peer1.peerChannelHandler.capabilityTlv.add(tempTlv);
peer1.connect(connectToSocket);
@@ -183,7 +183,7 @@
peer1.peerChannelHandler.version = 4;
peer1.peerChannelHandler.holdTime = 120;
bgpControllerImpl.getConfig().setLsCapability(true);
- BGPValueType tempTlv1 = new MultiProtocolExtnCapabilityTlv(afi, res, safi);
+ BgpValueType tempTlv1 = new MultiProtocolExtnCapabilityTlv(afi, res, safi);
peer1.peerChannelHandler.capabilityTlv.add(tempTlv1);
peer1.connect(connectToSocket);
@@ -206,7 +206,7 @@
peer1.peerChannelHandler.holdTime = 120;
peer1.peerChannelHandler.isLargeAsCapabilitySet = true;
bgpControllerImpl.getConfig().setLargeASCapability(true);
- BGPValueType tempTlv = new FourOctetAsNumCapabilityTlv(200);
+ BgpValueType tempTlv = new FourOctetAsNumCapabilityTlv(200);
peer1.peerChannelHandler.capabilityTlv.add(tempTlv);
peer1.connect(connectToSocket);
@@ -238,11 +238,11 @@
peer1.peerChannelHandler.isLargeAsCapabilitySet = true;
bgpControllerImpl.getConfig().setLargeASCapability(true);
- BGPValueType tempTlv = new FourOctetAsNumCapabilityTlv(200);
+ BgpValueType tempTlv = new FourOctetAsNumCapabilityTlv(200);
peer1.peerChannelHandler.capabilityTlv.add(tempTlv);
bgpControllerImpl.getConfig().setLsCapability(true);
- BGPValueType tempTlv1 = new MultiProtocolExtnCapabilityTlv(afi, res, safi);
+ BgpValueType tempTlv1 = new MultiProtocolExtnCapabilityTlv(afi, res, safi);
peer1.peerChannelHandler.capabilityTlv.add(tempTlv1);
peer1.connect(connectToSocket);
@@ -264,7 +264,7 @@
private BgpPeerTest(byte version, short asNumber,
short holdTime, int bgpId, boolean isLargeAsCapabilitySet,
- LinkedList<BGPValueType> capabilityTlv) {
+ LinkedList<BgpValueType> capabilityTlv) {
peerChannelHandler = new BgpPeerChannelHandlerTest(version,
asNumber, holdTime, bgpId, isLargeAsCapabilitySet, capabilityTlv);
}
diff --git a/bgp/ctl/src/test/java/org/onosproject/bgp/BgpPeerChannelHandlerTest.java b/bgp/ctl/src/test/java/org/onosproject/bgp/BgpPeerChannelHandlerTest.java
index 6f1828f..26ed36d 100755
--- a/bgp/ctl/src/test/java/org/onosproject/bgp/BgpPeerChannelHandlerTest.java
+++ b/bgp/ctl/src/test/java/org/onosproject/bgp/BgpPeerChannelHandlerTest.java
@@ -23,10 +23,10 @@
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ChannelStateEvent;
import org.jboss.netty.channel.SimpleChannelHandler;
-import org.onosproject.bgpio.protocol.ver4.BGPKeepaliveMsgVer4;
-import org.onosproject.bgpio.protocol.ver4.BGPOpenMsgVer4;
-import org.onosproject.bgpio.types.BGPHeader;
-import org.onosproject.bgpio.types.BGPValueType;
+import org.onosproject.bgpio.protocol.ver4.BgpKeepaliveMsgVer4;
+import org.onosproject.bgpio.protocol.ver4.BgpOpenMsgVer4;
+import org.onosproject.bgpio.types.BgpHeader;
+import org.onosproject.bgpio.types.BgpValueType;
public class BgpPeerChannelHandlerTest extends SimpleChannelHandler {
public static final int OPEN_MSG_MINIMUM_LENGTH = 29;
@@ -34,16 +34,16 @@
(byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,
(byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,
(byte) 0xff, (byte) 0xff};
- public static final BGPHeader DEFAULT_OPEN_HEADER = new BGPHeader(MARKER,
+ public static final BgpHeader DEFAULT_OPEN_HEADER = new BgpHeader(MARKER,
(short) OPEN_MSG_MINIMUM_LENGTH, (byte) 0X01);
- LinkedList<BGPValueType> capabilityTlv = new LinkedList<>();
+ LinkedList<BgpValueType> capabilityTlv = new LinkedList<>();
public byte version;
public short asNumber;
public short holdTime;
public int bgpId;
public boolean isLargeAsCapabilitySet;
- final BGPOpenMsgVer4 openMessage = new BGPOpenMsgVer4();
+ final BgpOpenMsgVer4 openMessage = new BgpOpenMsgVer4();
ChannelHandlerContext savedCtx;
/**
@@ -60,7 +60,7 @@
short holdTime,
int bgpId,
boolean isLargeAsCapabilitySet,
- LinkedList<BGPValueType> capabilityTlv) {
+ LinkedList<BgpValueType> capabilityTlv) {
this.version = version;
this.asNumber = asNumber;
this.holdTime = holdTime;
@@ -81,7 +81,7 @@
ChannelStateEvent channelEvent) throws InterruptedException {
this.savedCtx = ctx;
- BGPOpenMsgVer4 openMsg = new BGPOpenMsgVer4(DEFAULT_OPEN_HEADER,
+ BgpOpenMsgVer4 openMsg = new BgpOpenMsgVer4(DEFAULT_OPEN_HEADER,
this.version,
this.asNumber,
this.holdTime,
@@ -93,7 +93,7 @@
TimeUnit.MILLISECONDS.sleep(100);
- BGPKeepaliveMsgVer4 keepaliveMsg = new BGPKeepaliveMsgVer4();
+ BgpKeepaliveMsgVer4 keepaliveMsg = new BgpKeepaliveMsgVer4();
ChannelBuffer buffer1 = ChannelBuffers.dynamicBuffer();
keepaliveMsg.writeTo(buffer1);
ctx.getChannel().write(buffer1);