Skip to content

Commit b176648

Browse files
fmaximussmeetsrSigert Goeminne
authored and
yadvr
committed
CLOUDSTACK-9813: Extending Config Drive support (#2097)
Extending Config Drive support * Added support for VMware * Build configdrive.iso on ssvm * Added support for VPC and Isolated Networks * Moved implementation to new Service Provider * UI fix: add support for urlencoded userdata * Add support for building systemvm behind a proxy Co-Authored-By: Raf Smeets <raf.smeets@nuagenetworks.net> Co-Authored-By: Frank Maximus <frank.maximus@nuagenetworks.net> Co-Authored-By: Sigert Goeminne <sigert.goeminne@nuagenetworks.net>
1 parent 7ca4582 commit b176648

46 files changed

Lines changed: 6118 additions & 316 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎api/src/com/cloud/network/Network.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ public static class Provider {
142142
public static final Provider GloboDns = new Provider("GloboDns", true);
143143
// add Big Switch Bcf Provider
144144
public static final Provider BigSwitchBcf = new Provider("BigSwitchBcf", false);
145+
//Add ConfigDrive provider
146+
public static final Provider ConfigDrive = new Provider("ConfigDrive", false);
145147

146148
private final String name;
147149
private final boolean isExternal;

‎api/src/com/cloud/network/NetworkModel.java‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
package com.cloud.network;
1919

20+
import com.google.common.collect.ImmutableMap;
21+
2022
import java.util.ArrayList;
2123
import java.util.List;
2224
import java.util.Map;
@@ -48,6 +50,28 @@
4850
* participants in the orchestration can use this interface to query the data.
4951
*/
5052
public interface NetworkModel {
53+
String METATDATA_DIR = "metadata";
54+
String USERDATA_DIR = "userdata";
55+
String USERDATA_FILE = "user_data";
56+
String PASSWORD_DIR = "password";
57+
String PASSWORD_FILE = "vm_password";
58+
String PASSWORD_CHECKSUM_FILE = "vm-password-md5checksum";
59+
String SERVICE_OFFERING_FILE = "service-offering";
60+
String AVAILABILITY_ZONE_FILE = "availability-zone";
61+
String LOCAL_HOSTNAME_FILE = "local-hostname";
62+
String INSTANCE_ID_FILE = "instance-id";
63+
String VM_ID_FILE = "vm-id";
64+
String PUBLIC_KEYS_FILE = "public-keys";
65+
String CLOUD_IDENTIFIER_FILE = "cloud-identifier";
66+
int CONFIGDATA_DIR = 0;
67+
int CONFIGDATA_FILE = 1;
68+
int CONFIGDATA_CONTENT = 2;
69+
ImmutableMap<String, String> openStackFileMapping = ImmutableMap.of(
70+
AVAILABILITY_ZONE_FILE, "availability_zone",
71+
LOCAL_HOSTNAME_FILE, "hostname",
72+
VM_ID_FILE, "uuid",
73+
INSTANCE_ID_FILE, "name"
74+
);
5175

5276
static final ConfigKey<Integer> MACIdentifier = new ConfigKey<Integer>("Advanced",Integer.class, "mac.identifier", "0",
5377
"This value will be used while generating the mac addresses for isolated and shared networks. The hexadecimal equivalent value will be present at the 2nd octet of the mac address. Default value is null which means this feature is disabled.Its scope is global.", true, ConfigKey.Scope.Global);

‎api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
import java.util.List;
2525
import java.util.Map;
2626

27+
import org.apache.log4j.Logger;
28+
2729
import org.apache.cloudstack.acl.RoleType;
2830
import org.apache.cloudstack.affinity.AffinityGroupResponse;
2931
import org.apache.cloudstack.api.ACL;
@@ -47,7 +49,6 @@
4749
import org.apache.cloudstack.api.response.ZoneResponse;
4850
import org.apache.cloudstack.context.CallContext;
4951
import org.apache.commons.collections.MapUtils;
50-
import org.apache.log4j.Logger;
5152

5253
import com.cloud.event.EventTypes;
5354
import com.cloud.exception.ConcurrentOperationException;

‎api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
import java.util.List;
2222
import java.util.Map;
2323

24+
import org.apache.log4j.Logger;
25+
2426
import org.apache.cloudstack.acl.RoleType;
2527
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
2628
import org.apache.cloudstack.api.ACL;
@@ -35,7 +37,6 @@
3537
import org.apache.cloudstack.api.response.SecurityGroupResponse;
3638
import org.apache.cloudstack.api.response.UserVmResponse;
3739
import org.apache.cloudstack.context.CallContext;
38-
import org.apache.log4j.Logger;
3940

4041
import com.cloud.exception.InsufficientCapacityException;
4142
import com.cloud.exception.ResourceUnavailableException;

‎core/src/com/cloud/agent/api/AttachIsoAnswer.java‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
17+
package com.cloud.agent.api;
18+
19+
20+
public class AttachIsoAnswer extends Answer {
21+
private Integer deviceKey;
22+
23+
24+
public AttachIsoAnswer(AttachIsoCommand cmd, String result) {
25+
super(cmd, false, result);
26+
this.deviceKey = null;
27+
}
28+
29+
public AttachIsoAnswer(AttachIsoCommand cmd, Integer deviceId) {
30+
super(cmd);
31+
this.deviceKey = deviceId;
32+
}
33+
34+
public AttachIsoAnswer(AttachIsoCommand cmd) {
35+
super(cmd);
36+
this.deviceKey = null;
37+
}
38+
39+
public AttachIsoAnswer(AttachIsoCommand command, boolean success, String details) {
40+
super(command,success,details);
41+
this.deviceKey = null;
42+
}
43+
44+
public AttachIsoAnswer(Command command, Exception e) {
45+
super(command, e);
46+
}
47+
48+
public Integer getDeviceKey() {
49+
return deviceKey;
50+
}
51+
52+
public void setDeviceKey(Integer deviceKey) {
53+
this.deviceKey = deviceKey;
54+
}
55+
}

‎core/src/com/cloud/agent/api/AttachIsoCommand.java‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,22 @@ public class AttachIsoCommand extends Command {
2525
private String storeUrl;
2626
private String isoPath;
2727
private boolean attach;
28+
private Integer deviceKey;
29+
private boolean force;
2830

2931
protected AttachIsoCommand() {
3032
}
3133

32-
public AttachIsoCommand(String vmName, String isoPath, boolean attach) {
34+
public AttachIsoCommand(String vmName, String isoPath, boolean attach, Integer deviceKey, boolean force) {
3335
this.vmName = vmName;
3436
this.isoPath = isoPath;
3537
this.attach = attach;
38+
this.deviceKey = deviceKey;
39+
this.force = force;
40+
}
41+
42+
public AttachIsoCommand(String vmName, String isoPath, boolean attach) {
43+
this(vmName, isoPath, attach, null, false);
3644
}
3745

3846
@Override
@@ -52,11 +60,27 @@ public boolean isAttach() {
5260
return attach;
5361
}
5462

63+
public void setAttach(boolean attach) {
64+
this.attach = attach;
65+
}
66+
5567
public String getStoreUrl() {
5668
return storeUrl;
5769
}
5870

5971
public void setStoreUrl(String url) {
6072
storeUrl = url;
6173
}
74+
75+
public void setDeviceKey(Integer deviceKey) {
76+
this.deviceKey = deviceKey;
77+
}
78+
79+
public Integer getDeviceKey() {
80+
return deviceKey;
81+
}
82+
83+
public boolean isForce() {
84+
return force;
85+
}
6286
}

‎core/src/com/cloud/agent/api/HandleConfigDriveIsoCommand.java‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
//
2+
// Licensed to the Apache Software Foundation (ASF) under one
3+
// or more contributor license agreements. See the NOTICE file
4+
// distributed with this work for additional information
5+
// regarding copyright ownership. The ASF licenses this file
6+
// to you under the Apache License, Version 2.0 (the
7+
// "License"); you may not use this file except in compliance
8+
// with the License. You may obtain a copy of the License at
9+
//
10+
// http://www.apache.org/licenses/LICENSE-2.0
11+
//
12+
// Unless required by applicable law or agreed to in writing,
13+
// software distributed under the License is distributed on an
14+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
// KIND, either express or implied. See the License for the
16+
// specific language governing permissions and limitations
17+
// under the License.
18+
//
19+
20+
package com.cloud.agent.api;
21+
22+
import java.util.List;
23+
24+
import com.cloud.agent.api.to.DataStoreTO;
25+
26+
public class HandleConfigDriveIsoCommand extends Command {
27+
28+
String isoFile;
29+
List<String[]> vmData;
30+
String configDriveLabel;
31+
boolean create = false;
32+
private boolean update = false;
33+
private DataStoreTO destStore;
34+
35+
public HandleConfigDriveIsoCommand(List<String[]> vmData, String label, DataStoreTO destStore, String isoFile, boolean create, boolean update) {
36+
this.vmData = vmData;
37+
this.configDriveLabel = label;
38+
this.create = create;
39+
this.update = update;
40+
this.destStore = destStore;
41+
42+
43+
this.isoFile = isoFile;
44+
}
45+
46+
@Override
47+
public boolean executeInSequence() {
48+
return false;
49+
}
50+
51+
public List<String[]> getVmData() {
52+
return vmData;
53+
}
54+
55+
public void setVmData(List<String[]> vmData) {
56+
this.vmData = vmData;
57+
}
58+
59+
public boolean isCreate() {
60+
return create;
61+
}
62+
63+
public String getConfigDriveLabel() {
64+
return configDriveLabel;
65+
}
66+
67+
public DataStoreTO getDestStore() {
68+
return destStore;
69+
}
70+
71+
public String getIsoFile() {
72+
return isoFile;
73+
}
74+
75+
public boolean isUpdate() {
76+
return update;
77+
}
78+
}

‎core/test/org/apache/cloudstack/api/agent/test/AttachIsoCommandTest.java‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,24 @@
1919

2020
package org.apache.cloudstack.api.agent.test;
2121

22+
import org.junit.Assert;
23+
import org.junit.Test;
24+
25+
import com.google.gson.Gson;
26+
27+
import com.cloud.agent.api.AttachIsoCommand;
28+
import com.cloud.agent.api.Command;
29+
import com.cloud.serializer.GsonHelper;
30+
2231
import static org.junit.Assert.assertEquals;
2332
import static org.junit.Assert.assertFalse;
2433
import static org.junit.Assert.assertTrue;
2534

26-
import org.junit.Test;
35+
public class AttachIsoCommandTest {
2736

28-
import com.cloud.agent.api.AttachIsoCommand;
37+
private static final Gson s_gson = GsonHelper.getGson();
2938

30-
public class AttachIsoCommandTest {
31-
AttachIsoCommand aic = new AttachIsoCommand("vmname", "isopath", false);
39+
AttachIsoCommand aic = new AttachIsoCommand("vmname", "isopath", false, 1, true);
3240

3341
@Test
3442
public void testGetVmName() {
@@ -80,4 +88,17 @@ public void testGetWait() {
8088
b = aic.getWait();
8189
assertEquals(b, 0);
8290
}
91+
92+
@Test
93+
public void testSerialization() {
94+
AttachIsoCommand after = serializeAndDeserialize(aic);
95+
Assert.assertEquals(aic, after);
96+
}
97+
98+
private <T extends Command> T serializeAndDeserialize(T command) {
99+
final String json = s_gson.toJson(new Command[] {command});
100+
Command[] forwardedCommands = s_gson.fromJson(json, Command[].class);
101+
return (T) forwardedCommands[0];
102+
}
103+
83104
}

‎engine/api/src/com/cloud/vm/VirtualMachineManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public interface VirtualMachineManager extends Manager {
5252
static final ConfigKey<Boolean> ExecuteInSequence = new ConfigKey<Boolean>("Advanced", Boolean.class, "execute.in.sequence.hypervisor.commands", "false",
5353
"If set to true, start, stop, reboot, copy and migrate commands will be serialized on the agent side. If set to false the commands are executed in parallel. Default value is false.", false);
5454

55-
static final ConfigKey<String> VmConfigDriveLabel = new ConfigKey<String>("Hidden", String.class, "vm.configdrive.label", "config",
55+
static final ConfigKey<String> VmConfigDriveLabel = new ConfigKey<String>("Hidden", String.class, "vm.configdrive.label", "config-2",
5656
"The default label name for the config drive", false);
5757

5858
public interface Topics {

‎plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import java.util.concurrent.ConcurrentHashMap;
4242
import java.util.regex.Matcher;
4343
import java.util.regex.Pattern;
44-
4544
import javax.naming.ConfigurationException;
4645
import javax.xml.parsers.DocumentBuilder;
4746
import javax.xml.parsers.DocumentBuilderFactory;
@@ -69,7 +68,6 @@
6968
import org.w3c.dom.NodeList;
7069
import org.xml.sax.InputSource;
7170
import org.xml.sax.SAXException;
72-
7371
import com.google.common.base.Strings;
7472

7573
import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
@@ -2251,16 +2249,15 @@ public int compare(final DiskTO arg0, final DiskTO arg1) {
22512249
DiskDef.DiskBus diskBusTypeData = (diskBusType == DiskDef.DiskBus.SCSI) ? diskBusType : DiskDef.DiskBus.VIRTIO;
22522250

22532251
final DiskDef disk = new DiskDef();
2252+
int devId = volume.getDiskSeq().intValue();
22542253
if (volume.getType() == Volume.Type.ISO) {
22552254
if (volPath == null) {
22562255
/* Add iso as placeholder */
2257-
disk.defISODisk(null);
2256+
disk.defISODisk(null, devId);
22582257
} else {
2259-
disk.defISODisk(volPath);
2258+
disk.defISODisk(volPath, devId);
22602259
}
22612260
} else {
2262-
final int devId = volume.getDiskSeq().intValue();
2263-
22642261
if (diskBusType == DiskDef.DiskBus.SCSI ) {
22652262
disk.setQemuDriver(true);
22662263
disk.setDiscard(DiscardType.UNMAP);
@@ -2390,9 +2387,9 @@ protected KVMStoragePoolManager getPoolManager() {
23902387
return _storagePoolMgr;
23912388
}
23922389

2393-
public synchronized String attachOrDetachISO(final Connect conn, final String vmName, String isoPath, final boolean isAttach) throws LibvirtException, URISyntaxException,
2390+
public synchronized String attachOrDetachISO(final Connect conn, final String vmName, String isoPath, final boolean isAttach, final Integer diskSeq) throws LibvirtException, URISyntaxException,
23942391
InternalErrorException {
2395-
String isoXml = null;
2392+
final DiskDef iso = new DiskDef();
23962393
if (isoPath != null && isAttach) {
23972394
final int index = isoPath.lastIndexOf("/");
23982395
final String path = isoPath.substring(0, index);
@@ -2401,20 +2398,17 @@ public synchronized String attachOrDetachISO(final Connect conn, final String vm
24012398
final KVMPhysicalDisk isoVol = secondaryPool.getPhysicalDisk(name);
24022399
isoPath = isoVol.getPath();
24032400

2404-
final DiskDef iso = new DiskDef();
2405-
iso.defISODisk(isoPath);
2406-
isoXml = iso.toString();
2401+
iso.defISODisk(isoPath, diskSeq);
24072402
} else {
2408-
final DiskDef iso = new DiskDef();
2409-
iso.defISODisk(null);
2410-
isoXml = iso.toString();
2403+
iso.defISODisk(null, diskSeq);
24112404
}
24122405

2413-
final List<DiskDef> disks = getDisks(conn, vmName);
2414-
final String result = attachOrDetachDevice(conn, true, vmName, isoXml);
2406+
final String result = attachOrDetachDevice(conn, true, vmName, iso.toString());
24152407
if (result == null && !isAttach) {
2408+
final List<DiskDef> disks = getDisks(conn, vmName);
24162409
for (final DiskDef disk : disks) {
2417-
if (disk.getDeviceType() == DiskDef.DeviceType.CDROM) {
2410+
if (disk.getDeviceType() == DiskDef.DeviceType.CDROM
2411+
&& (diskSeq == null || disk.getDiskLabel() == iso.getDiskLabel())) {
24182412
cleanupDisk(disk);
24192413
}
24202414
}

0 commit comments

Comments
 (0)