Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix broken portlets #4386

Merged
merged 1 commit into from
Mar 24, 2017
Merged

Fix broken portlets #4386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ui/vic-ui-h5c/vic-service/src/main/java/com/vmware/vic/PropFetcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ public class PropFetcher implements ClientSessionEndListener {
private static final Log _logger = LogFactory.getLog(PropFetcher.class);
private static VimPortType _vimPort = initializeVimPort();
private static final String[] VIC_VM_TYPES = {"isVCH", "isContainer"};
private static final String EXTRACONFIG_VCH_PATH = "guestinfo.vice./init/common/name";
private static final String EXTRACONFIG_CONTAINER_PATH = "guestinfo.vice./common/name";
private static final String EXTRACONFIG_VCH_PATH = "init/common/name";
private static final String EXTRACONFIG_CONTAINER_PATH = "common/name";
private static final String SERVICE_INSTANCE = "ServiceInstance";
private static final Set<String> _thumbprints = new HashSet<String>();
private final UserSessionService _userSessionService;
Expand Down
2 changes: 1 addition & 1 deletion ui/vic-ui-h5c/vic-service/src/main/java/com/vmware/vic/model/ContainerVm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

public class ContainerVm extends VicBaseVm {
private static final String EXTRACONFIG_CONTAINER_NAME_KEY =
"guestinfo.vice./common/name";
"common/name";
private static final String EXTRACONFIG_IMAGE_NAME_KEY =
"guestinfo.vice./repo";
private static final String EXTRACONFIG_PORTMAPPING_KEY =
Expand Down
2 changes: 1 addition & 1 deletion ui/vic-ui-h5c/vic-service/src/test/java/com/vmware/vic/test/Common.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ protected ContainerVm getMockedContainerVm(
List<OptionValue> ovList = new ArrayList<OptionValue>();

OptionValue ovContainerNameKey = new OptionValue();
ovContainerNameKey.setKey("guestinfo.vice./common/name");
ovContainerNameKey.setKey("common/name");
ovContainerNameKey.setValue(containerName);
ovList.add(ovContainerNameKey);

Expand Down
2 changes: 1 addition & 1 deletion ui/vic-ui-h5c/vic/src/vic-app/src/app/vm.constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const VM_PROPERTIES_TO_EXTRACT = [
];
export const CONTAINER_VM_IMAGE_NAME_KEY = 'guestinfo.vice./repo';
export const CONTAINER_VM_PORTMAPPING_KEY = 'guestinfo.vice./networks|bridge/ports~';
export const CONTAINER_PRETTY_NAME_KEY = 'guestinfo.vice./common/name';
export const CONTAINER_PRETTY_NAME_KEY = 'common/name';
export const VCH_VM_CLIENT_IP_KEY = 'guestinfo.vice..init.networks|client.assigned.IP';
export const VCH_VM_ENDPOINT_PORT = ':2376';
export const VCH_VM_LOG_PORT = ':2378';