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 2017/03/09 19:09:21 UTC

[13/44] incubator-trafficcontrol git commit: Checkpoint - t tests work now w Profile cdn / type

Checkpoint - t tests work now w Profile cdn / type


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/5ef37cee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/5ef37cee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/5ef37cee

Branch: refs/heads/master
Commit: 5ef37cee40f4e4fe18b8c0901c16b9d9147799c3
Parents: 9ede7b6
Author: Jan van Doorn <ja...@cable.comcast.com>
Authored: Tue Jan 3 14:04:26 2017 -0700
Committer: Jan van Doorn <jv...@apache.org>
Committed: Fri Feb 17 17:49:10 2017 +0000

----------------------------------------------------------------------
 traffic_ops/app/lib/API/Deliveryservice.pm       | 18 +++++++++---------
 traffic_ops/app/lib/API/Deliveryservice2.pm      |  2 +-
 traffic_ops/app/lib/API/Profile.pm               | 19 ++++++++++++++++++-
 traffic_ops/app/lib/Fixtures/Profile.pm          | 14 +++++++-------
 .../Result/DeliveryServiceInfoForDomainList.pm   |  2 --
 .../Result/DeliveryServiceInfoForServerList.pm   |  2 --
 traffic_ops/app/lib/UI/ConfigFiles.pm            |  2 +-
 traffic_ops/app/lib/UI/DeliveryService.pm        |  8 +++++---
 traffic_ops/app/lib/UI/DeliveryServiceServer.pm  |  3 ++-
 traffic_ops/app/lib/UI/Profile.pm                |  1 +
 traffic_ops/app/t/api/1.2/profile.t              |  6 ++++--
 traffic_ops/app/t/deliveryservice.t              |  4 ++--
 traffic_ops/app/t/profile.t                      |  8 ++++++--
 13 files changed, 56 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5ef37cee/traffic_ops/app/lib/API/Deliveryservice.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Deliveryservice.pm b/traffic_ops/app/lib/API/Deliveryservice.pm
