Changing savanna-db to internal-db

* changing "savanna-db" to "internal-db" as part of the
  renaming process.

Partial-Implements:  blueprint savanna-renaming-dashboard

Change-Id: I079f012a0a4850defbfa4013dcdd6c1bb6bf2d3f
This commit is contained in:
Chad Roberts 2014-03-17 13:41:24 -04:00 committed by Gerrit Code Review
parent 81511be956
commit ddb58fa8ed
3 changed files with 7 additions and 7 deletions

View File

@ -41,7 +41,7 @@ class LabeledInput(widgets.Input):
final_attrs = self.build_attrs(attrs, type=self.input_type, name=name)
output = "<span id='%s'>%s</span>%s" %\
("id_%s_label" % name,
"savanna-db://",
"internal-db://",
('<input%s />' % flatatt(final_attrs)))
return mark_safe(output)
@ -90,7 +90,7 @@ class JobBinaryCreateForm(forms.SelfHandlingForm):
self.help_text_template = "job_binaries/_create_job_binary_help.html"
self.fields["job_binary_type"].choices =\
[("savanna-db", "Internal database"),
[("internal-db", "Internal database"),
("swift", "Swift")]
self.fields["job_binary_internal"].choices =\
@ -113,7 +113,7 @@ class JobBinaryCreateForm(forms.SelfHandlingForm):
extra = {}
bin_url = "%s://%s" % (context["job_binary_type"],
context["job_binary_url"])
if(context["job_binary_type"] == "savanna-db"):
if(context["job_binary_type"] == "internal-db"):
bin_url = self.handle_internal(request, context)
elif(context["job_binary_type"] == "swift"):
extra = self.handle_swift(request, context)
@ -165,7 +165,7 @@ class JobBinaryCreateForm(forms.SelfHandlingForm):
context["job_binary_script"])
bin_id = result.id
return "savanna-db://%s" % bin_id
return "internal-db://%s" % bin_id
def handle_swift(self, request, context):
username = context["job_binary_username"]

View File

@ -45,7 +45,7 @@ class DeleteJobBinary(tables.BatchAction):
sahara = saharaclient.client(request)
jb = sahara.job_binaries.get(obj_id)
(jb_type, jb_internal_id) = jb.url.split("://")
if jb_type == "savanna-db":
if jb_type == "internal-db":
try:
sahara.job_binary_internals.delete(jb_internal_id)
except api_base.APIException:

View File

@ -20,8 +20,8 @@
var script_name = $("[name=job_binary_script_name]").closest(".control-group");
var script_text = $("[name=job_binary_script]").closest(".control-group");
switch($(this).val()) {
case "savanna-db":
label.html("savanna-db://");
case "internal-db":
label.html("internal-db://");
username.hide();
password.hide();
bin_file.show();