cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anim...@apache.org
Subject [19/50] git commit: updated refs/heads/4.2 to 86c9363
Date Thu, 03 Oct 2013 06:06:17 GMT
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/df522804
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/df522804
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/df522804

Branch: refs/heads/4.2
Commit: df52280409af9ae05eb007442277c40cc1109aca
Parents: fd49d25
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Fri Sep 20 10:21:48 2013 -0700
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Fri Sep 20 10:21:48 2013 -0700

----------------------------------------------------------------------
 server/src/com/cloud/network/NetworkManagerImpl.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/df522804/server/src/com/cloud/network/NetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 7042e18..df3dfea 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -1354,7 +1354,7 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager,
L
         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/df522804/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index 197f375..d9560fd 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -2178,3 +2178,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'));
\ No newline at end of file


Mime
View raw message