홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
alshabib
Committed by Gerrit Code Review
4809e546 1 parent 1aa0782e

Adding a cord-config appliation which hosts configuration 

classes common to several cord applications.

Change-Id: Ie8fba7dbfacb50f627407a6c9d96bfaea43a6b61
Inline Side-by-side
Showing 12 changed files with 95 additions and 10 deletions
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<!--
3 + ~ Copyright 2015-present Open Networking Laboratory
4 + ~
5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 + ~ you may not use this file except in compliance with the License.
7 + ~ You may obtain a copy of the License at
8 + ~
9 + ~ http://www.apache.org/licenses/LICENSE-2.0
10 + ~
11 + ~ Unless required by applicable law or agreed to in writing, software
12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14 + ~ See the License for the specific language governing permissions and
15 + ~ limitations under the License.
16 + -->
17 +<project xmlns="http://maven.apache.org/POM/4.0.0"
18 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20 + <modelVersion>4.0.0</modelVersion>
21 +
22 + <parent>
23 + <groupId>org.onosproject</groupId>
24 + <artifactId>onos-apps</artifactId>
25 + <version>1.6.0-SNAPSHOT</version>
26 + <relativePath>../pom.xml</relativePath>
27 + </parent>
28 +
29 +
30 + <artifactId>onos-cord-config</artifactId>
31 + <packaging>bundle</packaging>
32 +
33 + <description>Cord configuration meta applications </description>
34 +
35 + <properties>
36 + <onos.app.name>org.onosproject.cord-config</onos.app.name>
37 + <onos.app.title>Cord Configuratuon Meta Application</onos.app.title>
38 + <onos.app.category>Utility</onos.app.category>
39 + <onos.app.url>http://opencord.org</onos.app.url>
40 + </properties>
41 +
42 + <dependencies>
43 + <dependency>
44 + <groupId>org.onosproject</groupId>
45 + <artifactId>onos-api</artifactId>
46 + </dependency>
47 + </dependencies>
48 +
49 +
50 +</project>
...@@ -14,11 +14,12 @@ ...@@ -14,11 +14,12 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -package org.onosproject.olt; 17 +package org.onosproject.cordconfig.access;
18 18
19 +import org.onosproject.net.DeviceId;
19 import com.fasterxml.jackson.databind.JsonNode; 20 import com.fasterxml.jackson.databind.JsonNode;
20 import org.onlab.packet.VlanId; 21 import org.onlab.packet.VlanId;
21 -import org.onosproject.net.DeviceId; 22 +
22 import org.onosproject.net.PortNumber; 23 import org.onosproject.net.PortNumber;
23 import org.onosproject.net.config.Config; 24 import org.onosproject.net.config.Config;
24 25
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -package org.onosproject.olt; 17 +package org.onosproject.cordconfig.access;
18 18
19 import org.onlab.packet.VlanId; 19 import org.onlab.packet.VlanId;
20 import org.onosproject.net.DeviceId; 20 import org.onosproject.net.DeviceId;
......
1 +/*
2 + * Copyright 2016-present 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 +/**
18 + * Meta Application for hosting common cord configuration classes.
19 + */
20 +package org.onosproject.cordconfig.access;
...\ No newline at end of file ...\ No newline at end of file
...@@ -37,6 +37,8 @@ import org.onlab.packet.VlanId; ...@@ -37,6 +37,8 @@ import org.onlab.packet.VlanId;
37 import org.onosproject.cfg.ComponentConfigService; 37 import org.onosproject.cfg.ComponentConfigService;
38 import org.onosproject.codec.CodecService; 38 import org.onosproject.codec.CodecService;
39 import org.onosproject.codec.JsonCodec; 39 import org.onosproject.codec.JsonCodec;
40 +import org.onosproject.cordconfig.access.AccessDeviceConfig;
41 +import org.onosproject.cordconfig.access.AccessDeviceData;
40 import org.onosproject.core.ApplicationId; 42 import org.onosproject.core.ApplicationId;
41 import org.onosproject.core.CoreService; 43 import org.onosproject.core.CoreService;
42 import org.onosproject.net.ConnectPoint; 44 import org.onosproject.net.ConnectPoint;
...@@ -62,8 +64,7 @@ import org.onosproject.net.mcast.McastListener; ...@@ -62,8 +64,7 @@ import org.onosproject.net.mcast.McastListener;
62 import org.onosproject.net.mcast.McastRoute; 64 import org.onosproject.net.mcast.McastRoute;
63 import org.onosproject.net.mcast.McastRouteInfo; 65 import org.onosproject.net.mcast.McastRouteInfo;
64 import org.onosproject.net.mcast.MulticastRouteService; 66 import org.onosproject.net.mcast.MulticastRouteService;
65 -import org.onosproject.olt.AccessDeviceConfig; 67 +
66 -import org.onosproject.olt.AccessDeviceData;
67 import org.onosproject.rest.AbstractWebResource; 68 import org.onosproject.rest.AbstractWebResource;
68 import org.osgi.service.component.ComponentContext; 69 import org.osgi.service.component.ComponentContext;
69 import org.slf4j.Logger; 70 import org.slf4j.Logger;
......
...@@ -34,6 +34,8 @@ import org.onlab.packet.IpPrefix; ...@@ -34,6 +34,8 @@ import org.onlab.packet.IpPrefix;
34 import org.onlab.util.SafeRecurringTask; 34 import org.onlab.util.SafeRecurringTask;
35 import org.onlab.util.Tools; 35 import org.onlab.util.Tools;
36 import org.onosproject.cfg.ComponentConfigService; 36 import org.onosproject.cfg.ComponentConfigService;
37 +import org.onosproject.cordconfig.access.AccessDeviceConfig;
38 +import org.onosproject.cordconfig.access.AccessDeviceData;
37 import org.onosproject.core.ApplicationId; 39 import org.onosproject.core.ApplicationId;
38 import org.onosproject.core.CoreService; 40 import org.onosproject.core.CoreService;
39 import org.onosproject.net.ConnectPoint; 41 import org.onosproject.net.ConnectPoint;
...@@ -64,8 +66,7 @@ import org.onosproject.net.packet.InboundPacket; ...@@ -64,8 +66,7 @@ import org.onosproject.net.packet.InboundPacket;
64 import org.onosproject.net.packet.PacketContext; 66 import org.onosproject.net.packet.PacketContext;
65 import org.onosproject.net.packet.PacketProcessor; 67 import org.onosproject.net.packet.PacketProcessor;
66 import org.onosproject.net.packet.PacketService; 68 import org.onosproject.net.packet.PacketService;
67 -import org.onosproject.olt.AccessDeviceConfig; 69 +
68 -import org.onosproject.olt.AccessDeviceData;
69 import org.osgi.service.component.ComponentContext; 70 import org.osgi.service.component.ComponentContext;
70 import org.slf4j.Logger; 71 import org.slf4j.Logger;
71 72
......
...@@ -52,6 +52,11 @@ ...@@ -52,6 +52,11 @@
52 <classifier>tests</classifier> 52 <classifier>tests</classifier>
53 <scope>test</scope> 53 <scope>test</scope>
54 </dependency> 54 </dependency>
55 + <dependency>
56 + <groupId>org.onosproject</groupId>
57 + <artifactId>onos-cord-config</artifactId>
58 + <version>1.6.0-SNAPSHOT</version>
59 + </dependency>
55 60
56 </dependencies> 61 </dependencies>
57 62
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
17 package org.onosproject.olt; 17 package org.onosproject.olt;
18 18
19 import org.onlab.packet.VlanId; 19 import org.onlab.packet.VlanId;
20 +import org.onosproject.cordconfig.access.AccessDeviceData;
20 import org.onosproject.event.ListenerService; 21 import org.onosproject.event.ListenerService;
21 import org.onosproject.net.ConnectPoint; 22 import org.onosproject.net.ConnectPoint;
22 import org.onosproject.net.DeviceId; 23 import org.onosproject.net.DeviceId;
......
...@@ -43,6 +43,11 @@ ...@@ -43,6 +43,11 @@
43 <dependencies> 43 <dependencies>
44 <dependency> 44 <dependency>
45 <groupId>org.onosproject</groupId> 45 <groupId>org.onosproject</groupId>
46 + <artifactId>onos-cord-config</artifactId>
47 + <version>${project.version}</version>
48 + </dependency>
49 + <dependency>
50 + <groupId>org.onosproject</groupId>
46 <artifactId>onos-app-olt-api</artifactId> 51 <artifactId>onos-app-olt-api</artifactId>
47 <version>${project.version}</version> 52 <version>${project.version}</version>
48 </dependency> 53 </dependency>
......
...@@ -19,8 +19,8 @@ package org.onosproject.olt.cli; ...@@ -19,8 +19,8 @@ package org.onosproject.olt.cli;
19 import org.apache.karaf.shell.commands.Argument; 19 import org.apache.karaf.shell.commands.Argument;
20 import org.apache.karaf.shell.commands.Command; 20 import org.apache.karaf.shell.commands.Command;
21 import org.onosproject.cli.AbstractShellCommand; 21 import org.onosproject.cli.AbstractShellCommand;
22 +import org.onosproject.cordconfig.access.AccessDeviceData;
22 import org.onosproject.net.DeviceId; 23 import org.onosproject.net.DeviceId;
23 -import org.onosproject.olt.AccessDeviceData;
24 import org.onosproject.olt.AccessDeviceService; 24 import org.onosproject.olt.AccessDeviceService;
25 25
26 import java.util.Map; 26 import java.util.Map;
......
...@@ -27,6 +27,8 @@ import org.apache.felix.scr.annotations.Service; ...@@ -27,6 +27,8 @@ import org.apache.felix.scr.annotations.Service;
27 import org.onlab.packet.EthType; 27 import org.onlab.packet.EthType;
28 import org.onlab.packet.VlanId; 28 import org.onlab.packet.VlanId;
29 import org.onosproject.cfg.ComponentConfigService; 29 import org.onosproject.cfg.ComponentConfigService;
30 +import org.onosproject.cordconfig.access.AccessDeviceConfig;
31 +import org.onosproject.cordconfig.access.AccessDeviceData;
30 import org.onosproject.core.ApplicationId; 32 import org.onosproject.core.ApplicationId;
31 import org.onosproject.core.CoreService; 33 import org.onosproject.core.CoreService;
32 import org.onosproject.event.AbstractListenerManager; 34 import org.onosproject.event.AbstractListenerManager;
...@@ -56,8 +58,6 @@ import org.onosproject.net.flowobjective.ForwardingObjective; ...@@ -56,8 +58,6 @@ import org.onosproject.net.flowobjective.ForwardingObjective;
56 import org.onosproject.net.flowobjective.Objective; 58 import org.onosproject.net.flowobjective.Objective;
57 import org.onosproject.net.flowobjective.ObjectiveContext; 59 import org.onosproject.net.flowobjective.ObjectiveContext;
58 import org.onosproject.net.flowobjective.ObjectiveError; 60 import org.onosproject.net.flowobjective.ObjectiveError;
59 -import org.onosproject.olt.AccessDeviceConfig;
60 -import org.onosproject.olt.AccessDeviceData;
61 import org.onosproject.olt.AccessDeviceEvent; 61 import org.onosproject.olt.AccessDeviceEvent;
62 import org.onosproject.olt.AccessDeviceListener; 62 import org.onosproject.olt.AccessDeviceListener;
63 import org.onosproject.olt.AccessDeviceService; 63 import org.onosproject.olt.AccessDeviceService;
......
...@@ -74,6 +74,7 @@ ...@@ -74,6 +74,7 @@
74 <module>gangliametrics</module> 74 <module>gangliametrics</module>
75 <module>graphitemetrics</module> 75 <module>graphitemetrics</module>
76 <module>xosclient</module> 76 <module>xosclient</module>
77 + <module>cordconfig</module>
77 </modules> 78 </modules>
78 79
79 <properties> 80 <properties>
......