Expose String Attributes to JSON
Change-Id: Ibc6de214cb8cedb7c262336adcfb283637fe9dc5
diff --git a/src/main/java/net/onrc/onos/core/topology/web/serializers/LinkSerializer.java b/src/main/java/net/onrc/onos/core/topology/web/serializers/LinkSerializer.java
index bec4760..44f5cc3 100644
--- a/src/main/java/net/onrc/onos/core/topology/web/serializers/LinkSerializer.java
+++ b/src/main/java/net/onrc/onos/core/topology/web/serializers/LinkSerializer.java
@@ -1,6 +1,7 @@
package net.onrc.onos.core.topology.web.serializers;
import java.io.IOException;
+import java.util.Map.Entry;
import net.onrc.onos.core.topology.Link;
@@ -27,6 +28,11 @@
jsonGenerator.writeStartObject();
jsonGenerator.writeObjectField("src", link.getSrcPort().asSwitchPort());
jsonGenerator.writeObjectField("dst", link.getDstPort().asSwitchPort());
+ jsonGenerator.writeObjectFieldStart("stringAttributes");
+ for (Entry<String, String> entry : link.getAllStringAttributes().entrySet()) {
+ jsonGenerator.writeStringField(entry.getKey(), entry.getValue());
+ }
+ jsonGenerator.writeEndObject(); // stringAttributes
jsonGenerator.writeEndObject();
}
}
diff --git a/src/main/java/net/onrc/onos/core/topology/web/serializers/PortSerializer.java b/src/main/java/net/onrc/onos/core/topology/web/serializers/PortSerializer.java
index a0d7385..69d710e 100644
--- a/src/main/java/net/onrc/onos/core/topology/web/serializers/PortSerializer.java
+++ b/src/main/java/net/onrc/onos/core/topology/web/serializers/PortSerializer.java
@@ -1,6 +1,7 @@
package net.onrc.onos.core.topology.web.serializers;
import java.io.IOException;
+import java.util.Map.Entry;
import net.onrc.onos.core.topology.Port;
@@ -35,6 +36,11 @@
jsonGenerator.writeNumberField("portNumber",
(0xffff & port.getNumber().value()));
jsonGenerator.writeStringField("desc", port.getDescription());
+ jsonGenerator.writeObjectFieldStart("stringAttributes");
+ for (Entry<String, String> entry : port.getAllStringAttributes().entrySet()) {
+ jsonGenerator.writeStringField(entry.getKey(), entry.getValue());
+ }
+ jsonGenerator.writeEndObject(); // stringAttributes
jsonGenerator.writeEndObject();
}
}
diff --git a/src/main/java/net/onrc/onos/core/topology/web/serializers/SwitchSerializer.java b/src/main/java/net/onrc/onos/core/topology/web/serializers/SwitchSerializer.java
index 3b74c53..79516b4 100644
--- a/src/main/java/net/onrc/onos/core/topology/web/serializers/SwitchSerializer.java
+++ b/src/main/java/net/onrc/onos/core/topology/web/serializers/SwitchSerializer.java
@@ -1,6 +1,7 @@
package net.onrc.onos.core.topology.web.serializers;
import java.io.IOException;
+import java.util.Map.Entry;
import net.onrc.onos.core.topology.Port;
import net.onrc.onos.core.topology.Switch;
@@ -32,6 +33,11 @@
jsonGenerator.writeObject(port);
}
jsonGenerator.writeEndArray();
+ jsonGenerator.writeObjectFieldStart("stringAttributes");
+ for (Entry<String, String> entry : sw.getAllStringAttributes().entrySet()) {
+ jsonGenerator.writeStringField(entry.getKey(), entry.getValue());
+ }
+ jsonGenerator.writeEndObject(); // stringAttributes
jsonGenerator.writeEndObject();
}
}