You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2014/01/03 11:34:29 UTC
git commit: updated refs/heads/opendaylight to b29b968
Updated Branches:
refs/heads/opendaylight 858fb6933 -> b29b96823
Merge mucus
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b29b9682
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b29b9682
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b29b9682
Branch: refs/heads/opendaylight
Commit: b29b96823f14413db63184b90d4c530da218f9d3
Parents: 858fb69
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Fri Jan 3 11:34:00 2014 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Fri Jan 3 11:34:00 2014 +0100
----------------------------------------------------------------------
.../agent/OpenDaylightControllerResource.java | 10 ----------
.../api/resources/NeutronNetworksNorthboundAction.java | 4 ----
2 files changed, 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b29b9682/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/OpenDaylightControllerResource.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/OpenDaylightControllerResource.java b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/OpenDaylightControllerResource.java
index d6fb1f9..c2b7a67 100644
--- a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/OpenDaylightControllerResource.java
+++ b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/OpenDaylightControllerResource.java
@@ -47,10 +47,7 @@ import org.apache.cloudstack.network.opendaylight.agent.responses.DestroyPortAns
import org.apache.cloudstack.network.opendaylight.api.NeutronRestApiException;
import org.apache.cloudstack.network.opendaylight.api.model.NeutronNetwork;
import org.apache.cloudstack.network.opendaylight.api.model.NeutronNetworkWrapper;
-<<<<<<< HEAD
import org.apache.cloudstack.network.opendaylight.api.model.NeutronNetworksList;
-=======
->>>>>>> b7d7342cd787af27a7f52a03356e9218a19c0030
import org.apache.cloudstack.network.opendaylight.api.model.NeutronNode;
import org.apache.cloudstack.network.opendaylight.api.model.NeutronNodeWrapper;
import org.apache.cloudstack.network.opendaylight.api.model.NeutronNodesList;
@@ -211,7 +208,6 @@ public class OpenDaylightControllerResource implements ServerResource {
private Answer executeRequest(ConfigureNetworkCommand cmd) {
NeutronNetworksNorthboundAction configureNetwork = new NeutronNetworksNorthboundAction(controllerUrl, controllerUsername, controllerPassword);
-<<<<<<< HEAD
// Find free gre key
int gre_key = -1;
@@ -233,8 +229,6 @@ public class OpenDaylightControllerResource implements ServerResource {
return new ConfigureNetworkAnswer(cmd, e);
}
-=======
->>>>>>> b7d7342cd787af27a7f52a03356e9218a19c0030
NeutronNetwork newNetwork = new NeutronNetwork();
// Configuration from the command
@@ -244,11 +238,7 @@ public class OpenDaylightControllerResource implements ServerResource {
// Static configuation
newNetwork.setNetworkType("gre");
newNetwork.setShared(false);
-<<<<<<< HEAD
newNetwork.setSegmentationId(gre_key);
-=======
- newNetwork.setSegmentationId(100);
->>>>>>> b7d7342cd787af27a7f52a03356e9218a19c0030
newNetwork.setId(UUID.randomUUID());
NeutronNetworkWrapper wrapper = new NeutronNetworkWrapper();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b29b9682/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/resources/NeutronNetworksNorthboundAction.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/resources/NeutronNetworksNorthboundAction.java b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/resources/NeutronNetworksNorthboundAction.java
index e92cc56..bee81ec 100644
--- a/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/resources/NeutronNetworksNorthboundAction.java
+++ b/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/resources/NeutronNetworksNorthboundAction.java
@@ -52,11 +52,7 @@ public class NeutronNetworksNorthboundAction extends Action {
String uri = NeutronNorthboundEnum.NETWORKS_URI.getUri();
String bodystring = executeGet(uri, Collections.<String, String> emptyMap());
-<<<<<<< HEAD
Type returnType = new TypeToken<NeutronNetworksList<NeutronNetwork>>() {
-=======
- Type returnType = new TypeToken<NeutronNetworksList<NeutronNetworkWrapper>>() {
->>>>>>> b7d7342cd787af27a7f52a03356e9218a19c0030
}.getType();
T returnValue = (T) gsonNeutronNetwork.fromJson(bodystring, returnType);