홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
Committed by Gerrit Code Review
61ab5e0f 1 parent 7e6d18ec

Fixed a stale pom.xml version. 

Change-Id: Id25a309714e582a7d25096170eec107320d651a0
Inline Side-by-side
Showing 2 changed files with 12 additions and 13 deletions
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
22 <parent> 22 <parent>
23 <groupId>org.onosproject</groupId> 23 <groupId>org.onosproject</groupId>
24 <artifactId>onos-apps</artifactId> 24 <artifactId>onos-apps</artifactId>
25 - <version>1.4.0-SNAPSHOT</version> 25 + <version>1.5.0-SNAPSHOT</version>
26 <relativePath>../pom.xml</relativePath> 26 <relativePath>../pom.xml</relativePath>
27 </parent> 27 </parent>
28 28
......
...@@ -15,20 +15,16 @@ ...@@ -15,20 +15,16 @@
15 */ 15 */
16 package org.onosproject.mfwd.impl; 16 package org.onosproject.mfwd.impl;
17 17
18 -import static com.google.common.base.Preconditions.checkNotNull;
19 -import static org.slf4j.LoggerFactory.getLogger;
20 -
21 import org.apache.felix.scr.annotations.Activate; 18 import org.apache.felix.scr.annotations.Activate;
22 import org.apache.felix.scr.annotations.Component; 19 import org.apache.felix.scr.annotations.Component;
23 import org.apache.felix.scr.annotations.Deactivate; 20 import org.apache.felix.scr.annotations.Deactivate;
24 import org.apache.felix.scr.annotations.Reference; 21 import org.apache.felix.scr.annotations.Reference;
25 import org.apache.felix.scr.annotations.ReferenceCardinality; 22 import org.apache.felix.scr.annotations.ReferenceCardinality;
26 -
27 import org.onlab.packet.Ethernet; 23 import org.onlab.packet.Ethernet;
28 -import org.onlab.packet.IpPrefix;
29 -import org.onlab.packet.IpAddress;
30 -import org.onlab.packet.Ip4Address;
31 import org.onlab.packet.IPv4; 24 import org.onlab.packet.IPv4;
25 +import org.onlab.packet.Ip4Address;
26 +import org.onlab.packet.IpAddress;
27 +import org.onlab.packet.IpPrefix;
32 import org.onosproject.core.ApplicationId; 28 import org.onosproject.core.ApplicationId;
33 import org.onosproject.core.CoreService; 29 import org.onosproject.core.CoreService;
34 import org.onosproject.net.ConnectPoint; 30 import org.onosproject.net.ConnectPoint;
...@@ -36,8 +32,8 @@ import org.onosproject.net.flow.DefaultTrafficSelector; ...@@ -36,8 +32,8 @@ import org.onosproject.net.flow.DefaultTrafficSelector;
36 import org.onosproject.net.flow.DefaultTrafficTreatment; 32 import org.onosproject.net.flow.DefaultTrafficTreatment;
37 import org.onosproject.net.flow.TrafficSelector; 33 import org.onosproject.net.flow.TrafficSelector;
38 import org.onosproject.net.flow.TrafficTreatment; 34 import org.onosproject.net.flow.TrafficTreatment;
39 -import org.onosproject.net.mcast.MulticastRouteService;
40 import org.onosproject.net.mcast.McastRoute; 35 import org.onosproject.net.mcast.McastRoute;
36 +import org.onosproject.net.mcast.MulticastRouteService;
41 import org.onosproject.net.packet.DefaultOutboundPacket; 37 import org.onosproject.net.packet.DefaultOutboundPacket;
42 import org.onosproject.net.packet.InboundPacket; 38 import org.onosproject.net.packet.InboundPacket;
43 import org.onosproject.net.packet.OutboundPacket; 39 import org.onosproject.net.packet.OutboundPacket;
...@@ -49,6 +45,9 @@ import org.slf4j.Logger; ...@@ -49,6 +45,9 @@ import org.slf4j.Logger;
49 45
50 import java.util.ArrayList; 46 import java.util.ArrayList;
51 47
48 +import static com.google.common.base.Preconditions.checkNotNull;
49 +import static org.slf4j.LoggerFactory.getLogger;
50 +
52 /** 51 /**
53 * The multicast forwarding component. This component is responsible for 52 * The multicast forwarding component. This component is responsible for
54 * handling live multicast traffic by modifying multicast state and forwarding 53 * handling live multicast traffic by modifying multicast state and forwarding
...@@ -167,7 +166,7 @@ public class McastForwarding { ...@@ -167,7 +166,7 @@ public class McastForwarding {
167 IpPrefix gpfx = IpPrefix.valueOf(gaddr, 32); 166 IpPrefix gpfx = IpPrefix.valueOf(gaddr, 32);
168 167
169 // TODO do we want to add a type for Mcast? 168 // TODO do we want to add a type for Mcast?
170 - McastRoute mRoute = new McastRoute(spfx, gpfx, McastRoute.Type.STATIC); 169 + McastRoute mRoute = new McastRoute(saddr, gaddr, McastRoute.Type.STATIC);
171 170
172 ConnectPoint ingress = mcastRouteManager.fetchSource(mRoute); 171 ConnectPoint ingress = mcastRouteManager.fetchSource(mRoute);
173 172
...@@ -216,12 +215,12 @@ public class McastForwarding { ...@@ -216,12 +215,12 @@ public class McastForwarding {
216 public static McastRoute createStaticRoute(String source, String group) { 215 public static McastRoute createStaticRoute(String source, String group) {
217 checkNotNull(source, "Must provide a source"); 216 checkNotNull(source, "Must provide a source");
218 checkNotNull(group, "Must provide a group"); 217 checkNotNull(group, "Must provide a group");
219 - IpPrefix ipSource = IpPrefix.valueOf(source); 218 + IpAddress ipSource = IpAddress.valueOf(source);
220 - IpPrefix ipGroup = IpPrefix.valueOf(group); 219 + IpAddress ipGroup = IpAddress.valueOf(group);
221 return createStaticcreateRoute(ipSource, ipGroup); 220 return createStaticcreateRoute(ipSource, ipGroup);
222 } 221 }
223 222
224 - public static McastRoute createStaticcreateRoute(IpPrefix source, IpPrefix group) { 223 + public static McastRoute createStaticcreateRoute(IpAddress source, IpAddress group) {
225 checkNotNull(source, "Must provide a source"); 224 checkNotNull(source, "Must provide a source");
226 checkNotNull(group, "Must provide a group"); 225 checkNotNull(group, "Must provide a group");
227 McastRoute.Type type = McastRoute.Type.STATIC; 226 McastRoute.Type type = McastRoute.Type.STATIC;
......