Removed patch path since changes have been merged upstream to a different path. Updated README with directions.

Change-Id: Ie419abd2d3d3ef7315de9f607dcd757a78190995
Signed-off-by: Ashlee Young <ashlee@wildernessvoice.com>

6 files changed, 1 insertions, 580 deletions

diff --git a/framework/patches/README b/framework/patches/README
new file mode 100644
index 00000000..f9626d79
--- /dev/null
+++ b/framework/patches/README
@@ -0,0 +1 @@
+This is where to place any files to patch upstream projects. The patches are whole files and must be added with their full relative path. For example, if you're making applying a patch to onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc, then you'll need that entire directory path here. Use copy and paste of the location after running "pwd". You can then use "mkdir -p" to create the full path.
diff --git a/framework/patches/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/sfc/FlowClassifier.java b/framework/patches/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/sfc/FlowClassifier.java
deleted file mode 100644
index 0931206c..00000000
--- a/framework/patches/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/sfc/FlowClassifier.java
+++ /dev/null
@@ -1,257 +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.sfc;
-
-import org.onlab.packet.IpPrefix;
-import org.onosproject.vtnrsc.TenantId;
-import org.onosproject.vtnrsc.VirtualPortId;
-/**
- * Abstraction of an entity which provides flow classifier for service function chain.
- */
-public interface FlowClassifier {
-
-    /**
-     * Returns flow classifier ID.
-     *
-     * @return flow classifier id
-     */
-    FlowClassifierId flowClassifierId();
-
-    /**
-     * Returns Tenant ID.
-     *
-     * @return tenant Id
-     */
-    TenantId tenantId();
-
-    /**
-     * Returns flow classifier name.
-     *
-     * @return flow classifier name
-     */
-    String flowclassifierName();
-
-    /**
-     * Returns flow classifier description.
-     *
-     * @return flow classifier description
-     */
-    String flowClassifierDescription();
-
-    /**
-     * Returns ethernet type.
-     *
-     * @return ethernet type
-     */
-    String etherType();
-
-    /**
-     * Returns IP Protocol.
-     *
-     * @return IP protocol
-     */
-    String ipProtocol();
-
-    /**
-     * Returns minimum source port range.
-     *
-     * @return minimum source port range
-     */
-    int minSrcPortRange();
-
-    /**
-     * Returns maximum source port range.
-     *
-     * @return maximum source port range
-     */
-    int maxSrcPortRange();
-
-    /**
-     * Returns minimum destination port range.
-     *
-     * @return minimum destination port range
-     */
-    int minDstPortRange();
-
-    /**
-     * Returns maximum destination port range.
-     *
-     * @return maximum destination port range.
-     */
-    int maxDstPortRange();
-
-    /**
-     * Returns Source IP prefix.
-     *
-     * @return Source IP prefix
-     */
-    IpPrefix srcIpPrefix();
-
-    /**
-     * Returns Destination IP prefix.
-     *
-     * @return Destination IP prefix
-     */
-    IpPrefix dstIpPrefix();
-
-    /**
-     * Returns Source virtual port.
-     *
-     * @return Source virtual port
-     */
-    VirtualPortId srcVirtualPort();
-
-    /**
-     * Returns Destination virtual port.
-     *
-     * @return Destination virtual port
-     */
-    VirtualPortId dstVirtualPort();
-
-    /**
-     * Returns whether this Flow classifier is an exact match to the
-     * Flow classifier given in the argument.
-     *
-     * @param flowClassifier other flowClassifier to match against
-     * @return true if the flowClassifiers are an exact match, otherwise false
-     */
-    boolean exactMatch(FlowClassifier flowClassifier);
-
-    /**
-     * Builder for flow Classifier.
-     */
-    interface Builder {
-
-        /**
-         * Returns Flow Classifier.
-         *
-         * @return flow classifier.
-         */
-        FlowClassifier build();
-
-        /**
-         * Sets Flow Classifier ID.
-         *
-         * @param flowClassifierId flow classifier id.
-         * @return Builder object by setting flow classifier Id.
-         */
-        Builder setFlowClassifierId(FlowClassifierId flowClassifierId);
-
-        /**
-         * Sets Tenant ID.
-         *
-         * @param tenantId tenant id.
-         * @return Builder object by setting Tenant ID.
-         */
-        Builder setTenantId(TenantId tenantId);
-
-        /**
-         * Sets Flow classifier name.
-         *
-         * @param name flow classifier name
-         * @return builder object by setting flow classifier name
-         */
-        Builder setFlowClassifierName(String name);
-
-        /**
-         * Sets flow classifier description.
-         *
-         * @param description flow classifier description
-         * @return flow classifier description
-         */
-        Builder setFlowClassifierDescription(String description);
-
-        /**
-         * Sets Ehternet type.
-         *
-         * @param etherType ethernet type
-         * @return ethernet type
-         */
-        Builder setEtherType(String etherType);
-
-        /**
-         * Sets IP protocol.
-         *
-         * @param protocol IP protocol
-         * @return builder object by setting IP protocol
-         */
-        Builder setIpProtocol(String protocol);
-
-        /**
-         * Set minimum source port range.
-         *
-         * @param minRange minimum source port range
-         * @return builder object by setting minimum source port range
-         */
-        Builder setMinSrcPortRange(int minRange);
-
-        /**
-         * Sets maximum source port range.
-         *
-         * @param maxRange maximum source port range
-         * @return builder object by setting maximum source port range
-         */
-        Builder setMaxSrcPortRange(int maxRange);
-
-        /**
-         * Sets minimum destination port range.
-         *
-         * @param minRange minimum destination port range
-         * @return builder object by setting minimum destination port range
-         */
-        Builder setMinDstPortRange(int minRange);
-
-        /**
-         * Sets maximum destination port range.
-         *
-         * @param maxRange maximum destination port range.
-         * @return builder object by setting maximum destination port range.
-         */
-        Builder setMaxDstPortRange(int maxRange);
-
-        /**
-         * Sets Source IP prefix.
-         *
-         * @param srcIpPrefix Source IP prefix
-         * @return builder object by setting Source IP prefix
-         */
-        Builder setSrcIpPrefix(IpPrefix srcIpPrefix);
-
-        /**
-         * Sets Destination IP prefix.
-         *
-         * @param dstIpPrefix Destination IP prefix
-         * @return builder object by setting Destination IP prefix
-         */
-        Builder setDstIpPrefix(IpPrefix dstIpPrefix);
-
-        /**
-         * Sets Source virtual port.
-         *
-         * @param srcPort Source virtual port
-         * @return builder object by setting Source virtual port
-         */
-        Builder setSrcVirtualPort(VirtualPortId srcPort);
-
-        /**
-         * Sets Destination virtual port.
-         *
-         * @param dstPort Destination virtual port
-         * @return builder object by setting Destination virtual port
-         */
-        Builder setDstVirtualPort(VirtualPortId dstPort);
-    }
-}
diff --git a/framework/patches/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/sfc/FlowClassifierId.java b/framework/patches/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/sfc/FlowClassifierId.java
deleted file mode 100644
index d0f03959..00000000
--- a/framework/patches/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/sfc/FlowClassifierId.java
+++ /dev/null
@@ -1,71 +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.sfc;
-
-import java.util.Objects;
-import java.util.UUID;
-import com.google.common.base.MoreObjects;
-
-/**
- * flow classification identifier.
- */
-public final class FlowClassifierId {
-
-    private final UUID flowClassifierId;
-
-    /**
-     * Constructor to create flow classifier id.
-     *
-     * @param flowClassifierId flow classifier id.
-     */
-    private FlowClassifierId(final UUID flowClassifierId) {
-        this.flowClassifierId = flowClassifierId;
-    }
-
-    /**
-     * Returns new flow classifier id.
-     *
-     * @param flowClassifierId flow classifier id
-     * @return new flow classifier id
-     */
-    public static FlowClassifierId flowClassifierId(final UUID flowClassifierId) {
-        return new FlowClassifierId(flowClassifierId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(this.flowClassifierId);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj instanceof FlowClassifierId) {
-            final FlowClassifierId other = (FlowClassifierId) obj;
-            return Objects.equals(this.flowClassifierId, other.flowClassifierId);
-        }
-        return false;
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(getClass())
-                .add("FlowClassifierId", flowClassifierId)
-                .toString();
-    }
-}
diff --git a/framework/patches/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/sfc/PortPair.java b/framework/patches/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/sfc/PortPair.java
deleted file mode 100644
index e3df941d..00000000
--- a/framework/patches/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/sfc/PortPair.java
+++ /dev/null
@@ -1,140 +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.sfc;
-
-import org.onosproject.vtnrsc.TenantId;
-
-/**
- * Abstraction of an entity providing Port Pair information.
- * A port pair represents a service function instance.
- */
-public interface PortPair {
-
-    /**
-     * Returns the ID of this port Pair.
-     *
-     * @return the port pair id
-     */
-    PortPairId portPairId();
-
-    /**
-     * Returns the tenant id of this port pair.
-     *
-     * @return an tenant id
-     */
-    TenantId tenantId();
-
-    /**
-     * Returns the description of this port pair.
-     *
-     * @return description of port pair
-     */
-    String name();
-
-    /**
-     * Returns the description of this port pair.
-     *
-     * @return description of port pair
-     */
-    String description();
-
-    /**
-     * Returns the ingress port of this port pair.
-     *
-     * @return ingress of port pair
-     */
-    String ingress();
-
-    /**
-     * Returns the egress port of this port pair.
-     *
-     * @return egress of port pair
-     */
-    String egress();
-
-    /**
-     * Returns whether this port pair is an exact match to the port pair given
-     * in the argument.
-     * <p>
-     * Exact match means the Port port pairs match with the given port pair.
-     * It does not consider the port pair id, name and description.
-     * </p>
-     * @param portPair other port pair to match against
-     * @return true if the port pairs are an exact match, otherwise false
-     */
-    boolean exactMatch(PortPair portPair);
-
-    /**
-     * A port pair builder..
-     */
-    interface Builder {
-
-        /**
-         * Assigns the port pair id to this object.
-         *
-         * @param portPairId the port pair id
-         * @return this the builder object
-         */
-        Builder setId(PortPairId portPairId);
-
-        /**
-         * Assigns tenant id to this object.
-         *
-         * @param tenantId tenant id of the port pair
-         * @return this the builder object
-         */
-        Builder setTenantId(TenantId tenantId);
-
-        /**
-         * Assigns the name to this object.
-         *
-         * @param name name of the port pair
-         * @return this the builder object
-         */
-        Builder setName(String name);
-
-        /**
-         * Assigns the description to this object.
-         *
-         * @param description description of the port pair
-         * @return this the builder object
-         */
-        Builder setDescription(String description);
-
-        /**
-         * Assigns the ingress port to this object.
-         *
-         * @param port ingress port of the port pair
-         * @return this the builder object
-         */
-        Builder setIngress(String port);
-
-        /**
-         * Assigns the egress port to this object.
-         *
-         * @param port egress port of the port pair
-         * @return this the builder object
-         */
-        Builder setEgress(String port);
-
-        /**
-         * Builds a port pair object.
-         *
-         * @return a port pair.
-         */
-        PortPair build();
-    }
-}
diff --git a/framework/patches/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/sfc/PortPairId.java b/framework/patches/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/sfc/PortPairId.java
deleted file mode 100644
index 0209c23e..00000000
--- a/framework/patches/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/sfc/PortPairId.java
+++ /dev/null
@@ -1,92 +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.sfc;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.UUID;
-
-import com.google.common.base.Objects;
-
-/**
- * Representation of a Port Pair ID.
- */
-public final class PortPairId {
-
-    private final UUID portPairId;
-
-    /**
-     * Private constructor for port pair id.
-     *
-     * @param id UUID id of port pair
-     */
-    private PortPairId(UUID id) {
-        checkNotNull(id, "Port chain id can not be null");
-        this.portPairId = id;
-    }
-
-    /**
-     * Constructor to create port pair id from UUID.
-     *
-     * @param id UUID of port pair id
-     * @return object of port pair id
-     */
-    public static PortPairId portPairId(UUID id) {
-        return new PortPairId(id);
-    }
-
-    /**
-     * Constructor to create port pair id from string.
-     *
-     * @param id port pair id in string
-     * @return object of port pair id
-     */
-    public static PortPairId portPairId(String id) {
-        return new PortPairId(UUID.fromString(id));
-    }
-
-    /**
-     * Returns teh value of port pair id.
-     *
-     * @return port pair id
-     */
-    public UUID value() {
-        return portPairId;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-
-        if (obj.getClass()  == this.getClass()) {
-            PortPairId that = (PortPairId) obj;
-            return Objects.equal(this.portPairId, that.portPairId);
-        }
-        return false;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(this.portPairId);
-    }
-
-    @Override
-    public String toString() {
-        return portPairId.toString();
-    }
-}
diff --git a/framework/patches/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/sfc/package-info.java b/framework/patches/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/sfc/package-info.java
deleted file mode 100644
index 4fbcfd29..00000000
--- a/framework/patches/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/sfc/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 SFC.
- */
-package org.onosproject.vtnrsc.sfc;