Skip to content

Commit 804cfae

Browse files
author
Sheng Yang
committed
Fix some testcases
1 parent 88c08cd commit 804cfae

3 files changed

Lines changed: 69 additions & 1 deletion

File tree

core/test/com/cloud/agent/transport/RequestTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public void testSerDeser() {
124124
public void testDownload() {
125125
s_logger.info("Testing Download answer");
126126
VMTemplateVO template = new VMTemplateVO(1, "templatename", ImageFormat.QCOW2, true, true, true, TemplateType.USER, "url", true, 32, 1, "chksum", "displayText", true, 30, true,
127-
HypervisorType.KVM);
127+
HypervisorType.KVM, null);
128128
DownloadCommand cmd = new DownloadCommand("secUrl", template, 30000000l);
129129
Request req = new Request(1, 1, cmd, true);
130130

server/test/com/cloud/network/MockNetworkManagerImpl.java

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.cloud.network;
22

3+
import java.util.ArrayList;
34
import java.util.List;
45
import java.util.Map;
56
import java.util.Set;
@@ -11,6 +12,7 @@
1112
import com.cloud.api.commands.AssociateIPAddrCmd;
1213
import com.cloud.api.commands.CreateNetworkCmd;
1314
import com.cloud.api.commands.ListNetworksCmd;
15+
import com.cloud.api.commands.ListTrafficTypeImplementorsCmd;
1416
import com.cloud.api.commands.RestartNetworkCmd;
1517
import com.cloud.dc.Vlan;
1618
import com.cloud.dc.Vlan.VlanType;
@@ -735,4 +737,46 @@ public boolean canAddDefaultSecurityGroup() {
735737
return false;
736738
}
737739

740+
@Override
741+
public List<Pair<TrafficType, String>> listTrafficTypeImplementor(ListTrafficTypeImplementorsCmd cmd) {
742+
// TODO Auto-generated method stub
743+
return null;
744+
}
745+
746+
@Override
747+
public List<Service> listNetworkOfferingServices(long networkOfferingId) {
748+
// TODO Auto-generated method stub
749+
return null;
750+
}
751+
752+
@Override
753+
public boolean areServicesEnabledInZone(long zoneId, long networkOfferingId, String tags, List<Service> services) {
754+
// TODO Auto-generated method stub
755+
return false;
756+
}
757+
758+
@Override
759+
public Map<PublicIp, Set<Service>> getIpToServices(List<PublicIp> publicIps, boolean rulesRevoked, boolean includingFirewall) {
760+
// TODO Auto-generated method stub
761+
return null;
762+
}
763+
764+
@Override
765+
public Map<Provider, ArrayList<PublicIp>> getProviderToIpList(Network network, Map<PublicIp, Set<Service>> ipToServices) {
766+
// TODO Auto-generated method stub
767+
return null;
768+
}
769+
770+
@Override
771+
public boolean checkIpForService(IPAddressVO ip, Service service) {
772+
// TODO Auto-generated method stub
773+
return false;
774+
}
775+
776+
@Override
777+
public void checkVirtualNetworkCidrOverlap(Long zoneId, String cidr) {
778+
// TODO Auto-generated method stub
779+
780+
}
781+
738782
}

server/test/com/cloud/user/MockAccountManagerImpl.java

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@
1818
import com.cloud.exception.ConcurrentOperationException;
1919
import com.cloud.exception.PermissionDeniedException;
2020
import com.cloud.exception.ResourceUnavailableException;
21+
import com.cloud.projects.Project.ListProjectResourcesCriteria;
2122
import com.cloud.utils.Pair;
2223
import com.cloud.utils.component.Manager;
24+
import com.cloud.utils.db.SearchBuilder;
25+
import com.cloud.utils.db.SearchCriteria;
2326

2427

2528
@Local(value = { AccountManager.class, AccountService.class })
@@ -297,4 +300,25 @@ public boolean enableAccount(long accountId) {
297300
return false;
298301
}
299302

303+
@Override
304+
public void buildACLSearchBuilder(SearchBuilder<? extends ControlledEntity> sb, Long domainId, boolean isRecursive, List<Long> permittedAccounts,
305+
ListProjectResourcesCriteria listProjectResourcesCriteria) {
306+
// TODO Auto-generated method stub
307+
308+
}
309+
310+
@Override
311+
public void buildACLSearchCriteria(SearchCriteria<? extends ControlledEntity> sc, Long domainId, boolean isRecursive, List<Long> permittedAccounts,
312+
ListProjectResourcesCriteria listProjectResourcesCriteria) {
313+
// TODO Auto-generated method stub
314+
315+
}
316+
317+
@Override
318+
public ListProjectResourcesCriteria buildACLSearchParameters(Account caller, Long domainId, boolean isRecursive, String accountName, Long projectId, List<Long> permittedAccounts, boolean listAll,
319+
Long id) {
320+
// TODO Auto-generated method stub
321+
return null;
322+
}
323+
300324
}

0 commit comments

Comments
 (0)