Vidyashree Rama
Committed by Ray Milkey

[ONOS-2596] BGP Open message issue fix

Change-Id: I3c836950f851bc3ff02bc826d9128787133ae5d7
...@@ -72,13 +72,6 @@ public interface BGPOpenMsg extends BGPMessage { ...@@ -72,13 +72,6 @@ public interface BGPOpenMsg extends BGPMessage {
72 BGPOpenMsg build() throws BGPParseException; 72 BGPOpenMsg build() throws BGPParseException;
73 73
74 /** 74 /**
75 - * Returns hold time of Open Message.
76 - *
77 - * @return hold time of Open Message
78 - */
79 - short getHoldTime();
80 -
81 - /**
82 * Sets hold time in Open Message and return its builder. 75 * Sets hold time in Open Message and return its builder.
83 * 76 *
84 * @param holdtime hold timer value in open message 77 * @param holdtime hold timer value in open message
...@@ -87,13 +80,6 @@ public interface BGPOpenMsg extends BGPMessage { ...@@ -87,13 +80,6 @@ public interface BGPOpenMsg extends BGPMessage {
87 Builder setHoldTime(short holdtime); 80 Builder setHoldTime(short holdtime);
88 81
89 /** 82 /**
90 - * Returns as number of Open Message.
91 - *
92 - * @return as number of Open Message
93 - */
94 - short getAsNumber();
95 -
96 - /**
97 * Sets AS number in Open Message and return its builder. 83 * Sets AS number in Open Message and return its builder.
98 * 84 *
99 * @param asNumber as number in open message 85 * @param asNumber as number in open message
...@@ -102,13 +88,6 @@ public interface BGPOpenMsg extends BGPMessage { ...@@ -102,13 +88,6 @@ public interface BGPOpenMsg extends BGPMessage {
102 Builder setAsNumber(short asNumber); 88 Builder setAsNumber(short asNumber);
103 89
104 /** 90 /**
105 - * Returns BGP Identifier of Open Message.
106 - *
107 - * @return BGP Identifier of Open Message
108 - */
109 - int getBgpId();
110 -
111 - /**
112 * Sets BGP Identifier in Open Message and return its builder. 91 * Sets BGP Identifier in Open Message and return its builder.
113 * 92 *
114 * @param bgpId BGP Identifier in open message 93 * @param bgpId BGP Identifier in open message
...@@ -117,13 +96,6 @@ public interface BGPOpenMsg extends BGPMessage { ...@@ -117,13 +96,6 @@ public interface BGPOpenMsg extends BGPMessage {
117 Builder setBgpId(int bgpId); 96 Builder setBgpId(int bgpId);
118 97
119 /** 98 /**
120 - * Returns capabilities of Open Message.
121 - *
122 - * @return capabilities of Open Message
123 - */
124 - LinkedList<BGPValueType> getCapabilityTlv();
125 -
126 - /**
127 * Sets capabilities in Open Message and return its builder. 99 * Sets capabilities in Open Message and return its builder.
128 * 100 *
129 * @param capabilityTlv capabilities in open message 101 * @param capabilityTlv capabilities in open message
......
...@@ -311,8 +311,8 @@ public class BGPOpenMsgVer4 implements BGPOpenMsg { ...@@ -311,8 +311,8 @@ public class BGPOpenMsgVer4 implements BGPOpenMsg {
311 311
312 if (this.isLargeAsCapabilityTlvSet) { 312 if (this.isLargeAsCapabilityTlvSet) {
313 BGPValueType tlv; 313 BGPValueType tlv;
314 - int iValue = this.getAsNumber(); 314 + int value = this.asNumber;
315 - tlv = new FourOctetAsNumCapabilityTlv(iValue); 315 + tlv = new FourOctetAsNumCapabilityTlv(value);
316 this.capabilityTlv.add(tlv); 316 this.capabilityTlv.add(tlv);
317 } 317 }
318 318
...@@ -333,26 +333,6 @@ public class BGPOpenMsgVer4 implements BGPOpenMsg { ...@@ -333,26 +333,6 @@ public class BGPOpenMsgVer4 implements BGPOpenMsg {
333 } 333 }
334 334
335 @Override 335 @Override
336 - public short getHoldTime() {
337 - return this.holdTime;
338 - }
339 -
340 - @Override
341 - public short getAsNumber() {
342 - return this.asNumber;
343 - }
344 -
345 - @Override
346 - public int getBgpId() {
347 - return this.bgpId;
348 - }
349 -
350 - @Override
351 - public LinkedList<BGPValueType> getCapabilityTlv() {
352 - return this.capabilityTlv;
353 - }
354 -
355 - @Override
356 public Builder setHoldTime(short holdTime) { 336 public Builder setHoldTime(short holdTime) {
357 this.holdTime = holdTime; 337 this.holdTime = holdTime;
358 this.isHoldTimeSet = true; 338 this.isHoldTimeSet = true;
......