Fix broken portlets

vmware · Mar 24, 2017 · 404f8c2 · 404f8c2
1 parent 254aa95
commit 404f8c2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/ui/vic-ui-h5c/vic-service/src/main/java/com/vmware/vic/PropFetcher.java b/ui/vic-ui-h5c/vic-service/src/main/java/com/vmware/vic/PropFetcher.java
@@ -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;

diff --git a/ui/vic-ui-h5c/vic-service/src/main/java/com/vmware/vic/model/ContainerVm.java b/ui/vic-ui-h5c/vic-service/src/main/java/com/vmware/vic/model/ContainerVm.java
@@ -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 =

diff --git a/ui/vic-ui-h5c/vic-service/src/test/java/com/vmware/vic/test/Common.java b/ui/vic-ui-h5c/vic-service/src/test/java/com/vmware/vic/test/Common.java
@@ -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);
 

diff --git a/ui/vic-ui-h5c/vic/src/vic-app/src/app/vm.constants.ts b/ui/vic-ui-h5c/vic/src/vic-app/src/app/vm.constants.ts
@@ -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';