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

Merge remote-tracking branch 'origin/4.15'

Browse Source
This commit is contained in:
Rohit Yadav 2021-01-05 15:25:39 +05:30
commit 015bb20caa
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2352,7 +2352,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
// Validate network offering // Validate network offering
if (ntwkOff.getState() != NetworkOffering.State.Enabled) { if (ntwkOff.getState() != NetworkOffering.State.Enabled) {
// see NetworkOfferingVO // see NetworkOfferingVO
final InvalidParameterValueException ex = new InvalidParameterValueException("Can't use specified network offering id as its stat is not " + NetworkOffering.State.Enabled); final InvalidParameterValueException ex = new InvalidParameterValueException("Can't use specified network offering id as its state is not " + NetworkOffering.State.Enabled);
ex.addProxyObject(ntwkOff.getUuid(), "networkOfferingId"); ex.addProxyObject(ntwkOff.getUuid(), "networkOfferingId");
throw ex; throw ex;
} }

2
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDisk.java
View File

@ -29,7 +29,7 @@ public class KVMPhysicalDisk {
rbdOpts = "rbd:" + image; rbdOpts = "rbd:" + image;
rbdOpts += ":mon_host=" + monHost; rbdOpts += ":mon_host=" + monHost;
if (monPort > 0) { if (monPort > 0) {
rbdOpts += "\\\\:" + monPort; rbdOpts += "\\:" + monPort;
} }
if (authUserName == null) { if (authUserName == null) {

2
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDiskTest.java
View File

@ -25,7 +25,7 @@ public class KVMPhysicalDiskTest extends TestCase {
public void testRBDStringBuilder() { public void testRBDStringBuilder() {
assertEquals(KVMPhysicalDisk.RBDStringBuilder("ceph-monitor", 8000, "admin", "supersecret", "volume1"), assertEquals(KVMPhysicalDisk.RBDStringBuilder("ceph-monitor", 8000, "admin", "supersecret", "volume1"),
"rbd:volume1:mon_host=ceph-monitor\\\\:8000:auth_supported=cephx:id=admin:key=supersecret:rbd_default_format=2:client_mount_timeout=30"); "rbd:volume1:mon_host=ceph-monitor\\:8000:auth_supported=cephx:id=admin:key=supersecret:rbd_default_format=2:client_mount_timeout=30");
} }
public void testAttributes() { public void testAttributes() {