Merge "Prevent ConfigPusher from killing its thread"

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

diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/ForwardingMode.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/ForwardingMode.java
index b83e3a696d1ca3eb3c3b0b340e2b77e939b2027d..ef68e1182722577ba469e53637cbf98865e86dac 100644 (file)
--- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/ForwardingMode.java
+++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/ForwardingMode.java
@@ -1,5 +1,14 @@
+/*
+ * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.opendaylight.controller.sal.core;
 
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
@@ -7,13 +16,14 @@ import javax.xml.bind.annotation.XmlRootElement;
  * The class represents the forwarding mode property of a node.
  */
 @XmlRootElement
+@XmlAccessorType(XmlAccessType.NONE)
 @SuppressWarnings("serial")
 public class ForwardingMode extends Property {
-    @XmlElement
+    @XmlElement(name="value")
     private final int modeValue;
     public static final int REACTIVE_FORWARDING = 0;
     public static final int PROACTIVE_FORWARDING = 1;
-    public static final String name = "mode";
+    public static final String name = "forwarding";
 
     /*
      * Private constructor used for JAXB mapping
@@ -71,4 +81,9 @@ public class ForwardingMode extends Property {
     public String toString() {
         return "Mode[" + modeValue + "]";
     }
-}
\ No newline at end of file
+
+    @Override
+    public String getStringValue() {
+        return (modeValue == ForwardingMode.PROACTIVE_FORWARDING) ? "Proactive" : "Reactive";
+    }
+}