incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kous...@apache.org
Subject [29/50] [abbrv] git commit: refs/heads/cisco-vnmc-api-integration - CLOUDSTACK-749: updated mockvpcdao mockvpcmanagerimpl with external device related changes
Date Wed, 13 Mar 2013 06:25:04 GMT
CLOUDSTACK-749: updated mockvpcdao mockvpcmanagerimpl with external device related changes


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

Branch: refs/heads/cisco-vnmc-api-integration
Commit: 15201d908fb12035d481cb43de829d339e94d4ca
Parents: 836ce6c
Author: Kishan Kavala <kishan@cloud.com>
Authored: Mon Feb 25 18:54:01 2013 +0530
Committer: Kishan Kavala <kishan@cloud.com>
Committed: Mon Feb 25 18:54:30 2013 +0530

----------------------------------------------------------------------
 server/test/com/cloud/vpc/MockVpcManagerImpl.java |   12 ++----------
 server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java |   13 ++++++++++++-
 2 files changed, 14 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/15201d90/server/test/com/cloud/vpc/MockVpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/MockVpcManagerImpl.java b/server/test/com/cloud/vpc/MockVpcManagerImpl.java
index b0a89ee..e6c6520 100644
--- a/server/test/com/cloud/vpc/MockVpcManagerImpl.java
+++ b/server/test/com/cloud/vpc/MockVpcManagerImpl.java
@@ -72,12 +72,8 @@ public class MockVpcManagerImpl extends ManagerBase implements VpcManager
{
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see com.cloud.network.vpc.VpcService#createVpcOffering(java.lang.String, java.lang.String,
java.util.List)
-     */
     @Override
-    public VpcOffering createVpcOffering(String name, String displayText, List<String>
supportedServices) {
-        // TODO Auto-generated method stub
+    public VpcOffering createVpcOffering(String name, String displayText, List<String>
supportedServices, Map<String, List<String>> serviceProviders) {
         return null;
     }
 
@@ -357,12 +353,8 @@ public class MockVpcManagerImpl extends ManagerBase implements VpcManager
{
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see com.cloud.network.vpc.VpcManager#vpcProviderEnabledInZone(long)
-     */
     @Override
-    public boolean vpcProviderEnabledInZone(long zoneId) {
-        // TODO Auto-generated method stub
+    public boolean vpcProviderEnabledInZone(long zoneId, String provider) {
         return false;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/15201d90/server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java b/server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java
index 99bdb58..562d67d 100644
--- a/server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java
+++ b/server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java
@@ -18,6 +18,7 @@ package com.cloud.vpc.dao;
 
 import java.lang.reflect.Field;
 import java.util.List;
+import java.util.Map;
 
 import javax.ejb.Local;
 
@@ -83,7 +84,17 @@ public class MockVpcDaoImpl extends GenericDaoBase<VpcVO, Long> implements
VpcDa
         // TODO Auto-generated method stub
         return 0;
     }
-    
+
+    @Override
+    public VpcVO persist(VpcVO vpc, Map<String, String> serviceProviderMap) {
+        return null;
+    }
+
+    @Override
+    public void persistVpcServiceProviders(long vpcId, Map<String, String> serviceProviderMap)
{
+        return;
+    }
+
     @Override
     public VpcVO findById(Long id) {
         VpcVO vo = null;


Mime
View raw message