summaryrefslogtreecommitdiffstats
path: root/framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/floatingip
diff options
context:
space:
mode:
authorCNlucius <lukai1@huawei.com>2016-09-13 11:40:12 +0800
committerCNlucius <lukai1@huawei.com>2016-09-13 11:41:53 +0800
commitb731e2f1dd0972409b136aebc7b463dd72c9cfad (patch)
tree5107d7d80c19ad8076c2c97c2b5ef8d1cf3ab903 /framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/floatingip
parentee93993458266114c29271a481ef9ce7ce621b2a (diff)
ONOSFW-171
O/S-SFC-ONOS scenario documentation Change-Id: I51ae1cf736ea24ab6680f8edca1b2bf5dd598365 Signed-off-by: CNlucius <lukai1@huawei.com>
Diffstat (limited to 'framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/floatingip')
-rw-r--r--framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/floatingip/FloatingIpEvent.java60
-rw-r--r--framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/floatingip/FloatingIpListener.java25
-rw-r--r--framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/floatingip/FloatingIpService.java108
-rw-r--r--framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/floatingip/impl/FloatingIpManager.java343
-rw-r--r--framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/floatingip/impl/package-info.java20
-rw-r--r--framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/floatingip/package-info.java20
6 files changed, 0 insertions, 576 deletions
diff --git a/framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/floatingip/FloatingIpEvent.java b/framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/floatingip/FloatingIpEvent.java
deleted file mode 100644
index f76007f7..00000000
--- a/framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/floatingip/FloatingIpEvent.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.vtnrsc.floatingip;
-
-import org.onosproject.event.AbstractEvent;
-import org.onosproject.vtnrsc.FloatingIp;
-
-/**
- * Describes network Floating IP event.
- */
-public class FloatingIpEvent
- extends AbstractEvent<FloatingIpEvent.Type, FloatingIp> {
- /**
- * Type of Floating IP events.
- */
- public enum Type {
- /**
- * Signifies that Floating IP has been created.
- */
- FLOATINGIP_PUT,
- /**
- * Signifies that Floating IP has been deleted.
- */
- FLOATINGIP_DELETE
- }
-
- /**
- * Creates an event of a given type and for the specified Floating IP.
- *
- * @param type Floating IP event type
- * @param floagingIp Floating IP subject
- */
- public FloatingIpEvent(Type type, FloatingIp floagingIp) {
- super(type, floagingIp);
- }
-
- /**
- * Creates an event of a given type and for the specified Floating IP.
- *
- * @param type Floating IP event type
- * @param floagingIp Floating IP subject
- * @param time occurrence time
- */
- public FloatingIpEvent(Type type, FloatingIp floagingIp, long time) {
- super(type, floagingIp, time);
- }
-}
diff --git a/framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/floatingip/FloatingIpListener.java b/framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/floatingip/FloatingIpListener.java
deleted file mode 100644
index a42af136..00000000
--- a/framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/floatingip/FloatingIpListener.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.vtnrsc.floatingip;
-
-import org.onosproject.event.EventListener;
-
-/**
- * Entity capable of Floating IP related events.
- */
-public interface FloatingIpListener extends EventListener<FloatingIpEvent> {
-
-}
diff --git a/framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/floatingip/FloatingIpService.java b/framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/floatingip/FloatingIpService.java
deleted file mode 100644
index 3f6f2515..00000000
--- a/framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/floatingip/FloatingIpService.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.vtnrsc.floatingip;
-
-import java.util.Collection;
-
-import org.onlab.packet.IpAddress;
-import org.onosproject.vtnrsc.FloatingIp;
-import org.onosproject.vtnrsc.FloatingIpId;
-import org.onosproject.vtnrsc.TenantId;
-
-/**
- * Service for interacting with the inventory of floating IP.
- */
-public interface FloatingIpService {
- /**
- * Returns exists or not of specific floatingIp identifier.
- *
- * @param floatingIpId floatingIp identifier
- * @return true or false
- */
- boolean exists(FloatingIpId floatingIpId);
-
- /**
- * Returns is used or not of specific floating IP address.
- *
- * @param floatingIpAddr floatingIp address
- * @param floatingIpId floatingIp identifier
- * @return true or false
- */
- boolean floatingIpIsUsed(IpAddress floatingIpAddr, FloatingIpId floatingIpId);
-
- /**
- * Returns is used or not of specific fixed IP address.
- *
- * @param fixedIpAddr fixedIp address
- * @param tenantId the tenant identifier of floating IP
- * @param floatingIpId floatingIp identifier
- * @return true or false
- */
- boolean fixedIpIsUsed(IpAddress fixedIpAddr, TenantId tenantId, FloatingIpId floatingIpId);
-
- /**
- * Returns a collection of the currently known floating IP.
- *
- * @return collection of floating IP
- */
- Collection<FloatingIp> getFloatingIps();
-
- /**
- * Returns the floatingIp with the specified identifier.
- *
- * @param floatingIpId floatingIp identifier
- * @return floatingIp or null if one with the given identifier is not known
- */
- FloatingIp getFloatingIp(FloatingIpId floatingIpId);
-
- /**
- * Creates new floatingIps.
- *
- * @param floatingIps the collection of floatingIp
- * @return true if the identifier floatingIp has been created right
- */
- boolean createFloatingIps(Collection<FloatingIp> floatingIps);
-
- /**
- * Updates existing floatingIps.
- *
- * @param floatingIps the collection of floatingIp
- * @return true if all floatingIp were updated successfully
- */
- boolean updateFloatingIps(Collection<FloatingIp> floatingIps);
-
- /**
- * Removes the specified floatingIp from the store.
- *
- * @param floatingIpIds the collection of floatingIp identifier
- * @return true if remove identifier floatingIp successfully
- */
- boolean removeFloatingIps(Collection<FloatingIpId> floatingIpIds);
-
- /**
- * Adds the specified listener to floating Ip manager.
- *
- * @param listener floating Ip listener
- */
- void addListener(FloatingIpListener listener);
-
- /**
- * Removes the specified listener to floating Ip manager.
- *
- * @param listener floating Ip listener
- */
- void removeListener(FloatingIpListener listener);
-}
diff --git a/framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/floatingip/impl/FloatingIpManager.java b/framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/floatingip/impl/FloatingIpManager.java
deleted file mode 100644
index ce9bb21f..00000000
--- a/framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/floatingip/impl/FloatingIpManager.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.vtnrsc.floatingip.impl;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.slf4j.LoggerFactory.getLogger;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Set;
-
-import org.apache.felix.scr.annotations.Activate;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Deactivate;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.apache.felix.scr.annotations.Service;
-import org.onlab.packet.IpAddress;
-import org.onlab.util.KryoNamespace;
-import org.onosproject.core.ApplicationId;
-import org.onosproject.core.CoreService;
-import org.onosproject.store.serializers.KryoNamespaces;
-import org.onosproject.store.service.EventuallyConsistentMap;
-import org.onosproject.store.service.EventuallyConsistentMapEvent;
-import org.onosproject.store.service.EventuallyConsistentMapListener;
-import org.onosproject.store.service.StorageService;
-import org.onosproject.store.service.WallClockTimestamp;
-import org.onosproject.vtnrsc.DefaultFloatingIp;
-import org.onosproject.vtnrsc.FloatingIp;
-import org.onosproject.vtnrsc.FloatingIpId;
-import org.onosproject.vtnrsc.TenantId;
-import org.onosproject.vtnrsc.TenantNetworkId;
-import org.onosproject.vtnrsc.VirtualPortId;
-import org.onosproject.vtnrsc.RouterId;
-import org.onosproject.vtnrsc.floatingip.FloatingIpEvent;
-import org.onosproject.vtnrsc.floatingip.FloatingIpListener;
-import org.onosproject.vtnrsc.floatingip.FloatingIpService;
-import org.onosproject.vtnrsc.router.RouterService;
-import org.onosproject.vtnrsc.tenantnetwork.TenantNetworkService;
-import org.onosproject.vtnrsc.virtualport.VirtualPortService;
-import org.slf4j.Logger;
-
-import com.google.common.collect.Sets;
-
-/**
- * Provides implementation of the FloatingIp service.
- */
-@Component(immediate = true)
-@Service
-public class FloatingIpManager implements FloatingIpService {
- private static final String FLOATINGIP_ID_NOT_NULL = "Floatingip ID cannot be null";
- private static final String FLOATINGIP_NOT_NULL = "Floatingip cannot be null";
- private static final String FLOATINGIP = "vtn-floatingip-store";
- private static final String VTNRSC_APP = "org.onosproject.vtnrsc";
- private static final String LISTENER_NOT_NULL = "Listener cannot be null";
- private static final String EVENT_NOT_NULL = "event cannot be null";
-
- private final Logger log = getLogger(getClass());
- private final Set<FloatingIpListener> listeners = Sets
- .newCopyOnWriteArraySet();
- private EventuallyConsistentMapListener<FloatingIpId, FloatingIp> floatingIpListener =
- new InnerFloatingIpStoreListener();
- protected EventuallyConsistentMap<FloatingIpId, FloatingIp> floatingIpStore;
- protected ApplicationId appId;
-
- @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- protected StorageService storageService;
-
- @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- protected CoreService coreService;
-
- @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- protected TenantNetworkService tenantNetworkService;
-
- @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- protected VirtualPortService virtualPortService;
-
- @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- protected RouterService routerService;
-
- @Activate
- public void activate() {
- appId = coreService.registerApplication(VTNRSC_APP);
- KryoNamespace.Builder serializer = KryoNamespace
- .newBuilder()
- .register(KryoNamespaces.API)
- .register(FloatingIp.class, FloatingIpId.class,
- TenantNetworkId.class, TenantId.class,
- FloatingIp.Status.class, RouterId.class,
- VirtualPortId.class, DefaultFloatingIp.class);
- floatingIpStore = storageService
- .<FloatingIpId, FloatingIp>eventuallyConsistentMapBuilder()
- .withName(FLOATINGIP).withSerializer(serializer)
- .withTimestampProvider((k, v) -> new WallClockTimestamp())
- .build();
- floatingIpStore.addListener(floatingIpListener);
- log.info("Started");
- }
-
- @Deactivate
- public void deactivate() {
- floatingIpStore.removeListener(floatingIpListener);
- floatingIpStore.destroy();
- listeners.clear();
- log.info("Stopped");
- }
-
- @Override
- public Collection<FloatingIp> getFloatingIps() {
- return Collections.unmodifiableCollection(floatingIpStore.values());
- }
-
- @Override
- public FloatingIp getFloatingIp(FloatingIpId floatingIpId) {
- checkNotNull(floatingIpId, FLOATINGIP_ID_NOT_NULL);
- return floatingIpStore.get(floatingIpId);
- }
-
- @Override
- public boolean exists(FloatingIpId floatingIpId) {
- checkNotNull(floatingIpId, FLOATINGIP_ID_NOT_NULL);
- return floatingIpStore.containsKey(floatingIpId);
- }
-
- @Override
- public boolean floatingIpIsUsed(IpAddress floatingIpAddr,
- FloatingIpId floatingIpId) {
- checkNotNull(floatingIpAddr, "Floating IP address cannot be null");
- checkNotNull(floatingIpId, "Floating IP Id cannot be null");
- Collection<FloatingIp> floatingIps = getFloatingIps();
- for (FloatingIp floatingIp : floatingIps) {
- if (floatingIp.floatingIp().equals(floatingIpAddr)
- && !floatingIp.id().equals(floatingIpId)) {
- return true;
- }
- }
- return false;
- }
-
- @Override
- public boolean fixedIpIsUsed(IpAddress fixedIpAddr, TenantId tenantId,
- FloatingIpId floatingIpId) {
- checkNotNull(fixedIpAddr, "Fixed IP address cannot be null");
- checkNotNull(tenantId, "Tenant Id cannot be null");
- checkNotNull(floatingIpId, "Floating IP Id cannot be null");
- Collection<FloatingIp> floatingIps = getFloatingIps();
- for (FloatingIp floatingIp : floatingIps) {
- IpAddress fixedIp = floatingIp.fixedIp();
- if (fixedIp != null) {
- if (fixedIp.equals(fixedIpAddr)
- && floatingIp.tenantId().equals(tenantId)
- && !floatingIp.id().equals(floatingIpId)) {
- return true;
- }
- }
- }
- return false;
- }
-
- @Override
- public boolean createFloatingIps(Collection<FloatingIp> floatingIps) {
- checkNotNull(floatingIps, FLOATINGIP_NOT_NULL);
- boolean result = true;
- for (FloatingIp floatingIp : floatingIps) {
- verifyFloatingIpData(floatingIp);
- if (floatingIp.portId() != null) {
- floatingIpStore.put(floatingIp.id(), floatingIp);
- if (!floatingIpStore.containsKey(floatingIp.id())) {
- log.debug("The floating Ip is created failed whose identifier is {}",
- floatingIp.id().toString());
- result = false;
- }
- } else {
- FloatingIp oldFloatingIp = floatingIpStore.get(floatingIp.id());
- if (oldFloatingIp != null) {
- floatingIpStore.remove(floatingIp.id(), oldFloatingIp);
- if (floatingIpStore.containsKey(floatingIp.id())) {
- log.debug("The floating Ip is created failed whose identifier is {}",
- floatingIp.id().toString());
- result = false;
- }
- }
- }
- }
- return result;
- }
-
- @Override
- public boolean updateFloatingIps(Collection<FloatingIp> floatingIps) {
- checkNotNull(floatingIps, FLOATINGIP_NOT_NULL);
- boolean result = true;
- for (FloatingIp floatingIp : floatingIps) {
- verifyFloatingIpData(floatingIp);
- if (floatingIp.portId() != null) {
- floatingIpStore.put(floatingIp.id(), floatingIp);
- if (!floatingIpStore.containsKey(floatingIp.id())) {
- log.debug("The floating Ip is updated failed whose identifier is {}",
- floatingIp.id().toString());
- result = false;
- }
- } else {
- FloatingIp oldFloatingIp = floatingIpStore.get(floatingIp.id());
- if (oldFloatingIp != null) {
- floatingIpStore.remove(floatingIp.id(), oldFloatingIp);
- if (floatingIpStore.containsKey(floatingIp.id())) {
- log.debug("The floating Ip is updated failed whose identifier is {}",
- floatingIp.id().toString());
- result = false;
- }
- }
- }
- }
- return result;
- }
-
- @Override
- public boolean removeFloatingIps(Collection<FloatingIpId> floatingIpIds) {
- checkNotNull(floatingIpIds, FLOATINGIP_ID_NOT_NULL);
- boolean result = true;
- for (FloatingIpId floatingIpId : floatingIpIds) {
- if (!floatingIpStore.containsKey(floatingIpId)) {
- log.debug("The floatingIp is not exist whose identifier is {}",
- floatingIpId.toString());
- throw new IllegalArgumentException(
- "FloatingIP ID doesn't exist");
- }
- FloatingIp floatingIp = floatingIpStore.get(floatingIpId);
- floatingIpStore.remove(floatingIpId, floatingIp);
- if (floatingIpStore.containsKey(floatingIpId)) {
- log.debug("The floating Ip is deleted failed whose identifier is {}",
- floatingIpId.toString());
- result = false;
- }
- }
- return result;
- }
-
- @Override
- public void addListener(FloatingIpListener listener) {
- checkNotNull(listener, LISTENER_NOT_NULL);
- listeners.add(listener);
- }
-
- @Override
- public void removeListener(FloatingIpListener listener) {
- checkNotNull(listener, LISTENER_NOT_NULL);
- listeners.add(listener);
- }
-
- /**
- * Verifies validity of FloatingIp data.
- *
- * @param floatingIps floatingIp instance
- */
- private void verifyFloatingIpData(FloatingIp floatingIps) {
- checkNotNull(floatingIps, FLOATINGIP_NOT_NULL);
- if (!tenantNetworkService.exists(floatingIps.networkId())) {
- log.debug("The network identifier {} that the floating Ip {} create for is not exist",
- floatingIps.networkId().toString(), floatingIps.id()
- .toString());
- throw new IllegalArgumentException(
- "Floating network ID doesn't exist");
- }
-
- VirtualPortId portId = floatingIps.portId();
- if (portId != null && !virtualPortService.exists(portId)) {
- log.debug("The port identifier {} that the floating Ip {} create for is not exist",
- floatingIps.portId().toString(), floatingIps.id()
- .toString());
- throw new IllegalArgumentException("Port ID doesn't exist");
- }
-
- RouterId routerId = floatingIps.routerId();
- if (routerId != null && !routerService.exists(routerId)) {
- log.debug("The router identifier {} that the floating Ip {} create for is not exist",
- floatingIps.routerId().toString(), floatingIps.id()
- .toString());
- throw new IllegalArgumentException("Router ID doesn't exist");
- }
-
- if (floatingIpIsUsed(floatingIps.floatingIp(), floatingIps.id())) {
- log.debug("The floaing Ip {} that the floating Ip {} create for is used",
- floatingIps.floatingIp().toString(), floatingIps.id()
- .toString());
- throw new IllegalArgumentException(
- "The floating IP address is used");
- }
-
- IpAddress fixedIp = floatingIps.fixedIp();
- if (fixedIp != null
- && fixedIpIsUsed(fixedIp, floatingIps.tenantId(),
- floatingIps.id())) {
- log.debug("The fixed Ip {} that the floating Ip {} create for is used",
- floatingIps.fixedIp().toString(), floatingIps.id()
- .toString());
- throw new IllegalArgumentException("The fixed IP address is used");
- }
- }
-
- private class InnerFloatingIpStoreListener
- implements
- EventuallyConsistentMapListener<FloatingIpId, FloatingIp> {
-
- @Override
- public void event(EventuallyConsistentMapEvent<FloatingIpId, FloatingIp> event) {
- checkNotNull(event, EVENT_NOT_NULL);
- FloatingIp floatingIp = event.value();
- if (EventuallyConsistentMapEvent.Type.PUT == event.type()) {
- notifyListeners(new FloatingIpEvent(
- FloatingIpEvent.Type.FLOATINGIP_PUT,
- floatingIp));
- }
- if (EventuallyConsistentMapEvent.Type.REMOVE == event.type()) {
- notifyListeners(new FloatingIpEvent(
- FloatingIpEvent.Type.FLOATINGIP_DELETE,
- floatingIp));
- }
- }
- }
-
- /**
- * Notifies specify event to all listeners.
- *
- * @param event Floating IP event
- */
- private void notifyListeners(FloatingIpEvent event) {
- checkNotNull(event, EVENT_NOT_NULL);
- listeners.forEach(listener -> listener.event(event));
- }
-}
diff --git a/framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/floatingip/impl/package-info.java b/framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/floatingip/impl/package-info.java
deleted file mode 100644
index c638eba0..00000000
--- a/framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/floatingip/impl/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Provides implementation of the FloatingIp service.
- */
-package org.onosproject.vtnrsc.floatingip.impl;
diff --git a/framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/floatingip/package-info.java b/framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/floatingip/package-info.java
deleted file mode 100644
index 274cbdd0..00000000
--- a/framework/src/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/floatingip/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Service for interacting with the inventory of FloatingIp.
- */
-package org.onosproject.vtnrsc.floatingip;