홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
Committed by Gerrit Code Review
6cdbdd83 1 parent c494f990

Fixed javadocs. 

Change-Id: Ie72449f277aa458d51e66a77c8e2c8c6f6edc2fb
Inline Side-by-side
Showing 9 changed files with 93 additions and 15 deletions
...@@ -64,10 +64,8 @@ public class DefaultGroupHandler { ...@@ -64,10 +64,8 @@ public class DefaultGroupHandler {
64 protected LinkService linkService; 64 protected LinkService linkService;
65 protected FlowObjectiveService flowObjectiveService; 65 protected FlowObjectiveService flowObjectiveService;
66 66
67 - protected HashMap<DeviceId, Set<PortNumber>> devicePortMap = 67 + protected HashMap<DeviceId, Set<PortNumber>> devicePortMap = new HashMap<>();
68 - new HashMap<DeviceId, Set<PortNumber>>(); 68 + protected HashMap<PortNumber, DeviceId> portDeviceMap = new HashMap<>();
69 - protected HashMap<PortNumber, DeviceId> portDeviceMap =
70 - new HashMap<PortNumber, DeviceId>();
71 //protected HashMap<NeighborSet, Integer> deviceNextObjectiveIds = 69 //protected HashMap<NeighborSet, Integer> deviceNextObjectiveIds =
72 // new HashMap<NeighborSet, Integer>(); 70 // new HashMap<NeighborSet, Integer>();
73 protected EventuallyConsistentMap< 71 protected EventuallyConsistentMap<
...@@ -113,6 +111,7 @@ public class DefaultGroupHandler { ...@@ -113,6 +111,7 @@ public class DefaultGroupHandler {
113 * @param config interface to retrieve the device properties 111 * @param config interface to retrieve the device properties
114 * @param linkService link service object 112 * @param linkService link service object
115 * @param flowObjService flow objective service object 113 * @param flowObjService flow objective service object
114 + * @param nsNextObjStore next objective store map
116 * @return default group handler type 115 * @return default group handler type
117 */ 116 */
118 public static DefaultGroupHandler createGroupHandler(DeviceId deviceId, 117 public static DefaultGroupHandler createGroupHandler(DeviceId deviceId,
...@@ -120,9 +119,8 @@ public class DefaultGroupHandler { ...@@ -120,9 +119,8 @@ public class DefaultGroupHandler {
120 DeviceProperties config, 119 DeviceProperties config,
121 LinkService linkService, 120 LinkService linkService,
122 FlowObjectiveService flowObjService, 121 FlowObjectiveService flowObjService,
123 - EventuallyConsistentMap< 122 + EventuallyConsistentMap<NeighborSetNextObjectiveStoreKey,
124 - NeighborSetNextObjectiveStoreKey, 123 + Integer> nsNextObjStore) {
125 - Integer> nsNextObjStore) {
126 if (config.isEdgeDevice(deviceId)) { 124 if (config.isEdgeDevice(deviceId)) {
127 return new DefaultEdgeGroupHandler(deviceId, appId, config, 125 return new DefaultEdgeGroupHandler(deviceId, appId, config,
128 linkService, 126 linkService,
......
...@@ -54,15 +54,15 @@ public class PolicyGroupHandler extends DefaultGroupHandler { ...@@ -54,15 +54,15 @@ public class PolicyGroupHandler extends DefaultGroupHandler {
54 * @param config interface to retrieve the device properties 54 * @param config interface to retrieve the device properties
55 * @param linkService link service object 55 * @param linkService link service object
56 * @param flowObjService flow objective service object 56 * @param flowObjService flow objective service object
57 + * @param nsNextObjStore next objective store map
57 */ 58 */
58 public PolicyGroupHandler(DeviceId deviceId, 59 public PolicyGroupHandler(DeviceId deviceId,
59 ApplicationId appId, 60 ApplicationId appId,
60 DeviceProperties config, 61 DeviceProperties config,
61 LinkService linkService, 62 LinkService linkService,
62 FlowObjectiveService flowObjService, 63 FlowObjectiveService flowObjService,
63 - EventuallyConsistentMap< 64 + EventuallyConsistentMap<NeighborSetNextObjectiveStoreKey,
64 - NeighborSetNextObjectiveStoreKey, 65 + Integer> nsNextObjStore) {
65 - Integer> nsNextObjStore) {
66 super(deviceId, appId, config, linkService, flowObjService, nsNextObjStore); 66 super(deviceId, appId, config, linkService, flowObjService, nsNextObjStore);
67 } 67 }
68 68
......
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 +/**
18 + * XOS integration application CLI commands.
19 + */
20 +package org.onosproject.xosintegration.cli;
...\ No newline at end of file ...\ No newline at end of file
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
15 */ 15 */
16 16
17 /** 17 /**
18 - * Test Application that calls a REST API. One dat it might call XOS to 18 + * XOS integration application which relies on XOS REST APIs to manage VMs.
19 - * launch a VM.
20 */ 19 */
21 package org.onosproject.xosintegration; 20 package org.onosproject.xosintegration;
......
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 +/**
18 + * Base abstractions and utilities for developing REST APIs.
19 + */
20 +package org.onosproject.rest;
...\ No newline at end of file ...\ No newline at end of file
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
56 <group> 56 <group>
57 <title>Network Model &amp; Services</title> 57 <title>Network Model &amp; Services</title>
58 <packages> 58 <packages>
59 - org.onosproject:org.onosproject.* 59 + org.onosproject:org.onosproject.*:org.onosproject.rest
60 </packages> 60 </packages>
61 </group> 61 </group>
62 <group> 62 <group>
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
55 <group> 55 <group>
56 <title>Network Model &amp; Services</title> 56 <title>Network Model &amp; Services</title>
57 <packages> 57 <packages>
58 - org.onosproject:org.onosproject.* 58 + org.onosproject:org.onosproject.*:org.onosproject.rest
59 </packages> 59 </packages>
60 </group> 60 </group>
61 <group> 61 <group>
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
115 <group> 115 <group>
116 <title>GUI, REST &amp; Command-Line</title> 116 <title>GUI, REST &amp; Command-Line</title>
117 <packages> 117 <packages>
118 - org.onosproject.ui.impl:org.onosproject.rest:org.onosproject.cli:org.onosproject.rest.*:org.onosproject.cli.*:org.onosproject.codec.impl 118 + org.onosproject.ui.impl*:org.onosproject.rest*:org.onosproject.cli:org.onosproject.rest.*:org.onosproject.cli.*:org.onosproject.codec.impl
119 </packages> 119 </packages>
120 </group> 120 </group>
121 <group> 121 <group>
......
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 +/**
18 + * Base abstractions and utilities for creating topology view overlays; experimental.
19 + */
20 +package org.onosproject.ui.impl.topo.overlay;
...\ No newline at end of file ...\ No newline at end of file
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 +/**
18 + * Topology view server-side model service with ability for apps to overlay
19 + * their own functionality and information; experimental.
20 + */
21 +package org.onosproject.ui.impl.topo;
...\ No newline at end of file ...\ No newline at end of file