From 754851249b5722222a84e5a821f6edea095e72e7 Mon Sep 17 00:00:00 2001 From: Steven Saunders Date: Wed, 16 Dec 2015 14:31:40 -0700 Subject: make create, delete, get work with new topology based REST calls Change-Id: Iad6fa28971ad61003d34ed38ab2e2d8647dc31bd Signed-off-by: Steven Saunders --- .../cablelabs/vcpe/uni/unibase/model/EvcPath.java | 119 +++++++++++---------- .../com/cablelabs/vcpe/uni/unibase/model/Uni.java | 55 +++++++--- 2 files changed, 99 insertions(+), 75 deletions(-) (limited to 'uni/unibase/src/main/java/com/cablelabs/vcpe/uni/unibase/model') diff --git a/uni/unibase/src/main/java/com/cablelabs/vcpe/uni/unibase/model/EvcPath.java b/uni/unibase/src/main/java/com/cablelabs/vcpe/uni/unibase/model/EvcPath.java index 469b05b..6c97cf8 100644 --- a/uni/unibase/src/main/java/com/cablelabs/vcpe/uni/unibase/model/EvcPath.java +++ b/uni/unibase/src/main/java/com/cablelabs/vcpe/uni/unibase/model/EvcPath.java @@ -36,71 +36,72 @@ public class EvcPath { public String toJson() { -//{ -// "evc": -// { -// "evc:id": "822f8284-2b35-11e5-b345-feff819cdc9f", -// "evc:uni-dest": -// [ -// { -// "order": 0, -// "uni": "822f7eec-2b35-11e5-b345-feff819cdc9f" -// } -// ], -// "evc:uni-source": -// [ -// { -// "order": 0, -// "uni": "111f7eec-2c35-11e5-b345-feff819cdc9f" -// } -// ], -// "evc:cos-id": "string", -// "evc:ingress-bw": -// { -// "speed-1G": {} -// }, -// "evc:egress-bw": -// { -// "speed-1G": {} -// } -// } -//} - - String json = "{\n"+ - " \"evc\":\n"+ - " {\n"+ - " \"evc:id\": \""+ this.getId() +"\",\n"+ - " \"evc:uni-dest\":\n"+ - " [\n"+ - " {\n"+ - " \"order\": 0,\n"+ - " \"uni\": \""+ this.uni1.getId() +"\"\n"+ - " }\n"+ - " ],\n"+ - " \"evc:uni-source\":\n"+ - " [\n"+ - " {\n"+ - " \"order\": 0,\n"+ - " \"uni\": \""+ this.uni2.getId() +"\"\n"+ - " }\n"+ - " ],\n"+ - " \"evc:cos-id\": \""+ this.getCos() +"\",\n"+ - " \"evc:ingress-bw\":\n"+ - " {\n"+ -// " \"speed-1G\": {}\n"+ - " \"" + this.getIngressBW() + "\": {}\n"+ - " },\n"+ - " \"evc:egress-bw\":\n"+ + // { + // "network-topology:link": + // [ + // { + // "evc:link-id": "evc1", + // "evc:uni-dest": [ + // { + // "order": 0, + // "ip-address": "10.36.0.21" + // } + // ], + + // "evc:uni-source": [ + // { + // "order": 0, + // "ip-address": "10.36.0.22" + // } + // ], + + // "evc:cos-id": "string", + // "evc:ingress-bw": { + // "speed-1G": {} + // }, + // "evc:egress-bw": { + // "speed-1G": {} + // } + // } + // ] + // } + + String json = + + "{\n"+ + " \"network-topology:link\":\n" + + " [" + " {\n"+ -// " \"speed-1G\": {}\n"+ - " \"" + this.getEgressBW() + "\": {}\n"+ + " \"evc:link-id\": \""+ this.getId() +"\",\n"+ + " \"evc:uni-dest\":\n"+ + " [\n"+ + " {\n"+ + " \"order\": 0,\n"+ + " \"ip-address\": \""+ this.uni1.getIpAddress() +"\"\n"+ + " }\n"+ + " ],\n"+ + " \"evc:uni-source\":\n"+ + " [\n"+ + " {\n"+ + " \"order\": 0,\n"+ + " \"ip-address\": \""+ this.uni2.getIpAddress() +"\"\n"+ + " }\n"+ + " ],\n"+ + " \"evc:cos-id\": \""+ this.getCos() +"\",\n"+ + " \"evc:ingress-bw\":\n"+ + " {\n"+ + " \"" + this.getIngressBW() + "\": {}\n"+ + " },\n"+ + " \"evc:egress-bw\":\n"+ + " {\n"+ + " \"" + this.getEgressBW() + "\": {}\n"+ + " }\n"+ " }\n"+ - " }\n"+ + " ]" + "}"; return json; } - public String getId() { return id; } public void setId(String id) { this.id = id; } diff --git a/uni/unibase/src/main/java/com/cablelabs/vcpe/uni/unibase/model/Uni.java b/uni/unibase/src/main/java/com/cablelabs/vcpe/uni/unibase/model/Uni.java index cec4d80..0edf3db 100644 --- a/uni/unibase/src/main/java/com/cablelabs/vcpe/uni/unibase/model/Uni.java +++ b/uni/unibase/src/main/java/com/cablelabs/vcpe/uni/unibase/model/Uni.java @@ -126,22 +126,45 @@ public class Uni public String toJson() { - String json = "{\n"+ - " \"uni\":\n"+ - " {\n"+ - " \"uni:id\": \""+ this.getId() +"\",\n"+ - " \"speed\":\n" + - " {\n" + - " \"" + this.getSpeed() + "\": "+"\"1\"\n"+ - " },\n"+ - " \"uni:mac-layer\": \""+ this.getMacLayer() +"\",\n"+ - " \"uni:physical-medium\": \""+ this.getPhysicalMedium() +"\",\n"+ - " \"uni:mtu-size\": \""+ this.getMtuSize() +"\",\n"+ - " \"uni:type\": \"\",\n"+ - " \"uni:mac-address\": \""+ this.getMacAddress() +"\",\n"+ - " \"uni:ip-address\": \""+ this.getIpAddress() +"\",\n"+ - " \"uni:mode\": \""+ this.getMode() +"\"\n"+ - " }\n"+ + /* + { + "network-topology:node": [ + { + "node-id": "uni1", + "speed": { + "speed-1G": 1 + }, + "uni:mac-layer": "IEEE 802.3-2005", + "uni:physical-medium": "UNI TypeFull Duplex 2 Physical Interface", + "uni:mtu-size": 0, + "uni:type": "", + "uni:mac-address": "b8:27:eb:c9:a9:66", + "uni:ip-address": "10.36.0.21", + "uni:mode": "Full Duplex" + } + ] + } + */ + + String json = + "{\n"+ + " \"network-topology:node\":\n" + + " [" + + " {\n"+ + " \"node-id\": \""+ this.getId() +"\",\n"+ + " \"speed\":\n" + + " {\n" + + " \"" + this.getSpeed() + "\": "+"\"1\"\n"+ + " },\n"+ + " \"uni:mac-layer\": \""+ this.getMacLayer() +"\",\n"+ + " \"uni:physical-medium\": \""+ this.getPhysicalMedium() +"\",\n"+ + " \"uni:mtu-size\": \""+ this.getMtuSize() +"\",\n"+ + " \"uni:type\": \"\",\n"+ + " \"uni:mac-address\": \""+ this.getMacAddress() +"\",\n"+ + " \"uni:ip-address\": \""+ this.getIpAddress() +"\",\n"+ + " \"uni:mode\": \""+ this.getMode() +"\"\n"+ + " }\n"+ + " ]" + "}"; return json; -- cgit 1.2.3-korg