홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
bf916ea1 1 parent c4483c77

Moved Tunnel subsystem to ONOS core incubator area. 

Change-Id: I03f90b068013fbf0490af5277b33459ccc0514ec
Inline Side-by-side
Showing 52 changed files with 396 additions and 153 deletions
...@@ -39,6 +39,10 @@ ...@@ -39,6 +39,10 @@
39 </dependency> 39 </dependency>
40 <dependency> 40 <dependency>
41 <groupId>org.onosproject</groupId> 41 <groupId>org.onosproject</groupId>
42 + <artifactId>onos-incubator-api</artifactId>
43 + </dependency>
44 + <dependency>
45 + <groupId>org.onosproject</groupId>
42 <artifactId>onlab-osgi</artifactId> 46 <artifactId>onlab-osgi</artifactId>
43 </dependency> 47 </dependency>
44 <dependency> 48 <dependency>
......
...@@ -27,13 +27,13 @@ import org.onosproject.core.DefaultApplicationId; ...@@ -27,13 +27,13 @@ import org.onosproject.core.DefaultApplicationId;
27 import org.onosproject.net.DeviceId; 27 import org.onosproject.net.DeviceId;
28 import org.onosproject.net.PortNumber; 28 import org.onosproject.net.PortNumber;
29 import org.onosproject.net.provider.ProviderId; 29 import org.onosproject.net.provider.ProviderId;
30 -import org.onosproject.net.tunnel.DefaultOpticalTunnelEndPoint; 30 +import org.onosproject.incubator.net.tunnel.DefaultOpticalTunnelEndPoint;
31 -import org.onosproject.net.tunnel.IpTunnelEndPoint; 31 +import org.onosproject.incubator.net.tunnel.IpTunnelEndPoint;
32 -import org.onosproject.net.tunnel.OpticalLogicId; 32 +import org.onosproject.incubator.net.tunnel.OpticalLogicId;
33 -import org.onosproject.net.tunnel.OpticalTunnelEndPoint; 33 +import org.onosproject.incubator.net.tunnel.OpticalTunnelEndPoint;
34 -import org.onosproject.net.tunnel.Tunnel; 34 +import org.onosproject.incubator.net.tunnel.Tunnel;
35 -import org.onosproject.net.tunnel.TunnelEndPoint; 35 +import org.onosproject.incubator.net.tunnel.TunnelEndPoint;
36 -import org.onosproject.net.tunnel.TunnelService; 36 +import org.onosproject.incubator.net.tunnel.TunnelService;
37 37
38 /** 38 /**
39 * Borrows all tunnels between specific source tunnel end point and specific 39 * Borrows all tunnels between specific source tunnel end point and specific
...@@ -43,7 +43,7 @@ import org.onosproject.net.tunnel.TunnelService; ...@@ -43,7 +43,7 @@ import org.onosproject.net.tunnel.TunnelService;
43 description = "Borrows all tunnels between specific source tunnel end point" 43 description = "Borrows all tunnels between specific source tunnel end point"
44 + " and specific destination tunnel end point." 44 + " and specific destination tunnel end point."
45 + " Supports for IP address and optical as tunnel end point now. It's used by consumers.") 45 + " Supports for IP address and optical as tunnel end point now. It's used by consumers.")
46 -public class BorrowTunnelCommand extends AbstractShellCommand { 46 +public class TunnelBorrowCommand extends AbstractShellCommand {
47 @Argument(index = 0, name = "consumerId", description = "consumer id means application id.", 47 @Argument(index = 0, name = "consumerId", description = "consumer id means application id.",
48 required = true, multiValued = false) 48 required = true, multiValued = false)
49 String consumerId = null; 49 String consumerId = null;
......
...@@ -24,12 +24,12 @@ import org.onosproject.cli.AbstractShellCommand; ...@@ -24,12 +24,12 @@ import org.onosproject.cli.AbstractShellCommand;
24 import org.onosproject.net.DeviceId; 24 import org.onosproject.net.DeviceId;
25 import org.onosproject.net.PortNumber; 25 import org.onosproject.net.PortNumber;
26 import org.onosproject.net.provider.ProviderId; 26 import org.onosproject.net.provider.ProviderId;
27 -import org.onosproject.net.tunnel.DefaultOpticalTunnelEndPoint; 27 +import org.onosproject.incubator.net.tunnel.DefaultOpticalTunnelEndPoint;
28 -import org.onosproject.net.tunnel.IpTunnelEndPoint; 28 +import org.onosproject.incubator.net.tunnel.IpTunnelEndPoint;
29 -import org.onosproject.net.tunnel.OpticalLogicId; 29 +import org.onosproject.incubator.net.tunnel.OpticalLogicId;
30 -import org.onosproject.net.tunnel.OpticalTunnelEndPoint; 30 +import org.onosproject.incubator.net.tunnel.OpticalTunnelEndPoint;
31 -import org.onosproject.net.tunnel.TunnelAdminService; 31 +import org.onosproject.incubator.net.tunnel.TunnelAdminService;
32 -import org.onosproject.net.tunnel.TunnelEndPoint; 32 +import org.onosproject.incubator.net.tunnel.TunnelEndPoint;
33 33
34 /** 34 /**
35 * Supports for deleting all tunnels by using IP address and optical as tunnel 35 * Supports for deleting all tunnels by using IP address and optical as tunnel
...@@ -37,7 +37,7 @@ import org.onosproject.net.tunnel.TunnelEndPoint; ...@@ -37,7 +37,7 @@ import org.onosproject.net.tunnel.TunnelEndPoint;
37 */ 37 */
38 @Command(scope = "onos", name = "delete-tunnels", description = "Supports for deleting all tunnels by using IP address" 38 @Command(scope = "onos", name = "delete-tunnels", description = "Supports for deleting all tunnels by using IP address"
39 + " and optical as tunnel end point now. It's used by consumers.") 39 + " and optical as tunnel end point now. It's used by consumers.")
40 -public class DeleteTunnelCommand extends AbstractShellCommand { 40 +public class TunnelDeleteCommand extends AbstractShellCommand {
41 static String applicationId = "DEFAULT_APP_ID"; 41 static String applicationId = "DEFAULT_APP_ID";
42 @Argument(index = 0, name = "src", description = "Source tunnel point." 42 @Argument(index = 0, name = "src", description = "Source tunnel point."
43 + " Only supports for IpTunnelEndPoint and OpticalTunnelEndPoint as end point now." 43 + " Only supports for IpTunnelEndPoint and OpticalTunnelEndPoint as end point now."
......
...@@ -25,13 +25,13 @@ import org.onosproject.cli.AbstractShellCommand; ...@@ -25,13 +25,13 @@ import org.onosproject.cli.AbstractShellCommand;
25 import org.onosproject.net.DeviceId; 25 import org.onosproject.net.DeviceId;
26 import org.onosproject.net.PortNumber; 26 import org.onosproject.net.PortNumber;
27 import org.onosproject.net.provider.ProviderId; 27 import org.onosproject.net.provider.ProviderId;
28 -import org.onosproject.net.tunnel.DefaultOpticalTunnelEndPoint; 28 +import org.onosproject.incubator.net.tunnel.DefaultOpticalTunnelEndPoint;
29 -import org.onosproject.net.tunnel.IpTunnelEndPoint; 29 +import org.onosproject.incubator.net.tunnel.IpTunnelEndPoint;
30 -import org.onosproject.net.tunnel.OpticalLogicId; 30 +import org.onosproject.incubator.net.tunnel.OpticalLogicId;
31 -import org.onosproject.net.tunnel.OpticalTunnelEndPoint; 31 +import org.onosproject.incubator.net.tunnel.OpticalTunnelEndPoint;
32 -import org.onosproject.net.tunnel.Tunnel; 32 +import org.onosproject.incubator.net.tunnel.Tunnel;
33 -import org.onosproject.net.tunnel.TunnelEndPoint; 33 +import org.onosproject.incubator.net.tunnel.TunnelEndPoint;
34 -import org.onosproject.net.tunnel.TunnelService; 34 +import org.onosproject.incubator.net.tunnel.TunnelService;
35 35
36 /** 36 /**
37 * Supports for querying all tunnels by using IP address and optical as tunnel 37 * Supports for querying all tunnels by using IP address and optical as tunnel
...@@ -40,7 +40,7 @@ import org.onosproject.net.tunnel.TunnelService; ...@@ -40,7 +40,7 @@ import org.onosproject.net.tunnel.TunnelService;
40 @Command(scope = "onos", name = "query-tunnels", description = "Supports for querying all tunnels by using IP address" 40 @Command(scope = "onos", name = "query-tunnels", description = "Supports for querying all tunnels by using IP address"
41 + " and optical as tunnel end point now." 41 + " and optical as tunnel end point now."
42 + " It's used by consumers.") 42 + " It's used by consumers.")
43 -public class QueryTunnelCommand extends AbstractShellCommand { 43 +public class TunnelQueryCommand extends AbstractShellCommand {
44 @Argument(index = 0, name = "src", description = "Source tunnel point." 44 @Argument(index = 0, name = "src", description = "Source tunnel point."
45 + " Only supports for IpTunnelEndPoint and OpticalTunnelEndPoint as end point now." 45 + " Only supports for IpTunnelEndPoint and OpticalTunnelEndPoint as end point now."
46 + " If deletess a ODUK or OCH type tunnel, the formatter of this argument is DeviceId-PortNumber." 46 + " If deletess a ODUK or OCH type tunnel, the formatter of this argument is DeviceId-PortNumber."
......
...@@ -22,8 +22,8 @@ import org.apache.karaf.shell.commands.Command; ...@@ -22,8 +22,8 @@ import org.apache.karaf.shell.commands.Command;
22 import org.onosproject.cli.AbstractShellCommand; 22 import org.onosproject.cli.AbstractShellCommand;
23 import org.onosproject.core.ApplicationId; 23 import org.onosproject.core.ApplicationId;
24 import org.onosproject.core.DefaultApplicationId; 24 import org.onosproject.core.DefaultApplicationId;
25 -import org.onosproject.net.tunnel.TunnelService; 25 +import org.onosproject.incubator.net.tunnel.TunnelService;
26 -import org.onosproject.net.tunnel.TunnelSubscription; 26 +import org.onosproject.incubator.net.tunnel.TunnelSubscription;
27 27
28 /** 28 /**
29 * Query all tunnel subscriptions of consumer by consumer id. 29 * Query all tunnel subscriptions of consumer by consumer id.
...@@ -31,7 +31,7 @@ import org.onosproject.net.tunnel.TunnelSubscription; ...@@ -31,7 +31,7 @@ import org.onosproject.net.tunnel.TunnelSubscription;
31 */ 31 */
32 @Command(scope = "onos", name = "query-tunnel-subscriptions", 32 @Command(scope = "onos", name = "query-tunnel-subscriptions",
33 description = "Query all request orders of consumer by consumer id. It's used by consumers.") 33 description = "Query all request orders of consumer by consumer id. It's used by consumers.")
34 -public class QueryTunnelSubscriptionCommand extends AbstractShellCommand { 34 +public class TunnelQuerySubscriptionCommand extends AbstractShellCommand {
35 @Argument(index = 0, name = "consumerId", 35 @Argument(index = 0, name = "consumerId",
36 description = "consumer id means provider id", 36 description = "consumer id means provider id",
37 required = true, multiValued = false) 37 required = true, multiValued = false)
......
...@@ -26,12 +26,12 @@ import org.onosproject.core.DefaultApplicationId; ...@@ -26,12 +26,12 @@ import org.onosproject.core.DefaultApplicationId;
26 import org.onosproject.net.DeviceId; 26 import org.onosproject.net.DeviceId;
27 import org.onosproject.net.PortNumber; 27 import org.onosproject.net.PortNumber;
28 import org.onosproject.net.provider.ProviderId; 28 import org.onosproject.net.provider.ProviderId;
29 -import org.onosproject.net.tunnel.DefaultOpticalTunnelEndPoint; 29 +import org.onosproject.incubator.net.tunnel.DefaultOpticalTunnelEndPoint;
30 -import org.onosproject.net.tunnel.IpTunnelEndPoint; 30 +import org.onosproject.incubator.net.tunnel.IpTunnelEndPoint;
31 -import org.onosproject.net.tunnel.OpticalLogicId; 31 +import org.onosproject.incubator.net.tunnel.OpticalLogicId;
32 -import org.onosproject.net.tunnel.OpticalTunnelEndPoint; 32 +import org.onosproject.incubator.net.tunnel.OpticalTunnelEndPoint;
33 -import org.onosproject.net.tunnel.TunnelEndPoint; 33 +import org.onosproject.incubator.net.tunnel.TunnelEndPoint;
34 -import org.onosproject.net.tunnel.TunnelService; 34 +import org.onosproject.incubator.net.tunnel.TunnelService;
35 35
36 /** 36 /**
37 * Returns all tunnels between specific source tunnel end point and specific 37 * Returns all tunnels between specific source tunnel end point and specific
...@@ -42,7 +42,7 @@ import org.onosproject.net.tunnel.TunnelService; ...@@ -42,7 +42,7 @@ import org.onosproject.net.tunnel.TunnelService;
42 description = "Returns all tunnels between specific source tunnel end point and specific " 42 description = "Returns all tunnels between specific source tunnel end point and specific "
43 + " destination tunnel end point. Supports for IP address and optical as tunnel end point now." 43 + " destination tunnel end point. Supports for IP address and optical as tunnel end point now."
44 + " It's used by consumers.") 44 + " It's used by consumers.")
45 -public class ReturnTunnelCommand extends AbstractShellCommand { 45 +public class TunnelReturnCommand extends AbstractShellCommand {
46 @Argument(index = 0, name = "consumerId", description = "consumer id means application id.", 46 @Argument(index = 0, name = "consumerId", description = "consumer id means application id.",
47 required = true, multiValued = false) 47 required = true, multiValued = false)
48 String consumerId = null; 48 String consumerId = null;
......
...@@ -369,19 +369,19 @@ ...@@ -369,19 +369,19 @@
369 </command> 369 </command>
370 <!-- tunnel commands --> 370 <!-- tunnel commands -->
371 <command> 371 <command>
372 - <action class="org.onosproject.cli.net.DeleteTunnelCommand"/> 372 + <action class="org.onosproject.cli.net.TunnelDeleteCommand"/>
373 </command> 373 </command>
374 <command> 374 <command>
375 - <action class="org.onosproject.cli.net.BorrowTunnelCommand"/> 375 + <action class="org.onosproject.cli.net.TunnelBorrowCommand"/>
376 </command> 376 </command>
377 <command> 377 <command>
378 - <action class="org.onosproject.cli.net.ReturnTunnelCommand"/> 378 + <action class="org.onosproject.cli.net.TunnelReturnCommand"/>
379 </command> 379 </command>
380 <command> 380 <command>
381 - <action class="org.onosproject.cli.net.QueryTunnelCommand"/> 381 + <action class="org.onosproject.cli.net.TunnelQueryCommand"/>
382 </command> 382 </command>
383 <command> 383 <command>
384 - <action class="org.onosproject.cli.net.QueryTunnelSubscriptionCommand"/> 384 + <action class="org.onosproject.cli.net.TunnelQuerySubscriptionCommand"/>
385 </command> 385 </command>
386 </command-bundle> 386 </command-bundle>
387 387
......
1 -package org.onosproject.net.tunnel;
2 -
3 -/**
4 - * Represents for source end point or destination end point of a tunnel. Maybe a tunnel
5 - * based on ConnectPoint, IpAddress, MacAddress and so on is built.
6 - */
7 -public interface TunnelEndPoint {
8 -
9 -}
...@@ -42,8 +42,6 @@ import org.onosproject.net.resource.LabelResourceService; ...@@ -42,8 +42,6 @@ import org.onosproject.net.resource.LabelResourceService;
42 import org.onosproject.net.statistic.StatisticService; 42 import org.onosproject.net.statistic.StatisticService;
43 import org.onosproject.net.topology.PathService; 43 import org.onosproject.net.topology.PathService;
44 import org.onosproject.net.topology.TopologyService; 44 import org.onosproject.net.topology.TopologyService;
45 -import org.onosproject.net.tunnel.TunnelAdminService;
46 -import org.onosproject.net.tunnel.TunnelService;
47 import org.onosproject.store.service.StorageAdminService; 45 import org.onosproject.store.service.StorageAdminService;
48 import org.onosproject.store.service.StorageService; 46 import org.onosproject.store.service.StorageService;
49 import org.osgi.framework.ServicePermission; 47 import org.osgi.framework.ServicePermission;
...@@ -111,8 +109,8 @@ public final class PolicyBuilder { ...@@ -111,8 +109,8 @@ public final class PolicyBuilder {
111 StorageAdminService.class.getName(), ServicePermission.GET), 109 StorageAdminService.class.getName(), ServicePermission.GET),
112 new PermissionInfo(ServicePermission.class.getName(), 110 new PermissionInfo(ServicePermission.class.getName(),
113 LabelResourceAdminService.class.getName(), ServicePermission.GET), 111 LabelResourceAdminService.class.getName(), ServicePermission.GET),
114 - new PermissionInfo(ServicePermission.class.getName(), 112 +// new PermissionInfo(ServicePermission.class.getName(),
115 - TunnelAdminService.class.getName(), ServicePermission.GET), 113 +// TunnelAdminService.class.getName(), ServicePermission.GET),
116 new PermissionInfo(ServicePermission.class.getName(), 114 new PermissionInfo(ServicePermission.class.getName(),
117 ApplicationService.class.getName(), ServicePermission.GET), 115 ApplicationService.class.getName(), ServicePermission.GET),
118 new PermissionInfo(ServicePermission.class.getName(), 116 new PermissionInfo(ServicePermission.class.getName(),
...@@ -165,8 +163,8 @@ public final class PolicyBuilder { ...@@ -165,8 +163,8 @@ public final class PolicyBuilder {
165 PathService.class.getName(), ServicePermission.GET), 163 PathService.class.getName(), ServicePermission.GET),
166 new PermissionInfo(ServicePermission.class.getName(), 164 new PermissionInfo(ServicePermission.class.getName(),
167 TopologyService.class.getName(), ServicePermission.GET), 165 TopologyService.class.getName(), ServicePermission.GET),
168 - new PermissionInfo(ServicePermission.class.getName(), 166 +// new PermissionInfo(ServicePermission.class.getName(),
169 - TunnelService.class.getName(), ServicePermission.GET), 167 +// TunnelService.class.getName(), ServicePermission.GET),
170 new PermissionInfo(ServicePermission.class.getName(), 168 new PermissionInfo(ServicePermission.class.getName(),
171 StorageService.class.getName(), ServicePermission.GET), 169 StorageService.class.getName(), ServicePermission.GET),
172 }; 170 };
...@@ -246,12 +244,12 @@ public final class PolicyBuilder { ...@@ -246,12 +244,12 @@ public final class PolicyBuilder {
246 TopologyService.class.getName(), PathService.class.getName())); 244 TopologyService.class.getName(), PathService.class.getName()));
247 serviceDirectory.put(Permission.TOPOLOGY_EVENT, ImmutableSet.of( 245 serviceDirectory.put(Permission.TOPOLOGY_EVENT, ImmutableSet.of(
248 TopologyService.class.getName())); 246 TopologyService.class.getName()));
249 - serviceDirectory.put(Permission.TUNNEL_READ, ImmutableSet.of( 247 +// serviceDirectory.put(Permission.TUNNEL_READ, ImmutableSet.of(
250 - TunnelService.class.getName())); 248 +// TunnelService.class.getName()));
251 - serviceDirectory.put(Permission.TUNNEL_WRITE, ImmutableSet.of( 249 +// serviceDirectory.put(Permission.TUNNEL_WRITE, ImmutableSet.of(
252 - TunnelService.class.getName())); 250 +// TunnelService.class.getName()));
253 - serviceDirectory.put(Permission.TUNNEL_EVENT, ImmutableSet.of( 251 +// serviceDirectory.put(Permission.TUNNEL_EVENT, ImmutableSet.of(
254 - TunnelService.class.getName())); 252 +// TunnelService.class.getName()));
255 serviceDirectory.put(Permission.STORAGE_WRITE, ImmutableSet.of( 253 serviceDirectory.put(Permission.STORAGE_WRITE, ImmutableSet.of(
256 StorageService.class.getName())); 254 StorageService.class.getName()));
257 255
......
...@@ -87,6 +87,7 @@ ...@@ -87,6 +87,7 @@
87 <bundle>mvn:org.onosproject/onlab-osgi/@ONOS-VERSION</bundle> 87 <bundle>mvn:org.onosproject/onlab-osgi/@ONOS-VERSION</bundle>
88 88
89 <bundle>mvn:org.onosproject/onos-api/@ONOS-VERSION</bundle> 89 <bundle>mvn:org.onosproject/onos-api/@ONOS-VERSION</bundle>
90 + <bundle>mvn:org.onosproject/onos-incubator-api/@ONOS-VERSION</bundle>
90 </feature> 91 </feature>
91 92
92 <feature name="onos-core" version="@FEATURE-VERSION" 93 <feature name="onos-core" version="@FEATURE-VERSION"
...@@ -99,6 +100,13 @@ ...@@ -99,6 +100,13 @@
99 <bundle>mvn:org.onosproject/onlab-netty/@ONOS-VERSION</bundle> 100 <bundle>mvn:org.onosproject/onlab-netty/@ONOS-VERSION</bundle>
100 </feature> 101 </feature>
101 102
103 + <feature name="onos-incubator" version="@FEATURE-VERSION"
104 + description="ONOS core incubator components">
105 + <feature>onos-core</feature>
106 + <bundle>mvn:org.onosproject/onos-incubator-net/@ONOS-VERSION</bundle>
107 + <bundle>mvn:org.onosproject/onos-incubator-store/@ONOS-VERSION</bundle>
108 + </feature>
109 +
102 <feature name="onos-rest" version="@FEATURE-VERSION" 110 <feature name="onos-rest" version="@FEATURE-VERSION"
103 description="ONOS REST API components"> 111 description="ONOS REST API components">
104 <feature>onos-api</feature> 112 <feature>onos-api</feature>
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 +
2 <!-- 3 <!--
3 ~ Copyright 2015 Open Networking Laboratory 4 ~ Copyright 2015 Open Networking Laboratory
4 ~ 5 ~
...@@ -14,6 +15,7 @@ ...@@ -14,6 +15,7 @@
14 ~ See the License for the specific language governing permissions and 15 ~ See the License for the specific language governing permissions and
15 ~ limitations under the License. 16 ~ limitations under the License.
16 --> 17 -->
18 +
17 <project xmlns="http://maven.apache.org/POM/4.0.0" 19 <project xmlns="http://maven.apache.org/POM/4.0.0"
18 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 20 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 21 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
......
1 -package org.onosproject.net.tunnel; 1 +/*
2 + * Copyright 2015 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +package org.onosproject.incubator.net.tunnel;
2 17
3 import static com.google.common.base.Preconditions.checkNotNull; 18 import static com.google.common.base.Preconditions.checkNotNull;
4 import static com.google.common.base.MoreObjects.toStringHelper; 19 import static com.google.common.base.MoreObjects.toStringHelper;
......
1 -package org.onosproject.net.tunnel; 1 +/*
2 + * Copyright 2015 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +package org.onosproject.incubator.net.tunnel;
2 18
3 import static com.google.common.base.Preconditions.checkNotNull; 19 import static com.google.common.base.Preconditions.checkNotNull;
4 import static com.google.common.base.MoreObjects.toStringHelper; 20 import static com.google.common.base.MoreObjects.toStringHelper;
......
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.net.tunnel; 16 +
17 +package org.onosproject.incubator.net.tunnel;
17 18
18 import static com.google.common.base.Preconditions.checkNotNull; 19 import static com.google.common.base.Preconditions.checkNotNull;
19 import org.onosproject.core.DefaultGroupId; 20 import org.onosproject.core.DefaultGroupId;
......
1 -package org.onosproject.net.tunnel; 1 +/*
2 + * Copyright 2015 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +package org.onosproject.incubator.net.tunnel;
2 18
3 import java.util.Objects; 19 import java.util.Objects;
4 20
......
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.net.tunnel; 16 +
17 +package org.onosproject.incubator.net.tunnel;
17 18
18 import java.util.Objects; 19 import java.util.Objects;
19 import com.google.common.primitives.UnsignedLongs; 20 import com.google.common.primitives.UnsignedLongs;
......
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.net.tunnel; 16 +
17 +package org.onosproject.incubator.net.tunnel;
17 18
18 import java.util.Optional; 19 import java.util.Optional;
19 20
......
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.net.tunnel; 16 +
17 +package org.onosproject.incubator.net.tunnel;
17 18
18 import org.onosproject.core.DefaultGroupId; 19 import org.onosproject.core.DefaultGroupId;
19 import org.onosproject.net.Annotated; 20 import org.onosproject.net.Annotated;
......
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.net.tunnel; 16 +
17 +package org.onosproject.incubator.net.tunnel;
17 18
18 import org.onosproject.net.Path; 19 import org.onosproject.net.Path;
19 import org.onosproject.net.provider.ProviderId; 20 import org.onosproject.net.provider.ProviderId;
......
...@@ -13,13 +13,14 @@ ...@@ -13,13 +13,14 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.net.tunnel; 16 +
17 +package org.onosproject.incubator.net.tunnel;
17 18
18 import org.onosproject.core.DefaultGroupId; 19 import org.onosproject.core.DefaultGroupId;
19 import org.onosproject.net.Annotated; 20 import org.onosproject.net.Annotated;
20 import org.onosproject.net.Description; 21 import org.onosproject.net.Description;
21 import org.onosproject.net.provider.ProviderId; 22 import org.onosproject.net.provider.ProviderId;
22 -import org.onosproject.net.tunnel.Tunnel.Type; 23 +import org.onosproject.incubator.net.tunnel.Tunnel.Type;
23 24
24 /** 25 /**
25 * Describes a tunnel. 26 * Describes a tunnel.
......
1 +/*
2 + * Copyright 2015 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +package org.onosproject.incubator.net.tunnel;
18 +
19 +/**
20 + * Represents for source end point or destination end point of a tunnel. Maybe a tunnel
21 + * based on ConnectPoint, IpAddress, MacAddress and so on is built.
22 + */
23 +public interface TunnelEndPoint {
24 +
25 +}
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.net.tunnel; 16 +
17 +package org.onosproject.incubator.net.tunnel;
17 18
18 import org.onosproject.event.AbstractEvent; 19 import org.onosproject.event.AbstractEvent;
19 20
......
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.net.tunnel; 16 +
17 +package org.onosproject.incubator.net.tunnel;
17 18
18 import static com.google.common.base.Preconditions.checkArgument; 19 import static com.google.common.base.Preconditions.checkArgument;
19 20
......
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.net.tunnel; 16 +
17 +package org.onosproject.incubator.net.tunnel;
17 18
18 import org.onosproject.event.EventListener; 19 import org.onosproject.event.EventListener;
19 20
......
1 -package org.onosproject.net.tunnel; 1 +/*
2 + * Copyright 2015 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +package org.onosproject.incubator.net.tunnel;
2 18
3 import java.util.Objects; 19 import java.util.Objects;
4 20
......
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.net.tunnel; 16 +
17 +package org.onosproject.incubator.net.tunnel;
17 18
18 import org.onosproject.net.ElementId; 19 import org.onosproject.net.ElementId;
19 import org.onosproject.net.Path; 20 import org.onosproject.net.Path;
......
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.net.tunnel; 16 +
17 +package org.onosproject.incubator.net.tunnel;
17 18
18 import org.onosproject.net.provider.ProviderRegistry; 19 import org.onosproject.net.provider.ProviderRegistry;
19 20
......
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.net.tunnel; 16 +
17 +package org.onosproject.incubator.net.tunnel;
17 18
18 import org.onosproject.net.provider.ProviderService; 19 import org.onosproject.net.provider.ProviderService;
19 20
......
...@@ -13,13 +13,13 @@ ...@@ -13,13 +13,13 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.net.tunnel; 16 +
17 +package org.onosproject.incubator.net.tunnel;
17 18
18 import java.util.Collection; 19 import java.util.Collection;
19 20
20 import org.onosproject.core.ApplicationId; 21 import org.onosproject.core.ApplicationId;
21 import org.onosproject.net.Annotations; 22 import org.onosproject.net.Annotations;
22 -import org.onosproject.net.tunnel.Tunnel.Type;
23 23
24 /** 24 /**
25 * Service for interacting with the inventory of tunnels. 25 * Service for interacting with the inventory of tunnels.
...@@ -83,7 +83,7 @@ public interface TunnelService { ...@@ -83,7 +83,7 @@ public interface TunnelService {
83 * @return collection of available Tunnels 83 * @return collection of available Tunnels
84 */ 84 */
85 Collection<Tunnel> borrowTunnel(ApplicationId consumerId, TunnelEndPoint src, 85 Collection<Tunnel> borrowTunnel(ApplicationId consumerId, TunnelEndPoint src,
86 - TunnelEndPoint dst, Type type, 86 + TunnelEndPoint dst, Tunnel.Type type,
87 Annotations... annotations); 87 Annotations... annotations);
88 88
89 /** 89 /**
...@@ -122,7 +122,7 @@ public interface TunnelService { ...@@ -122,7 +122,7 @@ public interface TunnelService {
122 * @return success or fail 122 * @return success or fail
123 */ 123 */
124 boolean returnTunnel(ApplicationId consumerId, TunnelEndPoint src, 124 boolean returnTunnel(ApplicationId consumerId, TunnelEndPoint src,
125 - TunnelEndPoint dst, Type type, 125 + TunnelEndPoint dst, Tunnel.Type type,
126 Annotations... annotations); 126 Annotations... annotations);
127 127
128 /** 128 /**
...@@ -160,7 +160,7 @@ public interface TunnelService { ...@@ -160,7 +160,7 @@ public interface TunnelService {
160 * @param type tunnel type 160 * @param type tunnel type
161 * @return Collection of tunnels 161 * @return Collection of tunnels
162 */ 162 */
163 - Collection<Tunnel> queryTunnel(Type type); 163 + Collection<Tunnel> queryTunnel(Tunnel.Type type);
164 164
165 /** 165 /**
166 * Returns all tunnels between source point and destination point. 166 * Returns all tunnels between source point and destination point.
......
...@@ -13,14 +13,15 @@ ...@@ -13,14 +13,15 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.net.tunnel; 16 +
17 +package org.onosproject.incubator.net.tunnel;
17 18
18 import java.util.Collection; 19 import java.util.Collection;
19 20
20 import org.onosproject.core.ApplicationId; 21 import org.onosproject.core.ApplicationId;
21 import org.onosproject.net.Annotations; 22 import org.onosproject.net.Annotations;
22 import org.onosproject.net.provider.ProviderId; 23 import org.onosproject.net.provider.ProviderId;
23 -import org.onosproject.net.tunnel.Tunnel.Type; 24 +import org.onosproject.incubator.net.tunnel.Tunnel.Type;
24 import org.onosproject.store.Store; 25 import org.onosproject.store.Store;
25 26
26 /** 27 /**
......
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.net.tunnel; 16 +
17 +package org.onosproject.incubator.net.tunnel;
17 18
18 import org.onosproject.store.StoreDelegate; 19 import org.onosproject.store.StoreDelegate;
19 20
......
1 -package org.onosproject.net.tunnel; 1 +/*
2 + * Copyright 2015 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +package org.onosproject.incubator.net.tunnel;
2 18
3 import static com.google.common.base.Preconditions.checkNotNull; 19 import static com.google.common.base.Preconditions.checkNotNull;
4 20
...@@ -7,7 +23,7 @@ import java.util.Objects; ...@@ -7,7 +23,7 @@ import java.util.Objects;
7 import org.onosproject.core.ApplicationId; 23 import org.onosproject.core.ApplicationId;
8 import org.onosproject.net.AbstractAnnotated; 24 import org.onosproject.net.AbstractAnnotated;
9 import org.onosproject.net.Annotations; 25 import org.onosproject.net.Annotations;
10 -import org.onosproject.net.tunnel.Tunnel.Type; 26 +import org.onosproject.incubator.net.tunnel.Tunnel.Type;
11 27
12 import com.google.common.base.MoreObjects; 28 import com.google.common.base.MoreObjects;
13 29
......
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
17 /** 17 /**
18 * Tunnel model related services and providers API definitions. 18 * Tunnel model related services and providers API definitions.
19 */ 19 */
20 -package org.onosproject.net.tunnel; 20 +package org.onosproject.incubator.net.tunnel;
......
1 -package org.onosproject.net.tunnel; 1 +/*
2 + * Copyright 2015 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +package org.onosproject.incubator.net.tunnel;
2 18
3 import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable; 19 import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
4 20
......
1 -package org.onosproject.net.tunnel; 1 +/*
2 + * Copyright 2015 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +package org.onosproject.incubator.net.tunnel;
2 18
3 import static org.hamcrest.MatcherAssert.assertThat; 19 import static org.hamcrest.MatcherAssert.assertThat;
4 import static org.hamcrest.Matchers.is; 20 import static org.hamcrest.Matchers.is;
......
1 -package org.onosproject.net.tunnel; 1 +/*
2 + * Copyright 2015 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +package org.onosproject.incubator.net.tunnel;
2 18
3 import static org.hamcrest.MatcherAssert.assertThat; 19 import static org.hamcrest.MatcherAssert.assertThat;
4 import static org.hamcrest.Matchers.is; 20 import static org.hamcrest.Matchers.is;
......
1 -package org.onosproject.net.tunnel; 1 +/*
2 + * Copyright 2015 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +package org.onosproject.incubator.net.tunnel;
2 18
3 import static org.hamcrest.MatcherAssert.assertThat; 19 import static org.hamcrest.MatcherAssert.assertThat;
4 import static org.hamcrest.Matchers.is; 20 import static org.hamcrest.Matchers.is;
......
1 -package org.onosproject.net.tunnel; 1 +/*
2 + * Copyright 2015 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +package org.onosproject.incubator.net.tunnel;
2 17
3 import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable; 18 import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
4 19
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 +
2 <!-- 3 <!--
3 ~ Copyright 2015 Open Networking Laboratory 4 ~ Copyright 2015 Open Networking Laboratory
4 ~ 5 ~
......
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.net.tunnel.impl; 16 +
17 +package org.onosproject.incubator.net.tunnel.impl;
17 18
18 import static com.google.common.base.Preconditions.checkNotNull; 19 import static com.google.common.base.Preconditions.checkNotNull;
19 import static org.slf4j.LoggerFactory.getLogger; 20 import static org.slf4j.LoggerFactory.getLogger;
...@@ -35,23 +36,23 @@ import org.onosproject.net.Path; ...@@ -35,23 +36,23 @@ import org.onosproject.net.Path;
35 import org.onosproject.net.provider.AbstractProviderRegistry; 36 import org.onosproject.net.provider.AbstractProviderRegistry;
36 import org.onosproject.net.provider.AbstractProviderService; 37 import org.onosproject.net.provider.AbstractProviderService;
37 import org.onosproject.net.provider.ProviderId; 38 import org.onosproject.net.provider.ProviderId;
38 -import org.onosproject.net.tunnel.DefaultTunnel; 39 +import org.onosproject.incubator.net.tunnel.DefaultTunnel;
39 -import org.onosproject.net.tunnel.Tunnel; 40 +import org.onosproject.incubator.net.tunnel.Tunnel;
40 -import org.onosproject.net.tunnel.Tunnel.Type; 41 +import org.onosproject.incubator.net.tunnel.Tunnel.Type;
41 -import org.onosproject.net.tunnel.TunnelAdminService; 42 +import org.onosproject.incubator.net.tunnel.TunnelAdminService;
42 -import org.onosproject.net.tunnel.TunnelDescription; 43 +import org.onosproject.incubator.net.tunnel.TunnelDescription;
43 -import org.onosproject.net.tunnel.TunnelEndPoint; 44 +import org.onosproject.incubator.net.tunnel.TunnelEndPoint;
44 -import org.onosproject.net.tunnel.TunnelEvent; 45 +import org.onosproject.incubator.net.tunnel.TunnelEvent;
45 -import org.onosproject.net.tunnel.TunnelId; 46 +import org.onosproject.incubator.net.tunnel.TunnelId;
46 -import org.onosproject.net.tunnel.TunnelListener; 47 +import org.onosproject.incubator.net.tunnel.TunnelListener;
47 -import org.onosproject.net.tunnel.TunnelName; 48 +import org.onosproject.incubator.net.tunnel.TunnelName;
48 -import org.onosproject.net.tunnel.TunnelProvider; 49 +import org.onosproject.incubator.net.tunnel.TunnelProvider;
49 -import org.onosproject.net.tunnel.TunnelProviderRegistry; 50 +import org.onosproject.incubator.net.tunnel.TunnelProviderRegistry;
50 -import org.onosproject.net.tunnel.TunnelProviderService; 51 +import org.onosproject.incubator.net.tunnel.TunnelProviderService;
51 -import org.onosproject.net.tunnel.TunnelService; 52 +import org.onosproject.incubator.net.tunnel.TunnelService;
52 -import org.onosproject.net.tunnel.TunnelStore; 53 +import org.onosproject.incubator.net.tunnel.TunnelStore;
53 -import org.onosproject.net.tunnel.TunnelStoreDelegate; 54 +import org.onosproject.incubator.net.tunnel.TunnelStoreDelegate;
54 -import org.onosproject.net.tunnel.TunnelSubscription; 55 +import org.onosproject.incubator.net.tunnel.TunnelSubscription;
55 import org.slf4j.Logger; 56 import org.slf4j.Logger;
56 57
57 /** 58 /**
......
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
17 /** 17 /**
18 * Core subsystem for tracking global inventory of tunnels. 18 * Core subsystem for tracking global inventory of tunnels.
19 */ 19 */
20 -package org.onosproject.net.tunnel.impl; 20 +package org.onosproject.incubator.net.tunnel.impl;
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- 2 <!--
3 - ~ Copyright 2014 Open Networking Laboratory 3 + ~ Copyright 2015 Open Networking Laboratory
4 ~ 4 ~
5 ~ Licensed under the Apache License, Version 2.0 (the "License"); 5 ~ Licensed under the Apache License, Version 2.0 (the "License");
6 ~ you may not use this file except in compliance with the License. 6 ~ you may not use this file except in compliance with the License.
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 +
2 <!-- 3 <!--
3 ~ Copyright 2015 Open Networking Laboratory 4 ~ Copyright 2015 Open Networking Laboratory
4 ~ 5 ~
...@@ -68,6 +69,21 @@ ...@@ -68,6 +69,21 @@
68 <classifier>tests</classifier> 69 <classifier>tests</classifier>
69 <scope>test</scope> 70 <scope>test</scope>
70 </dependency> 71 </dependency>
72 +
73 + <dependency>
74 + <groupId>org.apache.felix</groupId>
75 + <artifactId>org.apache.felix.scr.annotations</artifactId>
76 + </dependency>
71 </dependencies> 77 </dependencies>
72 78
79 +
80 + <build>
81 + <plugins>
82 + <plugin>
83 + <groupId>org.apache.felix</groupId>
84 + <artifactId>maven-scr-plugin</artifactId>
85 + </plugin>
86 + </plugins>
87 + </build>
88 +
73 </project> 89 </project>
......
1 -package org.onosproject.store.tunnel.impl; 1 +/*
2 + * Copyright 2015 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +package org.onosproject.incubator.store.tunnel.impl;
2 18
3 import static org.slf4j.LoggerFactory.getLogger; 19 import static org.slf4j.LoggerFactory.getLogger;
4 20
...@@ -23,16 +39,16 @@ import org.onosproject.core.CoreService; ...@@ -23,16 +39,16 @@ import org.onosproject.core.CoreService;
23 import org.onosproject.core.IdGenerator; 39 import org.onosproject.core.IdGenerator;
24 import org.onosproject.net.Annotations; 40 import org.onosproject.net.Annotations;
25 import org.onosproject.net.provider.ProviderId; 41 import org.onosproject.net.provider.ProviderId;
26 -import org.onosproject.net.tunnel.DefaultTunnel; 42 +import org.onosproject.incubator.net.tunnel.DefaultTunnel;
27 -import org.onosproject.net.tunnel.Tunnel; 43 +import org.onosproject.incubator.net.tunnel.Tunnel;
28 -import org.onosproject.net.tunnel.Tunnel.Type; 44 +import org.onosproject.incubator.net.tunnel.Tunnel.Type;
29 -import org.onosproject.net.tunnel.TunnelEndPoint; 45 +import org.onosproject.incubator.net.tunnel.TunnelEndPoint;
30 -import org.onosproject.net.tunnel.TunnelEvent; 46 +import org.onosproject.incubator.net.tunnel.TunnelEvent;
31 -import org.onosproject.net.tunnel.TunnelId; 47 +import org.onosproject.incubator.net.tunnel.TunnelId;
32 -import org.onosproject.net.tunnel.TunnelName; 48 +import org.onosproject.incubator.net.tunnel.TunnelName;
33 -import org.onosproject.net.tunnel.TunnelStore; 49 +import org.onosproject.incubator.net.tunnel.TunnelStore;
34 -import org.onosproject.net.tunnel.TunnelStoreDelegate; 50 +import org.onosproject.incubator.net.tunnel.TunnelStoreDelegate;
35 -import org.onosproject.net.tunnel.TunnelSubscription; 51 +import org.onosproject.incubator.net.tunnel.TunnelSubscription;
36 import org.onosproject.store.AbstractStore; 52 import org.onosproject.store.AbstractStore;
37 import org.onosproject.store.app.GossipApplicationStore.InternalState; 53 import org.onosproject.store.app.GossipApplicationStore.InternalState;
38 import org.onosproject.store.cluster.messaging.ClusterCommunicationService; 54 import org.onosproject.store.cluster.messaging.ClusterCommunicationService;
......
1 /* 1 /*
2 - * Copyright 2014 Open Networking Laboratory 2 + * Copyright 2015 Open Networking Laboratory
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
17 /** 17 /**
18 * Implementation of distributed tunnel store using p2p synchronization protocol. 18 * Implementation of distributed tunnel store using p2p synchronization protocol.
19 */ 19 */
20 -package org.onosproject.store.tunnel.impl; 20 +package org.onosproject.incubator.store.tunnel.impl;
......
...@@ -361,6 +361,11 @@ ...@@ -361,6 +361,11 @@
361 <scope>test</scope> 361 <scope>test</scope>
362 </dependency> 362 </dependency>
363 363
364 + <dependency>
365 + <groupId>org.onosproject</groupId>
366 + <artifactId>onos-incubator-api</artifactId>
367 + <version>${project.version}</version>
368 + </dependency>
364 369
365 <dependency> 370 <dependency>
366 <groupId>org.onosproject</groupId> 371 <groupId>org.onosproject</groupId>
......
...@@ -45,6 +45,10 @@ ...@@ -45,6 +45,10 @@
45 <groupId>org.onosproject</groupId> 45 <groupId>org.onosproject</groupId>
46 <artifactId>onos-api</artifactId> 46 <artifactId>onos-api</artifactId>
47 </dependency> 47 </dependency>
48 + <dependency>
49 + <groupId>org.onosproject</groupId>
50 + <artifactId>onos-incubator-api</artifactId>
51 + </dependency>
48 52
49 <dependency> 53 <dependency>
50 <groupId>org.onosproject</groupId> 54 <groupId>org.onosproject</groupId>
......
...@@ -28,12 +28,12 @@ import org.onosproject.net.ElementId; ...@@ -28,12 +28,12 @@ import org.onosproject.net.ElementId;
28 import org.onosproject.net.Path; 28 import org.onosproject.net.Path;
29 import org.onosproject.net.provider.AbstractProvider; 29 import org.onosproject.net.provider.AbstractProvider;
30 import org.onosproject.net.provider.ProviderId; 30 import org.onosproject.net.provider.ProviderId;
31 -import org.onosproject.net.tunnel.Tunnel; 31 +import org.onosproject.incubator.net.tunnel.Tunnel;
32 -import org.onosproject.net.tunnel.TunnelDescription; 32 +import org.onosproject.incubator.net.tunnel.TunnelDescription;
33 -import org.onosproject.net.tunnel.TunnelId; 33 +import org.onosproject.incubator.net.tunnel.TunnelId;
34 -import org.onosproject.net.tunnel.TunnelProvider; 34 +import org.onosproject.incubator.net.tunnel.TunnelProvider;
35 -import org.onosproject.net.tunnel.TunnelProviderRegistry; 35 +import org.onosproject.incubator.net.tunnel.TunnelProviderRegistry;
36 -import org.onosproject.net.tunnel.TunnelProviderService; 36 +import org.onosproject.incubator.net.tunnel.TunnelProviderService;
37 import org.osgi.service.component.ComponentContext; 37 import org.osgi.service.component.ComponentContext;
38 import org.slf4j.Logger; 38 import org.slf4j.Logger;
39 39
......
...@@ -29,17 +29,17 @@ import org.onosproject.net.DeviceId; ...@@ -29,17 +29,17 @@ import org.onosproject.net.DeviceId;
29 import org.onosproject.net.PortNumber; 29 import org.onosproject.net.PortNumber;
30 import org.onosproject.net.SparseAnnotations; 30 import org.onosproject.net.SparseAnnotations;
31 import org.onosproject.net.provider.ProviderId; 31 import org.onosproject.net.provider.ProviderId;
32 -import org.onosproject.net.tunnel.DefaultOpticalTunnelEndPoint; 32 +import org.onosproject.incubator.net.tunnel.DefaultOpticalTunnelEndPoint;
33 -import org.onosproject.net.tunnel.DefaultTunnelDescription; 33 +import org.onosproject.incubator.net.tunnel.DefaultTunnelDescription;
34 -import org.onosproject.net.tunnel.IpTunnelEndPoint; 34 +import org.onosproject.incubator.net.tunnel.IpTunnelEndPoint;
35 -import org.onosproject.net.tunnel.OpticalLogicId; 35 +import org.onosproject.incubator.net.tunnel.OpticalLogicId;
36 -import org.onosproject.net.tunnel.OpticalTunnelEndPoint; 36 +import org.onosproject.incubator.net.tunnel.OpticalTunnelEndPoint;
37 -import org.onosproject.net.tunnel.Tunnel; 37 +import org.onosproject.incubator.net.tunnel.Tunnel;
38 -import org.onosproject.net.tunnel.TunnelDescription; 38 +import org.onosproject.incubator.net.tunnel.TunnelDescription;
39 -import org.onosproject.net.tunnel.TunnelEndPoint; 39 +import org.onosproject.incubator.net.tunnel.TunnelEndPoint;
40 -import org.onosproject.net.tunnel.TunnelId; 40 +import org.onosproject.incubator.net.tunnel.TunnelId;
41 -import org.onosproject.net.tunnel.TunnelName; 41 +import org.onosproject.incubator.net.tunnel.TunnelName;
42 -import org.onosproject.net.tunnel.TunnelProvider; 42 +import org.onosproject.incubator.net.tunnel.TunnelProvider;
43 43
44 /** 44 /**
45 * Supports for creating a tunnel by using IP address and optical as tunnel end 45 * Supports for creating a tunnel by using IP address and optical as tunnel end
......
...@@ -24,15 +24,15 @@ import org.onosproject.cli.AbstractShellCommand; ...@@ -24,15 +24,15 @@ import org.onosproject.cli.AbstractShellCommand;
24 import org.onosproject.net.DeviceId; 24 import org.onosproject.net.DeviceId;
25 import org.onosproject.net.PortNumber; 25 import org.onosproject.net.PortNumber;
26 import org.onosproject.net.provider.ProviderId; 26 import org.onosproject.net.provider.ProviderId;
27 -import org.onosproject.net.tunnel.DefaultOpticalTunnelEndPoint; 27 +import org.onosproject.incubator.net.tunnel.DefaultOpticalTunnelEndPoint;
28 -import org.onosproject.net.tunnel.DefaultTunnelDescription; 28 +import org.onosproject.incubator.net.tunnel.DefaultTunnelDescription;
29 -import org.onosproject.net.tunnel.IpTunnelEndPoint; 29 +import org.onosproject.incubator.net.tunnel.IpTunnelEndPoint;
30 -import org.onosproject.net.tunnel.OpticalLogicId; 30 +import org.onosproject.incubator.net.tunnel.OpticalLogicId;
31 -import org.onosproject.net.tunnel.OpticalTunnelEndPoint; 31 +import org.onosproject.incubator.net.tunnel.OpticalTunnelEndPoint;
32 -import org.onosproject.net.tunnel.Tunnel; 32 +import org.onosproject.incubator.net.tunnel.Tunnel;
33 -import org.onosproject.net.tunnel.TunnelDescription; 33 +import org.onosproject.incubator.net.tunnel.TunnelDescription;
34 -import org.onosproject.net.tunnel.TunnelEndPoint; 34 +import org.onosproject.incubator.net.tunnel.TunnelEndPoint;
35 -import org.onosproject.net.tunnel.TunnelProvider; 35 +import org.onosproject.incubator.net.tunnel.TunnelProvider;
36 36
37 /** 37 /**
38 * Supports for removing all tunnels by using IP address and optical as tunnel 38 * Supports for removing all tunnels by using IP address and optical as tunnel
......
...@@ -67,7 +67,7 @@ perl -pi.old -e "s|^(featuresRepositories=.*)|\1,mvn:org.onosproject/onos-featur ...@@ -67,7 +67,7 @@ perl -pi.old -e "s|^(featuresRepositories=.*)|\1,mvn:org.onosproject/onos-featur
67 $ONOS_STAGE/$KARAF_DIST/etc/org.apache.karaf.features.cfg 67 $ONOS_STAGE/$KARAF_DIST/etc/org.apache.karaf.features.cfg
68 68
69 # Patch the Apache Karaf distribution file to load default ONOS boot features 69 # Patch the Apache Karaf distribution file to load default ONOS boot features
70 -export BOOT_FEATURES="webconsole,onos-api,onos-core,onos-cli,onos-rest,onos-gui" 70 +export BOOT_FEATURES="webconsole,onos-api,onos-core,onos-incubator,onos-cli,onos-rest,onos-gui"
71 perl -pi.old -e "s|^(featuresBoot=.*)|\1,$BOOT_FEATURES|" \ 71 perl -pi.old -e "s|^(featuresBoot=.*)|\1,$BOOT_FEATURES|" \
72 $ONOS_STAGE/$KARAF_DIST/etc/org.apache.karaf.features.cfg 72 $ONOS_STAGE/$KARAF_DIST/etc/org.apache.karaf.features.cfg
73 73
......
...@@ -79,7 +79,7 @@ fi ...@@ -79,7 +79,7 @@ fi
79 79
80 if ! grep -q ",onos-api," $KARAF_ROOT/etc/org.apache.karaf.features.cfg; then 80 if ! grep -q ",onos-api," $KARAF_ROOT/etc/org.apache.karaf.features.cfg; then
81 # Patch the Apache Karaf distribution file to load default ONOS boot features 81 # Patch the Apache Karaf distribution file to load default ONOS boot features
82 - export BOOT_FEATURES="webconsole,onos-api,onos-core,onos-cli,onos-rest,onos-gui" 82 + export BOOT_FEATURES="webconsole,onos-api,onos-core,onos-incubator,onos-cli,onos-rest,onos-gui"
83 echo "Adding ONOS boot features $BOOT_FEATURES..." 83 echo "Adding ONOS boot features $BOOT_FEATURES..."
84 perl -pi.old -e "s|^(featuresBoot=.*)|\1,$BOOT_FEATURES|" \ 84 perl -pi.old -e "s|^(featuresBoot=.*)|\1,$BOOT_FEATURES|" \
85 $KARAF_ROOT/etc/org.apache.karaf.features.cfg 85 $KARAF_ROOT/etc/org.apache.karaf.features.cfg
......