From 5a61944075c161996869efcbe915d4c9e67774ec Mon Sep 17 00:00:00 2001
From: kwanggithub <kwang@clemson.edu>
Date: Mon, 18 Feb 2013 20:56:34 -0800
Subject: [PATCH] Upgrading Virtual Network Filter to latest bigswitch/quantum
plugin (/networkService/v1.1)
---
.../floodlightcontroller/virtualnetwork/NetworkResource.java | 1 +
.../virtualnetwork/VirtualNetworkWebRoutable.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/floodlightcontroller/virtualnetwork/NetworkResource.java b/src/main/java/net/floodlightcontroller/virtualnetwork/NetworkResource.java
index 4c5ddaf6b..746490bc6 100644
--- a/src/main/java/net/floodlightcontroller/virtualnetwork/NetworkResource.java
+++ b/src/main/java/net/floodlightcontroller/virtualnetwork/NetworkResource.java
@@ -70,6 +70,7 @@ public class NetworkResource extends ServerResource {
else if (n.equals("network")) {
while (jp.nextToken() != JsonToken.END_OBJECT) {
String field = jp.getCurrentName();
+ if (field == null) continue;
if (field.equals("name")) {
network.name = jp.getText();
} else if (field.equals("gateway")) {
diff --git a/src/main/java/net/floodlightcontroller/virtualnetwork/VirtualNetworkWebRoutable.java b/src/main/java/net/floodlightcontroller/virtualnetwork/VirtualNetworkWebRoutable.java
index 0d5d6a5ba..8e8570950 100644
--- a/src/main/java/net/floodlightcontroller/virtualnetwork/VirtualNetworkWebRoutable.java
+++ b/src/main/java/net/floodlightcontroller/virtualnetwork/VirtualNetworkWebRoutable.java
@@ -37,6 +37,6 @@ public class VirtualNetworkWebRoutable implements RestletRoutable {
@Override
public String basePath() {
- return "/quantum/v1.0";
+ return "/networkService/v1.1";
}
}
\ No newline at end of file
--
GitLab