Committed by
Gerrit Code Review
[ONOS] SBI part of label flow.
Change-Id: Id3af26cbf0dd7d02febfe4c13ce6fe496641e043
Showing
4 changed files
with
49 additions
and
27 deletions
protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFactory.java
100755 → 100644
... | @@ -18,117 +18,116 @@ package org.onosproject.pcepio.protocol; | ... | @@ -18,117 +18,116 @@ package org.onosproject.pcepio.protocol; |
18 | 18 | ||
19 | /** | 19 | /** |
20 | * Abstraction of an Message factory providing Builder functions to PCEP Messages and Objects. | 20 | * Abstraction of an Message factory providing Builder functions to PCEP Messages and Objects. |
21 | - * | ||
22 | */ | 21 | */ |
23 | public interface PcepFactory { | 22 | public interface PcepFactory { |
24 | 23 | ||
25 | /** | 24 | /** |
26 | - * To get Builder Object for Open Message. | 25 | + * Returns Builder Object for Open Message. |
27 | * | 26 | * |
28 | * @return Builder Object for Open Message | 27 | * @return Builder Object for Open Message |
29 | */ | 28 | */ |
30 | PcepOpenMsg.Builder buildOpenMsg(); | 29 | PcepOpenMsg.Builder buildOpenMsg(); |
31 | 30 | ||
32 | /** | 31 | /** |
33 | - * To get Builder Object for Open Object. | 32 | + * Returns Builder Object for Open Object. |
34 | * | 33 | * |
35 | * @return Builder Object for Open Object | 34 | * @return Builder Object for Open Object |
36 | */ | 35 | */ |
37 | PcepOpenObject.Builder buildOpenObject(); | 36 | PcepOpenObject.Builder buildOpenObject(); |
38 | 37 | ||
39 | /** | 38 | /** |
40 | - * To get Builder Object for Keepalive Message. | 39 | + * Returns Builder Object for Keepalive Message. |
41 | * | 40 | * |
42 | * @return Builder Object for Keepalive Message | 41 | * @return Builder Object for Keepalive Message |
43 | */ | 42 | */ |
44 | PcepKeepaliveMsg.Builder buildKeepaliveMsg(); | 43 | PcepKeepaliveMsg.Builder buildKeepaliveMsg(); |
45 | 44 | ||
46 | /** | 45 | /** |
47 | - * To get Builder Object for Close Message. | 46 | + * Returns Builder Object for Close Message. |
48 | * | 47 | * |
49 | * @return Builder Object for Close Message | 48 | * @return Builder Object for Close Message |
50 | */ | 49 | */ |
51 | PcepCloseMsg.Builder buildCloseMsg(); | 50 | PcepCloseMsg.Builder buildCloseMsg(); |
52 | 51 | ||
53 | /** | 52 | /** |
54 | - * To get Builder Object for Report Message. | 53 | + * Returns Builder Object for Report Message. |
55 | * | 54 | * |
56 | * @return Builder Object for Report Message | 55 | * @return Builder Object for Report Message |
57 | */ | 56 | */ |
58 | PcepReportMsg.Builder buildReportMsg(); | 57 | PcepReportMsg.Builder buildReportMsg(); |
59 | 58 | ||
60 | /** | 59 | /** |
61 | - * To get Builder Object for Update Message. | 60 | + * Returns Builder Object for Update Message. |
62 | * | 61 | * |
63 | * @return Builder Object for Update Message | 62 | * @return Builder Object for Update Message |
64 | */ | 63 | */ |
65 | PcepUpdateMsg.Builder buildUpdateMsg(); | 64 | PcepUpdateMsg.Builder buildUpdateMsg(); |
66 | 65 | ||
67 | /** | 66 | /** |
68 | - * To get Builder Object for Initiate Message. | 67 | + * Returns Builder Object for Initiate Message. |
69 | * | 68 | * |
70 | * @return Builder Object for Initiate Message | 69 | * @return Builder Object for Initiate Message |
71 | */ | 70 | */ |
72 | PcepInitiateMsg.Builder buildPcepInitiateMsg(); | 71 | PcepInitiateMsg.Builder buildPcepInitiateMsg(); |
73 | 72 | ||
74 | /** | 73 | /** |
75 | - * To get Builder Object for LSP Object. | 74 | + * Returns Builder Object for LSP Object. |
76 | * | 75 | * |
77 | * @return Builder Object for LSP Object | 76 | * @return Builder Object for LSP Object |
78 | */ | 77 | */ |
79 | PcepLspObject.Builder buildLspObject(); | 78 | PcepLspObject.Builder buildLspObject(); |
80 | 79 | ||
81 | /** | 80 | /** |
82 | - * To get Builder Object for SRP Object. | 81 | + * Returns Builder Object for SRP Object. |
83 | * | 82 | * |
84 | * @return Builder Object for SRP Object | 83 | * @return Builder Object for SRP Object |
85 | */ | 84 | */ |
86 | PcepSrpObject.Builder buildSrpObject(); | 85 | PcepSrpObject.Builder buildSrpObject(); |
87 | 86 | ||
88 | /** | 87 | /** |
89 | - * To get Builder Object for EndPoints Object. | 88 | + * Returns Builder Object for EndPoints Object. |
90 | * | 89 | * |
91 | * @return Builder Object for EndPoints Object | 90 | * @return Builder Object for EndPoints Object |
92 | */ | 91 | */ |
93 | PcepEndPointsObject.Builder buildEndPointsObject(); | 92 | PcepEndPointsObject.Builder buildEndPointsObject(); |
94 | 93 | ||
95 | /** | 94 | /** |
96 | - * To get Builder Object for ERO Object. | 95 | + * Returns Builder Object for ERO Object. |
97 | * | 96 | * |
98 | * @return Builder Object for ERO Object | 97 | * @return Builder Object for ERO Object |
99 | */ | 98 | */ |
100 | PcepEroObject.Builder buildEroObject(); | 99 | PcepEroObject.Builder buildEroObject(); |
101 | 100 | ||
102 | /** | 101 | /** |
103 | - * To get Builder Object for RRO Object. | 102 | + * Returns Builder Object for RRO Object. |
104 | * | 103 | * |
105 | * @return Builder Object for RRO Object | 104 | * @return Builder Object for RRO Object |
106 | */ | 105 | */ |
107 | PcepRroObject.Builder buildRroObject(); | 106 | PcepRroObject.Builder buildRroObject(); |
108 | 107 | ||
109 | /** | 108 | /** |
110 | - * To get Builder Object for LSPA Object. | 109 | + * Returns Builder Object for LSPA Object. |
111 | * | 110 | * |
112 | * @return Builder Object for LSPA Object | 111 | * @return Builder Object for LSPA Object |
113 | */ | 112 | */ |
114 | PcepLspaObject.Builder buildLspaObject(); | 113 | PcepLspaObject.Builder buildLspaObject(); |
115 | 114 | ||
116 | /** | 115 | /** |
117 | - * To get Builder Object for IRO Object. | 116 | + * Returns Builder Object for IRO Object. |
118 | * | 117 | * |
119 | * @return Builder Object for IRO Object | 118 | * @return Builder Object for IRO Object |
120 | */ | 119 | */ |
121 | PcepIroObject.Builder buildIroObject(); | 120 | PcepIroObject.Builder buildIroObject(); |
122 | 121 | ||
123 | /** | 122 | /** |
124 | - * To get Builder Object for METRIC Object. | 123 | + * Returns Builder Object for METRIC Object. |
125 | * | 124 | * |
126 | * @return Builder Object for METRIC Object | 125 | * @return Builder Object for METRIC Object |
127 | */ | 126 | */ |
128 | PcepMetricObject.Builder buildMetricObject(); | 127 | PcepMetricObject.Builder buildMetricObject(); |
129 | 128 | ||
130 | /** | 129 | /** |
131 | - * To get Builder Object for Bandwidth Object. | 130 | + * Returns Builder Object for Bandwidth Object. |
132 | * | 131 | * |
133 | * @return Builder Object for Bandwidth Object | 132 | * @return Builder Object for Bandwidth Object |
134 | */ | 133 | */ |
... | @@ -184,70 +183,77 @@ public interface PcepFactory { | ... | @@ -184,70 +183,77 @@ public interface PcepFactory { |
184 | PcepAttribute.Builder buildPcepAttribute(); | 183 | PcepAttribute.Builder buildPcepAttribute(); |
185 | 184 | ||
186 | /** | 185 | /** |
187 | - * To get Builder Object for LabelUpdate message. | 186 | + * Returns Builder Object for LabelUpdate message. |
188 | * | 187 | * |
189 | * @return Builder Object for LabelUpdate message | 188 | * @return Builder Object for LabelUpdate message |
190 | */ | 189 | */ |
191 | PcepLabelUpdateMsg.Builder buildPcepLabelUpdateMsg(); | 190 | PcepLabelUpdateMsg.Builder buildPcepLabelUpdateMsg(); |
192 | 191 | ||
193 | /** | 192 | /** |
194 | - * To get Builder Object for PcepLabelUpdate Object. | 193 | + * Returns Builder Object for PcepLabelUpdate Object. |
195 | * | 194 | * |
196 | * @return Builder Object for PcepLabelUpdate Object | 195 | * @return Builder Object for PcepLabelUpdate Object |
197 | */ | 196 | */ |
198 | PcepLabelUpdate.Builder buildPcepLabelUpdateObject(); | 197 | PcepLabelUpdate.Builder buildPcepLabelUpdateObject(); |
199 | 198 | ||
200 | /** | 199 | /** |
201 | - * To get Builder Object for PcepLabel Object. | 200 | + * Returns Builder Object for PcepLabel Object. |
202 | * | 201 | * |
203 | * @return Builder Object for PcepLabel Object | 202 | * @return Builder Object for PcepLabel Object |
204 | */ | 203 | */ |
205 | PcepLabelObject.Builder buildLabelObject(); | 204 | PcepLabelObject.Builder buildLabelObject(); |
206 | 205 | ||
207 | /** | 206 | /** |
208 | - * To get Builder Object for Error Message. | 207 | + * Returns Builder Object for Error Message. |
209 | * | 208 | * |
210 | * @return Builder Object for Error Message | 209 | * @return Builder Object for Error Message |
211 | */ | 210 | */ |
212 | PcepErrorMsg.Builder buildPcepErrorMsg(); | 211 | PcepErrorMsg.Builder buildPcepErrorMsg(); |
213 | 212 | ||
214 | /** | 213 | /** |
215 | - * To get Builder Object for Error Object. | 214 | + * Returns Builder Object for Error Object. |
216 | * | 215 | * |
217 | * @return Builder Object for Error Object | 216 | * @return Builder Object for Error Object |
218 | */ | 217 | */ |
219 | PcepErrorObject.Builder buildPcepErrorObject(); | 218 | PcepErrorObject.Builder buildPcepErrorObject(); |
220 | 219 | ||
221 | /** | 220 | /** |
222 | - * To get Builder Object for FecIpv4Adjacency. | 221 | + * Returns Builder Object for FecIpv4Adjacency. |
223 | * | 222 | * |
224 | * @return Builder Object for FecIpv4Adjacency | 223 | * @return Builder Object for FecIpv4Adjacency |
225 | */ | 224 | */ |
226 | PcepFecObjectIPv4Adjacency.Builder buildFecIpv4Adjacency(); | 225 | PcepFecObjectIPv4Adjacency.Builder buildFecIpv4Adjacency(); |
227 | 226 | ||
228 | /** | 227 | /** |
229 | - * To get Builder Object for ErrorInfo. | 228 | + * Returns Builder Object for FecObjectIPv4. |
229 | + * | ||
230 | + * @return Builder Object for FecObjectIPv4 | ||
231 | + */ | ||
232 | + PcepFecObjectIPv4.Builder buildFecObjectIpv4(); | ||
233 | + | ||
234 | + /** | ||
235 | + * Returns Builder Object for ErrorInfo. | ||
230 | * | 236 | * |
231 | * @return Builder Object for ErrorInfo | 237 | * @return Builder Object for ErrorInfo |
232 | */ | 238 | */ |
233 | PcepErrorInfo.Builder buildPcepErrorInfo(); | 239 | PcepErrorInfo.Builder buildPcepErrorInfo(); |
234 | 240 | ||
235 | /** | 241 | /** |
236 | - * To get Builder Object for PcepError. | 242 | + * Returns Builder Object for PcepError. |
237 | * | 243 | * |
238 | * @return Builder Object for PcepError | 244 | * @return Builder Object for PcepError |
239 | */ | 245 | */ |
240 | PcepError.Builder buildPcepError(); | 246 | PcepError.Builder buildPcepError(); |
241 | 247 | ||
242 | /** | 248 | /** |
243 | - * To get Builder Object for PcepLabelRangeObject. | 249 | + * Returns Builder Object for PcepLabelRangeObject. |
244 | * | 250 | * |
245 | * @return Builder Object for PcepLabelRangeObject | 251 | * @return Builder Object for PcepLabelRangeObject |
246 | */ | 252 | */ |
247 | PcepLabelRangeObject.Builder buildPcepLabelRangeObject(); | 253 | PcepLabelRangeObject.Builder buildPcepLabelRangeObject(); |
248 | 254 | ||
249 | /** | 255 | /** |
250 | - * To get Builder Object for PcepLabelRangeResvMsg. | 256 | + * Returns Builder Object for PcepLabelRangeResvMsg. |
251 | * | 257 | * |
252 | * @return Builder Object for PcepLabelRangeResvMsg | 258 | * @return Builder Object for PcepLabelRangeResvMsg |
253 | */ | 259 | */ | ... | ... |
... | @@ -27,6 +27,7 @@ import org.onosproject.pcepio.protocol.PcepError; | ... | @@ -27,6 +27,7 @@ import org.onosproject.pcepio.protocol.PcepError; |
27 | import org.onosproject.pcepio.protocol.PcepErrorMsg; | 27 | import org.onosproject.pcepio.protocol.PcepErrorMsg; |
28 | import org.onosproject.pcepio.protocol.PcepErrorObject; | 28 | import org.onosproject.pcepio.protocol.PcepErrorObject; |
29 | import org.onosproject.pcepio.protocol.PcepFactory; | 29 | import org.onosproject.pcepio.protocol.PcepFactory; |
30 | +import org.onosproject.pcepio.protocol.PcepFecObjectIPv4.Builder; | ||
30 | import org.onosproject.pcepio.protocol.PcepFecObjectIPv4Adjacency; | 31 | import org.onosproject.pcepio.protocol.PcepFecObjectIPv4Adjacency; |
31 | import org.onosproject.pcepio.protocol.PcepInitiateMsg; | 32 | import org.onosproject.pcepio.protocol.PcepInitiateMsg; |
32 | import org.onosproject.pcepio.protocol.PcepIroObject; | 33 | import org.onosproject.pcepio.protocol.PcepIroObject; |
... | @@ -223,4 +224,9 @@ public class PcepFactoryVer1 implements PcepFactory { | ... | @@ -223,4 +224,9 @@ public class PcepFactoryVer1 implements PcepFactory { |
223 | public PcepLabelRangeResvMsg.Builder buildPcepLabelRangeResvMsg() { | 224 | public PcepLabelRangeResvMsg.Builder buildPcepLabelRangeResvMsg() { |
224 | return new PcepLabelRangeResvMsgVer1.Builder(); | 225 | return new PcepLabelRangeResvMsgVer1.Builder(); |
225 | } | 226 | } |
227 | + | ||
228 | + @Override | ||
229 | + public Builder buildFecObjectIpv4() { | ||
230 | + return new PcepFecObjectIPv4Ver1.Builder(); | ||
231 | + } | ||
226 | } | 232 | } | ... | ... |
This diff is collapsed. Click to expand it.
... | @@ -42,6 +42,16 @@ | ... | @@ -42,6 +42,16 @@ |
42 | <artifactId>onos-bgp-api</artifactId> | 42 | <artifactId>onos-bgp-api</artifactId> |
43 | <version>${project.version}</version> | 43 | <version>${project.version}</version> |
44 | </dependency> | 44 | </dependency> |
45 | + <dependency> | ||
46 | + <groupId>org.onosproject</groupId> | ||
47 | + <artifactId>onos-pcep-provider-tunnel</artifactId> | ||
48 | + <version>${project.version}</version> | ||
49 | + </dependency> | ||
50 | + <dependency> | ||
51 | + <groupId>org.onosproject</groupId> | ||
52 | + <artifactId>onos-pcepio</artifactId> | ||
53 | + <version>${project.version}</version> | ||
54 | + </dependency> | ||
45 | </dependencies> | 55 | </dependencies> |
46 | 56 | ||
47 | </project> | 57 | </project> | ... | ... |
-
Please register or login to post a comment