mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 01:32:18 +02:00
Fix spelling (#6860)
This commit is contained in:
John Bampton
GitHub
parent
b8b66b7a3d
commit
e65c22d883
10
CHANGES.md
10
CHANGES.md
@ -180,7 +180,7 @@ Bug ID | Description
|
||||
[CLOUDSTACK-6099](https://issues.apache.org/jira/browse/CLOUDSTACK-6099) | live migration is failing for vm deployed using dynaic compute offerings with NP...
|
||||
[CLOUDSTACK-6075](https://issues.apache.org/jira/browse/CLOUDSTACK-6075) | Increase the ram size for router service offering ...
|
||||
[CLOUDSTACK-6036](https://issues.apache.org/jira/browse/CLOUDSTACK-6036) | CloudStack stops the machine for no reason...
|
||||
[CLOUDSTACK-5992](https://issues.apache.org/jira/browse/CLOUDSTACK-5992) | [Upgrade] default values of configuraiton parameters in configuration table are ...
|
||||
[CLOUDSTACK-5992](https://issues.apache.org/jira/browse/CLOUDSTACK-5992) | [Upgrade] default values of configuration parameters in configuration table are ...
|
||||
[CLOUDSTACK-5984](https://issues.apache.org/jira/browse/CLOUDSTACK-5984) | addvmwaredc API call is not documented ...
|
||||
[CLOUDSTACK-5952](https://issues.apache.org/jira/browse/CLOUDSTACK-5952) | [UI] VM ip address information is not shown after configuring static NAT...
|
||||
[CLOUDSTACK-5946](https://issues.apache.org/jira/browse/CLOUDSTACK-5946) | SSL: Fail to find the generated keystore. Loading fail-safe one to continue....
|
||||
@ -388,8 +388,8 @@ Bug ID | Description
|
||||
[CLOUDSTACK-5632](https://issues.apache.org/jira/browse/CLOUDSTACK-5632) | [Automation] XenServer - Template deletion fails with error "Please specify a te...
|
||||
[CLOUDSTACK-5597](https://issues.apache.org/jira/browse/CLOUDSTACK-5597) | attachVolume shouldn't create the volume on the primary storage if the vm's root...
|
||||
[CLOUDSTACK-5582](https://issues.apache.org/jira/browse/CLOUDSTACK-5582) | kvm - HA is not triggered when host is powered down since the host gets into "Di...
|
||||
[CLOUDSTACK-5577](https://issues.apache.org/jira/browse/CLOUDSTACK-5577) | Remote Access VPN and S2S VPN should be treated as two seperate services for Net...
|
||||
[CLOUDSTACK-5575](https://issues.apache.org/jira/browse/CLOUDSTACK-5575) | Remote Access VPN and S2S VPN should be treated as two seperate services on VPC...
|
||||
[CLOUDSTACK-5577](https://issues.apache.org/jira/browse/CLOUDSTACK-5577) | Remote Access VPN and S2S VPN should be treated as two separate services for Net...
|
||||
[CLOUDSTACK-5575](https://issues.apache.org/jira/browse/CLOUDSTACK-5575) | Remote Access VPN and S2S VPN should be treated as two separate services on VPC...
|
||||
[CLOUDSTACK-5563](https://issues.apache.org/jira/browse/CLOUDSTACK-5563) | path field is set to null in volumes table ...
|
||||
[CLOUDSTACK-5505](https://issues.apache.org/jira/browse/CLOUDSTACK-5505) | [Automation] Private gateway not getting programmed in VPC router ...
|
||||
[CLOUDSTACK-5501](https://issues.apache.org/jira/browse/CLOUDSTACK-5501) | Unable to create more than one vpnConnection per vpn customer gateway...
|
||||
@ -617,7 +617,7 @@ Bug ID | Description
|
||||
[CLOUDSTACK-4061](https://issues.apache.org/jira/browse/CLOUDSTACK-4061) | UI issue with Japanese localized ui...
|
||||
[CLOUDSTACK-3806](https://issues.apache.org/jira/browse/CLOUDSTACK-3806) | OS Preference can not be set...
|
||||
[CLOUDSTACK-3664](https://issues.apache.org/jira/browse/CLOUDSTACK-3664) | scaling up vms is not considering parameter "cluster.(memory/cpu).allocated.cap...
|
||||
[CLOUDSTACK-3627](https://issues.apache.org/jira/browse/CLOUDSTACK-3627) | Public IP interface(eth2) is not getting confugured with Redundant VR (State = F...
|
||||
[CLOUDSTACK-3627](https://issues.apache.org/jira/browse/CLOUDSTACK-3627) | Public IP interface(eth2) is not getting configured with Redundant VR (State = F...
|
||||
[CLOUDSTACK-3577](https://issues.apache.org/jira/browse/CLOUDSTACK-3577) | NPE while downloading the template to secondary storage ...
|
||||
[CLOUDSTACK-3561](https://issues.apache.org/jira/browse/CLOUDSTACK-3561) | When inputting the nfs server in secondary storage, if once it's required, it al...
|
||||
[CLOUDSTACK-3364](https://issues.apache.org/jira/browse/CLOUDSTACK-3364) | normal users are not allowed to edit their own iso...
|
||||
@ -682,7 +682,7 @@ Bug Fixes:
|
||||
|
||||
* CLOUDSTACK-1600 Typo in dpkg-buildpackage command
|
||||
* CLOUDSTACK-1574 updateResourceCount API is failed saying to specify valida resource type even after parsing the valid resource type
|
||||
* CLOUDSTACK-1562 Replace the short-cut solution of supportting @DB with the formal one
|
||||
* CLOUDSTACK-1562 Replace the short-cut solution of supporting @DB with the formal one
|
||||
* CLOUDSTACK-1541 NPE while deleting snapshot :Unexpected exception while executing org.apache.cloudstack.api.command.user.snapshot.DeleteSnapshotCmd
|
||||
* CLOUDSTACK-1521 Redundant router: Services are not stopped when switch to BACKUP state
|
||||
* CLOUDSTACK-1509 Failed to implement network elements and resources while provisioning for persistent network(createVlanIpRange to an account]
|
||||
|
||||
@ -57,7 +57,7 @@ public class Answer extends Command {
|
||||
}
|
||||
|
||||
public static UnsupportedAnswer createUnsupportedVersionAnswer(final Command cmd) {
|
||||
return new UnsupportedAnswer(cmd, "Unsuppored Version.");
|
||||
return new UnsupportedAnswer(cmd, "Unsupported Version.");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -194,7 +194,7 @@ public class Networks {
|
||||
/**
|
||||
* converts a String to a BroadcastDomainType
|
||||
*
|
||||
* @param scheme convert a string representation to a BroacastDomainType
|
||||
* @param scheme convert a string representation to a BroadcastDomainType
|
||||
* @return the value of this
|
||||
*/
|
||||
public static BroadcastDomainType toEnumValue(String scheme) {
|
||||
|
||||
@ -70,7 +70,7 @@ public interface LoadBalancingRulesService {
|
||||
* the command specifying the stickiness method name, params (name,value pairs), policy name and
|
||||
* description.
|
||||
* @return the newly created stickiness policy if successful, null otherwise
|
||||
* @thows NetworkRuleConflictException
|
||||
* @throws NetworkRuleConflictException
|
||||
*/
|
||||
public StickinessPolicy createLBStickinessPolicy(CreateLBStickinessPolicyCmd cmd) throws NetworkRuleConflictException;
|
||||
|
||||
@ -87,7 +87,7 @@ public interface LoadBalancingRulesService {
|
||||
* (name,value pairs), policy name and description.
|
||||
* @return the newly created stickiness policy if successful, null
|
||||
* otherwise
|
||||
* @thows NetworkRuleConflictException
|
||||
* @throws NetworkRuleConflictException
|
||||
*/
|
||||
public HealthCheckPolicy createLBHealthCheckPolicy(CreateLBHealthCheckPolicyCmd cmd);
|
||||
|
||||
|
||||
@ -85,7 +85,7 @@ public class ListAnnotationsCmd extends BaseListCmd {
|
||||
// preconditions to check:
|
||||
// if entity type is null entity uuid can not have a value
|
||||
Preconditions.checkArgument(StringUtils.isNotBlank(entityType) ? StringUtils.isBlank(uuid) : true,
|
||||
"I can search for an anotation on an entity or for a specific annotation, not both");
|
||||
"I can search for an annotation on an entity or for a specific annotation, not both");
|
||||
// if uuid has a value entity type and entity uuid can not have a value
|
||||
Preconditions.checkArgument(StringUtils.isNotBlank(uuid) ? entityType == null && entityUuid == null : true,
|
||||
"I will either search for a specific annotation or for annotations on an entity, not both");
|
||||
|
||||
@ -57,7 +57,7 @@ public class ListRemoteAccessVpnsCmd extends BaseListProjectAndAccountResourcesC
|
||||
@Parameter(name = ApiConstants.NETWORK_ID,
|
||||
type = CommandType.UUID,
|
||||
entityType = NetworkResponse.class,
|
||||
description = "list remote access VPNs for ceratin network",
|
||||
description = "list remote access VPNs for certain network",
|
||||
since = "4.3")
|
||||
private Long networkId;
|
||||
|
||||
|
||||
@ -70,6 +70,6 @@ public class AnswerTest {
|
||||
assertFalse(b);
|
||||
|
||||
d = usa.getDetails();
|
||||
assertTrue(d.equals("Unsuppored Version."));
|
||||
assertTrue(d.equals("Unsupported Version."));
|
||||
}
|
||||
}
|
||||
|
||||
@ -93,7 +93,7 @@ public interface VirtualMachineManager extends Manager {
|
||||
*
|
||||
* @param vmInstanceName Instance name of the VM. This name uniquely
|
||||
* a VM in CloudStack's deploy environment. The caller gets to
|
||||
* define this VM but it must be unqiue for all of CloudStack.
|
||||
* define this VM but it must be unique for all of CloudStack.
|
||||
* @param template The template this VM is based on.
|
||||
* @param serviceOffering The service offering that specifies the offering this VM should provide.
|
||||
* @param defaultNetwork The default network for the VM.
|
||||
|
||||
@ -26,7 +26,7 @@ import com.cloud.agent.api.to.VirtualMachineTO;
|
||||
import com.cloud.host.Host;
|
||||
|
||||
/**
|
||||
* Interface to query how to move data around and to commision the moving
|
||||
* Interface to query how to move data around and to commission the moving
|
||||
*/
|
||||
public interface DataMotionStrategy {
|
||||
/**
|
||||
|
||||
@ -952,7 +952,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
|
||||
* @param nics the list of nics present
|
||||
* @param finalNetwork the network to add the nics to
|
||||
* @throws InsufficientVirtualNetworkCapacityException great
|
||||
* @throws InsufficientAddressCapacityException also magnificent, as the name sugests
|
||||
* @throws InsufficientAddressCapacityException also magnificent, as the name suggests
|
||||
*/
|
||||
private void createExtraNics(int size, List<NicProfile> nics, Network finalNetwork) throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException {
|
||||
if (nics.size() != size) {
|
||||
|
||||
@ -79,7 +79,7 @@ public class Upgrade2214to30 extends Upgrade30xBase implements DbUpgrade {
|
||||
encryptData(conn);
|
||||
// drop keys
|
||||
dropKeysIfExist(conn);
|
||||
//update templete ID for system Vms
|
||||
//update template ID for system Vms
|
||||
//updateSystemVms(conn); This is not required as system template update is handled during 4.2 upgrade
|
||||
// update domain network ref
|
||||
updateDomainNetworkRef(conn);
|
||||
|
||||
@ -113,7 +113,7 @@ public class Upgrade304to305 extends Upgrade30xBase {
|
||||
pstmt.setLong(1, templateId);
|
||||
pstmt.executeUpdate();
|
||||
pstmt.close();
|
||||
// update templete ID of system Vms
|
||||
// update template ID of system Vms
|
||||
pstmt = conn.prepareStatement("update `cloud`.`vm_instance` set vm_template_id = ? where type <> 'User' and hypervisor_type = 'VMware'");
|
||||
pstmt.setLong(1, templateId);
|
||||
pstmt.executeUpdate();
|
||||
|
||||
@ -224,7 +224,7 @@ public class Upgrade430to440 implements DbUpgrade {
|
||||
} catch (SQLException e) {
|
||||
throw new CloudRuntimeException("Unable to update vlan URIs ", e);
|
||||
}
|
||||
s_logger.debug("Done updateing vlan URIs");
|
||||
s_logger.debug("Done updating vlan URIs");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -44,7 +44,7 @@ ALTER TABLE `cloud`.`host` MODIFY COLUMN `storage_ip_address` char(40);
|
||||
ALTER TABLE `cloud`.`resource_count` ADD UNIQUE `i_resource_count__type_accountId`(`type`, `account_id`);
|
||||
ALTER TABLE `cloud`.`resource_count` ADD UNIQUE `i_resource_count__type_domaintId`(`type`, `domain_id`);
|
||||
|
||||
UPDATE configuration set description='Load Balancer(haproxy) stats visibilty, the value can be one of the following six parameters : global,guest-network,link-local,disabled,all,default' WHERE name='network.loadbalancer.haproxy.stats.visibility' ;
|
||||
UPDATE configuration set description='Load Balancer(haproxy) stats visibility, the value can be one of the following six parameters : global,guest-network,link-local,disabled,all,default' WHERE name='network.loadbalancer.haproxy.stats.visibility' ;
|
||||
|
||||
UPDATE nics SET strategy="Managed" WHERE (ip4_address, network_id) IN (SELECT public_ip_address, source_network_id FROM user_ip_address WHERE source_nat=1) AND vm_type="DomainRouter";
|
||||
|
||||
|
||||
@ -66,7 +66,7 @@ ALTER TABLE `cloud`.`configuration` ADD INDEX `i_configuration__component` (`com
|
||||
ALTER TABLE `cloud`.`port_forwarding_rules` ADD CONSTRAINT `fk_port_forwarding_rules__instance_id` FOREIGN KEY `fk_port_forwarding_rules__instance_id` (`instance_id`) REFERENCES `vm_instance` (`id`) ON DELETE CASCADE;
|
||||
|
||||
INSERT IGNORE INTO configuration VALUES ('Advanced', 'DEFAULT', 'management-server', 'agent.load.threshold', '0.70', 'Percentage (as a value between 0 and 1) of connected agents after which agent load balancing will start happening');
|
||||
INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.loadbalancer.haproxy.stats.visibility', 'global', 'Load Balancer(haproxy) stats visibilty, it can take the following four parameters : global,guest-network,link-local,disabled');
|
||||
INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.loadbalancer.haproxy.stats.visibility', 'global', 'Load Balancer(haproxy) stats visibility, it can take the following four parameters : global,guest-network,link-local,disabled');
|
||||
INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.loadbalancer.haproxy.stats.uri','/admin?stats','Load Balancer(haproxy) uri.');
|
||||
INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.loadbalancer.haproxy.stats.auth','admin1:AdMiN123','Load Balancer(haproxy) authetication string in the format username:password');
|
||||
INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.loadbalancer.haproxy.stats.port','8081','Load Balancer(haproxy) stats port number.');
|
||||
|
||||
@ -48,7 +48,7 @@ INSERT IGNORE INTO `cloud`.`configuration` (category, instance, name, value, des
|
||||
|
||||
|
||||
INSERT IGNORE INTO configuration VALUES ('Advanced', 'DEFAULT', 'management-server', 'agent.load.threshold', '0.70', 'Percentage (as a value between 0 and 1) of connected agents after which agent load balancing will start happening');
|
||||
INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.loadbalancer.haproxy.stats.visibility', 'global', 'Load Balancer(haproxy) stats visibilty, it can take the following four parameters : global,guest-network,link-local,disabled');
|
||||
INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.loadbalancer.haproxy.stats.visibility', 'global', 'Load Balancer(haproxy) stats visibility, it can take the following four parameters : global,guest-network,link-local,disabled');
|
||||
INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.loadbalancer.haproxy.stats.uri','/admin?stats','Load Balancer(haproxy) uri.');
|
||||
INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.loadbalancer.haproxy.stats.auth','admin1:AdMiN123','Load Balancer(haproxy) authetication string in the format username:password');
|
||||
INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.loadbalancer.haproxy.stats.port','8081','Load Balancer(haproxy) stats port number.');
|
||||
|
||||
@ -91,6 +91,6 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'Agent
|
||||
|
||||
UPDATE `cloud`.`networks` set name='Shared SG enabled network', display_text='Shared SG enabled network' WHERE name IS null AND traffic_type='Guest' AND data_center_id IN (select id from data_center where networktype='Advanced' and is_security_group_enabled=1) AND acl_type='Domain';
|
||||
|
||||
# patch UUID colomn with ID for volumes and snapshot_policy tables
|
||||
# patch UUID column with ID for volumes and snapshot_policy tables
|
||||
UPDATE `cloud`.`volumes` set uuid=id WHERE uuid is NULL;
|
||||
UPDATE `cloud`.`snapshot_policy` set uuid=id WHERE uuid is NULL;
|
||||
|
||||
@ -1484,7 +1484,7 @@ UPDATE `cloud`.`load_balancing_rules` SET `scheme`='Public';
|
||||
|
||||
|
||||
|
||||
-- Add details talbe for the network offering
|
||||
-- Add details table for the network offering
|
||||
CREATE TABLE `cloud`.`network_offering_details` (
|
||||
`id` bigint unsigned NOT NULL auto_increment,
|
||||
`network_offering_id` bigint unsigned NOT NULL COMMENT 'network offering id',
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
ALTER TABLE cloud.remote_access_vpn MODIFY ipsec_psk text NOT NULL;
|
||||
|
||||
|
||||
-- PR#5832 Fix 'endpointe.url' global settings configruation typo.
|
||||
-- PR#5832 Fix 'endpointe.url' global settings configuration typo.
|
||||
UPDATE `cloud`.`configuration` SET name='endpoint.url' WHERE name='endpointe.url';
|
||||
|
||||
|
||||
|
||||
@ -237,7 +237,7 @@ CREATE VIEW `cloud`.`user_vm_view` AS
|
||||
update `cloud`.`volumes` v, `cloud`.`volume_host_ref` vhr set v.format=vhr.format where v.id=vhr.volume_id and v.format is null;
|
||||
|
||||
|
||||
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'baremetal.ipmi.lan.interface', 'default', 'option specified in -I option of impitool. candidates are: open/bmc/lipmi/lan/lanplus/free/imb, see ipmitool man page for details. default valule "default" means using default option of ipmitool');
|
||||
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'baremetal.ipmi.lan.interface', 'default', 'option specified in -I option of impitool. candidates are: open/bmc/lipmi/lan/lanplus/free/imb, see ipmitool man page for details. default value "default" means using default option of ipmitool');
|
||||
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'baremetal.ipmi.fail.retry', 'default', "ipmi interface will be temporary out of order after power opertions(e.g. cycle, on), it leads following commands fail immediately. The value specifies retry times before accounting it as real failure");
|
||||
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'vmware.hung.wokervm.timeout', '7200', 'Worker VM timeout in seconds');
|
||||
INSERT IGNORE INTO `cloud`.`configuration` VALUES ("Alert", 'DEFAULT', 'management-server', "alert.smtp.connectiontimeout", "30000", "Socket connection timeout value in milliseconds. -1 for infinite timeout.");
|
||||
|
||||
@ -138,7 +138,7 @@ public class DataObjectManagerImpl implements DataObjectManager {
|
||||
try {
|
||||
objectInDataStoreMgr.update(objInStore, ObjectInDataStoreStateMachine.Event.OperationFailed);
|
||||
} catch (Exception e1) {
|
||||
s_logger.debug("state transation failed", e1);
|
||||
s_logger.debug("state transaction failed", e1);
|
||||
}
|
||||
CreateCmdResult result = new CreateCmdResult(null, null);
|
||||
result.setSuccess(false);
|
||||
@ -149,7 +149,7 @@ public class DataObjectManagerImpl implements DataObjectManager {
|
||||
try {
|
||||
objectInDataStoreMgr.update(objInStore, ObjectInDataStoreStateMachine.Event.OperationFailed);
|
||||
} catch (Exception e1) {
|
||||
s_logger.debug("state transation failed", e1);
|
||||
s_logger.debug("state transaction failed", e1);
|
||||
}
|
||||
CreateCmdResult result = new CreateCmdResult(null, null);
|
||||
result.setSuccess(false);
|
||||
|
||||
@ -389,7 +389,7 @@ namespace HypervResource
|
||||
}
|
||||
|
||||
// Assert
|
||||
errMsg = "No valide path in DestroyCommand in " + CloudStackTypes.DestroyCommand + " " + (String)cmd.ToString();
|
||||
errMsg = "No valid path in DestroyCommand in " + CloudStackTypes.DestroyCommand + " " + (String)cmd.ToString();
|
||||
if (cmd.volume.path == null)
|
||||
{
|
||||
logger.Error(errMsg);
|
||||
|
||||
@ -410,7 +410,7 @@ wants a VM from source to migrate into this planned VM.")]
|
||||
[Browsable(true)]
|
||||
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
|
||||
[Description("For storage migration, this could be set to TRUE or FALSE\nto determine wheither, " +
|
||||
"at the end of a storage migration, when the\nsource host is beeing clean up, the " +
|
||||
"at the end of a storage migration, when the\nsource host is being clean up, the " +
|
||||
"read only VHDs should be removedor not.")]
|
||||
[TypeConverter(typeof(WMIValueTypeConverter))]
|
||||
public bool RetainVhdCopiesOnSource {
|
||||
|
||||
@ -68,7 +68,7 @@ public class OvmVm extends OvmObject {
|
||||
|
||||
public static void stop(Connection c, String vmName) throws XmlRpcException {
|
||||
Object[] params = {vmName};
|
||||
/* Agent will destroy vm if vm shutdowns failed due to timout after 10 mins, so we set timeout to 20 mins here*/
|
||||
/* Agent will destroy vm if vm shutdowns failed due to timeout after 10 mins, so we set timeout to 20 mins here*/
|
||||
c.callTimeoutInSec("OvmVm.stop", params, 1200);
|
||||
}
|
||||
|
||||
|
||||
@ -45,17 +45,17 @@ def OvmDispatch(methodName, *params):
|
||||
global ExposedClass
|
||||
p = methodName.split('.')
|
||||
if len(p) != 2:
|
||||
logger.error(OvmDispatch, "%s is not a vaild format, should be classname.methodname"%p)
|
||||
raise Fault(dispatchErrCode('InvalidCallMethodFormat'), "%s is not a vaild format, should be classname.methodname"%p)
|
||||
logger.error(OvmDispatch, "%s is not a valid format, should be classname.methodname"%p)
|
||||
raise Fault(dispatchErrCode('InvalidCallMethodFormat'), "%s is not a valid format, should be classname.methodname"%p)
|
||||
clzName = p[0]
|
||||
funcName = p[1]
|
||||
if clzName not in ExposedClass.keys():
|
||||
logger.error(OvmDispatch, "class %s is not exposed by agent"%clzName)
|
||||
raise Fault(dispatchErrCode('InvaildClass'), "class %s is not exposed by agent"%clzName)
|
||||
raise Fault(dispatchErrCode('InvalidClass'), "class %s is not exposed by agent"%clzName)
|
||||
clz = ExposedClass[clzName]
|
||||
if not hasattr(clz, funcName):
|
||||
logger.error(OvmDispatch, "class %s has no function %s"%(clzName, funcName))
|
||||
raise Fault(dispatchErrCode('InvaildFunction'), "class %s has no function %s"%(clzName, funcName))
|
||||
raise Fault(dispatchErrCode('InvalidFunction'), "class %s has no function %s"%(clzName, funcName))
|
||||
logger.debug(OvmDispatch, "Entering %s.%s ===>"%(clzName, funcName))
|
||||
rs = getattr(clz, funcName)(*params)
|
||||
logger.debug(OvmDispatch, "Exited %s.%s <==="%(clzName, funcName))
|
||||
|
||||
@ -37,8 +37,8 @@ class ShellExceutedFailedException(Exception):
|
||||
errCode = {
|
||||
# OvmDispatch is not class, these error codes are reserved
|
||||
"OvmDispatch.InvalidCallMethodFormat":OvmDispatcherStub+1,
|
||||
"OvmDispatch.InvaildClass":OvmDispatcherStub+2,
|
||||
"OvmDispatch.InvaildFunction":OvmDispatcherStub+3,
|
||||
"OvmDispatch.InvalidClass":OvmDispatcherStub+2,
|
||||
"OvmDispatch.InvalidFunction":OvmDispatcherStub+3,
|
||||
"OvmVm.reboot":OvmDispatcherStub+4,
|
||||
|
||||
"OvmHost.registerAsPrimary":OvmHostErrCodeStub+1,
|
||||
|
||||
@ -133,7 +133,7 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager {
|
||||
command.add(name + ".ovf"); // OVF file should be the first file in OVA archive
|
||||
command.add(name + "-disk0.vmdk");
|
||||
|
||||
s_logger.info("Package OVA with commmand: " + command.toString());
|
||||
s_logger.info("Package OVA with command: " + command.toString());
|
||||
command.execute();
|
||||
}
|
||||
|
||||
|
||||
@ -3858,7 +3858,7 @@ public class VmwareResource extends ServerResourceBase implements StoragePoolRes
|
||||
// BroadcastDomainType recogniizes and handles this.
|
||||
return BroadcastDomainType.getValue(nicTo.getBroadcastUri());
|
||||
else
|
||||
// for pvlan, the broacast uri will be of the form pvlan://<vlanid>-i<pvlanid>
|
||||
// for pvlan, the broadcast uri will be of the form pvlan://<vlanid>-i<pvlanid>
|
||||
// TODO consider the spread of functionality between BroadcastDomainType and NetUtils
|
||||
return NetUtils.getPrimaryPvlanFromUri(nicTo.getBroadcastUri());
|
||||
} else {
|
||||
|
||||
@ -43,7 +43,7 @@ public final class CitrixOvsCreateGreTunnelCommandWrapper extends CommandWrapper
|
||||
citrixResourceBase.setIsOvs(true);
|
||||
|
||||
final Connection conn = citrixResourceBase.getConnection();
|
||||
String bridge = "unkonwn";
|
||||
String bridge = "unknown";
|
||||
try {
|
||||
final Network nw = citrixResourceBase.setupvSwitchNetwork(conn);
|
||||
bridge = nw.getBridge(conn);
|
||||
|
||||
@ -69,7 +69,7 @@ public final class CitrixSetupCommandWrapper extends CommandWrapper<SetupCommand
|
||||
final boolean canBridgeFirewall = citrixResourceBase.canBridgeFirewall(conn);
|
||||
citrixResourceBase.setCanBridgeFirewall(canBridgeFirewall);
|
||||
if (!canBridgeFirewall) {
|
||||
final String msg = "Failed to configure brige firewall";
|
||||
final String msg = "Failed to configure bridge firewall";
|
||||
s_logger.warn(msg);
|
||||
s_logger.warn("Check host " + citrixResourceBase.getHost().getIp() +" for CSP is installed or not and check network mode for bridge");
|
||||
return new SetupAnswer(command, msg);
|
||||
|
||||
@ -235,7 +235,7 @@ public class OpenDaylightControllerResource implements ServerResource {
|
||||
newNetwork.setName(cmd.getName());
|
||||
newNetwork.setTenantId(cmd.getTenantId());
|
||||
|
||||
// Static configuation
|
||||
// Static configuration
|
||||
newNetwork.setNetworkType("gre");
|
||||
newNetwork.setShared(false);
|
||||
newNetwork.setSegmentationId(gre_key);
|
||||
|
||||
@ -247,10 +247,10 @@ public class DateraPrimaryDataStoreDriver implements PrimaryDataStoreDriver {
|
||||
Preconditions.checkNotNull(initiatorGroup, "initiatorGroup should not be Null");
|
||||
|
||||
// We create an initiator for every host in this cluster and add it to the
|
||||
// initator group
|
||||
// initiator group
|
||||
addClusterHostsToInitiatorGroup(conn, clusterId, initiatorGroupName);
|
||||
|
||||
// assgin the initiatorgroup to appInstance
|
||||
// assign the initiatorgroup to appInstance
|
||||
|
||||
if (!isInitiatorGroupAssignedToAppInstance(conn, initiatorGroup, appInstance)) {
|
||||
DateraUtil.assignGroupToAppInstance(conn, initiatorGroupName, appInstanceName);
|
||||
|
||||
@ -228,7 +228,7 @@ public class LinstorStorageAdaptor implements StorageAdaptor {
|
||||
null,
|
||||
null);
|
||||
|
||||
// TODO make avialable on node
|
||||
// TODO make available on node
|
||||
|
||||
if (!resources.isEmpty() && !resources.get(0).getVolumes().isEmpty()) {
|
||||
final String devPath = resources.get(0).getVolumes().get(0).getDevicePath();
|
||||
|
||||
@ -65,7 +65,7 @@ public class LdapConfiguration implements Configurable{
|
||||
String.class,
|
||||
"ldap.user.memberof.attribute",
|
||||
"memberof",
|
||||
"the reverse membership attibute for group members",
|
||||
"the reverse membership attribute for group members",
|
||||
true,
|
||||
ConfigKey.Scope.Domain);
|
||||
|
||||
|
||||
@ -63,7 +63,7 @@ class LdapContextFactorySpec extends spock.lang.Specification {
|
||||
def "Test successfully creating a initial context"() {
|
||||
given: "We have a LdapContextFactory"
|
||||
def ldapContextFactory = new LdapContextFactory(ldapConfiguration)
|
||||
when: "A context attempts to bind and no Ldap server is avaiable"
|
||||
when: "A context attempts to bind and no Ldap server is available"
|
||||
ldapContextFactory.createInitialDirContext(null, null, true)
|
||||
then: "An expection is thrown"
|
||||
thrown NamingException
|
||||
@ -72,7 +72,7 @@ class LdapContextFactorySpec extends spock.lang.Specification {
|
||||
def "Test successfully binding as a user"() {
|
||||
given: "We have a LdapContextFactory"
|
||||
def ldapContextFactory = new LdapContextFactory(ldapConfiguration)
|
||||
when: "A user attempts to bind and no LDAP server is avaiable"
|
||||
when: "A user attempts to bind and no LDAP server is available"
|
||||
ldapContextFactory.createUserContext(principal, password)
|
||||
then: "An exception is thrown"
|
||||
thrown NamingException
|
||||
@ -111,7 +111,7 @@ class LdapContextFactorySpec extends spock.lang.Specification {
|
||||
def "Test successully binding as system"() {
|
||||
given: "We have a LdapContextFactory"
|
||||
def ldapContextFactory = new LdapContextFactory(ldapConfiguration)
|
||||
when: "A bind context attempts to bind and no Ldap server is avaiable"
|
||||
when: "A bind context attempts to bind and no Ldap server is available"
|
||||
ldapContextFactory.createBindContext()
|
||||
then: "An exception is thrown"
|
||||
thrown NamingException
|
||||
|
||||
@ -98,7 +98,7 @@ class LdapCreateAccountCmdSpec extends spock.lang.Specification {
|
||||
def ldapCreateAccountCmd = new LdapCreateAccountCmd(ldapManager, accountService)
|
||||
when: "A user with no lastname attempts to validate"
|
||||
ldapCreateAccountCmd.validateUser(new LdapUser("username", "email", "firstname", null, "principal", "domain", false, null))
|
||||
then: "An exception is thown"
|
||||
then: "An exception is thrown"
|
||||
thrown Exception
|
||||
}
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@ class serviceCfgBase(object):
|
||||
self.syscfg = syscfg
|
||||
self.netMgrRunning = False
|
||||
|
||||
def configration(self):
|
||||
def configuration(self):
|
||||
writeProgressBar("Configure " + self.serviceName + " ...", None)
|
||||
result = False
|
||||
try:
|
||||
|
||||
@ -82,7 +82,7 @@ class sysConfig(object):
|
||||
return False
|
||||
|
||||
for service in self.services:
|
||||
if not service.configration():
|
||||
if not service.configuration():
|
||||
raise CloudInternalException("Configuration failed for service %s" % service.serviceName)
|
||||
|
||||
def restore(self):
|
||||
|
||||
@ -53,7 +53,7 @@ class InstallSysTemplate(object):
|
||||
|
||||
def parseOptions(self):
|
||||
self.parser = argparse.ArgumentParser(prog="System Template Installer")
|
||||
self.parser.add_argument("-m", "--mount-point", action="store", dest="mountpoint", help="Secondary Storage Mount Point where to install the temlate.", required="true")
|
||||
self.parser.add_argument("-m", "--mount-point", action="store", dest="mountpoint", help="Secondary Storage Mount Point where to install the template.", required="true")
|
||||
self.parser.add_argument("-H", "--hypervisor", action="store", dest="hypervisor", help="The Hypervisor name for which template need to be installed", required="true", choices=['kvm','xenserver','vmware','lxc','hyperv'])
|
||||
group = self.parser.add_mutually_exclusive_group(required=True)
|
||||
group.add_argument("-f", "--system-vm-template", action="store", dest="systemvmtemplatepath", help="The local system vm template file path")
|
||||
|
||||
@ -139,7 +139,7 @@ add_to_ports() {
|
||||
}
|
||||
|
||||
del_from_ports() {
|
||||
# Delete when only, begining, middle and end of string
|
||||
# Delete when only, beginning, middle and end of string
|
||||
echo "$1" | sed -e "s/^$2$//g" -e "s/^$2,//g" -e "s/,$2$//g" -e "s/,$2,/,/g"
|
||||
}
|
||||
|
||||
@ -231,7 +231,7 @@ then
|
||||
ovs-ofctl add-flow $br table=0,priority=70,dl_vlan=$pri_vlan,dl_dst=ff:ff:ff:ff:ff:ff,actions=strip_vlan,group:$pri_vlan
|
||||
# From a promiscuous device, so send it to all community and isolated devices on this switch. Passed to all promiscuous devices in the prior step ^^
|
||||
ovs-ofctl add-flow $br table=1,priority=70,dl_vlan=$pri_vlan,dl_dst=ff:ff:ff:ff:ff:ff,actions=strip_vlan,group:$pri_vlan_header
|
||||
# Since it's from a community, gotta braodcast it to all community devices
|
||||
# Since it's from a community, gotta broadcast it to all community devices
|
||||
if [ "$type" == "C" ]
|
||||
then
|
||||
ovs-ofctl add-flow $br table=1,priority=70,dl_vlan=$sec_vlan,dl_dst=ff:ff:ff:ff:ff:ff,actions=strip_vlan,group:$sec_vlan
|
||||
|
||||
@ -911,7 +911,7 @@ def cleanup_bridge(bridge):
|
||||
try:
|
||||
execute("iptables -F " + chain)
|
||||
except: pass
|
||||
# Remove brige chains
|
||||
# Remove bridge chains
|
||||
for chain in chains:
|
||||
try:
|
||||
execute("iptables -X " + chain)
|
||||
|
||||
@ -228,7 +228,7 @@ public enum Config {
|
||||
String.class,
|
||||
"network.loadbalancer.haproxy.stats.visibility",
|
||||
"global",
|
||||
"Load Balancer(haproxy) stats visibilty, the value can be one of the following six parameters : global,guest-network,link-local,disabled,all,default",
|
||||
"Load Balancer(haproxy) stats visibility, the value can be one of the following six parameters : global,guest-network,link-local,disabled,all,default",
|
||||
null),
|
||||
NetworkLBHaproxyStatsUri(
|
||||
"Network",
|
||||
@ -1696,7 +1696,7 @@ public enum Config {
|
||||
String.class,
|
||||
"baremetal.ipmi.lan.interface",
|
||||
"default",
|
||||
"option specified in -I option of impitool. candidates are: open/bmc/lipmi/lan/lanplus/free/imb, see ipmitool man page for details. default valule 'default' means using default option of ipmitool",
|
||||
"option specified in -I option of impitool. candidates are: open/bmc/lipmi/lan/lanplus/free/imb, see ipmitool man page for details. default value 'default' means using default option of ipmitool",
|
||||
null),
|
||||
|
||||
BaremetalIpmiRetryTimes("Advanced",
|
||||
|
||||
@ -6128,7 +6128,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
|
||||
associatePublicIP = value.contains("true");
|
||||
} else {
|
||||
throw new InvalidParameterValueException("Only " + Capability.ElasticIp.getName() + " and " + Capability.AssociatePublicIP.getName()
|
||||
+ " capabilitiy can be sepcified for static nat service");
|
||||
+ " capability can be sepcified for static nat service");
|
||||
}
|
||||
}
|
||||
if (!eipEnabled && associatePublicIP) {
|
||||
@ -6779,7 +6779,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
|
||||
final int networkCount = _networkDao.getNetworkCountByNetworkOffId(offeringId);
|
||||
if (networkCount > 0) {
|
||||
throw new InvalidParameterValueException("Can't delete network offering " + offeringId + " as its used by " + networkCount + " networks. "
|
||||
+ "To make the network offering unavaiable, disable it");
|
||||
+ "To make the network offering unavailable, disable it");
|
||||
}
|
||||
|
||||
annotationDao.removeByEntityType(AnnotationService.EntityType.NETWORK_OFFERING.name(), offering.getUuid());
|
||||
|
||||
@ -254,7 +254,7 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase
|
||||
ExternalLoadBalancerDeviceVO zoneGslbProvider =
|
||||
_externalLoadBalancerDeviceDao.findGslbServiceProvider(physicalNetworkId, ntwkDevice.getNetworkServiceProvder());
|
||||
if (zoneGslbProvider != null) {
|
||||
throw new CloudRuntimeException("There is a GSLB service provider configured in the zone alredy.");
|
||||
throw new CloudRuntimeException("There is a GSLB service provider configured in the zone already.");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -825,7 +825,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
|
||||
final int vpcCount = _vpcDao.getVpcCountByOfferingId(offId);
|
||||
if (vpcCount > 0) {
|
||||
throw new InvalidParameterValueException("Can't delete vpc offering " + offId + " as its used by " + vpcCount + " vpcs. "
|
||||
+ "To make the network offering unavaiable, disable it");
|
||||
+ "To make the network offering unavailable, disable it");
|
||||
}
|
||||
|
||||
if (_vpcOffDao.remove(offId)) {
|
||||
|
||||
@ -2921,7 +2921,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
|
||||
return result;
|
||||
}
|
||||
} catch (final AgentUnavailableException e) {
|
||||
s_logger.error("Agent is not availbale!", e);
|
||||
s_logger.error("Agent is not available!", e);
|
||||
}
|
||||
|
||||
final boolean shouldUpdateHostPasswd = command.getUpdatePasswdOnHost();
|
||||
|
||||
@ -4224,7 +4224,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
|
||||
}
|
||||
|
||||
if (cmd.getCertIndex() == null) {
|
||||
throw new InvalidParameterValueException("index can't be empty, if it's a certifciation chain");
|
||||
throw new InvalidParameterValueException("index can't be empty, if it's a certification chain");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1153,7 +1153,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
|
||||
newSize = newSize << 30;
|
||||
} else {
|
||||
if (cmd.getSize() != null) {
|
||||
throw new InvalidParameterValueException("You cannnot pass in a custom disk size to a non-custom disk offering.");
|
||||
throw new InvalidParameterValueException("You cannot pass in a custom disk size to a non-custom disk offering.");
|
||||
}
|
||||
|
||||
newSize = newDiskOffering.getDiskSize();
|
||||
|
||||
@ -263,7 +263,7 @@ public class PodZoneConfig {
|
||||
return genReturnList("true", "Successfully added VLAN.");
|
||||
|
||||
} else {
|
||||
return genReturnList("false", "That operation is not suppored.");
|
||||
return genReturnList("false", "That operation is not supported.");
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -2049,7 +2049,7 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
|
||||
private void checkIfNotMovingAcrossDomains(long domainId, Account newAccount) {
|
||||
if (newAccount.getDomainId() != domainId) {
|
||||
// not in scope
|
||||
throw new InvalidParameterValueException("moving a user from an account in one domain to an account in annother domain is not supported!");
|
||||
throw new InvalidParameterValueException("moving a user from an account in one domain to an account in another domain is not supported!");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -90,7 +90,7 @@ public interface UserVmManager extends UserVmService {
|
||||
|
||||
HashMap<Long, List<VmDiskStatsEntry>> getVmDiskStatistics(long hostId, String hostName, List<Long> vmIds);
|
||||
|
||||
HashMap<String, VolumeStatsEntry> getVolumeStatistics(long clusterId, String poolUuid, StoragePoolType poolType, int timout);
|
||||
HashMap<String, VolumeStatsEntry> getVolumeStatistics(long clusterId, String poolUuid, StoragePoolType poolType, int timeout);
|
||||
|
||||
boolean deleteVmGroup(long groupId);
|
||||
|
||||
|
||||
@ -249,7 +249,7 @@ public class VirtualRouterElementTest {
|
||||
public void testGetRouters2(){
|
||||
Network networkUpdateInprogress=new NetworkVO(2l,null,null,null,1l,1l,1l,1l,"d","d","d",null,1l,1l,null,true,null,true);
|
||||
mockDAOs((NetworkVO)networkUpdateInprogress,testOffering);
|
||||
//alwyas return backup routers first when both primary and backup need update.
|
||||
//always return backup routers first when both primary and backup need update.
|
||||
List<DomainRouterVO> routers=virtualRouterElement.getRouters(networkUpdateInprogress);
|
||||
assertTrue(routers.size()==1);
|
||||
assertTrue(routers.get(0).getRedundantState()==RedundantState.BACKUP && routers.get(0).getUpdateState()==VirtualRouter.UpdateState.UPDATE_IN_PROGRESS);
|
||||
@ -259,7 +259,7 @@ public class VirtualRouterElementTest {
|
||||
public void testGetRouters3(){
|
||||
Network network=new NetworkVO(3l,null,null,null,1l,1l,1l,1l,"d","d","d",null,1l,1l,null,true,null,true);
|
||||
mockDAOs((NetworkVO)network,testOffering);
|
||||
//alwyas return backup routers first when both primary and backup need update.
|
||||
//always return backup routers first when both primary and backup need update.
|
||||
List<DomainRouterVO> routers=virtualRouterElement.getRouters(network);
|
||||
assertTrue(routers.size()==4);
|
||||
}
|
||||
|
||||
@ -21,7 +21,7 @@ Usage:
|
||||
|
||||
Common options:
|
||||
--help|-h Show this help text.
|
||||
--debug-link|-DL Print debugging messages when packets are trasnferred via links.
|
||||
--debug-link|-DL Print debugging messages when packets are transferred via links.
|
||||
--debug-element|-DE Print debugging messages when packets are received or sent by elements.
|
||||
--debug-pipeline|-DP Print debugging messages in pipelines.
|
||||
--host|-n|--host-name VALUE Name or IP address of host to connect to. Required.
|
||||
|
||||
@ -59,7 +59,7 @@ public class Client {
|
||||
{
|
||||
name = "--debug-link";
|
||||
alias = "-DL";
|
||||
description = "Print debugging messages when packets are trasnferred via links.";
|
||||
description = "Print debugging messages when packets are transferred via links.";
|
||||
}
|
||||
};
|
||||
private final Option debugElement = new Option() {
|
||||
|
||||
@ -74,7 +74,7 @@ public class ClientMCSChannelJoinRequestServerMCSChannelConfirmPDUs extends OneT
|
||||
// Channel Join Request PDU the connection SHOULD be dropped.
|
||||
|
||||
// Initiator: 1007 (6+1001)
|
||||
// int initator=buf.readUnsignedShort();
|
||||
// int initiator=buf.readUnsignedShort();
|
||||
buf.skipBytes(2);
|
||||
|
||||
// Requested channel
|
||||
|
||||
@ -65,7 +65,7 @@ public class MockSink extends BaseElement {
|
||||
ByteBuffer expectedBuf = bufs[packetNumber];
|
||||
if (!Arrays.equals(expectedBuf.toByteArray(), buf.toByteArray())) {
|
||||
dump(buf, expectedBuf);
|
||||
throw new AssertionError("[" + this + "] Incoming buffer #" + packetNumber + " is not equal to expected buffer.\n Actual bufer: " + buf
|
||||
throw new AssertionError("[" + this + "] Incoming buffer #" + packetNumber + " is not equal to expected buffer.\n Actual buffer: " + buf
|
||||
+ ",\n expected buffer: " + expectedBuf + ".");
|
||||
}
|
||||
|
||||
|
||||
@ -94,7 +94,7 @@ function KeyboardMapper() {
|
||||
// shift : <shift state match condition>, -- match on shift state
|
||||
// guestos : <guest os match condition>, -- match on guestos type
|
||||
// browser: <browser type match condition>, -- match on browser
|
||||
// browserVersion: <brower version match condition> -- match on browser version
|
||||
// browserVersion: <browser version match condition> -- match on browser version
|
||||
// }
|
||||
//
|
||||
KeyboardMapper.KEYBOARD_TYPE_RAW = 0;
|
||||
|
||||
@ -319,7 +319,7 @@ dhcp-option=vendor:MSFT,2,1i
|
||||
# Enable dnsmasq's built-in TFTP server
|
||||
#enable-tftp
|
||||
|
||||
# Set the root directory for files availble via FTP.
|
||||
# Set the root directory for files available via FTP.
|
||||
#tftp-root=/var/ftpd
|
||||
|
||||
# Make the TFTP server more secure: with this set, only files owned by
|
||||
|
||||
@ -95,7 +95,7 @@ log="${log}"`grep "^dhcp-range=" "$DHCP_CONFIG_MAIN"`"\n"
|
||||
|
||||
if [ "$log" != '\n\n\n' ]
|
||||
then
|
||||
#Cleaning the existing dhcp confgiuration
|
||||
#Cleaning the existing dhcp configuration
|
||||
logger -t cloud "dnsmasq.sh: remvoing the primaryip confg from dnsmasq.conf and adding it to /etc/dnsmaq.d/multiple_ranges.conf"
|
||||
logger -t cloud "dnsmasq.sh: config removed from dnsmasq.conf is $log"
|
||||
sed -i -e '/dhcp-option=6/d' "$DHCP_CONFIG_MAIN"
|
||||
@ -103,7 +103,7 @@ then
|
||||
sed -i -e '/^dhcp-range=/d' "$DHCP_CONFIG_MAIN"
|
||||
fi
|
||||
|
||||
#wrting the new config into the config file.
|
||||
#writing the new config into the config file.
|
||||
echo -e "$dhcp_range" >> "$DHCP_CONFIG"
|
||||
echo -e "$dhcp_gateway" >> "$DHCP_CONFIG"
|
||||
echo -e "$dhcp_netmask" >> "$DHCP_CONFIG"
|
||||
|
||||
@ -144,7 +144,7 @@ fw_entry() {
|
||||
local lb_vif_list=$(get_lb_vif_list)
|
||||
for vif in $lb_vif_list; do
|
||||
|
||||
#TODO : The below delete will be used only when we upgrade the from older verion to the newer one , the below delete become obsolute in the future.
|
||||
#TODO : The below delete will be used only when we upgrade the from older version to the newer one , the below delete become obsolute in the future.
|
||||
sudo iptables -D INPUT -i $vif -p tcp -d $pubIp --dport $dport -j ACCEPT 2> /dev/null
|
||||
|
||||
sudo iptables -A load_balancer_$vif -p tcp -d $pubIp --dport $dport -j ACCEPT
|
||||
@ -161,7 +161,7 @@ fw_entry() {
|
||||
sudo iptables -A lb_stats -s $cidrs -p tcp -m state --state NEW -d $pubIp --dport $dport -j ACCEPT
|
||||
|
||||
|
||||
#TODO : The below delete in the for-loop will be used only when we upgrade the from older verion to the newer one , the below delete become obsolute in the future.
|
||||
#TODO : The below delete in the for-loop will be used only when we upgrade the from older version to the newer one , the below delete become obsolute in the future.
|
||||
for i in $r
|
||||
do
|
||||
local pubIp=$(echo $i | cut -d: -f1)
|
||||
|
||||
@ -41,7 +41,7 @@ cat $cfg | while read line; do
|
||||
elif [ "$line" == "<version>" ]; then
|
||||
read line
|
||||
version=$line
|
||||
log_it "VR config: configuation format version $version"
|
||||
log_it "VR config: configuration format version $version"
|
||||
#skip </version>
|
||||
read line
|
||||
|
||||
|
||||
@ -118,7 +118,7 @@ unlock_exit() {
|
||||
exit $1
|
||||
}
|
||||
|
||||
# calcuate the ip & network mask
|
||||
# calculate the ip & network mask
|
||||
rangecalc(){
|
||||
local IFS='.'
|
||||
local -a oct mask ip
|
||||
|
||||
@ -173,7 +173,7 @@ def restart_ms(self):
|
||||
#1-ssh into m/c running MS
|
||||
#2-restart ms
|
||||
#3-verify the response
|
||||
#4-loop unitl you get list_zone api answer """
|
||||
#4-loop until you get list_zone api answer """
|
||||
sshClient = SshClient(
|
||||
self.mgtSvrDetails["mgtSvrIp"],
|
||||
22,
|
||||
@ -209,7 +209,7 @@ def restart_ms(self):
|
||||
self.debug("list zone response is not available due to %s" % e)
|
||||
|
||||
if timeout == 0:
|
||||
raise Exception("Ms is not comming up !")
|
||||
raise Exception("Ms is not coming up !")
|
||||
timeout = timeout - 1
|
||||
|
||||
|
||||
@ -320,7 +320,7 @@ class TestSystemVmLocalStorage(cloudstackTestCase):
|
||||
e)
|
||||
|
||||
if timeout == 0:
|
||||
raise Exception("Ms is not comming up !")
|
||||
raise Exception("Ms is not coming up !")
|
||||
|
||||
time.sleep(cls.testdata["sleep"])
|
||||
timeout = timeout - 1
|
||||
|
||||
@ -1641,7 +1641,7 @@ class TestRvRRedundancy(cloudstackTestCase):
|
||||
if retry == 0:
|
||||
break
|
||||
time.sleep(self.testdata["sleep"])
|
||||
self.info("wating for backup router to become primary router name:"+new_backup_router.name)
|
||||
self.info("waiting for backup router to become primary router name:"+new_backup_router.name)
|
||||
primary_router, backup_router = self.get_primary_and_backupRouter()
|
||||
if retry == 0:
|
||||
self.fail("timed out while waiting for new backup router to change state to PRIMARY.")
|
||||
|
||||
@ -578,7 +578,7 @@ class TestNetworksInAdvancedSG(cloudstackTestCase):
|
||||
domainid=self.parent_domain.id,networkofferingid=self.shared_network_offering_sg.id,
|
||||
zoneid=self.zone.id,subdomainaccess=True)
|
||||
except Exception as e:
|
||||
self.fail("Exception whle creating domain wide shared network: %s" % e)
|
||||
self.fail("Exception while creating domain wide shared network: %s" % e)
|
||||
|
||||
self.debug("Created shared network: %s" % self.shared_network_sg.id)
|
||||
|
||||
|
||||
@ -300,7 +300,7 @@ class TestCPULimits(cloudstackTestCase):
|
||||
|
||||
expected_resource_count = int(self.service_offering.cpunumber) * 4 #Total 4 Vms
|
||||
self.assertTrue(resource_count == expected_resource_count,
|
||||
"Resource count does not match the expected vavlue")
|
||||
"Resource count does not match the expected value")
|
||||
return
|
||||
|
||||
class TestDomainCPULimitsConfiguration(cloudstackTestCase):
|
||||
|
||||
@ -4279,7 +4279,7 @@ class TestInstances(cloudstackTestCase):
|
||||
def test_25_ip_reallocation_ES1377(self):
|
||||
"""
|
||||
@Desc: Test to verify dnsmasq dhcp conflict issue due to
|
||||
/ect/hosts not getting udpated
|
||||
/ect/hosts not getting updated
|
||||
@Steps:
|
||||
Step1: Create a network for the user
|
||||
Step2: List the network and check that it is created for the user
|
||||
|
||||
@ -1479,7 +1479,7 @@ class TestIpAddresses(cloudstackTestCase):
|
||||
self.assertEqual(
|
||||
vm_created.id,
|
||||
list_lbruleinstance_applied_false[0].id,
|
||||
"Failed to list Instance available to asign a Load Balancer Rule"
|
||||
"Failed to list Instance available to assign a Load Balancer Rule"
|
||||
)
|
||||
# Assigning Instance created to Load Balancer Rule
|
||||
LoadBalancerRule.assign(
|
||||
@ -1566,7 +1566,7 @@ class TestIpAddresses(cloudstackTestCase):
|
||||
self.assertEqual(
|
||||
vm_created.id,
|
||||
list_lbruleinstance_applied_false[0].id,
|
||||
"Failed to list Instance available to asign a Load Balancer Rule"
|
||||
"Failed to list Instance available to assign a Load Balancer Rule"
|
||||
)
|
||||
# Destroying the VM Launched
|
||||
vm_created.delete(self.apiClient)
|
||||
|
||||
@ -815,7 +815,7 @@ class TestHAProxyStickyness(cloudstackTestCase):
|
||||
# 1. create an account
|
||||
# 2. using that account,create an instances
|
||||
# 3. select the Source NAT IP and configure the stikiness policy
|
||||
# 4. enable /disable the VPN. It should not impact the ceated rules
|
||||
# 4. enable /disable the VPN. It should not impact the created rules
|
||||
# listLBStickinessPolicies Api should show created stikiness policy
|
||||
|
||||
self.debug("Creating LB rule for account: %s" % self.account.name)
|
||||
@ -850,7 +850,7 @@ class TestHAProxyStickyness(cloudstackTestCase):
|
||||
|
||||
@attr(tags=["advanced", "advancedns"], required_hardware="false")
|
||||
def test_11_invalid_params(self):
|
||||
"""Test verfify functionality syncronous and asyncronous validations"""
|
||||
"""Test verify functionality syncronous and asyncronous validations"""
|
||||
|
||||
# Validate the following
|
||||
# verify the validation while creating or attaching stikiness policy
|
||||
|
||||
@ -1612,7 +1612,7 @@ class TestResourceTags(cloudstackTestCase):
|
||||
Tag.create(self.apiclient,
|
||||
resourceIds=self.vm_1.id,
|
||||
resourceType='UserVm',
|
||||
tags={tag_key.upper(): tag_value.uppper()})
|
||||
tags={tag_key.upper(): tag_value.upper()})
|
||||
except Exception as e:
|
||||
pass
|
||||
else:
|
||||
|
||||
@ -905,7 +905,7 @@ class TestVPCOffering(cloudstackTestCase):
|
||||
# 4. Enable the VPC offering again and create VPC. VPC should be
|
||||
# created successfully
|
||||
# 5. Change name and displaytext of the VPCOffering. Name and
|
||||
# displaytext chnages should be reflected in listVPCPffering call
|
||||
# displaytext changes should be reflected in listVPCPffering call
|
||||
|
||||
self.logger.debug("Creating a VPC offering..")
|
||||
vpc_off = VpcOffering.create(
|
||||
|
||||
@ -2314,7 +2314,7 @@ class TestVMDeployVPC(cloudstackTestCase):
|
||||
@attr(tags=["advanced", "intervlan"], required_hardware="true")
|
||||
def test_08_ip_reallocation_CS5986(self):
|
||||
"""
|
||||
@Desc: Test to verify dnsmasq dhcp conflict issue due to /ect/hosts not getting udpated
|
||||
@Desc: Test to verify dnsmasq dhcp conflict issue due to /ect/hosts not getting updated
|
||||
@Steps:
|
||||
Step1: Create a VPC
|
||||
Step2: Create one network in vpc
|
||||
|
||||
@ -71,10 +71,10 @@ class TestPVLAN(cloudstackTestCase):
|
||||
self.broadcasttype = createNetworkResponse.broadcastdomaintype
|
||||
self.broadcasturi = createNetworkResponse.broadcasturi
|
||||
|
||||
braodcasturi = "pvlan://{0}-i{1}".format(self.vlan, self.isolatedpvlan)
|
||||
broadcasturi = "pvlan://{0}-i{1}".format(self.vlan, self.isolatedpvlan)
|
||||
self.assertIsNotNone(createNetworkResponse.id, "Network failed to create")
|
||||
self.assertTrue(createNetworkResponse.broadcastdomaintype, "Pvlan")
|
||||
self.assertTrue(createNetworkResponse.broadcasturi, braodcasturi)
|
||||
self.assertTrue(createNetworkResponse.broadcasturi, broadcasturi)
|
||||
|
||||
self.debug("Clean up test pvlan network")
|
||||
deleteNetworkCmd = deleteNetwork.deleteNetworkCmd()
|
||||
|
||||
@ -635,7 +635,7 @@ class TestVMLifeCycle(cloudstackTestCase):
|
||||
if self.hypervisor.lower() in ["kvm", "simulator"]:
|
||||
# identify suitable host
|
||||
clusters = [h.clusterid for h in hosts]
|
||||
# find hosts withe same clusterid
|
||||
# find hosts with same clusterid
|
||||
clusters = [cluster for index, cluster in enumerate(clusters) if clusters.count(cluster) > 1]
|
||||
|
||||
if len(clusters) <= 1:
|
||||
|
||||
@ -2472,7 +2472,7 @@ under the License.
|
||||
<!-- ADD TEST CASES FOR IP FORWARDING HERE!!! -->
|
||||
|
||||
|
||||
<!-- Test case #16 - rebootVirtualMachine command; verfiy that machine is in Running state after it's rebooted -->
|
||||
<!-- Test case #16 - rebootVirtualMachine command; verify that machine is in Running state after it's rebooted -->
|
||||
<command>
|
||||
<name>rebootVirtualMachine</name>
|
||||
<testcase>16</testcase>
|
||||
|
||||
@ -2366,7 +2366,7 @@ under the License.
|
||||
</command>
|
||||
|
||||
<!--
|
||||
Test case #16 - rebootVirtualMachine command; verfiy that machine is
|
||||
Test case #16 - rebootVirtualMachine command; verify that machine is
|
||||
in Running state after it's rebooted
|
||||
-->
|
||||
<command>
|
||||
|
||||
@ -1518,7 +1518,7 @@ under the License.
|
||||
</command>
|
||||
|
||||
|
||||
<!-- Test case #16 - rebootVirtualMachine command; verfiy that machine is in Running state after it's rebooted -->
|
||||
<!-- Test case #16 - rebootVirtualMachine command; verify that machine is in Running state after it's rebooted -->
|
||||
<command>
|
||||
<name>rebootVirtualMachine</name>
|
||||
<testcase>16</testcase>
|
||||
|
||||
@ -1324,7 +1324,7 @@ under the License.
|
||||
</command>
|
||||
|
||||
|
||||
<!-- Test case #16 - rebootVirtualMachine command; verfiy that machine is in Running state after it's rebooted -->
|
||||
<!-- Test case #16 - rebootVirtualMachine command; verify that machine is in Running state after it's rebooted -->
|
||||
<command>
|
||||
<name>rebootVirtualMachine</name>
|
||||
<usercommand>true</usercommand>
|
||||
|
||||
@ -3112,7 +3112,7 @@ under the License.
|
||||
</command>
|
||||
|
||||
<!--
|
||||
Test case #16 - rebootVirtualMachine command; verfiy that machine is
|
||||
Test case #16 - rebootVirtualMachine command; verify that machine is
|
||||
in Running state after it's rebooted
|
||||
-->
|
||||
<command>
|
||||
|
||||
@ -695,10 +695,10 @@ under the License.
|
||||
</command>
|
||||
|
||||
|
||||
<!-- Test case #90 - try to reboot stopped vitrual machine - should fail - Negative case -->
|
||||
<!-- Test case #90 - try to reboot stopped virtual machine - should fail - Negative case -->
|
||||
<command>
|
||||
<name>rebootVirtualMachine</name>
|
||||
<testcase>90 [Try to reboot stopped vitrual machine - Negative case]</testcase>
|
||||
<testcase>90 [Try to reboot stopped virtual machine - Negative case]</testcase>
|
||||
<error>true</error>
|
||||
<parameters>
|
||||
<item getparam="true">
|
||||
|
||||
@ -198,7 +198,7 @@ public class TestClient {
|
||||
client.executeMethod(new GetMethod(url));
|
||||
} catch (Exception e1) {
|
||||
s_logger.info("[ignored]"
|
||||
+ "error while executing last resort stop attampt: " + e1.getLocalizedMessage());
|
||||
+ "error while executing last resort stop attempt: " + e1.getLocalizedMessage());
|
||||
}
|
||||
} finally {
|
||||
NDC.clear();
|
||||
|
||||
@ -63,7 +63,7 @@ Deploy Cloud using marvin:
|
||||
docker run -ti --rm --link simulator:8096 cloudstack/marvin python /marvin/marvin/deployDataCenter.py -i /marvin/dev/advanced.cfg
|
||||
```
|
||||
|
||||
Perform Smoke tests against CloudStack Simulator containter:
|
||||
Perform Smoke tests against CloudStack Simulator container:
|
||||
```
|
||||
docker run -ti --rm --link simulator:8096 \
|
||||
nosetests-2.7 -v --with-marvin \
|
||||
|
||||
@ -1055,7 +1055,7 @@ test_data = {
|
||||
"value": "test"
|
||||
},
|
||||
{
|
||||
"key": "usefull.property",
|
||||
"key": "useful.property",
|
||||
"value": "True"
|
||||
}
|
||||
],
|
||||
|
||||
@ -480,7 +480,7 @@ def checkVolumeSize(ssh_handle=None,
|
||||
@Desc : provides facility to verify the volume size against the size to verify
|
||||
@Input: 1. ssh_handle : machine against which to execute the disk size cmd
|
||||
2. volume_name : The name of the volume against which to verify the size
|
||||
3. cmd_inp : Input command used to veify the size
|
||||
3. cmd_inp : Input command used to verify the size
|
||||
4. size_to_verify: size against which to compare.
|
||||
@Output: Returns FAILED in case of an issue, else SUCCESS
|
||||
'''
|
||||
|
||||
4
tools/ngui/static/js/lib/angular.js
vendored
4
tools/ngui/static/js/lib/angular.js
vendored
@ -844,7 +844,7 @@ function toKeyValue(obj) {
|
||||
|
||||
|
||||
/**
|
||||
* We need our custom method because encodeURIComponent is too agressive and doesn't follow
|
||||
* We need our custom method because encodeURIComponent is too aggressive and doesn't follow
|
||||
* http://www.ietf.org/rfc/rfc3986.txt with regards to the character set (pchar) allowed in path
|
||||
* segments:
|
||||
* segment = *pchar
|
||||
@ -864,7 +864,7 @@ function encodeUriSegment(val) {
|
||||
|
||||
/**
|
||||
* This method is intended for encoding *key* or *value* parts of query component. We need a custom
|
||||
* method becuase encodeURIComponent is too agressive and encodes stuff that doesn't have to be
|
||||
* method because encodeURIComponent is too aggressive and encodes stuff that doesn't have to be
|
||||
* encoded per http://tools.ietf.org/html/rfc3986:
|
||||
* query = *( pchar / "/" / "?" )
|
||||
* pchar = unreserved / pct-encoded / sub-delims / ":" / "@"
|
||||
|
||||
@ -46,7 +46,7 @@ with the translatons from traductors.
|
||||
The sync-transifex-ui provide too the ability to :
|
||||
|
||||
* Download from Transifex the source language resource files. Be carrefully,
|
||||
with this, you can remove some transation on Transifex if some keys has
|
||||
with this, you can remove some transaction on Transifex if some keys has
|
||||
been removed inside the source language resource files.
|
||||
|
||||
./sync-transifex-ui.sh download-source-language CloudStack_UI.410_messagesjson
|
||||
|
||||
@ -28,11 +28,11 @@ The usage is as follows
|
||||
4. After upgrade run usage_schema_comparision.sh to compare cloud usage all tables schema between fresh and upgraded setup
|
||||
NOTE: this script requires step 1 output in current working directory
|
||||
|
||||
5. Run test_config_between_fresh_and_upgraded_setup.sh to comapre table global configuration values between fresh and upgraded setup
|
||||
5. Run test_config_between_fresh_and_upgraded_setup.sh to compare table global configuration values between fresh and upgraded setup
|
||||
NOTE: this script requires step 1 output in current working directory
|
||||
|
||||
|
||||
6. Run test_config_before_and_after_upgrade.sh to comapre table global configuration values between before upgraded and after upgraded setup
|
||||
6. Run test_config_before_and_after_upgrade.sh to compare table global configuration values between before upgraded and after upgraded setup
|
||||
NOTE: this script requires step 2 output in current working directory
|
||||
|
||||
|
||||
|
||||
@ -249,7 +249,7 @@ Within the deps/awsapi-lib directory
|
||||
We reserve no legal rights to the ANTLR--it is fully in the public domain. An
|
||||
individual or company may do whatever they wish with source code distributed
|
||||
with ANTLR or the code generated by ANTLR, including the incorporation of ANTLR,
|
||||
or its output, into commerical software. We encourage users to develop software
|
||||
or its output, into commercial software. We encourage users to develop software
|
||||
with ANTLR. However, we do ask that credit is given to us for developing ANTLR.
|
||||
By "credit", we mean that if you use ANTLR or incorporate any source code into
|
||||
one of your programs (commercial product, research project, or otherwise) that
|
||||
|
||||
@ -1435,7 +1435,7 @@ ANTLR 2 License
|
||||
We reserve no legal rights to the ANTLR--it is fully in the public domain. An
|
||||
individual or company may do whatever they wish with source code distributed
|
||||
with ANTLR or the code generated by ANTLR, including the incorporation of ANTLR,
|
||||
or its output, into commerical software. We encourage users to develop software
|
||||
or its output, into commercial software. We encourage users to develop software
|
||||
with ANTLR. However, we do ask that credit is given to us for developing ANTLR.
|
||||
By "credit", we mean that if you use ANTLR or incorporate any source code into
|
||||
one of your programs (commercial product, research project, or otherwise) that
|
||||
|
||||
@ -1435,7 +1435,7 @@ ANTLR 2 License
|
||||
We reserve no legal rights to the ANTLR--it is fully in the public domain. An
|
||||
individual or company may do whatever they wish with source code distributed
|
||||
with ANTLR or the code generated by ANTLR, including the incorporation of ANTLR,
|
||||
or its output, into commerical software. We encourage users to develop software
|
||||
or its output, into commercial software. We encourage users to develop software
|
||||
with ANTLR. However, we do ask that credit is given to us for developing ANTLR.
|
||||
By "credit", we mean that if you use ANTLR or incorporate any source code into
|
||||
one of your programs (commercial product, research project, or otherwise) that
|
||||
|
||||
@ -1934,8 +1934,8 @@
|
||||
"message.error.version.for.cluster": "Bitte Kubernetes Version für Kubernetes Cluster eingeben",
|
||||
"message.error.vlan.range": "Bitte einen gültigen VLAN/VNI-Bereich eingeben",
|
||||
"message.error.volume.name": "Bitte einen Namen für den Speicher eingeben",
|
||||
"message.error.volumne": "Bitte geben Sie den Speicher ein",
|
||||
"message.error.volumne.group": "Bitte wählen Sie die Speichergruppe",
|
||||
"message.error.volume": "Bitte geben Sie den Speicher ein",
|
||||
"message.error.volume.group": "Bitte wählen Sie die Speichergruppe",
|
||||
"message.error.zone": "Bitte wählen Sie eine Zone aus",
|
||||
"message.error.zone.combined": "Eine Zone kann mit keiner weiteren Zone kombiniert werden",
|
||||
"message.error.zone.for.cluster": "Bitte wählen Sie die Zone für das Kubernetes Cluster",
|
||||
@ -2062,7 +2062,7 @@
|
||||
"message.success.add.vpc.network": "VPC-Network erfolgreich hinzugefügt",
|
||||
"message.success.add.vpn.customer.gateway": "VPN Customer Gateway erfolgreich hinzugefügt",
|
||||
"message.success.add.vpn.gateway": "VPN-Gateway erfolgreich hinzugefügt",
|
||||
"message.success.asign.vm": "VM erfolgreich zugeordnet",
|
||||
"message.success.assign.vm": "VM erfolgreich zugeordnet",
|
||||
"message.success.assigned.vms": "VMs erfolgreich zugeordnet",
|
||||
"message.success.certificate.upload": "Zertifikat erfolgreich hochgeladen",
|
||||
"message.success.change.affinity.group": "Affinitätsgruppen erfolgreich geändert",
|
||||
|
||||
@ -2355,8 +2355,8 @@
|
||||
"message.error.version.for.cluster": "Επιλέξτε την έκδοση Κυβερνητών για την ομάδα Κυβερνητών",
|
||||
"message.error.vlan.range": "Πληκτρολογήστε μια έγκυρη περιοχή VLAN/VNI",
|
||||
"message.error.volume.name": "Πληκτρολογήστε το όνομα τόμου",
|
||||
"message.error.volumne": "Πληκτρολογήστε Τόμος",
|
||||
"message.error.volumne.group": "Εισαγάγετε την ομάδα τόμων",
|
||||
"message.error.volume": "Πληκτρολογήστε Τόμος",
|
||||
"message.error.volume.group": "Εισαγάγετε την ομάδα τόμων",
|
||||
"message.error.zone": "Επιλέξτε μια ζώνη",
|
||||
"message.error.zone.combined": "Όλες οι ζώνες δεν μπορούν να συνδυαστούν με οποιαδήποτε άλλη ζώνη",
|
||||
"message.error.zone.for.cluster": "Επιλέξτε ζώνη για σύμπλεγμα Κυβερνητών",
|
||||
@ -2553,7 +2553,7 @@
|
||||
"message.success.add.vpc.network": "Προστέθηκε με επιτυχία δίκτυο VPC",
|
||||
"message.success.add.vpn.customer.gateway": "Προστέθηκε με επιτυχία πύλη πελάτη Εικον. Ιδιωτ. Δίκτυο",
|
||||
"message.success.add.vpn.gateway": "Προστέθηκε με επιτυχία πύλη Εικον. Ιδιωτ. Δίκτυο",
|
||||
"message.success.asign.vm": "Η εικονική μηχανή που εκχωρήθηκαν με επιτυχία ολοκληρώθηκε με επιτυχία",
|
||||
"message.success.assign.vm": "Η εικονική μηχανή που εκχωρήθηκαν με επιτυχία ολοκληρώθηκε με επιτυχία",
|
||||
"message.success.assigned.vms": "Η αντιστοίχιση εικονικής μηχανής ολοκληρώθηκε με επιτυχία",
|
||||
"message.success.certificate.upload": "Η αποστολή του πιστοποιητικού ολοκληρώθηκε με επιτυχία",
|
||||
"message.success.change.affinity.group": "Η αλλαγή ομάδων συνάφειας ολοκληρώθηκε με επιτυχία",
|
||||
|
||||
@ -2331,8 +2331,8 @@
|
||||
"message.error.version.for.cluster": "Please select Kubernetes version for Kubernetes cluster.",
|
||||
"message.error.vlan.range": "Please enter a valid VLAN/VNI range.",
|
||||
"message.error.volume.name": "Please enter volume name.",
|
||||
"message.error.volumne": "Please enter volume.",
|
||||
"message.error.volumne.group": "Please enter volume group.",
|
||||
"message.error.volume": "Please enter volume.",
|
||||
"message.error.volume.group": "Please enter volume group.",
|
||||
"message.error.zone": "Please select a zone.",
|
||||
"message.error.zone.combined": "All zones cannot be combined with any other zone.",
|
||||
"message.error.zone.for.cluster": "Please select zone for Kubernetes cluster.",
|
||||
@ -2523,7 +2523,7 @@
|
||||
"message.success.add.vpc.network": "Successfully added VPC network",
|
||||
"message.success.add.vpn.customer.gateway": "Successfully added VPN customer gateway",
|
||||
"message.success.add.vpn.gateway": "Successfully added VPN gateway",
|
||||
"message.success.asign.vm": "Successfully assigned VM",
|
||||
"message.success.assign.vm": "Successfully assigned VM",
|
||||
"message.success.assigned.vms": "Successfully assigned VMs",
|
||||
"message.success.certificate.upload": "Certificate successfully uploaded",
|
||||
"message.success.change.affinity.group": "Successfully changed affinity groups",
|
||||
|
||||
@ -3025,8 +3025,8 @@
|
||||
"message.error.version.for.cluster": "KubernetesクラスターのKubernetesバージョンを選択してください",
|
||||
"message.error.vlan.range": "有効なVLAN/VNI範囲を入力してください",
|
||||
"message.error.volume.name": "ボリューム名を入力してください",
|
||||
"message.error.volumne": "音量を入力してください",
|
||||
"message.error.volumne.group": "ボリュームグループを入力してください",
|
||||
"message.error.volume": "音量を入力してください",
|
||||
"message.error.volume.group": "ボリュームグループを入力してください",
|
||||
"message.error.zone": "ゾーンを選択してください",
|
||||
"message.error.zone.combined": "すべてのゾーンを他のゾーンと組み合わせることはできません",
|
||||
"message.error.zone.for.cluster": "Kubernetesクラスターのゾーンを選択してください",
|
||||
@ -3315,7 +3315,7 @@
|
||||
"message.success.add.vpc.network": "VPCネットワークが正常に追加されました",
|
||||
"message.success.add.vpn.customer.gateway": "VPNカスタマーゲートウェイが正常に追加されました",
|
||||
"message.success.add.vpn.gateway": "VPNゲートウェイが正常に追加されました",
|
||||
"message.success.asign.vm": "正常に割り当てられたVM",
|
||||
"message.success.assign.vm": "正常に割り当てられたVM",
|
||||
"message.success.assigned.vms": "正常に割り当てられたVM",
|
||||
"message.success.certificate.upload": "証明書が正常にアップロードされました",
|
||||
"message.success.change.affinity.group": "アフィニティグループが正常に変更されました",
|
||||
|
||||
@ -2029,8 +2029,8 @@
|
||||
"message.error.version.for.cluster": "\ucfe0\ubc84\ub124\ud14c\uc2a4 \ud074\ub7ec\uc2a4\ud130 \uc6a9 \ucfe0\ubc84\ub124\ud14c\uc2a4 \ubc84\uc804\uc744 \uc120\ud0dd\ud558\uc2ed\uc2dc\uc624.",
|
||||
"message.error.vlan.range": "\uc720\ud6a8\ud55c VLAN/VNI \ubc94\uc704\ub97c \uc785\ub825\ud558\uc2ed\uc2dc\uc624.",
|
||||
"message.error.volume.name": "\ubcfc\ub968 \uc774\ub984\uc744 \uc785\ub825\ud558\uc2ed\uc2dc\uc624.",
|
||||
"message.error.volumne": "\ubcfc\ub968\uc744 \uc785\ub825\ud558\uc2ed\uc2dc\uc624.",
|
||||
"message.error.volumne.group": "\ubcfc\ub968 \uadf8\ub8f9\uc744 \uc785\ub825\ud558\uc2ed\uc2dc\uc624.",
|
||||
"message.error.volume": "\ubcfc\ub968\uc744 \uc785\ub825\ud558\uc2ed\uc2dc\uc624.",
|
||||
"message.error.volume.group": "\ubcfc\ub968 \uadf8\ub8f9\uc744 \uc785\ub825\ud558\uc2ed\uc2dc\uc624.",
|
||||
"message.error.zone": "Zone\uc744 \uc120\ud0dd\ud558\uc138\uc694.",
|
||||
"message.error.zone.combined": "\ubaa8\ub4e0 Zone\uc740 \ub2e4\ub978 Zone\uacfc \uacb0\ud569 \ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.",
|
||||
"message.error.zone.for.cluster": "\ucfe0\ubc84\ub124\ud14c\uc2a4 \ud074\ub7ec\uc2a4\ud130\uc5d0 \ub300\ud55c Zone\uc744 \uc120\ud0dd\ud558\uc2ed\uc2dc\uc624.",
|
||||
@ -2178,7 +2178,7 @@
|
||||
"message.success.add.vpc.network": "VPC \ub124\ud2b8\uc6cc\ud06c\ub97c \ucd94\uac00\ud588\uc2b5\ub2c8\ub2e4.",
|
||||
"message.success.add.vpn.customer.gateway": "VPN \uace0\uac1d \uac8c\uc774\ud2b8\uc6e8\uc774\ub97c \ucd94\uac00\ud588\uc2b5\ub2c8\ub2e4.",
|
||||
"message.success.add.vpn.gateway": "VPN \uac8c\uc774\ud2b8\uc6e8\uc774\ub97c \ucd94\uac00\ud588\uc2b5\ub2c8\ub2e4.",
|
||||
"message.success.asign.vm": "VM \ud560\ub2f9 \uc131\uacf5",
|
||||
"message.success.assign.vm": "VM \ud560\ub2f9 \uc131\uacf5",
|
||||
"message.success.assigned.vms": "VM\uc744 \ud560\ub2f9\ud588\uc2b5\ub2c8\ub2e4.",
|
||||
"message.success.certificate.upload": "\uc778\uc99d\uc11c\uac00 \uc5c5\ub85c\ub4dc\ub418\uc5c8\uc2b5\ub2c8\ub2e4.",
|
||||
"message.success.change.affinity.group": "Affinity \uadf8\ub8f9\uc744 \ubcc0\uacbd\ud588\uc2b5\ub2c8\ub2e4.",
|
||||
|
||||
@ -2166,8 +2166,8 @@
|
||||
"message.error.version.for.cluster": "Por favor, selecionar a vers\u00e3o Kubernetes para o cluster Kubernetes",
|
||||
"message.error.vlan.range": "Por favor, insira um intervalo VLAN/VNI v\u00e1lido",
|
||||
"message.error.volume.name": "Por favor, insira o nome do volume",
|
||||
"message.error.volumne": "Por favor, insira o volume",
|
||||
"message.error.volumne.group": "Por favor, insira o grupo de volume",
|
||||
"message.error.volume": "Por favor, insira o volume",
|
||||
"message.error.volume.group": "Por favor, insira o grupo de volume",
|
||||
"message.error.zone": "Por favor, selecione uma zona",
|
||||
"message.error.zone.combined": "Todas as zonas n\u00e3o podem ser combinadas com nenhuma outra zona",
|
||||
"message.error.zone.for.cluster": "Por favor, selecionar a zona para o cluster Kubernetes",
|
||||
@ -2341,7 +2341,7 @@
|
||||
"message.success.add.vpc.network": "Rede VPC adicionada com sucesso",
|
||||
"message.success.add.vpn.customer.gateway": "Gateway da VPN do cliente adicionado com sucesso",
|
||||
"message.success.add.vpn.gateway": "Gateway da VPN adicionado com sucesso",
|
||||
"message.success.asign.vm": "VM atribu\u00edda com sucesso",
|
||||
"message.success.assign.vm": "VM atribu\u00edda com sucesso",
|
||||
"message.success.assigned.vms": "VMs atribu\u00eddas com sucesso",
|
||||
"message.success.certificate.upload": "Certificado carregado com sucesso",
|
||||
"message.success.change.affinity.group": "Grupos de afinidade alterados com sucesso",
|
||||
|
||||
@ -3331,7 +3331,7 @@
|
||||
"message.enabling.zone": "\u6B63\u5728\u542F\u7528\u8D44\u6E90\u57DF",
|
||||
"message.enabling.zone.dots": "\u6B63\u5728\u542F\u7528\u8D44\u6E90\u57DF...",
|
||||
|
||||
"message.enter.seperated.list.multiple.cidrs": "\u5982\u679C\u5B58\u5728\u591A\u4E2A CIDR\uFF0C\u8BF7\u8F93\u5165\u7528\u9017\u53F7\u5206\u9694\u7684 CIDR \u5217\u8868",
|
||||
"message.enter.separated.list.multiple.cidrs": "\u5982\u679C\u5B58\u5728\u591A\u4E2A CIDR\uFF0C\u8BF7\u8F93\u5165\u7528\u9017\u53F7\u5206\u9694\u7684 CIDR \u5217\u8868",
|
||||
"message.enter.token": "\u8BF7\u8F93\u5165\u60A8\u5728\u9080\u8BF7\u7535\u5B50\u90AE\u4EF6\u4E2D\u6536\u5230\u7684\u4EE4\u724C\u3002",
|
||||
|
||||
"message.enter.valid.nic.ip": "\u8BF7\u8F93\u5165\u7F51\u5361\u6709\u6548\u7684 IP \u5730\u5740",
|
||||
@ -3454,8 +3454,8 @@
|
||||
"message.error.vlan.range": "\u8BF7\u8F93\u5165\u6709\u6548\u7684 VLAN/VNI \u8303\u56F4",
|
||||
|
||||
"message.error.volume.name": "\u8BF7\u8F93\u5165\u5377\u540D",
|
||||
"message.error.volumne": "\u8BF7\u8F93\u5165\u5377\u5BB9\u91CF",
|
||||
"message.error.volumne.group": "\u8BF7\u8F93\u5165\u5377\u7EC4",
|
||||
"message.error.volume": "\u8BF7\u8F93\u5165\u5377\u5BB9\u91CF",
|
||||
"message.error.volume.group": "\u8BF7\u8F93\u5165\u5377\u7EC4",
|
||||
"message.error.zone": "\u8BF7\u9009\u62E9\u4E00\u4E2A\u8D44\u6E90\u57DF",
|
||||
"message.error.zone.combined": "\u6240\u6709\u5206\u533A\u4E0D\u80FD\u4E0E\u4EFB\u4F55\u5176\u4ED6\u5206\u533A\u5408\u5E76",
|
||||
"message.error.zone.for.cluster": "\u8BF7\u4E3A Kubernetes \u96C6\u7FA4\u9009\u62E9\u533A\u57DF",
|
||||
@ -3778,7 +3778,7 @@
|
||||
"message.success.add.vpn.customer.gateway": "\u5DF2\u6210\u529F\u6DFB\u52A0 VPN \u5BA2\u6237\u7F51\u5173",
|
||||
"message.success.add.vpn.gateway": "\u5DF2\u6210\u529F\u6DFB\u52A0 VPN \u7F51\u5173",
|
||||
|
||||
"message.success.asign.vm": "\u5DF2\u6210\u529F\u5206\u914D\u865A\u62DF\u673A",
|
||||
"message.success.assign.vm": "\u5DF2\u6210\u529F\u5206\u914D\u865A\u62DF\u673A",
|
||||
"message.success.assigned.vms": "\u5DF2\u6210\u529F\u5206\u914D\u865A\u62DF\u673A",
|
||||
"message.success.certificate.upload": "\u8BC1\u4E66\u5DF2\u6210\u529F\u4E0A\u8F7D",
|
||||
"message.success.change.affinity.group": "\u5DF2\u6210\u529F\u66F4\u6539\u5173\u8054\u7EC4",
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
6. objects
|
||||
- repeatly used elements like buttons, inputs
|
||||
7. components
|
||||
- complex elements like dropdown, forms, table, search (usualy include this to components/FooterToolbar/ folder)
|
||||
- complex elements like dropdown, forms, table, search (usually include this to components/FooterToolbar/ folder)
|
||||
|
||||
|
||||
# The "/deep/" combinator
|
||||
|
||||
@ -485,7 +485,7 @@ export default {
|
||||
{
|
||||
title: 'label.volgroup',
|
||||
key: 'primaryStorageVolumeGroup',
|
||||
placeHolder: 'message.error.volumne.group',
|
||||
placeHolder: 'message.error.volume.group',
|
||||
required: true,
|
||||
display: {
|
||||
primaryStorageProtocol: 'clvm'
|
||||
@ -494,7 +494,7 @@ export default {
|
||||
{
|
||||
title: 'label.volume',
|
||||
key: 'primaryStorageVolume',
|
||||
placeHolder: 'message.error.volumne',
|
||||
placeHolder: 'message.error.volume',
|
||||
required: true,
|
||||
display: {
|
||||
primaryStorageProtocol: 'gluster'
|
||||
|
||||
@ -1280,7 +1280,7 @@ export default {
|
||||
}).then(response => {
|
||||
this.$pollJob({
|
||||
jobId: response.assigntoloadbalancerruleresponse.jobid,
|
||||
successMessage: this.$t('message.success.asign.vm'),
|
||||
successMessage: this.$t('message.success.assign.vm'),
|
||||
successMethod: () => {
|
||||
this.parentToggleLoading()
|
||||
this.fetchData()
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user