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:18:23 UTC
[50/50] [abbrv] git commit: updated refs/heads/opendaylight to 858fb69
Merge branch 'opendaylight' of https://git-wip-us.apache.org/repos/asf/cloudstack into opendaylight
Conflicts:
plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/OpenDaylightControllerResource.java
plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/resources/NeutronNetworksNorthboundAction.java
setup/db/db/schema-430to440.sql
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/858fb693
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/858fb693
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/858fb693
Branch: refs/heads/opendaylight
Commit: 858fb69334b37a198eb6acb6b4dd34f2854c4e29
Parents: a422bfb b7d7342
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Fri Jan 3 11:16:24 2014 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Fri Jan 3 11:16:24 2014 +0100
----------------------------------------------------------------------
.../agent/OpenDaylightControllerResource.java | 10 ++++++++++
.../api/resources/NeutronNetworksNorthboundAction.java | 6 +++++-
2 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/858fb693/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/OpenDaylightControllerResource.java
----------------------------------------------------------------------
diff --cc plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/OpenDaylightControllerResource.java
index c2b7a67,5c1e1e4..d6fb1f9
--- 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,7 -46,6 +47,10 @@@ import org.apache.cloudstack.network.op
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;
@@@ -208,27 -206,6 +211,30 @@@ public class OpenDaylightControllerReso
private Answer executeRequest(ConfigureNetworkCommand cmd) {
NeutronNetworksNorthboundAction configureNetwork = new NeutronNetworksNorthboundAction(controllerUrl, controllerUsername, controllerPassword);
++<<<<<<< HEAD
+
+ // Find free gre key
+ int gre_key = -1;
+ Random keyGenerator = new Random(System.currentTimeMillis());
+ try {
+ NeutronNetworksList<NeutronNetwork> networks = configureNetwork.listAllNetworks();
+ while (true) {
+ int i = keyGenerator.nextInt();
+ for (NeutronNetwork network : networks.getNetworks()) {
+ if (network.getSegmentationId() == i) {
+ continue;
+ }
+ }
+ gre_key = i;
+ break;
+ }
+ } catch (NeutronRestApiException e) {
+ s_logger.error("Failed to list existing networks on the ODL Controller", e);
+ return new ConfigureNetworkAnswer(cmd, e);
+ }
+
++=======
++>>>>>>> b7d7342cd787af27a7f52a03356e9218a19c0030
NeutronNetwork newNetwork = new NeutronNetwork();
// Configuration from the command
@@@ -238,7 -215,7 +244,11 @@@
// 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/858fb693/plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/resources/NeutronNetworksNorthboundAction.java
----------------------------------------------------------------------
diff --cc plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/resources/NeutronNetworksNorthboundAction.java
index 3a8c187,2d4f7c9..e92cc56
--- 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,7 -50,7 +52,11 @@@ public class NeutronNetworksNorthboundA
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);
@@@ -110,4 -108,4 +114,4 @@@
executeDelete(uri);
}
--}
++}