You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mu...@apache.org on 2013/01/31 15:22:59 UTC
[41/50] [abbrv] git commit: refs/heads/events-framework - server: Fix
network refactor regressions for CLOUDSTACK-297
server: Fix network refactor regressions for CLOUDSTACK-297
Signed-off-by: Rohit Yadav <bh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/d7ad2da7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d7ad2da7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/d7ad2da7
Branch: refs/heads/events-framework
Commit: d7ad2da7e0ea63734c93e21d92f4936a1f909309
Parents: b21595c
Author: Rohit Yadav <bh...@apache.org>
Authored: Wed Jan 30 17:32:44 2013 -0800
Committer: Rohit Yadav <bh...@apache.org>
Committed: Wed Jan 30 17:33:53 2013 -0800
----------------------------------------------------------------------
.../networkservice/BaremetalUserdataElement.java | 6 ++++++
.../src/com/cloud/network/NetworkManagerImpl.java | 2 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 6 +++---
.../vpc/MockVpcVirtualNetworkApplianceManager.java | 5 +++++
4 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d7ad2da7/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalUserdataElement.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalUserdataElement.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalUserdataElement.java
index d1f0e8b..b5fd6f6 100755
--- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalUserdataElement.java
+++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalUserdataElement.java
@@ -92,6 +92,12 @@ public class BaremetalUserdataElement extends AdapterBase implements NetworkElem
}
@Override
+ public boolean saveSSHKey(Network network, NicProfile nic, VirtualMachineProfile<? extends VirtualMachine> vm, String SSHPublicKey) throws ResourceUnavailableException {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
public Map<Service, Map<Capability, String>> getCapabilities() {
return capabilities;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d7ad2da7/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 49ef89b..6c7377f 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -2635,7 +2635,7 @@ public class NetworkManagerImpl implements NetworkManager, Manager, Listener {
return null;
}
- return (UserDataServiceProvider)getElementImplementingProvider(SSHKeyProvider);
+ return (UserDataServiceProvider)_networkModel.getElementImplementingProvider(SSHKeyProvider);
}
protected boolean isSharedNetworkOfferingWithServices(long networkOfferingId) {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d7ad2da7/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index da6a8e1..ff6f3e7 100644
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -473,7 +473,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
VMInstanceVO vmInstance = _vmDao.findById(vmId);
VMTemplateVO template = _templateDao.findByIdIncludingRemoved(vmInstance.getTemplateId());
- Nic defaultNic = _networkMgr.getDefaultNic(vmId);
+ Nic defaultNic = _networkModel.getDefaultNic(vmId);
if (defaultNic == null) {
s_logger.error("Unable to reset SSH Key for vm " + vmInstance + " as the instance doesn't have default nic");
return false;
@@ -481,8 +481,8 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
Network defaultNetwork = _networkDao.findById(defaultNic.getNetworkId());
NicProfile defaultNicProfile = new NicProfile(defaultNic, defaultNetwork, null, null, null,
- _networkMgr.isSecurityGroupSupportedInNetwork(defaultNetwork),
- _networkMgr.getNetworkTag(template.getHypervisorType(), defaultNetwork));
+ _networkModel.isSecurityGroupSupportedInNetwork(defaultNetwork),
+ _networkModel.getNetworkTag(template.getHypervisorType(), defaultNetwork));
VirtualMachineProfile<VMInstanceVO> vmProfile = new VirtualMachineProfileImpl<VMInstanceVO>(vmInstance);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d7ad2da7/server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java b/server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
index 65ee33a..29da612 100644
--- a/server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
+++ b/server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
@@ -74,6 +74,11 @@ public class MockVpcVirtualNetworkApplianceManager implements VpcVirtualNetworkA
return false;
}
+ @Override
+ public boolean saveSSHPublicKeyToRouter(Network network, NicProfile nic, VirtualMachineProfile<UserVm> profile, List<? extends VirtualRouter> routers, String SSHPublicKey) throws ResourceUnavailableException {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
/* (non-Javadoc)
* @see com.cloud.network.router.VirtualNetworkApplianceManager#saveUserDataToRouter(com.cloud.network.Network, com.cloud.vm.NicProfile, com.cloud.vm.VirtualMachineProfile, java.util.List)
*/