Backed out DefaultFlowClassifier.java DefaultPortPair.java due to build

errors.

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

2 files changed, 0 insertions, 614 deletions

diff --git a/framework/patches/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/sfc/DefaultFlowClassifier.java b/framework/patches/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/sfc/DefaultFlowClassifier.java
deleted file mode 100644
index 7e06f332..00000000
--- a/framework/patches/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/sfc/DefaultFlowClassifier.java
+++ /dev/null
@@ -1,414 +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 org.onlab.packet.EthType.EtherType;
-import org.onlab.packet.IpPrefix;
-import org.onosproject.vtnrsc.TenantId;
-import org.onosproject.vtnrsc.VirtualPortId;
-
-import com.google.common.base.MoreObjects;
-import static com.google.common.base.Preconditions.checkNotNull;
-/**
- * Provides Default flow classifier.
- */
-public final class DefaultFlowClassifier implements FlowClassifier {
-
-    private final FlowClassifierId flowClassifierId;
-    private final TenantId tenantId;
-    private final String name;
-    private final String description;
-    private final EtherType etherType;
-    private final String protocol;
-    private final int minSrcPortRange;
-    private final int maxSrcPortRange;
-    private final int minDstPortRange;
-    private final int maxDstPortRange;
-    private final IpPrefix srcIpPrefix;
-    private final IpPrefix dstIpPrefix;
-    private final VirtualPortId srcPort;
-    private final VirtualPortId dstPort;
-    private static final int NULL_PORT = 0;
-
-    /**
-     * Constructor to create default flow classifier.
-     *
-     * @param flowClassifierId      flow classifier Id
-     * @param tenantId              Tenant ID
-     * @param name                  flow classifier name
-     * @param description           flow classifier description
-     * @param etherType             etherType
-     * @param protocol              IP protocol
-     * @param minSrcPortRange       Minimum Source port range
-     * @param maxSrcPortRange       Maximum Source port range
-     * @param minDstPortRange       Minimum destination port range
-     * @param maxDstPortRange       Maximum destination port range
-     * @param srcIpPrefix           Source IP prefix
-     * @param dstIpPrefix           destination IP prefix
-     * @param srcPort               Source VirtualPort
-     * @param dstPort               destination VirtualPort
-     */
-    private DefaultFlowClassifier(FlowClassifierId flowClassifierId, TenantId tenantId, String name,
-            String description, EtherType etherType, String protocol, int minSrcPortRange, int maxSrcPortRange,
-            int minDstPortRange, int maxDstPortRange, IpPrefix srcIpPrefix, IpPrefix dstIpPrefix,
-            VirtualPortId srcPort, VirtualPortId dstPort) {
-        this.flowClassifierId = flowClassifierId;
-        this.tenantId = tenantId;
-        this.name = name;
-        this.description = description;
-        this.etherType = etherType;
-        this.protocol = protocol;
-        this.minSrcPortRange = minSrcPortRange;
-        this.maxSrcPortRange = maxSrcPortRange;
-        this.minDstPortRange = minDstPortRange;
-        this.maxDstPortRange = maxDstPortRange;
-        this.srcIpPrefix = srcIpPrefix;
-        this.dstIpPrefix = dstIpPrefix;
-        this.srcPort = srcPort;
-        this.dstPort = dstPort;
-    }
-
-    @Override
-    public FlowClassifierId flowClassifierId() {
-        return flowClassifierId;
-    }
-
-    @Override
-    public TenantId tenantId() {
-        return tenantId;
-    }
-
-    @Override
-    public String flowclassifierName() {
-        return name;
-    }
-
-    @Override
-    public String flowClassifierDescription() {
-        return description;
-    }
-
-    @Override
-    public EtherType etherType() {
-        return etherType;
-    }
-
-    @Override
-    public String ipProtocol() {
-        return protocol;
-    }
-
-    @Override
-    public int minSrcPortRange() {
-        return minSrcPortRange;
-    }
-
-    @Override
-    public int maxSrcPortRange() {
-        return maxSrcPortRange;
-    }
-
-    @Override
-    public int minDstPortRange() {
-        return minDstPortRange;
-    }
-
-    @Override
-    public int maxDstPortRange() {
-        return maxDstPortRange;
-    }
-
-    @Override
-    public IpPrefix srcIpPrefix() {
-        return srcIpPrefix;
-    }
-
-    @Override
-    public IpPrefix dstIpPrefix() {
-        return dstIpPrefix;
-    }
-
-    @Override
-    public VirtualPortId srcVirtualPort() {
-        return srcPort;
-    }
-
-    @Override
-    public VirtualPortId dstVirtualPort() {
-        return dstPort;
-    }
-
-    /**
-     * Builder class for constructing Flow classifier.
-     */
-    public static class Builder implements FlowClassifier.Builder {
-
-        private FlowClassifierId flowClassifierId;
-        private TenantId tenantId;
-        private String name;
-        private boolean isFlowClassifierNameSet = false;
-        private String description;
-        private boolean isFlowClassifierDescriptionSet = false;
-        private EtherType etherType;
-        private boolean isEtherTypeSet = false;
-        private String protocol;
-        private boolean isProtocolSet = false;
-        private int minSrcPortRange;
-        private boolean isMinSrcPortRangeSet = false;
-        private int maxSrcPortRange;
-        private boolean isMaxSrcPortRangeSet = false;
-        private int minDstPortRange;
-        private boolean isMinDstPortRangeSet = false;
-        private int maxDstPortRange;
-        private boolean isMaxDstPortRangeSet = false;
-        private IpPrefix srcIpPrefix;
-        private boolean isSrcIpPrefixSet = false;
-        private IpPrefix dstIpPrefix;
-        private boolean isDstIpPrefixSet = false;
-        private VirtualPortId srcPort;
-        private boolean isSrcPortSet = false;
-        private VirtualPortId dstPort;
-        private boolean isDstPortSet = false;
-
-        @Override
-        public FlowClassifier build() {
-
-            checkNotNull(flowClassifierId, "FlowClassifier id can not be null.");
-            checkNotNull(tenantId, "Tenant id can not be null.");
-            String name = null;
-            String description = null;
-            EtherType etherType = null;
-            String protocol = null;
-            int minSrcPortRange = NULL_PORT;
-            int maxSrcPortRange = NULL_PORT;
-            int minDstPortRange = NULL_PORT;
-            int maxDstPortRange = NULL_PORT;
-            IpPrefix srcIpPrefix = null;
-            IpPrefix dstIpPrefix = null;
-            VirtualPortId srcPort = null;
-            VirtualPortId dstPort = null;
-
-            if (isFlowClassifierNameSet) {
-                name = this.name;
-            }
-            if (isFlowClassifierDescriptionSet) {
-                description = this.description;
-            }
-            if (isEtherTypeSet) {
-                etherType = this.etherType;
-            }
-            if (isProtocolSet) {
-                protocol = this.protocol;
-            }
-            if (isMinSrcPortRangeSet) {
-                minSrcPortRange = this.minSrcPortRange;
-            }
-            if (isMaxSrcPortRangeSet) {
-                maxSrcPortRange = this.maxSrcPortRange;
-            }
-            if (isMinDstPortRangeSet) {
-                minDstPortRange = this.minDstPortRange;
-            }
-            if (isMaxDstPortRangeSet) {
-                maxDstPortRange = this.maxDstPortRange;
-            }
-            if (isSrcIpPrefixSet) {
-                srcIpPrefix = this.srcIpPrefix;
-            }
-            if (isDstIpPrefixSet) {
-                dstIpPrefix = this.dstIpPrefix;
-            }
-            if (isSrcPortSet) {
-                srcPort = this.srcPort;
-            }
-            if (isDstPortSet) {
-                dstPort = this.dstPort;
-            }
-
-            return new DefaultFlowClassifier(flowClassifierId, tenantId, name, description, etherType, protocol,
-                    minSrcPortRange, maxSrcPortRange, minDstPortRange, maxDstPortRange, srcIpPrefix, dstIpPrefix,
-                    srcPort, dstPort);
-        }
-
-        @Override
-        public Builder setFlowClassifierId(FlowClassifierId flowClassifierId) {
-            this.flowClassifierId = flowClassifierId;
-            return this;
-        }
-
-        @Override
-        public Builder setTenantId(TenantId tenantId) {
-            this.tenantId = tenantId;
-            return this;
-        }
-
-        @Override
-        public Builder setFlowClassifierName(String name) {
-            this.name = name;
-            this.isFlowClassifierNameSet = true;
-            return this;
-        }
-
-        @Override
-        public Builder setFlowClassifierDescription(String description) {
-            this.description = description;
-            this.isFlowClassifierDescriptionSet = true;
-            return this;
-        }
-
-        @Override
-        public Builder setEtherType(EtherType etherType) {
-            this.etherType = etherType;
-            this.isEtherTypeSet = true;
-            return this;
-        }
-
-        @Override
-        public Builder setIpProtocol(String protocol) {
-            this.protocol = protocol;
-            this.isProtocolSet = true;
-            return this;
-        }
-
-        @Override
-        public Builder setMinSrcPortRange(int minSrcPortRange) {
-            this.minSrcPortRange = minSrcPortRange;
-            this.isMinSrcPortRangeSet = true;
-            return this;
-        }
-
-        @Override
-        public Builder setMaxSrcPortRange(int maxSrcPortRange) {
-            this.maxSrcPortRange = maxSrcPortRange;
-            this.isMaxSrcPortRangeSet = true;
-            return this;
-        }
-
-        @Override
-        public Builder setMinDstPortRange(int minDstPortRange) {
-            this.minDstPortRange = minDstPortRange;
-            this.isMinDstPortRangeSet = true;
-            return this;
-        }
-
-        @Override
-        public Builder setMaxDstPortRange(int maxDstPortRange) {
-            this.maxDstPortRange = maxDstPortRange;
-            this.isMaxDstPortRangeSet = true;
-            return this;
-        }
-
-        @Override
-        public Builder setSrcIpPrefix(IpPrefix srcIpPrefix) {
-            this.srcIpPrefix = srcIpPrefix;
-            this.isSrcIpPrefixSet = true;
-            return this;
-        }
-
-        @Override
-        public Builder setDstIpPrefix(IpPrefix dstIpPrefix) {
-            this.dstIpPrefix = dstIpPrefix;
-            this.isDstIpPrefixSet = true;
-            return this;
-        }
-
-        @Override
-        public Builder setSrcVirtualPort(VirtualPortId srcPort) {
-            this.srcPort = srcPort;
-            this.isSrcPortSet = true;
-            return this;
-        }
-
-        @Override
-        public Builder setDstVirtualPort(VirtualPortId dstPort) {
-            this.dstPort = dstPort;
-            this.isDstPortSet = true;
-            return this;
-        }
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(flowClassifierId, tenantId, name, description, etherType, protocol, minSrcPortRange,
-                maxSrcPortRange, minDstPortRange, maxDstPortRange, srcIpPrefix, dstIpPrefix, srcPort, dstPort);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj instanceof DefaultFlowClassifier) {
-            DefaultFlowClassifier other = (DefaultFlowClassifier) obj;
-            return Objects.equals(this.flowClassifierId, other.flowClassifierId)
-                    && Objects.equals(this.tenantId, other.tenantId)
-                    && Objects.equals(this.name, other.name)
-                    && Objects.equals(this.description, other.description)
-                    && Objects.equals(this.etherType, other.etherType)
-                    && Objects.equals(this.protocol, other.protocol)
-                    && Objects.equals(this.minSrcPortRange, other.minSrcPortRange)
-                    && Objects.equals(this.maxSrcPortRange, other.maxSrcPortRange)
-                    && Objects.equals(this.minDstPortRange, other.minDstPortRange)
-                    && Objects.equals(this.maxDstPortRange, other.maxDstPortRange)
-                    && Objects.equals(this.srcIpPrefix, other.srcIpPrefix)
-                    && Objects.equals(this.dstIpPrefix, other.dstIpPrefix)
-                    && Objects.equals(this.srcPort, other.srcPort)
-                    && Objects.equals(this.dstPort, other.dstPort);
-        }
-        return false;
-    }
-
-    @Override
-    public boolean exactMatch(FlowClassifier flowClassifier) {
-        return this.equals(flowClassifier)
-                && Objects.equals(this.flowClassifierId, flowClassifier.flowClassifierId())
-                && Objects.equals(this.tenantId, flowClassifier.tenantId())
-                && Objects.equals(this.name, flowClassifier.flowclassifierName())
-                && Objects.equals(this.description, flowClassifier.flowClassifierDescription())
-                && Objects.equals(this.etherType, flowClassifier.etherType())
-                && Objects.equals(this.protocol, flowClassifier.ipProtocol())
-                && Objects.equals(this.minSrcPortRange, flowClassifier.minSrcPortRange())
-                && Objects.equals(this.maxSrcPortRange, flowClassifier.maxSrcPortRange())
-                && Objects.equals(this.minDstPortRange, flowClassifier.minDstPortRange())
-                && Objects.equals(this.maxDstPortRange, flowClassifier.maxDstPortRange())
-                && Objects.equals(this.srcIpPrefix, flowClassifier.srcIpPrefix())
-                && Objects.equals(this.dstIpPrefix, flowClassifier.dstIpPrefix())
-                && Objects.equals(this.srcPort, flowClassifier.srcVirtualPort())
-                && Objects.equals(this.dstPort, flowClassifier.dstVirtualPort());
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(getClass())
-                .add("FlowClassifierId", flowClassifierId)
-                .add("TenantId", tenantId)
-                .add("Name", name)
-                .add("Description", description)
-                .add("EtherType", etherType)
-                .add("Protocol", protocol)
-                .add("MinSrcPortRange", minSrcPortRange)
-                .add("MaxSrcPortRange", maxSrcPortRange)
-                .add("MinDstPortRange", minDstPortRange)
-                .add("MaxDstPortRange", maxDstPortRange)
-                .add("SrcIpPrefix", srcIpPrefix)
-                .add("DstIpPrefix", dstIpPrefix)
-                .add("SrcPort", srcPort)
-                .add("DstPort", dstPort)
-                .toString();
-    }
-}
\ No newline at end of file
diff --git a/framework/patches/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/sfc/DefaultPortPair.java b/framework/patches/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/sfc/DefaultPortPair.java
deleted file mode 100644
index ed480fb7..00000000
--- a/framework/patches/onos/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/sfc/DefaultPortPair.java
+++ /dev/null
@@ -1,200 +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.MoreObjects.toStringHelper;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Objects;
-
-import org.onosproject.vtnrsc.TenantId;
-
-/**
- * Implementation of port pair.
- */
-public final class DefaultPortPair implements PortPair {
-
-    private final PortPairId portPairId;
-    private final TenantId tenantId;
-    private final String name;
-    private final String description;
-    private final String ingress;
-    private final String egress;
-
-    /**
-     * Default constructor to create Port Pair.
-     *
-     * @param portPairId port pair id
-     * @param tenantId tenant id
-     * @param name name of port pair
-     * @param description description of port pair
-     * @param ingress ingress port
-     * @param egress egress port
-     */
-    private DefaultPortPair(PortPairId portPairId, TenantId tenantId,
-                            String name, String description,
-                            String ingress, String egress) {
-
-        this.portPairId = portPairId;
-        this.tenantId = tenantId;
-        this.name = name;
-        this.description = description;
-        this.ingress = ingress;
-        this.egress = egress;
-    }
-
-    @Override
-    public PortPairId portPairId() {
-        return portPairId;
-    }
-
-    @Override
-    public TenantId tenantId() {
-        return tenantId;
-    }
-
-    @Override
-    public String name() {
-        return name;
-    }
-
-    @Override
-    public String description() {
-        return description;
-    }
-
-    @Override
-    public String ingress() {
-        return ingress;
-    }
-
-    @Override
-    public String egress() {
-        return egress;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(portPairId, tenantId, name, description,
-                            ingress, egress);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj instanceof DefaultPortPair) {
-            DefaultPortPair that = (DefaultPortPair) obj;
-            return Objects.equals(portPairId, that.portPairId) &&
-                    Objects.equals(tenantId, that.tenantId) &&
-                    Objects.equals(name, that.name) &&
-                    Objects.equals(description, that.description) &&
-                    Objects.equals(ingress, that.ingress) &&
-                    Objects.equals(egress, that.egress);
-        }
-        return false;
-    }
-
-    @Override
-    public boolean exactMatch(PortPair portPair) {
-        return this.equals(portPair) &&
-                Objects.equals(this.portPairId, portPair.portPairId()) &&
-                Objects.equals(this.tenantId, portPair.tenantId());
-    }
-
-    @Override
-    public String toString() {
-        return toStringHelper(this)
-                .add("id", portPairId.toString())
-                .add("tenantId", tenantId.tenantId())
-                .add("name", name)
-                .add("description", description)
-                .add("ingress", ingress)
-                .add("egress", egress)
-                .toString();
-    }
-
-    /**
-     * To create an instance of the builder.
-     *
-     * @return instance of builder
-     */
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    /**
-     * Builder class for Port pair.
-     */
-    public static final class Builder implements PortPair.Builder {
-
-        private PortPairId portPairId;
-        private TenantId tenantId;
-        private String name;
-        private String description;
-        private String ingress;
-        private String egress;
-
-        @Override
-        public Builder setId(PortPairId portPairId) {
-            this.portPairId = portPairId;
-            return this;
-        }
-
-        @Override
-        public Builder setTenantId(TenantId tenantId) {
-            this.tenantId = tenantId;
-            return this;
-        }
-
-        @Override
-        public Builder setName(String name) {
-            this.name = name;
-            return this;
-        }
-
-        @Override
-        public Builder setDescription(String description) {
-            this.description = description;
-            return this;
-        }
-
-        @Override
-        public Builder setIngress(String ingress) {
-            this.ingress = ingress;
-            return this;
-        }
-
-        @Override
-        public Builder setEgress(String egress) {
-            this.egress = egress;
-            return this;
-        }
-
-        @Override
-        public PortPair build() {
-
-            checkNotNull(portPairId, "Port pair id cannot be null");
-            checkNotNull(tenantId, "Tenant id cannot be null");
-            checkNotNull(ingress, "Ingress of a port pair cannot be null");
-            checkNotNull(egress, "Egress of a port pair cannot be null");
-
-            return new DefaultPortPair(portPairId, tenantId, name, description,
-                                       ingress, egress);
-        }
-    }
-}