cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject git commit: updated refs/heads/master to 29b4cde
Date Tue, 24 Sep 2013 18:51:43 GMT
Updated Branches:
  refs/heads/master 34c04a454 -> 29b4cde04


CS-18283: 2.2.x to 4.2 upgrade - corrected the Service Provider name for the Network offeirng
that can be used in VPC (from VirtualRouter to VpcVirtualRouter)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/29b4cde0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/29b4cde0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/29b4cde0

Branch: refs/heads/master
Commit: 29b4cde04a8d60f83cf35f44b2c9f62697fd0ec0
Parents: 34c04a4
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Fri Sep 20 10:21:48 2013 -0700
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Tue Sep 24 11:44:46 2013 -0700

----------------------------------------------------------------------
 .../cloudstack/engine/orchestration/NetworkOrchestrator.java     | 2 +-
 setup/db/db/schema-410to420.sql                                  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/29b4cde0/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index d8c3b8e..53f64fd 100755
--- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -390,7 +390,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
 
         Map<Network.Service, Set<Network.Provider>> defaultVPCOffProviders =
new HashMap<Network.Service, Set<Network.Provider>>();
         defaultProviders.clear();
-        defaultProviders.add(Network.Provider.VirtualRouter);
+        defaultProviders.add(Network.Provider.VPCVirtualRouter);
         defaultVPCOffProviders.put(Service.Dhcp, defaultProviders);
         defaultVPCOffProviders.put(Service.Dns, defaultProviders);
         defaultVPCOffProviders.put(Service.UserData, defaultProviders);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/29b4cde0/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index e7d9f44..522ccc4 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -2371,3 +2371,7 @@ CREATE VIEW `cloud`.`data_center_view` AS
         `cloud`.`dedicated_resources` ON data_center.id = dedicated_resources.data_center_id
 			left join
         `cloud`.`affinity_group` ON dedicated_resources.affinity_group_id = affinity_group.id;
+
+
+
+UPDATE `cloud`.`ntwk_offering_service_map` SET Provider='VpcVirtualRouter' WHERE network_offering_id
IN (SELECT id from `cloud`.`network_offerings` WHERE name IN ('DefaultIsolatedNetworkOfferingForVpcNetworks',
'DefaultIsolatedNetworkOfferingForVpcNetworksNoLB'));


Mime
View raw message