You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2018/07/09 14:26:45 UTC
[trafficcontrol] 06/08: code cleanup
This is an automated email from the ASF dual-hosted git repository.
mitchell852 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit 7454c5ed8762c75aed1eede2f8d3c1089b995e1d
Author: Jesse Rivas <je...@comcast.com>
AuthorDate: Tue Jul 3 11:03:16 2018 -0600
code cleanup
---
traffic_ops/app/lib/API/Iso.pm | 12 +++++------
traffic_ops/app/lib/UI/GenIso.pm | 23 ++++++++++------------
traffic_ops/app/templates/gen_iso/geniso.html.ep | 2 +-
traffic_portal/app/src/common/api/ToolsService.js | 3 ++-
.../common/modules/form/iso/FormISOController.js | 6 ++++--
.../src/common/modules/form/iso/form.iso.tpl.html | 2 --
traffic_portal/app/src/index.html | 2 --
traffic_portal/package.json | 4 ----
8 files changed, 22 insertions(+), 32 deletions(-)
diff --git a/traffic_ops/app/lib/API/Iso.pm b/traffic_ops/app/lib/API/Iso.pm
index d080f96..856fc02 100644
--- a/traffic_ops/app/lib/API/Iso.pm
+++ b/traffic_ops/app/lib/API/Iso.pm
@@ -83,9 +83,9 @@ sub generate {
my $response = $self->generate_iso($params);
- if ( index( $params->{stream}, "yes" ) != -1 ) {
+ if ( $params->{stream} eq 'yes' ) {
$self->res->headers->content_type("application/download");
- $self->res->headers->content_disposition("attachment; filename=\"$response->{name}\"");
+ $self->res->headers->content_disposition("attachment; filename=\"$response->{isoName}\"");
return $self->render( data => $response->{iso} );
} else {
@@ -248,19 +248,17 @@ sub generate_iso {
&log($self, "ISO created [ " . $osversion_dir . " ] for " . $fqdn, "APICHANGE");
- #my $iso_url = join("/", $config->{'to'}{'base_url'}, $iso_dir, $iso_file_name);
- my $iso_url = join("/", "https://" . hostfqdn(), $iso_dir, $iso_file_name);
+ my $iso_url = join("/", "https://" . lc hostfqdn(), $iso_dir, $iso_file_name);
$response = {
isoName => $iso_file_name,
isoURL => $iso_url,
};
- }
- else {
+ } else {
my $data = `$cmd`;
$response = {
iso => $data,
- name => $iso_file_name,
+ isoName => $iso_file_name,
};
}
return $response;
diff --git a/traffic_ops/app/lib/UI/GenIso.pm b/traffic_ops/app/lib/UI/GenIso.pm
index 0ed3d07..995132a 100644
--- a/traffic_ops/app/lib/UI/GenIso.pm
+++ b/traffic_ops/app/lib/UI/GenIso.pm
@@ -40,23 +40,20 @@ sub geniso {
&navbarpage($self);
my %serverselect;
- my $rs_server = $self->db->resultset('Server')->search(undef,
- { columns => [ qw/id host_name domain_name/ ], orderby => "host_name" });
+ my $rs_server = $self->db->resultset('Server')->search( undef, { columns => [qw/id host_name domain_name/], orderby => "host_name" } );
- while (my $row = $rs_server->next) {
+ while ( my $row = $rs_server->next ) {
my $fqdn = $row->host_name . "." . $row->domain_name;
$serverselect{$fqdn} = $row->id;
}
my $osversionsdir;
# my $ksdir = $self->db->resultset('Parameter')->search( { and => [ name => $ksfiles_parm_name, config_file => $ksfiles_configfile_name ] } )->get_column('value')->single();
- my $ksdir = $self->db->resultset('Parameter')->search({ -and =>
- [ name => $ksfiles_parm_name, config_file => $ksfiles_configfile_name ] })->get_column('value')->single();
+ my $ksdir = $self->db->resultset('Parameter')->search( { -and => [ name => $ksfiles_parm_name, config_file => $ksfiles_configfile_name ] } )->get_column('value')->single();
if (defined $ksdir && $ksdir ne "") {
$osversionsdir = $ksdir;
- }
- else {
+ } else {
$osversionsdir = $filebasedir;
}
@@ -75,7 +72,7 @@ sub geniso {
);
my $hostname = $self->param('hostname');
- if (defined($hostname)) {
+ if (defined($hostname)){
my $iso_file_name = $self->iso_download();
if ( $self->param('stream') ne 'yes' ) {
$self->stash(iso_file_name => $iso_file_name);
@@ -109,14 +106,14 @@ sub iso_download {
if ( $params->{stream} eq 'yes' ) {
$self->res->headers->content_type("application/download");
- $self->res->headers->content_disposition("attachment; filename=\"$dl_res->{name}\"");
+ $self->res->headers->content_disposition("attachment; filename=\"$dl_res->{isoName}\"");
return $self->render( data => $dl_res->{iso} );
+ } else {
+ # serverselect
+ $self->flash(message => "Download ISO here");
+ return $dl_res->{isoName};
}
-
- # serverselect
- $self->flash( message => "Download ISO here" );
- return $dl_res->{isoName};
}
sub find_conf_path {
diff --git a/traffic_ops/app/templates/gen_iso/geniso.html.ep b/traffic_ops/app/templates/gen_iso/geniso.html.ep
index 9bf64ff..d3966b4 100644
--- a/traffic_ops/app/templates/gen_iso/geniso.html.ep
+++ b/traffic_ops/app/templates/gen_iso/geniso.html.ep
@@ -66,7 +66,7 @@ $(function () {
$("#mgmt_ip_netmask").val(newvalues.response[0].mgmtIpNetmask);
$("#mgmt_ip_gateway").val(newvalues.response[0].mgmtIpGateway);
$("#mgmt_interface").val(newvalues.response[0].mgmtInterface);
- $("#stream").val("yes");
+ $("#stream").val("no");
}
);
});
diff --git a/traffic_portal/app/src/common/api/ToolsService.js b/traffic_portal/app/src/common/api/ToolsService.js
index 3195f3b..2ceb61c 100644
--- a/traffic_portal/app/src/common/api/ToolsService.js
+++ b/traffic_portal/app/src/common/api/ToolsService.js
@@ -49,7 +49,8 @@ var ToolsService = function($http, $q, Restangular, locationUtils, messageModel,
function(result) {
request.resolve(result.data.response);
if (iso.stream == 'yes') {
- download(result.data, "myiso.iso");
+ var isoName = iso.hostName + "." + iso.domainName + "-" + iso.osversionDir + ".iso";
+ download(result.data, isoName);
}
},
function(fault) {
diff --git a/traffic_portal/app/src/common/modules/form/iso/FormISOController.js b/traffic_portal/app/src/common/modules/form/iso/FormISOController.js
index 7b878ed..57b09f0 100644
--- a/traffic_portal/app/src/common/modules/form/iso/FormISOController.js
+++ b/traffic_portal/app/src/common/modules/form/iso/FormISOController.js
@@ -52,8 +52,10 @@ var FormISOController = function(servers, osversions, $scope, $anchorScroll, for
.then(function(result) {
$anchorScroll(); // scrolls window to top
if (iso.stream != 'yes') {
- messageModel.setMessages([{level: 'success', text: 'ISO created at ' + result.isoURL}], false);
- }
+ messageModel.setMessages([{level: 'success', text: 'ISO created at ' + result.isoURL}], false);
+ } else {
+ messageModel.setMessages([{level: 'success', text: 'ISO successfully downloaded'}], false);
+ }
});
};
diff --git a/traffic_portal/app/src/common/modules/form/iso/form.iso.tpl.html b/traffic_portal/app/src/common/modules/form/iso/form.iso.tpl.html
index 5b15ea6..285dbec 100644
--- a/traffic_portal/app/src/common/modules/form/iso/form.iso.tpl.html
+++ b/traffic_portal/app/src/common/modules/form/iso/form.iso.tpl.html
@@ -189,7 +189,6 @@ under the License.
<span ng-show="hasError(isoForm.mgmtInterface)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
-
<div class="form-group" ng-class="{'has-error': hasError(isoForm.stream), 'has-feedback': hasError(isoForm.stream)}">
<label class="control-label col-md-2 col-sm-2 col-xs-12">Stream ISO *</label>
<div class="col-md-10 col-sm-10 col-xs-12">
@@ -199,7 +198,6 @@ under the License.
<small class="input-error" ng-show="hasPropertyError(isoForm.stream, 'required')">Required</small>
</div>
</div>
-
<div class="modal-footer">
<button type="button" class="btn btn-success" ng-disabled="isoForm.$pristine || isoForm.$invalid" ng-click="generate(iso)">Generate ISO</button>
</div>
diff --git a/traffic_portal/app/src/index.html b/traffic_portal/app/src/index.html
index 7d768a6..fc5363b 100644
--- a/traffic_portal/app/src/index.html
+++ b/traffic_portal/app/src/index.html
@@ -54,8 +54,6 @@ under the License.
<script src="resources/assets/js/underscore-min_1.8.3.js"></script>
<script src="resources/assets/js/jquery.dataTables.min_1.10.16.js"></script>
- <script src="https://cdnjs.cloudflare.com/ajax/libs/downloadjs/1.4.8/download.js"></script>
-
</body>
</html>
diff --git a/traffic_portal/package.json b/traffic_portal/package.json
index d2038de..6f51e0e 100755
--- a/traffic_portal/package.json
+++ b/traffic_portal/package.json
@@ -33,9 +33,5 @@
},
"engines": {
"node": "0.11.14"
- },
- "dependencies": {
- "base64-js": "^1.3.0",
- "js-base64": "^2.4.5"
}
}