[Engine-patches] Change in ovirt-engine[master]: restapi: collection actions links doesnt have base url #8069...

[mpastern]

Michael Pasternak has uploaded a new change for review.

Change subject: restapi: collection actions links doesnt have base url #806916
......................................................................

restapi: collection actions links doesnt have base url #806916

Change-Id: I6d07308d595d4e0b72893e50efe293b8dde8eef4
Signed-off-by: Michael Pasternak <mpast...@redhat.com>
---
M 
backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/ActionsBuilder.java
M 
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java
M 
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResourceTest.java
3 files changed, 11 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/23/7723/1

diff --git 
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/ActionsBuilder.java
 
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/ActionsBuilder.java
index 8c15e18..f4be566 100644
--- 
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/ActionsBuilder.java
+++ 
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/ActionsBuilder.java
@@ -28,6 +28,7 @@
 
 public class ActionsBuilder {
 
+    private static final String URL_SEPARATOR  = "/";
     private UriBuilder uriBuilder;
     private Class<?> service;
     UriInfo uriInfo;
@@ -58,7 +59,10 @@
                     URI uri = uriBuilder.clone().path(path.value()).build();
                     link.setHref(uri.toString());
                 } else {
-                    link.setHref(this.uriInfo.getPath()+'/'+link.getRel());
+                    link.setHref(this.uriInfo.getBaseUri().getPath() +
+                                 this.uriInfo.getPath().substring(1) +
+                                 URL_SEPARATOR +
+                                 link.getRel());
                 }
                 if (actions == null) {
                     actions = new Actions();
diff --git 
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java
 
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java
index 446d990..d4f4548 100644
--- 
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java
+++ 
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java
@@ -146,8 +146,12 @@
     }
 
     protected UriInfo setUpBasicUriExpectations(String path) {
-        UriInfo uriInfo = setUpBasicUriExpectations();
+        UriInfo uriInfo = control.createMock(UriInfo.class);
+        URI baseUri = URI.create(URI_BASE + '/');
+
+        expect(uriInfo.getBaseUri()).andReturn(baseUri).anyTimes();
         expect(uriInfo.getPath()).andReturn(path).anyTimes();
+
         return uriInfo;
     }
 
diff --git 
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResourceTest.java
 
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResourceTest.java
index 4001d76..5b51311 100644
--- 
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResourceTest.java
+++ 
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResourceTest.java
@@ -53,7 +53,7 @@
     private static final InterfaceStatus NIC_STATUS = InterfaceStatus.Up;
     private static final NetworkBootProtocol BOOT_PROTOCOL = 
NetworkBootProtocol.StaticIp;
     private static final String SETUPNETWORKS_ACTION_BASE_URL = 
"/hosts/00000000-0000-0000-0000-000000000000/nics";
-    private static final String SETUPNETWORKS_ACTION_URL = 
"/hosts/00000000-0000-0000-0000-000000000000/nics/setupnetworks";
+    private static final String SETUPNETWORKS_ACTION_URL = 
"/api/hosts/00000000-0000-0000-0000-000000000000/nics/setupnetworks";
     private static final String SETUPNETWORKS_ACTION_REL = "setupnetworks";
 
     public BackendHostNicsResourceTest() {


--
To view, visit http://gerrit.ovirt.org/7723
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d07308d595d4e0b72893e50efe293b8dde8eef4
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Michael Pasternak <mpast...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches