[trafficcontrol] 02/08: updated GenIso for TP

[mi...@apache.org]

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 f8d25a8c1b872aeb80beb6ee3ad16a19cf4d087b
Author: Jesse Rivas <je...@comcast.com>
AuthorDate: Tue Jun 19 08:19:15 2018 -0600

    updated GenIso for TP
---
 traffic_ops/app/lib/API/Iso.pm   |  6 +++-
 traffic_ops/app/lib/UI/GenIso.pm | 71 +++++++++++++++++++---------------------
 2 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/traffic_ops/app/lib/API/Iso.pm b/traffic_ops/app/lib/API/Iso.pm
index fc30171..b16d966 100644
--- a/traffic_ops/app/lib/API/Iso.pm
+++ b/traffic_ops/app/lib/API/Iso.pm
@@ -231,7 +231,7 @@ sub generate_iso {
 
 	my $response = {};
 
-	if ( $stream eq 'no' ) {
+	if ( $stream ne 'yes' ) {
 		$self->app->log->info("Writing ISO: " . $iso_file_path);
 		my $output = `$cmd 2>&1` || die("Error executing $cmd:");
 		$self->app->log->info($output);
@@ -250,6 +250,10 @@ sub generate_iso {
 		$self->res->headers->content_disposition("attachment; filename=\"$iso_file_name\"");
 		my $data = `$cmd`;
 		$self->render( data => $data );
+		$response = {
+			iso => $data,
+			name => $iso_file_name,
+		};
 	}
 	return $response;
 }
diff --git a/traffic_ops/app/lib/UI/GenIso.pm b/traffic_ops/app/lib/UI/GenIso.pm
index dd81333..ceccc08 100644
--- a/traffic_ops/app/lib/UI/GenIso.pm
+++ b/traffic_ops/app/lib/UI/GenIso.pm
@@ -38,51 +38,46 @@ my $install_cfg = "ks_scripts";
 sub geniso {
 	my $self = shift;
 
-	# if 'stream' is set to yes, skip to /iso_download endpoint
-	if ( $self->param('stream') eq 'yes' ) {
-		$self->iso_download();
+	&navbarpage($self);
+	my %serverselect;
+	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) {
+		my $fqdn = $row->host_name . "." . $row->domain_name;
+		$serverselect{$fqdn} = $row->id;
 	}
-	else {
-
-		&navbarpage($self);
-		my %serverselect;
-		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) {
-			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 $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();
 
-		if (defined $ksdir && $ksdir ne "") {
-			$osversionsdir = $ksdir;
-		}
-		else {
-			$osversionsdir = $filebasedir;
-		}
+	if (defined $ksdir && $ksdir ne "") {
+		$osversionsdir = $ksdir;
+	}
+	else {
+		$osversionsdir = $filebasedir;
+	}
 
-		my %osversions;
+	my %osversions;
 
-		{
-			open(CFG, "<$osversionsdir/osversions.cfg") || die("$osversionsdir/osversions.cfg:$!");
-			local $/;
-			eval <CFG>;
-			close CFG;
-		}
+	{
+		open(CFG, "<$osversionsdir/osversions.cfg") || die("$osversionsdir/osversions.cfg:$!");
+		local $/;
+		eval <CFG>;
+		close CFG;
+	}
 
-		$self->stash(
-			serverselect => \%serverselect,
-			osversions   => \%osversions,
-		);
+	$self->stash(
+		serverselect => \%serverselect,
+		osversions   => \%osversions,
+	);
 
-		my $hostname = $self->param('hostname');
-		if (defined($hostname)) {
-			my $iso_file_name = $self->iso_download();
+	my $hostname = $self->param('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);
 			return $self->render('gen_iso/geniso');
 		}