mirror of https://github.com/apache/cloudstack.git
parent
cf6e67bfe5
commit
00d3bc59db
|
|
@ -52,7 +52,7 @@ msgstr "Per abilitare le funzioni di live migration libvirt deve avere il serviz
|
|||
|
||||
#. Tag: para
|
||||
#, no-c-format
|
||||
msgid "Set the following paramaters:"
|
||||
msgid "Set the following parameters:"
|
||||
msgstr "Impostare i seguenti parametri:"
|
||||
|
||||
#. Tag: programlisting
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ msgstr "libvirt を用いてライブマイグレーションを実施するに
|
|||
|
||||
#. Tag: para
|
||||
#, no-c-format
|
||||
msgid "Set the following paramaters:"
|
||||
msgid "Set the following parameters:"
|
||||
msgstr "以下のパラメーターを設定してください。"
|
||||
|
||||
#. Tag: programlisting
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ msgstr ""
|
|||
|
||||
#. Tag: para
|
||||
#, no-c-format
|
||||
msgid "Set the following paramaters:"
|
||||
msgid "Set the following parameters:"
|
||||
msgstr ""
|
||||
|
||||
#. Tag: programlisting
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ msgstr ""
|
|||
|
||||
#. Tag: para
|
||||
#, no-c-format
|
||||
msgid "Set the following paramaters:"
|
||||
msgid "Set the following parameters:"
|
||||
msgstr ""
|
||||
|
||||
#. Tag: programlisting
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ msgstr ""
|
|||
|
||||
#. Tag: para
|
||||
#, no-c-format
|
||||
msgid "Set the following paramaters:"
|
||||
msgid "Set the following parameters:"
|
||||
msgstr ""
|
||||
|
||||
#. Tag: programlisting
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ msgstr "為了具備live migration的能力 ,libviry必須傾聽不安全的TCP
|
|||
|
||||
#. Tag: para
|
||||
#, no-c-format
|
||||
msgid "Set the following paramaters:"
|
||||
msgid "Set the following parameters:"
|
||||
msgstr "設定以下參數"
|
||||
|
||||
#. Tag: programlisting
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ public interface NetworkSubsystem {
|
|||
|
||||
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);
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ public class TemplateProfile {
|
|||
String displayText;
|
||||
Integer bits;
|
||||
Boolean passwordEnabled;
|
||||
Boolean sshKeyEnbaled;
|
||||
Boolean sshKeyEnabled;
|
||||
Boolean requiresHvm;
|
||||
String url;
|
||||
Boolean isPublic;
|
||||
|
|
@ -72,7 +72,7 @@ public class TemplateProfile {
|
|||
this.chksum = chksum;
|
||||
this.bootable = bootable;
|
||||
this.details = details;
|
||||
this.sshKeyEnbaled = sshKeyEnabled;
|
||||
this.sshKeyEnabled = sshKeyEnabled;
|
||||
}
|
||||
|
||||
public TemplateProfile(Long userId, VirtualMachineTemplate template, Long zoneId) {
|
||||
|
|
@ -246,11 +246,11 @@ public class TemplateProfile {
|
|||
}
|
||||
|
||||
public void setSshKeyEnabled(Boolean enabled) {
|
||||
this.sshKeyEnbaled = enabled;
|
||||
this.sshKeyEnabled = enabled;
|
||||
}
|
||||
|
||||
public Boolean getSshKeyEnabled() {
|
||||
return this.sshKeyEnbaled;
|
||||
return this.sshKeyEnabled;
|
||||
}
|
||||
|
||||
public String getImageStorageUri() {
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ public class TemplateObject implements TemplateInfo {
|
|||
@Inject
|
||||
ImageDataDao imageDao;
|
||||
@Inject
|
||||
ObjectInDataStoreManager ojbectInStoreMgr;
|
||||
ObjectInDataStoreManager objectInStoreMgr;
|
||||
|
||||
protected TemplateObject() {
|
||||
}
|
||||
|
|
@ -97,7 +97,7 @@ public class TemplateObject implements TemplateInfo {
|
|||
if (this.dataStore == null) {
|
||||
return image.getUrl();
|
||||
} else {
|
||||
ObjectInDataStoreVO obj = ojbectInStoreMgr.findObject(
|
||||
ObjectInDataStoreVO obj = objectInStoreMgr.findObject(
|
||||
this.imageVO.getId(), DataObjectType.TEMPLATE,
|
||||
this.dataStore.getId(), this.dataStore.getRole());
|
||||
StringBuilder builder = new StringBuilder();
|
||||
|
|
@ -124,7 +124,7 @@ public class TemplateObject implements TemplateInfo {
|
|||
if (this.dataStore == null) {
|
||||
return this.imageVO.getSize();
|
||||
}
|
||||
ObjectInDataStoreVO obj = ojbectInStoreMgr.findObject(
|
||||
ObjectInDataStoreVO obj = objectInStoreMgr.findObject(
|
||||
this.imageVO.getId(), DataObjectType.TEMPLATE,
|
||||
this.dataStore.getId(), this.dataStore.getRole());
|
||||
return obj.getSize();
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ public class VolumeObject implements VolumeInfo {
|
|||
@Inject
|
||||
VolumeManager volumeMgr;
|
||||
@Inject
|
||||
ObjectInDataStoreManager ojbectInStoreMgr;
|
||||
ObjectInDataStoreManager objectInStoreMgr;
|
||||
|
||||
protected VolumeObject() {
|
||||
|
||||
|
|
@ -122,7 +122,7 @@ public class VolumeObject implements VolumeInfo {
|
|||
if (this.dataStore == null) {
|
||||
throw new CloudRuntimeException("datastore must be set before using this object");
|
||||
}
|
||||
ObjectInDataStoreVO obj = ojbectInStoreMgr.findObject(this.volumeVO.getId(), DataObjectType.VOLUME, this.dataStore.getId(), this.dataStore.getRole());
|
||||
ObjectInDataStoreVO obj = objectInStoreMgr.findObject(this.volumeVO.getId(), DataObjectType.VOLUME, this.dataStore.getId(), this.dataStore.getRole());
|
||||
if (obj.getState() != ObjectInDataStoreStateMachine.State.Ready) {
|
||||
return this.dataStore.getUri() +
|
||||
"&" + EncodingType.OBJTYPE + "=" + DataObjectType.VOLUME +
|
||||
|
|
|
|||
|
|
@ -1438,11 +1438,11 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
|
|||
protected void assignPublicIpAddress(VirtualMachineMO vmMo, final String vmName, final String privateIpAddress, final String publicIpAddress, final boolean add, final boolean firstIP,
|
||||
final boolean sourceNat, final String vlanId, final String vlanGateway, final String vlanNetmask, final String vifMacAddress) throws Exception {
|
||||
|
||||
String publicNeworkName = HypervisorHostHelper.getPublicNetworkNamePrefix(vlanId);
|
||||
Pair<Integer, VirtualDevice> publicNicInfo = vmMo.getNicDeviceIndex(publicNeworkName);
|
||||
String publicNetworkName = HypervisorHostHelper.getPublicNetworkNamePrefix(vlanId);
|
||||
Pair<Integer, VirtualDevice> publicNicInfo = vmMo.getNicDeviceIndex(publicNetworkName);
|
||||
|
||||
if (s_logger.isDebugEnabled()) {
|
||||
s_logger.debug("Find public NIC index, public network name: " + publicNeworkName + ", index: " + publicNicInfo.first());
|
||||
s_logger.debug("Find public NIC index, public network name: " + publicNetworkName + ", index: " + publicNicInfo.first());
|
||||
}
|
||||
|
||||
boolean addVif = false;
|
||||
|
|
@ -1463,7 +1463,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
|
|||
|
||||
if (addVif) {
|
||||
plugPublicNic(vmMo, vlanId, vifMacAddress);
|
||||
publicNicInfo = vmMo.getNicDeviceIndex(publicNeworkName);
|
||||
publicNicInfo = vmMo.getNicDeviceIndex(publicNetworkName);
|
||||
if (publicNicInfo.first().intValue() >= 0) {
|
||||
networkUsage(privateIpAddress, "addVif", "eth" + publicNicInfo.first());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2226,7 +2226,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
|
|||
} else {
|
||||
network = _networkModel.getNetworkWithSecurityGroupEnabled(zoneId);
|
||||
if (network == null) {
|
||||
throw new InvalidParameterValueException("Nework id is required for Direct vlan creation ");
|
||||
throw new InvalidParameterValueException("Network id is required for Direct vlan creation ");
|
||||
}
|
||||
networkId = network.getId();
|
||||
zoneId = network.getDataCenterId();
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ public class TemplateProfile {
|
|||
String displayText;
|
||||
Integer bits;
|
||||
Boolean passwordEnabled;
|
||||
Boolean sshKeyEnbaled;
|
||||
Boolean sshKeyEnabled;
|
||||
Boolean requiresHvm;
|
||||
String url;
|
||||
Boolean isPublic;
|
||||
|
|
@ -72,7 +72,7 @@ public class TemplateProfile {
|
|||
this.chksum = chksum;
|
||||
this.bootable = bootable;
|
||||
this.details = details;
|
||||
this.sshKeyEnbaled = sshKeyEnabled;
|
||||
this.sshKeyEnabled = sshKeyEnabled;
|
||||
}
|
||||
|
||||
public TemplateProfile(Long userId, VMTemplateVO template, Long zoneId) {
|
||||
|
|
@ -246,10 +246,10 @@ public class TemplateProfile {
|
|||
}
|
||||
|
||||
public void setSshKeyEnabled(Boolean enabled) {
|
||||
this.sshKeyEnbaled = enabled;
|
||||
this.sshKeyEnabled = enabled;
|
||||
}
|
||||
|
||||
public Boolean getSshKeyEnabled() {
|
||||
return this.sshKeyEnbaled;
|
||||
return this.sshKeyEnabled;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue