Node MAC address to be derived inside the protocol plugin

[controller.git] / opendaylight / sal / api / src / main / java / org / opendaylight / controller / sal / core / MacAddress.java

diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/MacAddress.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/MacAddress.java
index b4d1045bac2e461c4c408b6ae04e5531f07e4b53..d5fbdbc74371df64bbd204ed7965e156c21512da 100644 (file)
--- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/MacAddress.java
+++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/MacAddress.java
@@ -1,4 +1,3 @@
-

 /*
  * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
  *
 /*
  * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
  *


@@ -19,86 +18,75 @@ import javax.xml.bind.annotation.XmlRootElement;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 
 /**
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 
 /**

- * The class contains the controller MAC address and node MAC address.
- *
- *
+ * The class contains MAC address property.

  */
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
  */
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)

-public class MacAddress extends Property {
+public class MacAddress extends Property implements Cloneable {

     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;

-    @XmlElement
-    private byte[] controllerMacAddress;
-    @XmlElement
-    private byte[] nodeMacAddress;
-    public static final String MacPropName = "macAddress";
+    @XmlElement(name="macAddress")
+    private final byte[] address;
+    public static final String name = "macAddress";

 
     /*
      * Private constructor used for JAXB mapping
      */
     private MacAddress() {
 
     /*
      * Private constructor used for JAXB mapping
      */
     private MacAddress() {

-        super(MacPropName);
-        this.controllerMacAddress = null;
-        this.nodeMacAddress = null;
-    }
-
-       /**
-        * Constructor to create DatalinkAddress property which contains the
-        * controller MAC address and node MAC address. The property will be
-        * attached to a {@link org.opendaylight.controller.sal.core.Node}.
-        * 
-        * @param controllerMacAddress Data Link Address for the controller
-        * @param nodeMacAddress Data Link Address for the node
-        * 
-        * @return the constructed object
-        */
-    public MacAddress(byte[] controllerMacAddress, byte[] nodeMacAddress) {
-        super(MacPropName);
-       
-        this.controllerMacAddress = controllerMacAddress;
-        this.nodeMacAddress = nodeMacAddress;
+        super(name);
+        this.address = null;

     }
 
     /**
     }
 
     /**

-     * @return the controller MAC address
+     * Constructor to create DatalinkAddress property which contains the MAC
+     * address. The property will be attached to a
+     * {@link org.opendaylight.controller.sal.core.Node}.
+     *
+     *
+     * @param nodeMacAddress
+     *            Data Link Address for the node
+     *
+     * @return the constructed object

      */
      */

-    public byte[] getControllerMacAddress() {
-        return this.controllerMacAddress;
+    public MacAddress(byte[] nodeMacAddress) {
+        super(name);
+        this.address = nodeMacAddress.clone();

     }
 
     /**
      * @return the node MAC address
      */
     }
 
     /**
      * @return the node MAC address
      */

-    public byte[] getNodeMacAddress() {
-        return this.nodeMacAddress;
+    public byte[] getMacAddress() {
+        return this.address.clone();

     }
 
     }
 

+    @Override

     public MacAddress clone() {
     public MacAddress clone() {

-       return new MacAddress(this.controllerMacAddress, this.nodeMacAddress);
+        return new MacAddress(this.address);

     }
 
     @Override
     public int hashCode() {
         final int prime = 31;
         int result = super.hashCode();
     }
 
     @Override
     public int hashCode() {
         final int prime = 31;
         int result = super.hashCode();

-        result = prime * result + Arrays.hashCode(controllerMacAddress);
-        result = prime * result + Arrays.hashCode(nodeMacAddress);
+        result = prime * result + Arrays.hashCode(address);

         return result;
     }
 
     @Override
     public boolean equals(Object obj) {
         return result;
     }
 
     @Override
     public boolean equals(Object obj) {

-        if (this == obj)
+        if (this == obj) {

             return true;
             return true;

-        if (!super.equals(obj))
+        }
+        if (!super.equals(obj)) {

             return false;
             return false;

-        if (getClass() != obj.getClass())
+        }
+        if (getClass() != obj.getClass()) {

             return false;
             return false;

+        }

         MacAddress other = (MacAddress) obj;
         MacAddress other = (MacAddress) obj;

-        if (!Arrays.equals(controllerMacAddress, other.controllerMacAddress))
-            return false;
-        if (!Arrays.equals(nodeMacAddress, other.nodeMacAddress))
+        if (!Arrays.equals(address, other.address)) {

             return false;
             return false;

+        }

         return true;
     }
 
         return true;
     }