bug fixing

woorea · woorea · commit fedd62d593f8 · 2012-03-16T03:30:39.000+01:00
diff --git a/openstack-ui/src/main/java/org/openstack/ui/client/api/OpenStackClient.java b/openstack-ui/src/main/java/org/openstack/ui/client/api/OpenStackClient.java
@@ -31,10 +31,12 @@ public static List<KeyStoneTenant> getTenants() {
 	}
 	
 	public static String getComputeURL() {
-		return  "http://192.168.1.45:8774/v2/" + getTenant();
+		return session.getBestEndpoint("compute");
+		// return  "http://192.168.1.45:8774/v2/" + getTenant();
 	}
 
 	public static String getIdentityURL() {
-		return "http://192.168.1.45:5000/v2.0";
+		return session.getBestEndpoint("identity");
+		// return "http://192.168.1.45:5000/v2.0";
 	}
 }
diff --git a/openstack-ui/src/main/java/org/openstack/ui/client/view/identity/tenant/TenantsActivity.java b/openstack-ui/src/main/java/org/openstack/ui/client/view/identity/tenant/TenantsActivity.java
@@ -40,7 +40,7 @@ public void start(AcceptsOneWidget panel, EventBus eventBus) {
 
 			@Override
 			protected void onRangeChanged(HasData<KeyStoneTenant> display) {
-				OpenStackClient.IDENTITY.listTenants(OpenStackClient.getComputeURL(), OpenStackClient.getToken(), new DefaultAsyncCallback<KeyStoneTenantList>() {
+				OpenStackClient.IDENTITY.listTenants(OpenStackClient.getIdentityURL(), OpenStackClient.getToken(), new DefaultAsyncCallback<KeyStoneTenantList>() {
 
 					@Override
 					public void onSuccess(KeyStoneTenantList result) {

Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,12 @@ public static List<KeyStoneTenant> getTenants() {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public static String getComputeURL() {`
`34`		`- return "http://192.168.1.45:8774/v2/" + getTenant();`
	`34`	`+ return session.getBestEndpoint("compute");`
	`35`	`+ // return "http://192.168.1.45:8774/v2/" + getTenant();`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`public static String getIdentityURL() {`
`38`		`- return "http://192.168.1.45:5000/v2.0";`
	`39`	`+ return session.getBestEndpoint("identity");`
	`40`	`+ // return "http://192.168.1.45:5000/v2.0";`
`39`	`41`	`}`
`40`	`42`	`}`