20319: Move /containers/*/log to /container_requests/*/log.

[arvados.git] / lib / controller / router / router_test.go

diff --git a/lib/controller/router/router_test.go b/lib/controller/router/router_test.go
index b194bd22261aad3990f53826f96965cd30df26be..0a85dcbf659bfa74b245ff5fcaab2da517e06a86 100644 (file)
--- a/lib/controller/router/router_test.go
+++ b/lib/controller/router/router_test.go
@@ -177,92 +177,92 @@ func (s *RouterSuite) TestOptions(c *check.C) {
                {
                        comment:    "container log webdav GET root",
                        method:     "GET",
-                       path:       "/arvados/v1/containers/" + arvadostest.CompletedContainerUUID + "/log/",
-                       shouldCall: "ContainerLog",
+                       path:       "/arvados/v1/container_requests/" + arvadostest.CompletedContainerRequestUUID + "/log/" + arvadostest.CompletedContainerUUID + "/",
+                       shouldCall: "ContainerRequestLog",
                        withOptions: arvados.ContainerLogOptions{
-                               UUID: arvadostest.CompletedContainerUUID,
+                               UUID: arvadostest.CompletedContainerRequestUUID,
                                WebDAVOptions: arvados.WebDAVOptions{
                                        Method: "GET",
                                        Header: http.Header{"Authorization": {"Bearer " + arvadostest.ActiveToken}},
-                                       Path:   "/"}},
+                                       Path:   "/" + arvadostest.CompletedContainerUUID + "/"}},
                },
                {
                        comment:    "container log webdav GET root without trailing slash",
                        method:     "GET",
-                       path:       "/arvados/v1/containers/" + arvadostest.CompletedContainerUUID + "/log",
-                       shouldCall: "ContainerLog",
+                       path:       "/arvados/v1/container_requests/" + arvadostest.CompletedContainerRequestUUID + "/log/" + arvadostest.CompletedContainerUUID + "",
+                       shouldCall: "ContainerRequestLog",
                        withOptions: arvados.ContainerLogOptions{
-                               UUID: arvadostest.CompletedContainerUUID,
+                               UUID: arvadostest.CompletedContainerRequestUUID,
                                WebDAVOptions: arvados.WebDAVOptions{
                                        Method: "GET",
                                        Header: http.Header{"Authorization": {"Bearer " + arvadostest.ActiveToken}},
-                                       Path:   ""}},
+                                       Path:   "/" + arvadostest.CompletedContainerUUID}},
                },
                {
                        comment:    "container log webdav OPTIONS root",
                        method:     "OPTIONS",
-                       path:       "/arvados/v1/containers/" + arvadostest.CompletedContainerUUID + "/log/",
-                       shouldCall: "ContainerLog",
+                       path:       "/arvados/v1/container_requests/" + arvadostest.CompletedContainerRequestUUID + "/log/" + arvadostest.CompletedContainerUUID + "/",
+                       shouldCall: "ContainerRequestLog",
                        withOptions: arvados.ContainerLogOptions{
-                               UUID: arvadostest.CompletedContainerUUID,
+                               UUID: arvadostest.CompletedContainerRequestUUID,
                                WebDAVOptions: arvados.WebDAVOptions{
                                        Method: "OPTIONS",
                                        Header: http.Header{"Authorization": {"Bearer " + arvadostest.ActiveToken}},
-                                       Path:   "/"}},
+                                       Path:   "/" + arvadostest.CompletedContainerUUID + "/"}},
                },
                {
                        comment:    "container log webdav OPTIONS root without trailing slash",
                        method:     "OPTIONS",
-                       path:       "/arvados/v1/containers/" + arvadostest.CompletedContainerUUID + "/log",
-                       shouldCall: "ContainerLog",
+                       path:       "/arvados/v1/container_requests/" + arvadostest.CompletedContainerRequestUUID + "/log/" + arvadostest.CompletedContainerUUID,
+                       shouldCall: "ContainerRequestLog",
                        withOptions: arvados.ContainerLogOptions{
-                               UUID: arvadostest.CompletedContainerUUID,
+                               UUID: arvadostest.CompletedContainerRequestUUID,
                                WebDAVOptions: arvados.WebDAVOptions{
                                        Method: "OPTIONS",
                                        Header: http.Header{"Authorization": {"Bearer " + arvadostest.ActiveToken}},
-                                       Path:   ""}},
+                                       Path:   "/" + arvadostest.CompletedContainerUUID}},
                },
                {
                        comment:    "container log webdav PROPFIND root",
                        method:     "PROPFIND",
-                       path:       "/arvados/v1/containers/" + arvadostest.CompletedContainerUUID + "/log/",
-                       shouldCall: "ContainerLog",
+                       path:       "/arvados/v1/container_requests/" + arvadostest.CompletedContainerRequestUUID + "/log/" + arvadostest.CompletedContainerUUID + "/",
+                       shouldCall: "ContainerRequestLog",
                        withOptions: arvados.ContainerLogOptions{
-                               UUID: arvadostest.CompletedContainerUUID,
+                               UUID: arvadostest.CompletedContainerRequestUUID,
                                WebDAVOptions: arvados.WebDAVOptions{
                                        Method: "PROPFIND",
                                        Header: http.Header{"Authorization": {"Bearer " + arvadostest.ActiveToken}},
-                                       Path:   "/"}},
+                                       Path:   "/" + arvadostest.CompletedContainerUUID + "/"}},
                },
                {
                        comment:    "container log webdav PROPFIND root without trailing slash",
                        method:     "PROPFIND",
-                       path:       "/arvados/v1/containers/" + arvadostest.CompletedContainerUUID + "/log",
-                       shouldCall: "ContainerLog",
+                       path:       "/arvados/v1/container_requests/" + arvadostest.CompletedContainerRequestUUID + "/log/" + arvadostest.CompletedContainerUUID + "",
+                       shouldCall: "ContainerRequestLog",
                        withOptions: arvados.ContainerLogOptions{
-                               UUID: arvadostest.CompletedContainerUUID,
+                               UUID: arvadostest.CompletedContainerRequestUUID,
                                WebDAVOptions: arvados.WebDAVOptions{
                                        Method: "PROPFIND",
                                        Header: http.Header{"Authorization": {"Bearer " + arvadostest.ActiveToken}},
-                                       Path:   ""}},
+                                       Path:   "/" + arvadostest.CompletedContainerUUID}},
                },
                {
                        comment:    "container log webdav no_forward=true",
                        method:     "GET",
-                       path:       "/arvados/v1/containers/" + arvadostest.CompletedContainerUUID + "/log/?no_forward=true",
-                       shouldCall: "ContainerLog",
+                       path:       "/arvados/v1/container_requests/" + arvadostest.CompletedContainerRequestUUID + "/log/" + arvadostest.CompletedContainerUUID + "/?no_forward=true",
+                       shouldCall: "ContainerRequestLog",
                        withOptions: arvados.ContainerLogOptions{
-                               UUID:      arvadostest.CompletedContainerUUID,
+                               UUID:      arvadostest.CompletedContainerRequestUUID,
                                NoForward: true,
                                WebDAVOptions: arvados.WebDAVOptions{
                                        Method: "GET",
                                        Header: http.Header{"Authorization": {"Bearer " + arvadostest.ActiveToken}},
-                                       Path:   "/"}},
+                                       Path:   "/" + arvadostest.CompletedContainerUUID + "/"}},
                },
                {
-                       comment:      "/logX does not route to ContainerLog",
+                       comment:      "/logX does not route to ContainerRequestLog",
                        method:       "GET",
-                       path:         "/arvados/v1/containers/" + arvadostest.CompletedContainerUUID + "/logX",
+                       path:         "/arvados/v1/containers/" + arvadostest.CompletedContainerRequestUUID + "/logX",
                        shouldStatus: http.StatusNotFound,
                        shouldCall:   "",
                },