apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix spelling (#7087)

Browse Source
This commit is contained in:
John Bampton 2023-01-16 19:56:07 +10:00 committed by GitHub
parent 566578297b
commit 52c321a0c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
44 changed files with 236 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/src/main/java/com/cloud/agent/properties/AgentProperties.java
View File

@ -508,7 +508,7 @@ public class AgentProperties{
public static final Property<String> VM_WATCHDOG_MODEL = new Property<>("vm.watchdog.model", "i6300esb"); public static final Property<String> VM_WATCHDOG_MODEL = new Property<>("vm.watchdog.model", "i6300esb");
/** /**
* Action to take when the Guest/Instance is no longer notifiying the Watchdog timer.<br> * Action to take when the Guest/Instance is no longer notifying the Watchdog timer.<br>
* Possible values: none | reset | poweroff <br> * Possible values: none | reset | poweroff <br>
* Data type: String.<br> * Data type: String.<br>
* Default value: <code>none</code> * Default value: <code>none</code>

2
api/src/main/java/com/cloud/network/vpc/VpcService.java
View File

@ -109,7 +109,7 @@ public interface VpcService {
Map<String, String> tags, Long projectId, Boolean display); Map<String, String> tags, Long projectId, Boolean display);
/** /**
* Starts VPC which includes starting VPC provider and applying all the neworking rules on the backend * Starts VPC which includes starting VPC provider and applying all the networking rules on the backend
* *
* @param vpcId * @param vpcId
* @param destroyOnFailure TODO * @param destroyOnFailure TODO

2
api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmd.java
View File

@ -78,7 +78,7 @@ public class AddAnnotationCmd extends BaseCmd {
throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException,
NetworkRuleConflictException { NetworkRuleConflictException {
Preconditions.checkNotNull(getEntityUuid(),"I have to have an entity to set an annotation on!"); Preconditions.checkNotNull(getEntityUuid(),"I have to have an entity to set an annotation on!");
Preconditions.checkState(AnnotationService.EntityType.contains(entityType),(java.lang.String)"'%s' is ot a valid EntityType to put annotations on", entityType); Preconditions.checkState(AnnotationService.EntityType.contains(entityType),(java.lang.String)"'%s' is not a valid EntityType to put annotations on", entityType);
AnnotationResponse annotationResponse = annotationService.addAnnotation(this); AnnotationResponse annotationResponse = annotationService.addAnnotation(this);
annotationResponse.setResponseName(getCommandName()); annotationResponse.setResponseName(getCommandName());
this.setResponseObject(annotationResponse); this.setResponseObject(annotationResponse);

4
client/conf/ehcache.xml.in
View File

@ -158,7 +158,7 @@ under the License.
pbcast.GMS(join_timeout=5000;join_retry_timeout=2000;shun=false;print_local_addr=false)" pbcast.GMS(join_timeout=5000;join_retry_timeout=2000;shun=false;print_local_addr=false)"
propertySeparator="::" propertySeparator="::"
/> />
The only property necessay is the connect String used by jgroups to configure itself. Refer to the Jgroups documentation for explanation The only property necessary is the connect String used by jgroups to configure itself. Refer to the Jgroups documentation for explanation
of all the protocols. The example above uses UDP multicast. If the connect property is not specified the default JGroups connection will be of all the protocols. The example above uses UDP multicast. If the connect property is not specified the default JGroups connection will be
used. used.
@ -272,7 +272,7 @@ under the License.
* bootstrapCacheLoaderFactory - Specifies a BootstrapCacheLoader, which is called by a * bootstrapCacheLoaderFactory - Specifies a BootstrapCacheLoader, which is called by a
cache on initialisation to prepopulate itself. cache on initialisation to prepopulate itself.
* cacheExtensionFactory - Specifies a CacheExtension, a generic mechansim to tie a class * cacheExtensionFactory - Specifies a CacheExtension, a generic mechanism to tie a class
which holds a reference to a cache to the cache lifecycle. which holds a reference to a cache to the cache lifecycle.
* cacheExceptionHandlerFactory - Specifies a CacheExceptionHandler, which is called when * cacheExceptionHandlerFactory - Specifies a CacheExceptionHandler, which is called when

2
core/src/main/java/com/cloud/agent/api/UnregisterNicCommand.java
View File

@ -23,7 +23,7 @@ import java.util.UUID;
/** /**
* This command will tell the hypervisor to cleanup any resources dedicated for * This command will tell the hypervisor to cleanup any resources dedicated for
* this particular nic. Orginally implemented to cleanup dedicated portgroups * this particular nic. Originally implemented to cleanup dedicated portgroups
* from a vmware standard switch * from a vmware standard switch
* *
*/ */

2
core/src/main/java/com/cloud/agent/api/routing/SiteLoadBalancerConfig.java
View File

@ -47,7 +47,7 @@ public class SiteLoadBalancerConfig {
// zone id in which site is located // zone id in which site is located
long dataCenterId; long dataCenterId;
// wight corresponding to this site // weight corresponding to this site
long weight = 1; long weight = 1;
public SiteLoadBalancerConfig(boolean revoked, String serviceType, String servicePublicIp, String servicePort, long dataCenterId) { public SiteLoadBalancerConfig(boolean revoked, String serviceType, String servicePublicIp, String servicePort, long dataCenterId) {

2
core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/TcpAclRule.java
View File

@ -25,7 +25,7 @@ public class TcpAclRule extends AclRule {
private int lastPort; private int lastPort;
public TcpAclRule() { public TcpAclRule() {
// Empty contructor for (de)serialization // Empty constructor for (de)serialization
} }
public TcpAclRule(String cidr, boolean allowed, int firstPort, int lastPort) { public TcpAclRule(String cidr, boolean allowed, int firstPort, int lastPort) {

2
core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/UdpAclRule.java
View File

@ -25,7 +25,7 @@ public class UdpAclRule extends AclRule {
private int lastPort; private int lastPort;
public UdpAclRule() { public UdpAclRule() {
// Empty contructor for (de)serialization // Empty constructor for (de)serialization
} }
public UdpAclRule(String cidr, boolean allowed, int firstPort, int lastPort) { public UdpAclRule(String cidr, boolean allowed, int firstPort, int lastPort) {

2
core/src/main/java/com/cloud/network/HAProxyConfigurator.java
View File

@ -96,7 +96,7 @@ public class HAProxyConfigurator implements LoadBalancerConfigurator {
final PortForwardingRuleTO firstRule = fwRules.get(0); final PortForwardingRuleTO firstRule = fwRules.get(0);
final String publicIP = firstRule.getSrcIp(); final String publicIP = firstRule.getSrcIp();
final int publicPort = firstRule.getSrcPortRange()[0]; final int publicPort = firstRule.getSrcPortRange()[0];
// FIXEME: String algorithm = firstRule.getAlgorithm(); // FIXME: String algorithm = firstRule.getAlgorithm();
final List<String> result = new ArrayList<String>(); final List<String> result = new ArrayList<String>();
// add line like this: "listen 65_37_141_30-80 65.37.141.30:80" // add line like this: "listen 65_37_141_30-80 65.37.141.30:80"

2
core/src/main/java/com/cloud/storage/template/MetalinkTemplateDownloader.java
View File

@ -140,7 +140,7 @@ public class MetalinkTemplateDownloader extends TemplateDownloaderBase implement
i++; i++;
} }
if (!downloaded) { if (!downloaded) {
LOGGER.error("Template couldnt be downloaded"); LOGGER.error("Template couldn't be downloaded");
status = Status.UNRECOVERABLE_ERROR; status = Status.UNRECOVERABLE_ERROR;
return 0; return 0;
} }

2
core/src/main/java/com/cloud/storage/template/Processor.java
View File

@ -40,7 +40,7 @@ public interface Processor extends Adapter {
* *
* @param templatePath path to the templates to process. * @param templatePath path to the templates to process.
* @param format Format of the original file. If null, it means unknown. If not null, * @param format Format of the original file. If null, it means unknown. If not null,
* there is already a file with thte template name and image format extension * there is already a file with the template name and image format extension
* that exists in case a conversion can be done. * that exists in case a conversion can be done.
*/ */
FormatInfo process(String templatePath, ImageFormat format, String templateName) throws InternalErrorException; FormatInfo process(String templatePath, ImageFormat format, String templateName) throws InternalErrorException;

2
core/src/test/java/com/cloud/agent/api/storage/DownloadAnswerTest.java
View File

@ -33,7 +33,7 @@ public class DownloadAnswerTest {
Gson gson = GsonHelper.getGson(); Gson gson = GsonHelper.getGson();
VMTemplateStorageResourceAssoc.Status status = VMTemplateStorageResourceAssoc.Status.DOWNLOADED; VMTemplateStorageResourceAssoc.Status status = VMTemplateStorageResourceAssoc.Status.DOWNLOADED;
DownloadAnswer answer = new DownloadAnswer("nothin wrong", status); DownloadAnswer answer = new DownloadAnswer("nothing wrong", status);
@Test @Test
public void redeserialise () public void redeserialise ()

4
core/src/test/java/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
View File

@ -333,7 +333,7 @@ public class VirtualRoutingResourceTest implements VirtualRouterDeployer {
assertEquals(VRScripts.IP_ASSOCIATION_CONFIG, args); assertEquals(VRScripts.IP_ASSOCIATION_CONFIG, args);
break; break;
default: default:
fail("Failed to recongize the match!"); fail("Failed to recognize the match!");
} }
} else { } else {
assertEquals(script, VRScripts.UPDATE_CONFIG); assertEquals(script, VRScripts.UPDATE_CONFIG);
@ -349,7 +349,7 @@ public class VirtualRoutingResourceTest implements VirtualRouterDeployer {
assertEquals(VRScripts.IP_ASSOCIATION_CONFIG, args); assertEquals(VRScripts.IP_ASSOCIATION_CONFIG, args);
break; break;
default: default:
fail("Failed to recongize the match!"); fail("Failed to recognize the match!");
} }
} }
} }

4
engine/api/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java
View File

@ -168,9 +168,9 @@ public interface VirtualMachineEntity extends CloudStackEntity {
/** /**
* Disconnect the VM from this network * Disconnect the VM from this network
* @param netowrk network to disconnect from * @param network network to disconnect from
*/ */
void disconnectFrom(NetworkEntity netowrk, short nicId); void disconnectFrom(NetworkEntity network, short nicId);
/** /**
* passing additional params of deployment associated with the virtual machine * passing additional params of deployment associated with the virtual machine

2
engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/network/NetworkSubsystem.java
View File

@ -23,7 +23,7 @@ public interface NetworkSubsystem {
String start(String network, String reservationId); String start(String network, String reservationId);
void shutdown(String nework, String reservationId); void shutdown(String network, String reservationId);
void prepare(String vm, String network, String reservationId); void prepare(String vm, String network, String reservationId);

2
engine/components-api/src/main/java/com/cloud/capacity/CapacityManager.java
View File

@ -159,7 +159,7 @@ public interface CapacityManager {
boolean checkIfHostHasCpuCapability(long hostId, Integer cpuNum, Integer cpuSpeed); boolean checkIfHostHasCpuCapability(long hostId, Integer cpuNum, Integer cpuSpeed);
/** /**
* Check if cluster will cross threshold if the cpu/memory requested are accomodated * Check if cluster will cross threshold if the cpu/memory requested are accommodated
* @param clusterId the clusterId to check * @param clusterId the clusterId to check
* @param cpuRequested cpu requested * @param cpuRequested cpu requested
* @param ramRequested cpu requested * @param ramRequested cpu requested

2
engine/components-api/src/main/java/com/cloud/network/rules/FirewallManager.java
View File

@ -29,7 +29,7 @@ import com.cloud.user.Account;
public interface FirewallManager extends FirewallService { public interface FirewallManager extends FirewallService {
/** /**
* detectRulesConflict finds conflicts in networking rules. It checks for * detectRulesConflict finds conflicts in networking rules. It checks for
* conflicts between the following types of netowrking rules; * conflicts between the following types of networking rules;
* 1. one to one nat ip forwarding * 1. one to one nat ip forwarding
* 2. port forwarding * 2. port forwarding
* 3. load balancing * 3. load balancing

8
engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java
View File

@ -655,7 +655,7 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
} catch (final ClassNotFoundException e) { } catch (final ClassNotFoundException e) {
s_logger.warn("Unable to find class " + host.getResource(), e); s_logger.warn("Unable to find class " + host.getResource(), e);
} catch (final InstantiationException e) { } catch (final InstantiationException e) {
s_logger.warn("Unablet to instantiate class " + host.getResource(), e); s_logger.warn("Unable to instantiate class " + host.getResource(), e);
} catch (final IllegalAccessException e) { } catch (final IllegalAccessException e) {
s_logger.warn("Illegal access " + host.getResource(), e); s_logger.warn("Illegal access " + host.getResource(), e);
} catch (final SecurityException e) { } catch (final SecurityException e) {
@ -1403,7 +1403,7 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
s_logger.warn(e.getMessage()); s_logger.warn(e.getMessage());
// upgradeAgent(task.getLink(), data, e.getReason()); // upgradeAgent(task.getLink(), data, e.getReason());
} catch (final ClassNotFoundException e) { } catch (final ClassNotFoundException e) {
final String message = String.format("Exception occurred when executing taks! Error '%s'", e.getMessage()); final String message = String.format("Exception occurred when executing tasks! Error '%s'", e.getMessage());
s_logger.error(message); s_logger.error(message);
throw new TaskExecutionException(message, e); throw new TaskExecutionException(message, e);
} }
@ -1464,8 +1464,8 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
try { try {
return _statusStateMachine.transitTo(host, e, host.getId(), _hostDao); return _statusStateMachine.transitTo(host, e, host.getId(), _hostDao);
} catch (final NoTransitionException e1) { } catch (final NoTransitionException e1) {
s_logger.debug("Cannot transit agent status with event " + e + " for host " + host.getId() + ", name=" + host.getName() + ", mangement server id is " + msId); s_logger.debug("Cannot transit agent status with event " + e + " for host " + host.getId() + ", name=" + host.getName() + ", management server id is " + msId);
throw new CloudRuntimeException("Cannot transit agent status with event " + e + " for host " + host.getId() + ", mangement server id is " + msId + "," + e1.getMessage()); throw new CloudRuntimeException("Cannot transit agent status with event " + e + " for host " + host.getId() + ", management server id is " + msId + "," + e1.getMessage());
} }
} finally { } finally {
_agentStatusLock.unlock(); _agentStatusLock.unlock();

6
engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
View File

@ -716,11 +716,11 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
} }
} }
} catch (final ClassNotFoundException e) { } catch (final ClassNotFoundException e) {
final String message = String.format("ClassNotFoundException occurred when executing taks! Error '%s'", e.getMessage()); final String message = String.format("ClassNotFoundException occurred when executing tasks! Error '%s'", e.getMessage());
s_logger.error(message); s_logger.error(message);
throw new TaskExecutionException(message, e); throw new TaskExecutionException(message, e);
} catch (final UnsupportedVersionException e) { } catch (final UnsupportedVersionException e) {
final String message = String.format("UnsupportedVersionException occurred when executing taks! Error '%s'", e.getMessage()); final String message = String.format("UnsupportedVersionException occurred when executing tasks! Error '%s'", e.getMessage());
s_logger.error(message); s_logger.error(message);
throw new TaskExecutionException(message, e); throw new TaskExecutionException(message, e);
} finally { } finally {
@ -1275,7 +1275,7 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
cmds = _gson.fromJson(pdu.getJsonPackage(), Command[].class); cmds = _gson.fromJson(pdu.getJsonPackage(), Command[].class);
} catch (final Throwable e) { } catch (final Throwable e) {
assert false; assert false;
s_logger.error("Excection in gson decoding : ", e); s_logger.error("Exception in gson decoding : ", e);
} }
if (cmds.length == 1 && cmds[0] instanceof ChangeAgentCommand) { // intercepted if (cmds.length == 1 && cmds[0] instanceof ChangeAgentCommand) { // intercepted

10
engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
View File

@ -1142,8 +1142,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
try { try {
dest = _dpMgr.planDeployment(vmProfile, plan, avoids, planner); dest = _dpMgr.planDeployment(vmProfile, plan, avoids, planner);
} catch (final AffinityConflictException e2) { } catch (final AffinityConflictException e2) {
s_logger.warn("Unable to create deployment, affinity rules associted to the VM conflict", e2); s_logger.warn("Unable to create deployment, affinity rules associated to the VM conflict", e2);
throw new CloudRuntimeException("Unable to create deployment, affinity rules associted to the VM conflict"); throw new CloudRuntimeException("Unable to create deployment, affinity rules associated to the VM conflict");
} }
if (dest == null) { if (dest == null) {
@ -3157,7 +3157,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
s_logger.error("AgentUnavailableException while cleanup on source host: " + srcHostId, e); s_logger.error("AgentUnavailableException while cleanup on source host: " + srcHostId, e);
} }
cleanup(vmGuru, new VirtualMachineProfileImpl(vm), work, Event.AgentReportStopped, true); cleanup(vmGuru, new VirtualMachineProfileImpl(vm), work, Event.AgentReportStopped, true);
throw new CloudRuntimeException("VM not found on desintation host. Unable to complete migration for " + vm); throw new CloudRuntimeException("VM not found on destination host. Unable to complete migration for " + vm);
} }
} catch (final OperationTimedoutException e) { } catch (final OperationTimedoutException e) {
s_logger.error("Error while checking the vm " + vm + " is on host " + destHost, e); s_logger.error("Error while checking the vm " + vm + " is on host " + destHost, e);
@ -3309,7 +3309,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
plan.setMigrationPlan(true); plan.setMigrationPlan(true);
dest = _dpMgr.planDeployment(profile, plan, excludes, planner); dest = _dpMgr.planDeployment(profile, plan, excludes, planner);
} catch (final AffinityConflictException e2) { } catch (final AffinityConflictException e2) {
String message = String.format("Unable to create deployment, affinity rules associted to the %s conflict.", vm.toString()); String message = String.format("Unable to create deployment, affinity rules associated to the %s conflict.", vm.toString());
s_logger.warn(message, e2); s_logger.warn(message, e2);
throw new CloudRuntimeException(message, e2); throw new CloudRuntimeException(message, e2);
} }
@ -4157,7 +4157,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
try { try {
dest = _dpMgr.planDeployment(profile, plan, excludes, null); dest = _dpMgr.planDeployment(profile, plan, excludes, null);
} catch (final AffinityConflictException e2) { } catch (final AffinityConflictException e2) {
String message = String.format("Unable to create deployment, affinity rules associted to the %s conflict.", vm.toString()); String message = String.format("Unable to create deployment, affinity rules associated to the %s conflict.", vm.toString());
s_logger.warn(message, e2); s_logger.warn(message, e2);
throw new CloudRuntimeException(message); throw new CloudRuntimeException(message);
} }

2
engine/orchestration/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java
View File

@ -266,7 +266,7 @@ public class VirtualMachineEntityImpl implements VirtualMachineEntity {
} }
@Override @Override
public void disconnectFrom(NetworkEntity netowrk, short nicId) { public void disconnectFrom(NetworkEntity network, short nicId) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }

2
engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
View File

@ -1578,7 +1578,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
for (NetworkElement element : networkElements) { for (NetworkElement element : networkElements) {
if (providersToImplement.contains(element.getProvider())) { if (providersToImplement.contains(element.getProvider())) {
if (!_networkModel.isProviderEnabledInPhysicalNetwork(_networkModel.getPhysicalNetworkId(network), element.getProvider().getName())) { if (!_networkModel.isProviderEnabledInPhysicalNetwork(_networkModel.getPhysicalNetworkId(network), element.getProvider().getName())) {
// The physicalNetworkId will not get translated into a uuid by the reponse serializer, // The physicalNetworkId will not get translated into a uuid by the response serializer,
// because the serializer would look up the NetworkVO class's table and retrieve the // because the serializer would look up the NetworkVO class's table and retrieve the
// network id instead of the physical network id. // network id instead of the physical network id.
// So just throw this exception as is. We may need to TBD by changing the serializer. // So just throw this exception as is. We may need to TBD by changing the serializer.

2
engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
View File

@ -1917,7 +1917,7 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
"Enable/disable storage migration across primary storage", true); "Enable/disable storage migration across primary storage", true);
static final ConfigKey<Boolean> VolumeUrlCheck = new ConfigKey<Boolean>("Advanced", Boolean.class, "volume.url.check", "true", static final ConfigKey<Boolean> VolumeUrlCheck = new ConfigKey<Boolean>("Advanced", Boolean.class, "volume.url.check", "true",
"Check the url for a volume before downloading it from the management server. Set to flase when you managment has no internet access.", true); "Check the url for a volume before downloading it from the management server. Set to false when your management has no internet access.", true);
@Override @Override
public ConfigKey<?>[] getConfigKeys() { public ConfigKey<?>[] getConfigKeys() {

4
framework/cluster/src/main/java/com/cloud/cluster/ClusterServiceServletHttpHandler.java
View File

@ -143,13 +143,13 @@ public class ClusterServiceServletHttpHandler implements HttpRequestHandler {
if (responseContent != null) { if (responseContent != null) {
if (s_logger.isTraceEnabled()) { if (s_logger.isTraceEnabled()) {
s_logger.trace("Write reponse with HTTP OK " + responseContent); s_logger.trace("Write response with HTTP OK " + responseContent);
} }
writeResponse(response, HttpStatus.SC_OK, responseContent); writeResponse(response, HttpStatus.SC_OK, responseContent);
} else { } else {
if (s_logger.isTraceEnabled()) { if (s_logger.isTraceEnabled()) {
s_logger.trace("Write reponse with HTTP Bad request"); s_logger.trace("Write response with HTTP Bad request");
} }
writeResponse(response, HttpStatus.SC_BAD_REQUEST, null); writeResponse(response, HttpStatus.SC_BAD_REQUEST, null);

4
plugins/alert-handlers/snmp-alerts/CS-ROOT-MIB.mib
View File

@ -289,7 +289,7 @@ usageServerStatus NOTIFICATION-TYPE
"No usage server process running" "No usage server process running"
::= { csAlertTraps 14 } ::= { csAlertTraps 14 }
managmentNode NOTIFICATION-TYPE managementNode NOTIFICATION-TYPE
OBJECTS { OBJECTS {
dataCenterId, dataCenterId,
podId, podId,
@ -512,7 +512,7 @@ csAlertNotificationsGroup NOTIFICATION-GROUP
routingConnection, routingConnection,
storageIssueSystemVms, storageIssueSystemVms,
usageServerStatus, usageServerStatus,
managmentNode, managementNode,
domainRouterMigrate, domainRouterMigrate,
consoleProxyMigrate, consoleProxyMigrate,
userVmMigrate, userVmMigrate,

2
plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/hypervisor/OvmResourceBase.java
View File

@ -1100,7 +1100,7 @@ public class OvmResourceBase implements ServerResource, HypervisorResource {
try { try {
OvmStoragePool.delete(_conn, cmd.getPool().getUuid()); OvmStoragePool.delete(_conn, cmd.getPool().getUuid());
} catch (Exception e) { } catch (Exception e) {
s_logger.debug("Delete storage pool on host " + _ip + " failed, however, we leave to user for cleanup and tell managment server it succeeded", e); s_logger.debug("Delete storage pool on host " + _ip + " failed, however, we leave to user for cleanup and tell management server it succeeded", e);
} }
return new Answer(cmd); return new Answer(cmd);

2
plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3StoragePool.java
View File

@ -311,7 +311,7 @@ public class Ovm3StoragePool {
LOGGER.debug( LOGGER.debug(
"Delete storage pool on host " "Delete storage pool on host "
+ config.getAgentHostname() + config.getAgentHostname()
+ " failed, however, we leave to user for cleanup and tell managment server it succeeded", + " failed, however, we leave to user for cleanup and tell management server it succeeded",
e); e);
} }

2
plugins/hypervisors/ucs/src/main/java/org/apache/cloudstack/api/ListUcsManagerCmd.java
View File

@ -71,7 +71,7 @@ public class ListUcsManagerCmd extends BaseListCmd {
@Override @Override
public String getCommandName() { public String getCommandName() {
return "listucsmanagerreponse"; return "listucsmanagerresponse";
} }
@Override @Override

2
plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LdapListUsersCmdTest.java
View File

@ -228,7 +228,7 @@ public class LdapListUsersCmdTest implements LdapConfigurationChanger {
*/ */
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void getInvalidUserFilterValues() throws NoSuchFieldException, IllegalAccessException { public void getInvalidUserFilterValues() throws NoSuchFieldException, IllegalAccessException {
setHiddenField(ldapListUsersCmd, "userFilter", "flase"); setHiddenField(ldapListUsersCmd, "userFilter", "false");
// unused output: LdapListUsersCmd.UserFilter userfilter = // unused output: LdapListUsersCmd.UserFilter userfilter =
ldapListUsersCmd.getUserFilter(); ldapListUsersCmd.getUserFilter();
} }

2
server/src/main/java/com/cloud/api/response/ApiResponseSerializer.java
View File

@ -294,7 +294,7 @@ public class ApiResponseSerializer {
} }
serializeResponseObjXML(sb, log, subObj); serializeResponseObjXML(sb, log, subObj);
} else if (value instanceof ExceptionProxyObject) { } else if (value instanceof ExceptionProxyObject) {
// Only exception reponses carry a list of // Only exception responses carry a list of
// ExceptionProxyObject objects. // ExceptionProxyObject objects.
ExceptionProxyObject idProxy = (ExceptionProxyObject)value; ExceptionProxyObject idProxy = (ExceptionProxyObject)value;
// If this is the first IdentityProxy field // If this is the first IdentityProxy field

2
server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -7146,7 +7146,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
networkRate = NetworkOrchestrationService.NetworkThrottlingRate.valueIn(dataCenterId); networkRate = NetworkOrchestrationService.NetworkThrottlingRate.valueIn(dataCenterId);
} }
// networkRate is unsigned int in netowrkOfferings table, and can't be // networkRate is unsigned int in networkOfferings table, and can't be
// set to -1 // set to -1
// so 0 means unlimited; we convert it to -1, so we are consistent with // so 0 means unlimited; we convert it to -1, so we are consistent with
// all our other resources where -1 means unlimited // all our other resources where -1 means unlimited

2
server/src/main/java/com/cloud/network/NetworkServiceImpl.java
View File

@ -2931,7 +2931,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C
throw new InvalidParameterValueException("Can only allow IP Reservation in networks with guest type " + GuestType.Isolated); throw new InvalidParameterValueException("Can only allow IP Reservation in networks with guest type " + GuestType.Isolated);
} }
if (networkOfferingChanged) { if (networkOfferingChanged) {
throw new InvalidParameterValueException("Cannot specify this nework offering change and guestVmCidr at same time. Specify only one."); throw new InvalidParameterValueException("Cannot specify this network offering change and guestVmCidr at same time. Specify only one.");
} }
if (!(network.getState() == Network.State.Implemented)) { if (!(network.getState() == Network.State.Implemented)) {
throw new InvalidParameterValueException("The network must be in " + Network.State.Implemented + " state. IP Reservation cannot be applied in " + network.getState() + " state"); throw new InvalidParameterValueException("The network must be in " + Network.State.Implemented + " state. IP Reservation cannot be applied in " + network.getState() + " state");

2
server/src/main/java/com/cloud/network/guru/ExternalGuestNetworkGuru.java
View File

@ -240,7 +240,7 @@ public class ExternalGuestNetworkGuru extends GuestNetworkGuru {
} }
} }
//Egress rules cidr is subset of guest nework cidr, we need to change //Egress rules cidr is subset of guest network cidr, we need to change
List <FirewallRuleVO> fwEgressRules = _fwRulesDao.listByNetworkPurposeTrafficType(config.getId(), FirewallRule.Purpose.Firewall, FirewallRule.TrafficType.Egress); List <FirewallRuleVO> fwEgressRules = _fwRulesDao.listByNetworkPurposeTrafficType(config.getId(), FirewallRule.Purpose.Firewall, FirewallRule.TrafficType.Egress);
for (FirewallRuleVO rule: fwEgressRules) { for (FirewallRuleVO rule: fwEgressRules) {

2
server/src/main/java/com/cloud/resource/DiscovererBase.java
View File

@ -92,7 +92,7 @@ public abstract class DiscovererBase extends AdapterBase implements Discoverer {
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
s_logger.warn("Unable to find class " + resourceName, e); s_logger.warn("Unable to find class " + resourceName, e);
} catch (InstantiationException e) { } catch (InstantiationException e) {
s_logger.warn("Unablet to instantiate class " + resourceName, e); s_logger.warn("Unable to instantiate class " + resourceName, e);
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
s_logger.warn("Illegal access " + resourceName, e); s_logger.warn("Illegal access " + resourceName, e);
} catch (SecurityException e) { } catch (SecurityException e) {

2
server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
View File

@ -329,7 +329,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
static final ConfigKey<Long> VmJobCheckInterval = new ConfigKey<Long>("Advanced", Long.class, "vm.job.check.interval", "3000", "Interval in milliseconds to check if the job is complete", false); static final ConfigKey<Long> VmJobCheckInterval = new ConfigKey<Long>("Advanced", Long.class, "vm.job.check.interval", "3000", "Interval in milliseconds to check if the job is complete", false);
static final ConfigKey<Boolean> VolumeUrlCheck = new ConfigKey<Boolean>("Advanced", Boolean.class, "volume.url.check", "true", static final ConfigKey<Boolean> VolumeUrlCheck = new ConfigKey<Boolean>("Advanced", Boolean.class, "volume.url.check", "true",
"Check the url for a volume before downloading it from the management server. Set to false when you managment has no internet access.", true); "Check the url for a volume before downloading it from the management server. Set to false when your management has no internet access.", true);
public static final ConfigKey<Boolean> AllowUserExpungeRecoverVolume = new ConfigKey<Boolean>("Advanced", Boolean.class, "allow.user.expunge.recover.volume", "true", public static final ConfigKey<Boolean> AllowUserExpungeRecoverVolume = new ConfigKey<Boolean>("Advanced", Boolean.class, "allow.user.expunge.recover.volume", "true",
"Determines whether users can expunge or recover their volume", true, ConfigKey.Scope.Account); "Determines whether users can expunge or recover their volume", true, ConfigKey.Scope.Account);

4
server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
View File

@ -6546,8 +6546,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
try { try {
return _planningMgr.planDeployment(profile, plan, excludes, null); return _planningMgr.planDeployment(profile, plan, excludes, null);
} catch (final AffinityConflictException e2) { } catch (final AffinityConflictException e2) {
s_logger.warn("Unable to create deployment, affinity rules associted to the VM conflict", e2); s_logger.warn("Unable to create deployment, affinity rules associated to the VM conflict", e2);
throw new CloudRuntimeException("Unable to create deployment, affinity rules associted to the VM conflict"); throw new CloudRuntimeException("Unable to create deployment, affinity rules associated to the VM conflict");
} catch (final InsufficientServerCapacityException e3) { } catch (final InsufficientServerCapacityException e3) {
throw new CloudRuntimeException("Unable to find a server to migrate the vm to"); throw new CloudRuntimeException("Unable to find a server to migrate the vm to");
} }

6
setup/bindir/cloud-set-guest-sshkey-password-userdata-configdrive.in
View File

@ -259,19 +259,19 @@ function sendAckToUserDataServer(){
function getPublicKeyFromUserDataServer(){ function getPublicKeyFromUserDataServer(){
userDataServer=$1 userDataServer=$1
outputLog "Sending request to userdata server at $userDataServer to get public key" outputLog "Sending request to userdata server at $userDataServer to get public key"
if ! reponse=$(curl --fail --silent --connect-timeout 20 --retry 3 http://"$userDataServer"/latest/public-keys) if ! response=$(curl --fail --silent --connect-timeout 20 --retry 3 http://"$userDataServer"/latest/public-keys)
then then
outputLog "Failed to get public key from userdata server" outputLog "Failed to get public key from userdata server"
return 2 return 2
fi fi
outputLog "Got response from userdata server at $userDataServer" outputLog "Got response from userdata server at $userDataServer"
if [ -z "$reponse" ] if [ -z "$response" ]
then then
outputLog "Did not receive any public keys from userdata server" outputLog "Did not receive any public keys from userdata server"
return 1 return 1
fi fi
outputLog "Successfully get public key from userdata server" outputLog "Successfully get public key from userdata server"
echo "$reponse" echo "$response"
return 0 return 0
} }

158
test/integration/component/test_project_configs.py
View File

@ -134,21 +134,21 @@ class TestUserProjectCreation(cloudstackTestCase):
self.debug("Created project with domain admin with ID: %s" % self.debug("Created project with domain admin with ID: %s" %
project.id) project.id)
list_projects_reponse = Project.list( list_projects_response = Project.list(
self.apiclient, self.apiclient,
id=project.id, id=project.id,
listall=True listall=True
) )
self.assertEqual( self.assertEqual(
isinstance(list_projects_reponse, list), isinstance(list_projects_response, list),
True, True,
"Check for a valid list projects response" "Check for a valid list projects response"
) )
list_project = list_projects_reponse[0] list_project = list_projects_response[0]
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
@ -170,21 +170,21 @@ class TestUserProjectCreation(cloudstackTestCase):
self.debug("Created project with domain user with ID: %s" % self.debug("Created project with domain user with ID: %s" %
project.id) project.id)
list_projects_reponse = Project.list( list_projects_response = Project.list(
self.apiclient, self.apiclient,
id=project.id, id=project.id,
listall=True listall=True
) )
self.assertEqual( self.assertEqual(
isinstance(list_projects_reponse, list), isinstance(list_projects_response, list),
True, True,
"Check for a valid list projects response" "Check for a valid list projects response"
) )
list_project = list_projects_reponse[0] list_project = list_projects_response[0]
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
@ -298,21 +298,21 @@ class TestProjectCreationNegative(cloudstackTestCase):
self.debug("Created project with domain admin with ID: %s" % self.debug("Created project with domain admin with ID: %s" %
project.id) project.id)
list_projects_reponse = Project.list( list_projects_response = Project.list(
self.apiclient, self.apiclient,
id=project.id, id=project.id,
listall=True listall=True
) )
self.assertEqual( self.assertEqual(
isinstance(list_projects_reponse, list), isinstance(list_projects_response, list),
True, True,
"Check for a valid list projects response" "Check for a valid list projects response"
) )
list_project = list_projects_reponse[0] list_project = list_projects_response[0]
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
@ -421,21 +421,21 @@ class TestProjectInviteRequired(cloudstackTestCase):
self.debug("Created project with domain admin with ID: %s" % self.debug("Created project with domain admin with ID: %s" %
project.id) project.id)
list_projects_reponse = Project.list( list_projects_response = Project.list(
self.apiclient, self.apiclient,
id=project.id, id=project.id,
listall=True listall=True
) )
self.assertEqual( self.assertEqual(
isinstance(list_projects_reponse, list), isinstance(list_projects_response, list),
True, True,
"Check for a valid list projects response" "Check for a valid list projects response"
) )
list_project = list_projects_reponse[0] list_project = list_projects_response[0]
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
@ -457,24 +457,24 @@ class TestProjectInviteRequired(cloudstackTestCase):
) )
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts( accounts_response = Project.listAccounts(
self.apiclient, self.apiclient,
projectid=project.id, projectid=project.id,
account=self.user.name, account=self.user.name,
) )
self.debug(accounts_reponse) self.debug(accounts_response)
self.assertEqual( self.assertEqual(
isinstance(accounts_reponse, list), isinstance(accounts_response, list),
True, True,
"Check for a valid list accounts response" "Check for a valid list accounts response"
) )
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
account = accounts_reponse[0] account = accounts_response[0]
self.assertEqual( self.assertEqual(
account.role, account.role,
@ -573,21 +573,21 @@ class TestProjectInviteRequiredTrue(cloudstackTestCase):
self.debug("Created project with domain admin with ID: %s" % self.debug("Created project with domain admin with ID: %s" %
project.id) project.id)
list_projects_reponse = Project.list( list_projects_response = Project.list(
self.apiclient, self.apiclient,
id=project.id, id=project.id,
listall=True listall=True
) )
self.assertEqual( self.assertEqual(
isinstance(list_projects_reponse, list), isinstance(list_projects_response, list),
True, True,
"Check for a valid list projects response" "Check for a valid list projects response"
) )
list_project = list_projects_reponse[0] list_project = list_projects_response[0]
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
@ -609,24 +609,24 @@ class TestProjectInviteRequiredTrue(cloudstackTestCase):
) )
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = ProjectInvitation.list( accounts_response = ProjectInvitation.list(
self.apiclient, self.apiclient,
state='Pending', state='Pending',
account=self.user.name, account=self.user.name,
domainid=self.user.domainid domainid=self.user.domainid
) )
self.assertEqual( self.assertEqual(
isinstance(accounts_reponse, list), isinstance(accounts_response, list),
True, True,
"Check for a valid list accounts response" "Check for a valid list accounts response"
) )
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
account = accounts_reponse[0] account = accounts_response[0]
self.assertEqual( self.assertEqual(
account.state, account.state,
@ -740,21 +740,21 @@ class TestProjectInviteTimeout(cloudstackTestCase):
self.debug("Created project with domain admin with ID: %s" % self.debug("Created project with domain admin with ID: %s" %
project.id) project.id)
list_projects_reponse = Project.list( list_projects_response = Project.list(
self.apiclient, self.apiclient,
id=project.id, id=project.id,
listall=True listall=True
) )
self.assertEqual( self.assertEqual(
isinstance(list_projects_reponse, list), isinstance(list_projects_response, list),
True, True,
"Check for a valid list projects response" "Check for a valid list projects response"
) )
list_project = list_projects_reponse[0] list_project = list_projects_response[0]
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
@ -776,24 +776,24 @@ class TestProjectInviteTimeout(cloudstackTestCase):
) )
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = ProjectInvitation.list( accounts_response = ProjectInvitation.list(
self.apiclient, self.apiclient,
state='Pending', state='Pending',
account=self.user.name, account=self.user.name,
domainid=self.user.domainid domainid=self.user.domainid
) )
self.assertEqual( self.assertEqual(
isinstance(accounts_reponse, list), isinstance(accounts_response, list),
True, True,
"Check for a valid list accounts response" "Check for a valid list accounts response"
) )
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
account = accounts_reponse[0] account = accounts_response[0]
self.assertEqual( self.assertEqual(
account.state, account.state,
@ -814,24 +814,24 @@ class TestProjectInviteTimeout(cloudstackTestCase):
self.user.name self.user.name
)) ))
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts( accounts_response = Project.listAccounts(
self.apiclient, self.apiclient,
projectid=project.id, projectid=project.id,
account=self.user.name, account=self.user.name,
) )
self.assertEqual( self.assertEqual(
isinstance(accounts_reponse, list), isinstance(accounts_response, list),
True, True,
"Check for a valid list accounts response" "Check for a valid list accounts response"
) )
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
account = accounts_reponse[0] account = accounts_response[0]
self.assertEqual( self.assertEqual(
account.role, account.role,
@ -866,21 +866,21 @@ class TestProjectInviteTimeout(cloudstackTestCase):
self.debug("Created project with domain admin with ID: %s" % self.debug("Created project with domain admin with ID: %s" %
project.id) project.id)
list_projects_reponse = Project.list( list_projects_response = Project.list(
self.apiclient, self.apiclient,
id=project.id, id=project.id,
listall=True listall=True
) )
self.assertEqual( self.assertEqual(
isinstance(list_projects_reponse, list), isinstance(list_projects_response, list),
True, True,
"Check for a valid list projects response" "Check for a valid list projects response"
) )
list_project = list_projects_reponse[0] list_project = list_projects_response[0]
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
@ -902,24 +902,24 @@ class TestProjectInviteTimeout(cloudstackTestCase):
) )
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = ProjectInvitation.list( accounts_response = ProjectInvitation.list(
self.apiclient, self.apiclient,
state='Pending', state='Pending',
account=self.user.name, account=self.user.name,
domainid=self.user.domainid domainid=self.user.domainid
) )
self.assertEqual( self.assertEqual(
isinstance(accounts_reponse, list), isinstance(accounts_response, list),
True, True,
"Check for a valid list accounts response" "Check for a valid list accounts response"
) )
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
account = accounts_reponse[0] account = accounts_response[0]
self.assertEqual( self.assertEqual(
account.state, account.state,
@ -945,24 +945,24 @@ class TestProjectInviteTimeout(cloudstackTestCase):
self.user.name self.user.name
)) ))
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = ProjectInvitation.list( accounts_response = ProjectInvitation.list(
self.apiclient, self.apiclient,
account=self.user.name, account=self.user.name,
domainid=self.user.domainid domainid=self.user.domainid
) )
self.assertEqual( self.assertEqual(
isinstance(accounts_reponse, list), isinstance(accounts_response, list),
True, True,
"Check for a valid list accounts response" "Check for a valid list accounts response"
) )
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
account = accounts_reponse[0] account = accounts_response[0]
self.assertEqual( self.assertEqual(
account.state, account.state,
@ -997,21 +997,21 @@ class TestProjectInviteTimeout(cloudstackTestCase):
self.debug("Created project with domain admin with ID: %s" % self.debug("Created project with domain admin with ID: %s" %
project.id) project.id)
list_projects_reponse = Project.list( list_projects_response = Project.list(
self.apiclient, self.apiclient,
id=project.id, id=project.id,
listall=True listall=True
) )
self.assertEqual( self.assertEqual(
isinstance(list_projects_reponse, list), isinstance(list_projects_response, list),
True, True,
"Check for a valid list projects response" "Check for a valid list projects response"
) )
list_project = list_projects_reponse[0] list_project = list_projects_response[0]
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
@ -1033,24 +1033,24 @@ class TestProjectInviteTimeout(cloudstackTestCase):
) )
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = ProjectInvitation.list( accounts_response = ProjectInvitation.list(
self.apiclient, self.apiclient,
state='Pending', state='Pending',
account=self.user.name, account=self.user.name,
domainid=self.user.domainid domainid=self.user.domainid
) )
self.assertEqual( self.assertEqual(
isinstance(accounts_reponse, list), isinstance(accounts_response, list),
True, True,
"Check for a valid list accounts response" "Check for a valid list accounts response"
) )
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
account = accounts_reponse[0] account = accounts_response[0]
self.assertEqual( self.assertEqual(
account.state, account.state,
@ -1074,24 +1074,24 @@ class TestProjectInviteTimeout(cloudstackTestCase):
) )
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = ProjectInvitation.list( accounts_response = ProjectInvitation.list(
self.apiclient, self.apiclient,
state='Pending', state='Pending',
account=self.user.name, account=self.user.name,
domainid=self.user.domainid domainid=self.user.domainid
) )
self.assertEqual( self.assertEqual(
isinstance(accounts_reponse, list), isinstance(accounts_response, list),
True, True,
"Check for a valid list accounts response" "Check for a valid list accounts response"
) )
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
account = accounts_reponse[0] account = accounts_response[0]
self.assertEqual( self.assertEqual(
account.state, account.state,
@ -1126,21 +1126,21 @@ class TestProjectInviteTimeout(cloudstackTestCase):
self.debug("Created project with domain admin with ID: %s" % self.debug("Created project with domain admin with ID: %s" %
project.id) project.id)
list_projects_reponse = Project.list( list_projects_response = Project.list(
self.apiclient, self.apiclient,
id=project.id, id=project.id,
listall=True listall=True
) )
self.assertEqual( self.assertEqual(
isinstance(list_projects_reponse, list), isinstance(list_projects_response, list),
True, True,
"Check for a valid list projects response" "Check for a valid list projects response"
) )
list_project = list_projects_reponse[0] list_project = list_projects_response[0]
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
@ -1162,24 +1162,24 @@ class TestProjectInviteTimeout(cloudstackTestCase):
) )
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = ProjectInvitation.list( accounts_response = ProjectInvitation.list(
self.apiclient, self.apiclient,
state='Pending', state='Pending',
account=self.user.name, account=self.user.name,
domainid=self.user.domainid domainid=self.user.domainid
) )
self.assertEqual( self.assertEqual(
isinstance(accounts_reponse, list), isinstance(accounts_response, list),
True, True,
"Check for a valid list accounts response" "Check for a valid list accounts response"
) )
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
account = accounts_reponse[0] account = accounts_response[0]
self.assertEqual( self.assertEqual(
account.state, account.state,
@ -1199,13 +1199,13 @@ class TestProjectInviteTimeout(cloudstackTestCase):
self.user.name self.user.name
)) ))
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts( accounts_response = Project.listAccounts(
self.apiclient, self.apiclient,
projectid=project.id, projectid=project.id,
account=self.user.name, account=self.user.name,
) )
self.assertEqual( self.assertEqual(
accounts_reponse, accounts_response,
None, None,
"Check for a valid list accounts response" "Check for a valid list accounts response"
) )
@ -1253,21 +1253,21 @@ class TestProjectInviteTimeout(cloudstackTestCase):
self.debug("Created project with domain admin with ID: %s" % self.debug("Created project with domain admin with ID: %s" %
project.id) project.id)
list_projects_reponse = Project.list( list_projects_response = Project.list(
self.apiclient, self.apiclient,
id=project.id, id=project.id,
listall=True listall=True
) )
self.assertEqual( self.assertEqual(
isinstance(list_projects_reponse, list), isinstance(list_projects_response, list),
True, True,
"Check for a valid list projects response" "Check for a valid list projects response"
) )
list_project = list_projects_reponse[0] list_project = list_projects_response[0]
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )

16
test/integration/component/test_project_limits.py
View File

@ -234,21 +234,21 @@ class TestProjectLimits(cloudstackTestCase):
self.debug("Created project with domain admin with ID: %s" % self.debug("Created project with domain admin with ID: %s" %
project.id) project.id)
list_projects_reponse = Project.list( list_projects_response = Project.list(
self.apiclient, self.apiclient,
id=project.id, id=project.id,
listall=True listall=True
) )
self.assertEqual( self.assertEqual(
isinstance(list_projects_reponse, list), isinstance(list_projects_response, list),
True, True,
"Check for a valid list projects response" "Check for a valid list projects response"
) )
list_project = list_projects_reponse[0] list_project = list_projects_response[0]
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
@ -394,21 +394,21 @@ class TestProjectLimits(cloudstackTestCase):
self.debug("Created project with domain admin with ID: %s" % self.debug("Created project with domain admin with ID: %s" %
project.id) project.id)
list_projects_reponse = Project.list( list_projects_response = Project.list(
self.apiclient, self.apiclient,
id=project.id, id=project.id,
listall=True listall=True
) )
self.assertEqual( self.assertEqual(
isinstance(list_projects_reponse, list), isinstance(list_projects_response, list),
True, True,
"Check for a valid list projects response" "Check for a valid list projects response"
) )
list_project = list_projects_reponse[0] list_project = list_projects_response[0]
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )

