Skip to content

Commit 4412cea

Browse files
authored
CA-367765: remove reference to obsolete default URL and test script (#6653)
2 parents fb23194 + 3fecb75 commit 4412cea

File tree

5 files changed

+5
-69
lines changed

5 files changed

+5
-69
lines changed

ocaml/xapi/xapi_host.ml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ let pool_size_is_restricted ~__context =
119119
not (Pool_features.is_enabled ~__context Features.Pool_size)
120120

121121
let bugreport_upload ~__context ~host:_ ~url ~options =
122+
if url = "" then
123+
raise Api_errors.(Server_error (invalid_value, ["url"; ""])) ;
122124
let proxy =
123125
if List.mem_assoc "http_proxy" options then
124126
List.assoc "http_proxy" options

ocaml/xapi/xapi_host_crashdump.ml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,5 +149,6 @@ let destroy ~__context ~self =
149149

150150
let upload ~__context ~self ~url ~options =
151151
let filename = Db.Host_crashdump.get_filename ~__context ~self in
152-
let url = if url = "" then upload_url filename else url in
152+
if url = "" then
153+
raise Api_errors.(Server_error (invalid_value, ["url"; ""])) ;
153154
do_upload "host-crash-upload" (crash_dir ^ "/" ^ filename) url options

ocaml/xapi/xapi_support.ml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,6 @@
1414
module D = Debug.Make (struct let name = "xapi_support" end)
1515

1616
open D
17-
18-
let support_url = "ftp://support.xensource.com/uploads/"
19-
20-
(* URL to which the crashdump/whatever will be uploaded *)
21-
let upload_url name =
22-
let uuid = Xapi_inventory.lookup Xapi_inventory._installation_uuid in
23-
Printf.sprintf "%s%s-%s" support_url uuid name
24-
2517
open Forkhelpers
2618

2719
let do_upload label file url options =

scripts/host-bugreport-upload

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
#
55
# Upload a bugreport to the support website
66

7-
DEFAULT_BASE_URL="ftp://support.xensource.com/uploads/"
8-
97
# If the user supplies a bare filename without a URI scheme,
108
# we ignore it -- if they _really_ want to upload named files
119
# to our support server, they can specify the URI scheme.
@@ -19,7 +17,7 @@ if [ -z "$FILENAME" ]; then
1917
. @INVENTORY@
2018
FILENAME=${INSTALLATION_UUID}-${now}
2119
fi
22-
[ ! -z "${BASE_URL}" ] || BASE_URL="${DEFAULT_BASE_URL}"
20+
[ -n "${BASE_URL}" ] || exit 1
2321

2422
URL="${BASE_URL}${FILENAME}"
2523

scripts/runtests

Lines changed: 0 additions & 57 deletions
This file was deleted.

0 commit comments

Comments
 (0)