Merge "Bug-835:Reserve ports should be logical ports"

diff --cc opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/NodeMapping.java
index 90134e627824729fa400a3b7d2f0d5fc865f7c2b,532922ae42e569b53a71c8395e1f993825245b6b..fa25122bba1565e6deb589b0523bb1f2cb9fffa6
--- 1/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/NodeMapping.java
--- 2/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/NodeMapping.java
+++ b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/NodeMapping.java
@@@ -58,15 -55,13 +56,17 @@@ import org.opendaylight.yang.gen.v1.urn
  import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
  import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
  
- import com.google.common.base.Objects;
- import com.google.common.base.Preconditions;
+ import java.math.BigInteger;
+ import java.util.Date;
+ import java.util.HashSet;
+ import java.util.List;
  
  public final class NodeMapping {
 -    public final static String MD_SAL_TYPE = "MD_SAL";
 +
 +    /** openflow id prefix */
 +    public static final String OPENFLOW_ID_PREFIX = "openflow:";
 +
 +    public final static String MD_SAL_TYPE = "MD_SAL_DEPRECATED";
  
      private final static Class<Node> NODE_CLASS = Node.class;