index 156f8c9..b7eb1f9 100644
--- a/traffic_ops/app/lib/API/Deliveryservice.pm
+++ b/traffic_ops/app/lib/API/Deliveryservice.pm
@@ -93,12 +93,12 @@ sub index {
 				"missLat"                  => defined($row->miss_lat) ? 0.0 + $row->miss_lat : undef,
 				"missLat"                  => defined($row->miss_long) ? 0.0 + $row->miss_long : undef,
 				"multiSiteOrigin"          => \$row->multi_site_origin,
-				"multiSiteOriginAlgorithm" => $row->multi_site_origin_algorithm,
+				# "multiSiteOriginAlgorithm" => $row->multi_site_origin_algorithm,
 				"orgServerFqdn"            => $row->org_server_fqdn,
 				"originShield"             => $row->origin_shield,
-				"profileId"                => $row->profile->id,
-				"profileName"              => $row->profile->name,
-				"profileDescription"       => $row->profile->description,
+				"profileId"                => defined($row->profile) ? $row->profile->id : undef,
+				"profileName"              => defined($row->profile) ? $row->profile->name : undef,
+				"profileDescription"       => defined($row->profile) ? $row->profile->description : undef,
 				"protocol"                 => $row->protocol,
 				"qstringIgnore"            => $row->qstring_ignore,
 				"rangeRequestHandling"     => $row->range_request_handling,
@@ -190,7 +190,7 @@ sub show {
 				"missLat"                  => defined($row->miss_lat) ? 0.0 + $row->miss_lat : undef,
 				"missLat"                  => defined($row->miss_long) ? 0.0 + $row->miss_long : undef,
 				"multiSiteOrigin"          => \$row->multi_site_origin,
-				"multiSiteOriginAlgorithm" => $row->multi_site_origin_algorithm,
+				# "multiSiteOriginAlgorithm" => $row->multi_site_origin_algorithm,
 				"orgServerFqdn"            => $row->org_server_fqdn,
 				"originShield"             => $row->origin_shield,
 				"profileId"                => $row->profile->id,
@@ -275,7 +275,7 @@ sub update {
 		miss_lat                    => $params->{missLat},
 		miss_long                   => $params->{missLong},
 		multi_site_origin           => $params->{multiSiteOrigin},
-		multi_site_origin_algorithm => $params->{multiSiteOriginAlgorithm},
+		# multi_site_origin_algorithm => $params->{multiSiteOriginAlgorithm},
 		org_server_fqdn             => $params->{orgServerFqdn},
 		origin_shield               => $params->{originShield},
 		profile                     => $params->{profileId},
@@ -338,7 +338,7 @@ sub update {
 				"missLat"                  => 0.0 + $rs->miss_lat,
 				"missLong"                 => 0.0 + $rs->miss_long,
 				"multiSiteOrigin"          => $rs->multi_site_origin,
-				"multiSiteOriginAlgorithm" => $rs->multi_site_origin_algorithm,
+				# "multiSiteOriginAlgorithm" => $rs->multi_site_origin_algorithm,
 				"orgServerFqdn"            => $rs->org_server_fqdn,
 				"originShield"             => $rs->origin_shield,
 				"profileId"                => $rs->profile->id,
@@ -421,7 +421,7 @@ sub create {
 		miss_lat                    => $params->{missLat},
 		miss_long                   => $params->{missLong},
 		multi_site_origin           => $params->{multiSiteOrigin},
-		multi_site_origin_algorithm => $params->{multiSiteOriginAlgorithm},
+		# multi_site_origin_algorithm => $params->{multiSiteOriginAlgorithm},
 		org_server_fqdn             => $params->{orgServerFqdn},
 		origin_shield               => $params->{originShield},
 		profile                     => $params->{profileId},
@@ -494,7 +494,7 @@ sub create {
 				"missLat"                  => $insert->miss_lat,
 				"missLong"                 => $insert->miss_long,
 				"multiSiteOrigin"          => $insert->multi_site_origin,
-				"multiSiteOriginAlgorithm" => $insert->multi_site_origin_algorithm,
+				#"multiSiteOriginAlgorithm" => $insert->multi_site_origin_algorithm,
 				"orgServerFqdn"            => $insert->org_server_fqdn,
 				"originShield"             => $insert->origin_shield,
 				"profileId"                => $insert->profile->id,

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5ef37cee/traffic_ops/app/lib/API/Deliveryservice2.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Deliveryservice2.pm b/traffic_ops/app/lib/API/Deliveryservice2.pm
index 8243701..81b340c 100644
--- a/traffic_ops/app/lib/API/Deliveryservice2.pm
+++ b/traffic_ops/app/lib/API/Deliveryservice2.pm
@@ -116,7 +116,7 @@ sub delivery_services {
 					"missLat"                  => $row->miss_lat,
 					"missLong"                 => $row->miss_long,
 					"multiSiteOrigin"          => \$row->multi_site_origin,
-					"multiSiteOriginAlgorithm" => $row->multi_site_origin_algorithm,
+					# "multiSiteOriginAlgorithm" => $row->multi_site_origin_algorithm,
 					"orgServerFqdn"            => $row->org_server_fqdn,
 					"originShield"             => $row->origin_shield,
 					"profileId"                => $row->profile->id,

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5ef37cee/traffic_ops/app/lib/API/Profile.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Profile.pm b/traffic_ops/app/lib/API/Profile.pm
index 1de9c8c..7e05f47 100644
--- a/traffic_ops/app/lib/API/Profile.pm
+++ b/traffic_ops/app/lib/API/Profile.pm
@@ -124,6 +124,7 @@ sub show {
 
 sub create {
 	my $self   = shift;
+	print "KK:\n";
 	my $params = $self->req->json;
 	if ( !defined($params) ) {
 		return $self->alert("parameters must be in JSON format,  please check!");
@@ -153,10 +154,14 @@ sub create {
 		return $self->alert("a profile with the exact same description already exists.");
 	}
 
+	my $cdn = $params->{cdn};
+	my $type = $params->{type};
 	my $insert = $self->db->resultset('Profile')->create(
 		{
 			name        => $name,
 			description => $description,
+			cdn         => $cdn,
+			type        => $type,
 		}
 	);
 	$insert->insert();
@@ -168,6 +173,8 @@ sub create {
 	$response->{id}          = $new_id;
 	$response->{name}        = $name;
 	$response->{description} = $description;
+	$response->{cdn}         = $cdn;
+	$response->{type}        = $type;
 	return $self->success($response);
 }
 
@@ -200,10 +207,14 @@ sub copy {
 	my $profile_copy_from_id = $row1->id;
 	my $description          = $row1->description;
 
+	my $cdn = $row1->cdn;
+	my $type = $row1->type;
 	my $insert = $self->db->resultset('Profile')->create(
 		{
 			name        => $name,
 			description => $description,
+			cdn         => $cdn,
+			type        => $type,
 		}
 	);
 	$insert->insert();
@@ -275,9 +286,13 @@ sub update {
 		}
 	}
 
+	my $cdn = $params->{cdn};
+	my $type = $params->{type};
 	my $values = {
 		name        => $name,
-		description => $description
+		description => $description,
+		cdn         => $cdn,
+		type        => $type,
 	};
 
 	my $rs = $profile->update($values);
@@ -286,6 +301,8 @@ sub update {
 		$response->{id}          = $id;
 		$response->{name}        = $name;
 		$response->{description} = $description;
+		$response->{cdn}         = $cdn;
+		$response->{type}        = $type;
 		&log( $self, "Update profile with id: " . $id . " and name: " . $name, "APICHANGE" );
 		return $self->success( $response, "Profile was updated: " . $id );
 	}

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5ef37cee/traffic_ops/app/lib/Fixtures/Profile.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Profile.pm b/traffic_ops/app/lib/Fixtures/Profile.pm
index f4370fd..bb2a33a 100644
--- a/traffic_ops/app/lib/Fixtures/Profile.pm
+++ b/traffic_ops/app/lib/Fixtures/Profile.pm
@@ -25,7 +25,7 @@ my %definition_for = (
 			name        => 'EDGE1',
 			description => 'edge description',
 			cdn         => 1,
-			type        => 'SERVER_PROFILE',
+			type        => 'ATS_PROFILE',
 		},
 	},
 	MID1 => {
@@ -35,7 +35,7 @@ my %definition_for = (
 			name        => 'MID1',
 			description => 'mid description',
 			cdn         => 1,
-			type        => 'SERVER_PROFILE',
+			type        => 'ATS_PROFILE',
 		},
 	},
 	CCR1 => {
@@ -45,7 +45,7 @@ my %definition_for = (
 			name        => 'CCR1',
 			description => 'ccr description',
 			cdn         => 1,
-			type        => 'SERVER_PROFILE',
+			type        => 'TR_PROFILE',
 		},
 	},
 	CCR2 => {
@@ -55,7 +55,7 @@ my %definition_for = (
 			name        => 'CCR2',
 			description => 'ccr description',
 			cdn         => 2,
-			type        => 'SERVER_PROFILE',
+			type        => 'TR_PROFILE',
 		},
 	},
 	RIAK1 => {
@@ -65,7 +65,7 @@ my %definition_for = (
 			name        => 'RIAK1',
 			description => 'riak description',
 			cdn         => 1,
-			type        => 'SERVER_PROFILE',
+			type        => 'RIAK_PROFILE',
 		},
 	},
 	RASCAL1 => {
@@ -75,7 +75,7 @@ my %definition_for = (
 			name        => 'RASCAL1',
 			description => 'rascal description',
 			cdn         => 1,
-			type        => 'SERVER_PROFILE',
+			type        => 'TM_PROFILE',
 		},
 	},
 	RASCAL2 => {
@@ -85,7 +85,7 @@ my %definition_for = (
 			name        => 'RASCAL2',
 			description => 'rascal2 description',
 			cdn         => 2,
-			type        => 'SERVER_PROFILE',
+			type        => 'TM_PROFILE',
 		},
 	},
 	MISC => {

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5ef37cee/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForDomainList.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForDomainList.pm b/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForDomainList.pm
index d64c681..8969815 100644
--- a/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForDomainList.pm
+++ b/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForDomainList.pm
@@ -46,7 +46,6 @@ SELECT
     deliveryservice.qstring_ignore,
     deliveryservice.org_server_fqdn,
     deliveryservice.multi_site_origin,
-    deliveryservice.multi_site_origin_algorithm,
     deliveryservice.range_request_handling,
     deliveryservice.origin_shield,
     regex.pattern,
@@ -84,7 +83,6 @@ __PACKAGE__->add_columns(
 	"xml_id",          { data_type => "varchar", is_nullable => 0, size => 45 },
 	"org_server_fqdn", { data_type => "varchar", is_nullable => 0, size => 45 },
 	"multi_site_origin",           { data_type => "integer", is_nullable => 0 },
-	"multi_site_origin_algorithm", { data_type => "tinyint", is_nullable => 1 },
 	"ds_id",                       { data_type => "integer", is_nullable => 0 },
 	"dscp",                        { data_type => "integer", is_nullable => 0 },
 	"signed",                      { data_type => "integer", is_nullable => 0 },

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5ef37cee/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForServerList.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForServerList.pm b/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForServerList.pm
index 6fc45af..c7d6c02 100644
--- a/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForServerList.pm
+++ b/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForServerList.pm
@@ -46,7 +46,6 @@ SELECT
     deliveryservice.qstring_ignore AS qstring_ignore,
     deliveryservice.org_server_fqdn as org_server_fqdn,
     deliveryservice.multi_site_origin as multi_site_origin,
-    deliveryservice.multi_site_origin_algorithm as multi_site_origin_algorithm,
     deliveryservice.range_request_handling as range_request_handling,
     deliveryservice.origin_shield as origin_shield,
     regex.pattern AS pattern,
@@ -77,7 +76,6 @@ __PACKAGE__->add_columns(
 	"xml_id",          { data_type => "varchar", is_nullable => 0, size => 45 },
 	"org_server_fqdn", { data_type => "varchar", is_nullable => 0, size => 45 },
 	"multi_site_origin",           { data_type => "integer", is_nullable => 0 },
-	"multi_site_origin_algorithm", { data_type => "tinyint", is_nullable => 1 },
 	"ds_id",                       { data_type => "integer", is_nullable => 0 },
 	"dscp",                        { data_type => "integer", is_nullable => 0 },
 	"signed",                      { data_type => "integer", is_nullable => 0 },

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5ef37cee/traffic_ops/app/lib/UI/ConfigFiles.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/ConfigFiles.pm b/traffic_ops/app/lib/UI/ConfigFiles.pm
index 68af823..d64ae2e 100644
--- a/traffic_ops/app/lib/UI/ConfigFiles.pm
+++ b/traffic_ops/app/lib/UI/ConfigFiles.pm
@@ -212,7 +212,7 @@ sub ds_data {
 		my $cacheurl                    = $row->cacheurl;
 		my $remap_text                  = $row->remap_text;
 		my $multi_site_origin           = $row->multi_site_origin;
-		my $multi_site_origin_algorithm = $row->multi_site_origin_algorithm;
+		my $multi_site_origin_algorithm = 0; #TODO JvD -- may not need this here, the other params are needed somewhere else as well
 
 		if ( $re_type eq 'HOST_REGEXP' ) {
 			my $host_re = $row->pattern;

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5ef37cee/traffic_ops/app/lib/UI/DeliveryService.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/DeliveryService.pm b/traffic_ops/app/lib/UI/DeliveryService.pm
index 834b08d..f319757 100644
--- a/traffic_ops/app/lib/UI/DeliveryService.pm
+++ b/traffic_ops/app/lib/UI/DeliveryService.pm
@@ -958,6 +958,7 @@ sub create {
 	}
 
 	if ( $self->check_deliveryservice_input($cdn_id) ) {
+		print "CDN:$cdn_id\n";
 		my $insert = $self->db->resultset('Deliveryservice')->create(
 			{
 				xml_id                      => $self->paramAsScalar('ds.xml_id'),
@@ -1059,7 +1060,6 @@ sub create {
 			);
 			$insert->insert();
 			my $new_re_id = $insert->id;
-
 			my $de_re_insert = $self->db->resultset('DeliveryserviceRegex')->create(
 				{
 					regex           => $new_re_id,
@@ -1080,6 +1080,7 @@ sub create {
 		my $cdn_rs = $self->db->resultset('Cdn')->search( { id => $cdn_id } )->single();
 		my $dnssec_enabled = $cdn_rs->dnssec_enabled;
 
+
 		if ( $dnssec_enabled == 1 ) {
 			$self->app->log->debug("dnssec is enabled, creating dnssec keys");
 			$self->create_dnssec_keys( $cdn_rs->name, $self->param('ds.xml_id'), $new_id );
@@ -1090,7 +1091,7 @@ sub create {
 	else {
 		my $selected_type    = $self->param('ds.type');
 		my $selected_profile = $self->param('ds.profile');
-		my $selected_cdn     = $self->param('ds.cdn');
+		my $selected_cdn     = $self->param('ds.cdn_id');
 		&stash_role($self);
 		$self->stash(
 			ds               => {},
@@ -1188,7 +1189,8 @@ sub get_key_ttl {
 sub add {
 	my $self = shift;
 
-	$self->stash_profile_selector();
+	$self->stash_profile_selector('DS_PROFILE');
+	$self->stash_cdn_selector();
 	&stash_role($self);
 	$self->stash(
 		fbox_layout      => 1,

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5ef37cee/traffic_ops/app/lib/UI/DeliveryServiceServer.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/DeliveryServiceServer.pm b/traffic_ops/app/lib/UI/DeliveryServiceServer.pm
index 758025e..1007c8e 100644
--- a/traffic_ops/app/lib/UI/DeliveryServiceServer.pm
+++ b/traffic_ops/app/lib/UI/DeliveryServiceServer.pm
@@ -31,7 +31,8 @@ sub cpdss_iframe {
 		my $server = $self->db->resultset('Server')->search( { 'me.id' => $srvr_id }, { prefetch => [ 'cachegroup' ] } )->single();
 
 		my @etypeids = &type_ids( $self, 'EDGE%', 'server' );
-		my $rs = $self->db->resultset('Server')->search( { type => { -in => \@etypeids }, cdn_id => $server->cdn_id }, { prefetch => 'profile', order_by => 'host_name' } );
+		my $rs = $self->db->resultset('Server')->search( { 'me.type' => { -in => \@etypeids }, cdn_id => $server->cdn_id }, 
+			{ prefetch => 'profile', order_by => 'host_name' } );
 		my @from_server_list;
 		while ( my $row = $rs->next ) {
 			if ( $row->id == $srvr_id ) {

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5ef37cee/traffic_ops/app/lib/UI/Profile.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Profile.pm b/traffic_ops/app/lib/UI/Profile.pm
index 550f18b..188bd84 100644
--- a/traffic_ops/app/lib/UI/Profile.pm
+++ b/traffic_ops/app/lib/UI/Profile.pm
@@ -236,6 +236,7 @@ sub create {
 	my $p_cdn         = $self->param('profile.cdn');
 	my $p_type        = $self->param('profile.type');
 
+	print ">>> cdn: $p_cdn t: $p_type \n";
 	if ( !&is_admin($self) ) {
 		my $err = "You must be an ADMIN to perform this operation!" . "__NEWLINE__";
 		return $self->flash( message => $err );

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5ef37cee/traffic_ops/app/t/api/1.2/profile.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/profile.t b/traffic_ops/app/t/api/1.2/profile.t
index 427466c..dc0a58e 100644
--- a/traffic_ops/app/t/api/1.2/profile.t
+++ b/traffic_ops/app/t/api/1.2/profile.t
@@ -39,7 +39,7 @@ ok $t->post_ok( '/login', => form => { u => Test::TestHelper::ADMIN_USER, p => T
 	->or( sub { diag $t->tx->res->content->asset->{content}; } ), 'Should login?';
 
 ok $t->post_ok('/api/1.2/profiles' => {Accept => 'application/json'} => json => {
-	"name" => "CCR_CREATE", "description" => "CCR_CREATE description" })->status_is(200)
+	"name" => "CCR_CREATE", "description" => "CCR_CREATE description", "cdn" => 1, "type" => 'TR_PROFILE' })->status_is(200)
 	->or( sub { diag $t->tx->res->content->asset->{content}; } )
 	->json_is( "/response/name" => "CCR_CREATE" )
 	->json_is( "/response/description" => "CCR_CREATE description" )
@@ -72,7 +72,9 @@ my $profile_id = &get_profile_id('CCR_CREATE');
 
 ok $t->put_ok('/api/1.2/profiles/' . $profile_id  => {Accept => 'application/json'} => json => {
         "name" => "CCR_UPDATE",
-        "description" => "CCR_UPDATE description"
+        "description" => "CCR_UPDATE description",
+        "cdn" => 1,
+        "type" => "TR_PROFILE"
         })
     ->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
     ->json_is( "/response/id" => "$profile_id")

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5ef37cee/traffic_ops/app/t/deliveryservice.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/deliveryservice.t b/traffic_ops/app/t/deliveryservice.t
index 99866b1..189791c 100644
--- a/traffic_ops/app/t/deliveryservice.t
+++ b/traffic_ops/app/t/deliveryservice.t
@@ -183,7 +183,7 @@ ok $t->post_ok(
 		'ds.qstring_ignore'              => '1',
 		'ds.signed'                      => '1',
 		'ds.type'                        => '9',
-		'ds.xml_id'                      => 'tst_xml_id_2',
+		'ds.xml_id'                      => 'tst_xml_id_3',
 		'ds.protocol'                    => '0',
 		'ds.edge_header_rewrite'         => '',
 		'ds.mid_header_rewrite'          => '',
@@ -201,7 +201,7 @@ ok $t->post_ok(
 		'ds.regional_geo_blocking'       => '0',
 		'ds.geolimit_redirect_url'       => 'http://knutsel3.com',
 	}
-)->status_is(200), "create HTTP_NO_CACHE deliveryservice";
+)->status_is(302), "create HTTP_NO_CACHE deliveryservice";
 
 #add - validate 200 response (data is actually added to DB when create is called)
 ok $t->get_ok('/ds/add')->status_is(200), "validate add screen";

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5ef37cee/traffic_ops/app/t/profile.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/profile.t b/traffic_ops/app/t/profile.t
index 6293ed0..a4947b4 100644
--- a/traffic_ops/app/t/profile.t
+++ b/traffic_ops/app/t/profile.t
@@ -52,7 +52,9 @@ $t->get_ok('/dataprofile')->status_is(200)->json_has('/0/name')->json_has('/0/de
 $t->post_ok(
 	'/profile/create' => form => {
 		'profile.name'        => 'JLP_Test',
-		'profile.description' => 'JLP Test Host'
+		'profile.description' => 'JLP Test Host',
+		'profile.cdn'         => 1,
+		'profile.type'        => 'ATS_PROFILE'
 	}
 )->status_is(302)->or( sub { diag $t->tx->res->content->asset->{content}; } );
 
@@ -71,7 +73,9 @@ sub upd_and_del() {
 		$t->post_ok(
 			"/profile/$id/update" => form => {
 				'profile.name'        => 'JLP_Test',
-				'profile.description' => 'JLP Test Host Updated'
+				'profile.description' => 'JLP Test Host Updated',
+				'profile.cdn'         => 1,
+				'profile.type'        => 'ATS_PROFILE'
 			}
 		)->status_is(302)->or( sub { diag $t->tx->res->content->asset->{content}; } );
 		$t->get_ok("/profile/$id/delete")->status_is(302);