8
test/integration/component/test_project_resources.py
View File

@ -289,21 +289,21 @@ class TestOfferings(cloudstackTestCase):
self.debug("Created project with domain admin with ID: %s" % self.debug("Created project with domain admin with ID: %s" %
project.id) project.id)
list_projects_reponse = Project.list( list_projects_response = Project.list(
self.apiclient, self.apiclient,
id=project.id, id=project.id,
listall=True listall=True
) )
self.assertEqual( self.assertEqual(
isinstance(list_projects_reponse, list), isinstance(list_projects_response, list),
True, True,
"Check for a valid list projects response" "Check for a valid list projects response"
) )
list_project = list_projects_reponse[0] list_project = list_projects_response[0]
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )

4
test/integration/component/test_vpc_vms_deployment.py
View File

@ -993,7 +993,7 @@ class TestVMDeployVPC(cloudstackTestCase):
"ListNetwork response should be empty as network is deleted" "ListNetwork response should be empty as network is deleted"
) )
self.debug("Create a new netowrk in VPC: %s" % vpc.name) self.debug("Create a new network in VPC: %s" % vpc.name)
# Creating network using the network offering created # Creating network using the network offering created
self.debug("Creating network with network offering: %s" % nw_off.id) self.debug("Creating network with network offering: %s" % nw_off.id)
@ -1263,7 +1263,7 @@ class TestVMDeployVPC(cloudstackTestCase):
"ListNetwork response should be empty as network is deleted" "ListNetwork response should be empty as network is deleted"
) )
self.debug("Create a new netowrk in VPC: %s" % vpc.name) self.debug("Create a new network in VPC: %s" % vpc.name)
# Creating network using the network offering created # Creating network using the network offering created
self.debug("Creating network with network offering: %s" % self.debug("Creating network with network offering: %s" %
nw_off_no_lb.id) nw_off_no_lb.id)

