cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahu...@apache.org
Subject [2/7] Changed VirtualMachineProfile to be non-generic. From here on VirtualMachineManager will only manage vm instance. It doesn't understand the difference between different types of VMs. This makes the vmsync code to be generic across all vms.
Date Mon, 22 Jul 2013 18:48:35 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1325014a/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 f325c4a..7f1048f 100644
--- a/server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
+++ b/server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
@@ -72,14 +72,14 @@ VpcVirtualNetworkApplianceService {
      * @see com.cloud.network.router.VirtualNetworkApplianceManager#savePasswordToRouter(com.cloud.network.Network,
com.cloud.vm.NicProfile, com.cloud.vm.VirtualMachineProfile, java.util.List)
      */
     @Override
-    public boolean savePasswordToRouter(Network network, NicProfile nic, VirtualMachineProfile<UserVm>
profile,
+    public boolean savePasswordToRouter(Network network, NicProfile nic, VirtualMachineProfile
profile,
             List<? extends VirtualRouter> routers) throws ResourceUnavailableException
{
         // TODO Auto-generated method stub
         return false;
     }
 
     @Override
-    public boolean saveSSHPublicKeyToRouter(Network network, NicProfile nic, VirtualMachineProfile<UserVm>
profile, List<? extends VirtualRouter> routers, String SSHPublicKey) throws ResourceUnavailableException
{
+    public boolean saveSSHPublicKeyToRouter(Network network, NicProfile nic, VirtualMachineProfile
profile, List<? extends VirtualRouter> routers, String SSHPublicKey) throws ResourceUnavailableException
{
         return false;  //To change body of implemented methods use File | Settings | File
Templates.
     }
 
@@ -87,7 +87,7 @@ VpcVirtualNetworkApplianceService {
      * @see com.cloud.network.router.VirtualNetworkApplianceManager#saveUserDataToRouter(com.cloud.network.Network,
com.cloud.vm.NicProfile, com.cloud.vm.VirtualMachineProfile, java.util.List)
      */
     @Override
-    public boolean saveUserDataToRouter(Network network, NicProfile nic, VirtualMachineProfile<UserVm>
profile,
+    public boolean saveUserDataToRouter(Network network, NicProfile nic, VirtualMachineProfile
profile,
             List<? extends VirtualRouter> routers) throws ResourceUnavailableException
{
         // TODO Auto-generated method stub
         return false;
@@ -196,7 +196,7 @@ VpcVirtualNetworkApplianceService {
      * @see com.cloud.network.router.VirtualNetworkApplianceManager#applyDhcpEntry(com.cloud.network.Network,
com.cloud.vm.NicProfile, com.cloud.vm.VirtualMachineProfile, com.cloud.deploy.DeployDestination,
java.util.List)
      */
     @Override
-    public boolean applyDhcpEntry(Network config, NicProfile nic, VirtualMachineProfile<UserVm>
vm,
+    public boolean applyDhcpEntry(Network config, NicProfile nic, VirtualMachineProfile vm,
             DeployDestination dest, List<DomainRouterVO> routers) throws ResourceUnavailableException
{
         // TODO Auto-generated method stub
         return false;
@@ -206,14 +206,14 @@ VpcVirtualNetworkApplianceService {
      * @see com.cloud.network.router.VirtualNetworkApplianceManager#applyUserData(com.cloud.network.Network,
com.cloud.vm.NicProfile, com.cloud.vm.VirtualMachineProfile, com.cloud.deploy.DeployDestination,
java.util.List)
      */
     @Override
-    public boolean applyUserData(Network config, NicProfile nic, VirtualMachineProfile<UserVm>
vm,
+    public boolean applyUserData(Network config, NicProfile nic, VirtualMachineProfile vm,
             DeployDestination dest, List<DomainRouterVO> routers) throws ResourceUnavailableException
{
         // TODO Auto-generated method stub
         return false;
     }
 
     @Override
-    public boolean configDhcpForSubnet(Network network, NicProfile nic, VirtualMachineProfile<UserVm>
uservm, DeployDestination dest, List<DomainRouterVO> routers) throws ResourceUnavailableException
{
+    public boolean configDhcpForSubnet(Network network, NicProfile nic, VirtualMachineProfile
uservm, DeployDestination dest, List<DomainRouterVO> routers) throws ResourceUnavailableException
{
         return false;  //To change body of implemented methods use File | Settings | File
Templates.
     }
 


Mime
View raw message