Skip to content
This repository was archived by the owner on Jul 26, 2022. It is now read-only.

Make not reseting the password on vm creation the default #3

Open
benmathews wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Make not reseting the password on vm creation the default #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
40de7b1
Fix minor visual issues with README
LordGaav Jul 4, 2013
c4da02c
Add debian packaging stuff
LordGaav Aug 29, 2013
0aca2a8
Bump version, update changelog
LordGaav Aug 29, 2013
153a7df
make the default to NOT change the password
benmathews Sep 23, 2013
ca15ff6
Merge remote branch 'upstream/master'
benmathews Sep 23, 2013
ee923a3
allocate addresses with DHCP
benmathews Sep 23, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/nl/cyso/vcloud/client/Entry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public static void main(String[] args) {
Formatter.printBorderedInfo(Configuration.dumpToString(ModeType.ADDVM));

Formatter.waitForTaskCompletion(client.addVM(Configuration.getOrganization(), Configuration.getVDC(), Configuration.getVApp(), Configuration.getCatalog(), Configuration.getTemplate(), Configuration.getFqdn(), Configuration.getDescription(), Configuration.getIp().getHostAddress(), Configuration.getNetwork()));
Formatter.waitForTaskCompletion(client.setGuestCustomizations(Configuration.getOrganization(), Configuration.getVDC(), Configuration.getVApp(), Configuration.getFqdn(), true));
Formatter.waitForTaskCompletion(client.setGuestCustomizations(Configuration.getOrganization(), Configuration.getVDC(), Configuration.getVApp(), Configuration.getFqdn(), false));
} else if (Configuration.getMode() == ModeType.REMOVEVM || Configuration.getMode() == ModeType.POWERONVM || Configuration.getMode() == ModeType.POWEROFFVM || Configuration.getMode() == ModeType.SHUTDOWNVM || Configuration.getMode() == ModeType.CONSOLIDATEVM) {
Configuration.load(Configuration.getMode(), args);
Formatter.printBorderedInfo(Configuration.dumpToString(Configuration.getMode()));
Expand Down
6 changes: 3 additions & 3 deletions src/nl/cyso/vcloud/client/vCloudClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ public Task addVM(String org, String vdc, String vapp, String catalog, String te
NetworkConnectionType nw = new NetworkConnectionType();
nw.setIpAddress(ip);
nw.setMACAddress(null);
nw.setIpAddressAllocationMode("MANUAL");
nw.setIpAddressAllocationMode("DHCP");
nw.setNetwork(network);
nw.setIsConnected(true);

Expand All @@ -541,8 +541,8 @@ public Task addVM(String org, String vdc, String vapp, String catalog, String te
GuestCustomizationSectionType guest = new GuestCustomizationSectionType();
guest.setInfo(new MsgType());
guest.setComputerName(fqdnParts[0]);
guest.setAdminPasswordAuto(true);
guest.setAdminPasswordEnabled(true);
guest.setAdminPasswordAuto(false);
guest.setAdminPasswordEnabled(false);
guest.setEnabled(true);
sections.add(new ObjectFactory().createGuestCustomizationSection(guest));

Expand Down