Hyunsun Moon
Committed by Thomas Vachuska

Fixed javadoc warnings on openstack applications

- Changed package name of 'app' submodule to avoid duplicate package name warning
- Added app.xml and features.xml to make the application activate successfully
- Fixed missing parameter javadoc warnings

Change-Id: Iaefdd08d15291ccea8224b13b815246eb13b84ce
...@@ -15,6 +15,6 @@ ...@@ -15,6 +15,6 @@
15 */ 15 */
16 16
17 /** 17 /**
18 - * Application for OpenstackRouting. 18 + * Application that handles OpenStack Neutron REST calls.
19 */ 19 */
20 package org.onosproject.openstackinterface; 20 package org.onosproject.openstackinterface;
...\ No newline at end of file ...\ No newline at end of file
......
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<!--
3 + ~ Copyright 2016 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 +<app name="org.onosproject.openstackinterface" origin="ON.Lab" version="${project.version}"
18 + category="default" url="http://onosproject.org"
19 + featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
20 + features="${project.artifactId}">
21 + <description>${project.description}</description>
22 + <artifact>mvn:${project.groupId}/onos-app-openstackinterface-api/${project.version}</artifact>
23 + <artifact>mvn:${project.groupId}/onos-app-openstackinterface-app/${project.version}</artifact>
24 +</app>
1 +<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2 +<!--
3 + ~ Copyright 2016 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 +<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
18 + <feature name="${project.artifactId}" version="${project.version}"
19 + description="${project.description}">
20 + <feature>onos-api</feature>
21 + <bundle>mvn:${project.groupId}/onos-app-openstackinterface-api/${project.version}</bundle>
22 + <bundle>mvn:${project.groupId}/onos-app-openstackinterface-app/${project.version}</bundle>
23 + </feature>
24 +</features>
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
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.openstackinterface; 16 +package org.onosproject.openstackinterface.impl;
17 17
18 import com.fasterxml.jackson.databind.ObjectMapper; 18 import com.fasterxml.jackson.databind.ObjectMapper;
19 import com.fasterxml.jackson.databind.node.ArrayNode; 19 import com.fasterxml.jackson.databind.node.ArrayNode;
...@@ -35,6 +35,13 @@ import org.onosproject.net.config.ConfigFactory; ...@@ -35,6 +35,13 @@ import org.onosproject.net.config.ConfigFactory;
35 import org.onosproject.net.config.NetworkConfigEvent; 35 import org.onosproject.net.config.NetworkConfigEvent;
36 import org.onosproject.net.config.NetworkConfigListener; 36 import org.onosproject.net.config.NetworkConfigListener;
37 import org.onosproject.net.config.NetworkConfigRegistry; 37 import org.onosproject.net.config.NetworkConfigRegistry;
38 +import org.onosproject.openstackinterface.OpenstackInterfaceService;
39 +import org.onosproject.openstackinterface.OpenstackNetwork;
40 +import org.onosproject.openstackinterface.OpenstackNetworkingConfig;
41 +import org.onosproject.openstackinterface.OpenstackPort;
42 +import org.onosproject.openstackinterface.OpenstackRouter;
43 +import org.onosproject.openstackinterface.OpenstackSecurityGroup;
44 +import org.onosproject.openstackinterface.OpenstackSubnet;
38 import org.onosproject.openstackinterface.web.OpenstackNetworkCodec; 45 import org.onosproject.openstackinterface.web.OpenstackNetworkCodec;
39 import org.onosproject.openstackinterface.web.OpenstackPortCodec; 46 import org.onosproject.openstackinterface.web.OpenstackPortCodec;
40 import org.onosproject.openstackinterface.web.OpenstackRouterCodec; 47 import org.onosproject.openstackinterface.web.OpenstackRouterCodec;
......
...@@ -15,6 +15,6 @@ ...@@ -15,6 +15,6 @@
15 */ 15 */
16 16
17 /** 17 /**
18 - * Application for OpenstackRouting. 18 + * Implementation classes for OpenStack interface that handles Neutron REST calls.
19 */ 19 */
20 -package org.onosproject.openstackinterface;
...\ No newline at end of file ...\ No newline at end of file
20 +package org.onosproject.openstackinterface.impl;
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -120,7 +120,7 @@ public class OpenstackRoutingRulePopulator { ...@@ -120,7 +120,7 @@ public class OpenstackRoutingRulePopulator {
120 * @param inboundPacket Packet-in event packet 120 * @param inboundPacket Packet-in event packet
121 * @param openstackPort Target VM information 121 * @param openstackPort Target VM information
122 * @param portNum Pnat port number 122 * @param portNum Pnat port number
123 - * @param externalIp 123 + * @param externalIp external ip address
124 * @param externalInterfaceMacAddress Gateway external interface macaddress 124 * @param externalInterfaceMacAddress Gateway external interface macaddress
125 * @param externalRouterMacAddress Outer(physical) router`s macaddress 125 * @param externalRouterMacAddress Outer(physical) router`s macaddress
126 */ 126 */
......
...@@ -69,6 +69,7 @@ public class OpenstackArpHandler { ...@@ -69,6 +69,7 @@ public class OpenstackArpHandler {
69 * OpenStack if it's not. This ARP proxy does not support overlapping IP. 69 * OpenStack if it's not. This ARP proxy does not support overlapping IP.
70 * 70 *
71 * @param pkt ARP request packet 71 * @param pkt ARP request packet
72 + * @param openstackPortInfoCollection collection of port information
72 */ 73 */
73 public void processPacketIn(InboundPacket pkt, Collection<OpenstackPortInfo> openstackPortInfoCollection) { 74 public void processPacketIn(InboundPacket pkt, Collection<OpenstackPortInfo> openstackPortInfoCollection) {
74 Ethernet ethRequest = pkt.parsed(); 75 Ethernet ethRequest = pkt.parsed();
......
...@@ -75,6 +75,7 @@ public class OpenstackSwitchingRulePopulator { ...@@ -75,6 +75,7 @@ public class OpenstackSwitchingRulePopulator {
75 * @param appId application id 75 * @param appId application id
76 * @param flowObjectiveService FlowObjectiveService reference 76 * @param flowObjectiveService FlowObjectiveService reference
77 * @param deviceService DeviceService reference 77 * @param deviceService DeviceService reference
78 + * @param openstackService openstack interface service
78 * @param driverService DriverService reference 79 * @param driverService DriverService reference
79 */ 80 */
80 public OpenstackSwitchingRulePopulator(ApplicationId appId, 81 public OpenstackSwitchingRulePopulator(ApplicationId appId,
......