2
test/integration/smoke/test_accounts.py
View File

@ -1465,7 +1465,7 @@ class TestUserLogin(cloudstackTestCase):
"secondarystoragetotal", "secondarystorageavailable" "secondarystoragetotal", "secondarystorageavailable"
] ]
self.debug("Creating a domain for testing list domain reponse") self.debug("Creating a domain for testing list domain response")
domain = Domain.create( domain = Domain.create(
self.apiclient, self.apiclient,
self.services["domain"], self.services["domain"],

172
test/integration/smoke/test_projects.py
View File

@ -205,20 +205,20 @@ class TestMultipleProjectCreation(cloudstackTestCase):
self.debug("Created project with domain admin with ID: %s" % self.debug("Created project with domain admin with ID: %s" %
project_1.id) project_1.id)
list_projects_reponse = Project.list( list_projects_response = Project.list(
self.apiclient, self.apiclient,
id=project_1.id, id=project_1.id,
listall=True listall=True
) )
self.assertEqual( self.assertEqual(
isinstance(list_projects_reponse, list), isinstance(list_projects_response, list),
True, True,
"Check for a valid list projects response" "Check for a valid list projects response"
) )
list_project = list_projects_reponse[0] list_project = list_projects_response[0]
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
@ -240,21 +240,21 @@ class TestMultipleProjectCreation(cloudstackTestCase):
self.debug("Created project with domain user with ID: %s" % self.debug("Created project with domain user with ID: %s" %
project_2.id) project_2.id)
list_projects_reponse = Project.list( list_projects_response = Project.list(
self.apiclient, self.apiclient,
id=project_2.id, id=project_2.id,
listall=True listall=True
) )
self.assertEqual( self.assertEqual(
isinstance(list_projects_reponse, list), isinstance(list_projects_response, list),
True, True,
"Check for a valid list projects response" "Check for a valid list projects response"
) )
list_project = list_projects_reponse[0] list_project = list_projects_response[0]
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
@ -288,7 +288,7 @@ class TestMultipleProjectCreation(cloudstackTestCase):
) )
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
@ -320,7 +320,7 @@ class TestMultipleProjectCreation(cloudstackTestCase):
) )
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
@ -439,21 +439,21 @@ class TestCrossDomainAccountAdd(cloudstackTestCase):
self.debug("Created project with domain admin with ID: %s" % self.debug("Created project with domain admin with ID: %s" %
project.id) project.id)
list_projects_reponse = Project.list( list_projects_response = Project.list(
self.apiclient, self.apiclient,
id=project.id, id=project.id,
listall=True listall=True
) )
self.assertEqual( self.assertEqual(
isinstance(list_projects_reponse, list), isinstance(list_projects_response, list),
True, True,
"Check for a valid list projects response" "Check for a valid list projects response"
) )
list_project = list_projects_reponse[0] list_project = list_projects_response[0]
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
@ -570,21 +570,21 @@ class TestDeleteAccountWithProject(cloudstackTestCase):
self.debug("Created project with domain admin with ID: %s" % self.debug("Created project with domain admin with ID: %s" %
project.id) project.id)
list_projects_reponse = Project.list( list_projects_response = Project.list(
self.apiclient, self.apiclient,
id=project.id, id=project.id,
listall=True listall=True
) )
self.assertEqual( self.assertEqual(
isinstance(list_projects_reponse, list), isinstance(list_projects_response, list),
True, True,
"Check for a valid list projects response" "Check for a valid list projects response"
) )
list_project = list_projects_reponse[0] list_project = list_projects_response[0]
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
@ -696,21 +696,21 @@ class TestDeleteDomainWithProject(cloudstackTestCase):
self.debug("Created project with domain admin with ID: %s" % self.debug("Created project with domain admin with ID: %s" %
project.id) project.id)
list_projects_reponse = Project.list( list_projects_response = Project.list(
self.apiclient, self.apiclient,
id=project.id, id=project.id,
listall=True listall=True
) )
self.assertEqual( self.assertEqual(
isinstance(list_projects_reponse, list), isinstance(list_projects_response, list),
True, True,
"Check for a valid list projects response" "Check for a valid list projects response"
) )
list_project = list_projects_reponse[0] list_project = list_projects_response[0]
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
@ -742,13 +742,13 @@ class TestDeleteDomainWithProject(cloudstackTestCase):
time.sleep(int(interval[0].value)) time.sleep(int(interval[0].value))
# Project should be deleted as part of domain cleanup # Project should be deleted as part of domain cleanup
list_projects_reponse = Project.list( list_projects_response = Project.list(
self.apiclient, self.apiclient,
id=project.id, id=project.id,
listall=True listall=True
) )
self.assertEqual( self.assertEqual(
list_projects_reponse, list_projects_response,
None, None,
"Project should be deleted as part of domain cleanup" "Project should be deleted as part of domain cleanup"
) )
@ -853,21 +853,21 @@ class TestProjectOwners(cloudstackTestCase):
self.debug("Created project with domain admin with ID: %s" % self.debug("Created project with domain admin with ID: %s" %
project.id) project.id)
list_projects_reponse = Project.list( list_projects_response = Project.list(
self.apiclient, self.apiclient,
id=project.id, id=project.id,
listall=True listall=True
) )
self.assertEqual( self.assertEqual(
isinstance(list_projects_reponse, list), isinstance(list_projects_response, list),
True, True,
"Check for a valid list projects response" "Check for a valid list projects response"
) )
list_project = list_projects_reponse[0] list_project = list_projects_response[0]
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
@ -888,24 +888,24 @@ class TestProjectOwners(cloudstackTestCase):
) )
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts( accounts_response = Project.listAccounts(
self.apiclient, self.apiclient,
projectid=project.id, projectid=project.id,
account=self.new_admin.name, account=self.new_admin.name,
) )
self.debug(accounts_reponse) self.debug(accounts_response)
self.assertEqual( self.assertEqual(
isinstance(accounts_reponse, list), isinstance(accounts_response, list),
True, True,
"Check for a valid list accounts response" "Check for a valid list accounts response"
) )
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
account = accounts_reponse[0] account = accounts_response[0]
self.assertEqual( self.assertEqual(
account.role, account.role,
@ -920,24 +920,24 @@ class TestProjectOwners(cloudstackTestCase):
) )
# listProjectAccount to verify the user is new admin of the project # listProjectAccount to verify the user is new admin of the project
accounts_reponse = Project.listAccounts( accounts_response = Project.listAccounts(
self.apiclient, self.apiclient,
projectid=project.id, projectid=project.id,
account=self.new_admin.name, account=self.new_admin.name,
) )
self.debug(accounts_reponse) self.debug(accounts_response)
self.assertEqual( self.assertEqual(
isinstance(accounts_reponse, list), isinstance(accounts_response, list),
True, True,
"Check for a valid list accounts response" "Check for a valid list accounts response"
) )
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
account = accounts_reponse[0] account = accounts_response[0]
self.assertEqual( self.assertEqual(
account.role, account.role,
@ -946,24 +946,24 @@ class TestProjectOwners(cloudstackTestCase):
) )
# listProjectAccount to verify old user becomes a regular user # listProjectAccount to verify old user becomes a regular user
accounts_reponse = Project.listAccounts( accounts_response = Project.listAccounts(
self.apiclient, self.apiclient,
projectid=project.id, projectid=project.id,
account=self.admin.name, account=self.admin.name,
) )
self.debug(accounts_reponse) self.debug(accounts_response)
self.assertEqual( self.assertEqual(
isinstance(accounts_reponse, list), isinstance(accounts_response, list),
True, True,
"Check for a valid list accounts response" "Check for a valid list accounts response"
) )
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
account = accounts_reponse[0] account = accounts_response[0]
self.assertEqual( self.assertEqual(
account.role, account.role,
@ -1011,21 +1011,21 @@ class TestProjectOwners(cloudstackTestCase):
self.debug("Created account with ID: %s" % self.debug("Created account with ID: %s" %
self.user.name) self.user.name)
list_projects_reponse = Project.list( list_projects_response = Project.list(
self.apiclient, self.apiclient,
id=project.id, id=project.id,
listall=True listall=True
) )
self.assertEqual( self.assertEqual(
isinstance(list_projects_reponse, list), isinstance(list_projects_response, list),
True, True,
"Check for a valid list projects response" "Check for a valid list projects response"
) )
list_project = list_projects_reponse[0] list_project = list_projects_response[0]
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
@ -1046,24 +1046,24 @@ class TestProjectOwners(cloudstackTestCase):
) )
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts( accounts_response = Project.listAccounts(
self.apiclient, self.apiclient,
projectid=project.id, projectid=project.id,
account=self.new_admin.name, account=self.new_admin.name,
) )
self.debug(accounts_reponse) self.debug(accounts_response)
self.assertEqual( self.assertEqual(
isinstance(accounts_reponse, list), isinstance(accounts_response, list),
True, True,
"Check for a valid list accounts response" "Check for a valid list accounts response"
) )
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
account = accounts_reponse[0] account = accounts_response[0]
self.assertEqual( self.assertEqual(
account.role, account.role,
@ -1079,23 +1079,23 @@ class TestProjectOwners(cloudstackTestCase):
) )
# listProjectAccount to verify the user is new admin of the project # listProjectAccount to verify the user is new admin of the project
accounts_reponse = Project.listAccounts( accounts_response = Project.listAccounts(
self.apiclient, self.apiclient,
projectid=project.id, projectid=project.id,
account=self.new_admin.name, account=self.new_admin.name,
) )
self.assertEqual( self.assertEqual(
isinstance(accounts_reponse, list), isinstance(accounts_response, list),
True, True,
"Check for a valid list accounts response" "Check for a valid list accounts response"
) )
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
account = accounts_reponse[0] account = accounts_response[0]
self.assertEqual( self.assertEqual(
account.role, account.role,
@ -1114,23 +1114,23 @@ class TestProjectOwners(cloudstackTestCase):
) )
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts( accounts_response = Project.listAccounts(
self.apiclient, self.apiclient,
projectid=project.id, projectid=project.id,
account=self.user.name, account=self.user.name,
) )
self.assertEqual( self.assertEqual(
isinstance(accounts_reponse, list), isinstance(accounts_response, list),
True, True,
"Check for a valid list accounts response" "Check for a valid list accounts response"
) )
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
account = accounts_reponse[0] account = accounts_response[0]
self.assertEqual( self.assertEqual(
account.role, account.role,
@ -1148,24 +1148,24 @@ class TestProjectOwners(cloudstackTestCase):
) )
# listProjectAccount to verify the user is new admin of the project # listProjectAccount to verify the user is new admin of the project
accounts_reponse = Project.listAccounts( accounts_response = Project.listAccounts(
self.apiclient, self.apiclient,
projectid=project.id, projectid=project.id,
account=self.user.name, account=self.user.name,
) )
self.debug(accounts_reponse) self.debug(accounts_response)
self.assertEqual( self.assertEqual(
isinstance(accounts_reponse, list), isinstance(accounts_response, list),
True, True,
"Check for a valid list accounts response" "Check for a valid list accounts response"
) )
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
account = accounts_reponse[0] account = accounts_response[0]
self.assertEqual( self.assertEqual(
account.role, account.role,
@ -1174,23 +1174,23 @@ class TestProjectOwners(cloudstackTestCase):
) )
# listProjectAccount to verify old user becomes a regular user # listProjectAccount to verify old user becomes a regular user
accounts_reponse = Project.listAccounts( accounts_response = Project.listAccounts(
self.apiclient, self.apiclient,
projectid=project.id, projectid=project.id,
account=self.new_admin.name, account=self.new_admin.name,
) )
self.assertEqual( self.assertEqual(
isinstance(accounts_reponse, list), isinstance(accounts_response, list),
True, True,
"Check for a valid list accounts response" "Check for a valid list accounts response"
) )
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
account = accounts_reponse[0] account = accounts_response[0]
self.assertEqual( self.assertEqual(
account.role, account.role,
@ -1302,21 +1302,21 @@ class TestProjectResources(cloudstackTestCase):
self.debug("Created project with domain admin with ID: %s" % self.debug("Created project with domain admin with ID: %s" %
project.id) project.id)
list_projects_reponse = Project.list( list_projects_response = Project.list(
self.apiclient, self.apiclient,
id=project.id, id=project.id,
listall=True listall=True
) )
self.assertEqual( self.assertEqual(
isinstance(list_projects_reponse, list), isinstance(list_projects_response, list),
True, True,
"Check for a valid list projects response" "Check for a valid list projects response"
) )
list_project = list_projects_reponse[0] list_project = list_projects_response[0]
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
@ -1349,7 +1349,7 @@ class TestProjectResources(cloudstackTestCase):
) )
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
@ -1424,21 +1424,21 @@ class TestProjectResources(cloudstackTestCase):
self.debug("Created project with domain admin with ID: %s" % self.debug("Created project with domain admin with ID: %s" %
project.id) project.id)
list_projects_reponse = Project.list( list_projects_response = Project.list(
self.apiclient, self.apiclient,
id=project.id, id=project.id,
listall=True listall=True
) )
self.assertEqual( self.assertEqual(
isinstance(list_projects_reponse, list), isinstance(list_projects_response, list),
True, True,
"Check for a valid list projects response" "Check for a valid list projects response"
) )
list_project = list_projects_reponse[0] list_project = list_projects_response[0]
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
@ -1466,23 +1466,23 @@ class TestProjectResources(cloudstackTestCase):
) )
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts( accounts_response = Project.listAccounts(
self.apiclient, self.apiclient,
projectid=project.id, projectid=project.id,
account=self.user.name, account=self.user.name,
) )
self.assertEqual( self.assertEqual(
isinstance(accounts_reponse, list), isinstance(accounts_response, list),
True, True,
"Check for a valid list accounts response" "Check for a valid list accounts response"
) )
self.assertNotEqual( self.assertNotEqual(
len(list_projects_reponse), len(list_projects_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
account = accounts_reponse[0] account = accounts_response[0]
self.assertEqual( self.assertEqual(
account.role, account.role,
@ -1646,23 +1646,23 @@ class TestProjectSuspendActivate(cloudstackTestCase):
) )
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts( accounts_response = Project.listAccounts(
self.apiclient, self.apiclient,
projectid=self.project.id, projectid=self.project.id,
account=self.user.name, account=self.user.name,
) )
self.assertEqual( self.assertEqual(
isinstance(accounts_reponse, list), isinstance(accounts_response, list),
True, True,
"Check for a valid list accounts response" "Check for a valid list accounts response"
) )
self.assertNotEqual( self.assertNotEqual(
len(accounts_reponse), len(accounts_response),
0, 0,
"Check list project response returns a valid project" "Check list project response returns a valid project"
) )
account = accounts_reponse[0] account = accounts_response[0]
self.assertEqual( self.assertEqual(
account.role, account.role,

4
ui/src/views/network/CreateVpc.vue
View File

@ -269,8 +269,8 @@ export default {
}, },
fetchOfferings () { fetchOfferings () {
this.loadingOffering = true this.loadingOffering = true
api('listVPCOfferings', { zoneid: this.form.zoneid, state: 'Enabled' }).then((reponse) => { api('listVPCOfferings', { zoneid: this.form.zoneid, state: 'Enabled' }).then((response) => {
this.vpcOfferings = reponse.listvpcofferingsresponse.vpcoffering this.vpcOfferings = response.listvpcofferingsresponse.vpcoffering
this.form.vpcofferingid = this.vpcOfferings[0].id || '' this.form.vpcofferingid = this.vpcOfferings[0].id || ''
this.selectedVpcOffering = this.vpcOfferings[0] || {} this.selectedVpcOffering = this.vpcOfferings[0] || {}
}).finally(() => { }).finally(() => {