You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2016/11/21 19:05:37 UTC
[22/40] incubator-trafficcontrol git commit: more id realignment
more id realignment
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/a430a003
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/a430a003
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/a430a003
Branch: refs/heads/psql-rebase
Commit: a430a003157ef4f363d55d47a28be789acb6b96d
Parents: e6a0fd8
Author: Dewayne Richardson <de...@apache.org>
Authored: Thu Nov 17 12:52:42 2016 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Mon Nov 21 12:04:09 2016 -0700
----------------------------------------------------------------------
.../app/lib/Fixtures/DeliveryserviceTmuser.pm | 8 +++---
.../app/lib/Fixtures/FederationTmuser.pm | 4 +--
traffic_ops/app/lib/Fixtures/Hwinfo.pm | 10 +++----
traffic_ops/app/lib/Fixtures/PhysLocation.pm | 6 ++--
traffic_ops/app/lib/Fixtures/Server.pm | 30 ++++++++++----------
traffic_ops/app/lib/Fixtures/TmUser.pm | 14 ++++-----
6 files changed, 36 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a430a003/traffic_ops/app/lib/Fixtures/DeliveryserviceTmuser.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/DeliveryserviceTmuser.pm b/traffic_ops/app/lib/Fixtures/DeliveryserviceTmuser.pm
index 2e03281..38f909d 100644
--- a/traffic_ops/app/lib/Fixtures/DeliveryserviceTmuser.pm
+++ b/traffic_ops/app/lib/Fixtures/DeliveryserviceTmuser.pm
@@ -22,28 +22,28 @@ my %definition_for = (
new => 'DeliveryserviceTmuser',
using => {
deliveryservice => 100,
- tm_user_id => 1,
+ tm_user_id => 100,
},
},
portal_ds1 => {
new => 'DeliveryserviceTmuser',
using => {
deliveryservice => 100,
- tm_user_id => 2,
+ tm_user_id => 200,
},
},
ds_steering_user1 => {
new => 'DeliveryserviceTmuser',
using => {
deliveryservice => 700,
- tm_user_id => 7,
+ tm_user_id => 700,
},
},
ds_steering_user2 => {
new => 'DeliveryserviceTmuser',
using => {
deliveryservice => 800,
- tm_user_id => 7,
+ tm_user_id => 700,
},
},
);
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a430a003/traffic_ops/app/lib/Fixtures/FederationTmuser.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/FederationTmuser.pm b/traffic_ops/app/lib/Fixtures/FederationTmuser.pm
index a9d5f13..1789f5d 100644
--- a/traffic_ops/app/lib/Fixtures/FederationTmuser.pm
+++ b/traffic_ops/app/lib/Fixtures/FederationTmuser.pm
@@ -25,7 +25,7 @@ my %definition_for = (
new => 'FederationTmuser',
using => {
federation => 1,
- tm_user => 5,
+ tm_user => 500,
role => 7,
},
},
@@ -33,7 +33,7 @@ my %definition_for = (
new => 'FederationTmuser',
using => {
federation => 2,
- tm_user => 5,
+ tm_user => 500,
role => 7,
},
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a430a003/traffic_ops/app/lib/Fixtures/Hwinfo.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Hwinfo.pm b/traffic_ops/app/lib/Fixtures/Hwinfo.pm
index b9a24c2..ed36cc4 100644
--- a/traffic_ops/app/lib/Fixtures/Hwinfo.pm
+++ b/traffic_ops/app/lib/Fixtures/Hwinfo.pm
@@ -23,7 +23,7 @@ my %definition_for = (
new => 'Hwinfo',
using => {
id => 1,
- serverid => 1,
+ serverid => 100,
description => 'BACKPLANE FIRMWA',
val => '7.0.0.29',
},
@@ -32,7 +32,7 @@ my %definition_for = (
new => 'Hwinfo',
using => {
id => 2,
- serverid => 2,
+ serverid => 200,
description => 'DRAC FIRMWA',
val => '1.0.0.29',
},
@@ -41,7 +41,7 @@ my %definition_for = (
new => 'Hwinfo',
using => {
id => 3,
- serverid => 2,
+ serverid => 200,
description => 'ServiceTag',
val => 'XXX',
},
@@ -50,7 +50,7 @@ my %definition_for = (
new => 'Hwinfo',
using => {
id => 4,
- serverid => 2,
+ serverid => 200,
description => 'Manufacturer',
val => 'Dell Inc.',
},
@@ -59,7 +59,7 @@ my %definition_for = (
new => 'Hwinfo',
using => {
id => 5,
- serverid => 2,
+ serverid => 200,
description => 'Model',
val => 'Beetle',
},
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a430a003/traffic_ops/app/lib/Fixtures/PhysLocation.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/PhysLocation.pm b/traffic_ops/app/lib/Fixtures/PhysLocation.pm
index e2026e1..914c9e4 100644
--- a/traffic_ops/app/lib/Fixtures/PhysLocation.pm
+++ b/traffic_ops/app/lib/Fixtures/PhysLocation.pm
@@ -21,7 +21,7 @@ my %definition_for = (
denver => {
new => 'PhysLocation',
using => {
- id => 1,
+ id => 100,
name => 'Denver',
short_name => 'denver',
address => '1234 mile high circle',
@@ -38,7 +38,7 @@ my %definition_for = (
boulder => {
new => 'PhysLocation',
using => {
- id => 2,
+ id => 200,
name => 'Boulder',
short_name => 'boulder',
address => '1234 green way',
@@ -55,7 +55,7 @@ my %definition_for = (
atlanta => {
new => 'PhysLocation',
using => {
- id => 3,
+ id => 300,
name => 'HotAtlanta',
short_name => 'atlanta',
address => '1234 southern way',
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a430a003/traffic_ops/app/lib/Fixtures/Server.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Server.pm b/traffic_ops/app/lib/Fixtures/Server.pm
index 3624a51..f69aa86 100644
--- a/traffic_ops/app/lib/Fixtures/Server.pm
+++ b/traffic_ops/app/lib/Fixtures/Server.pm
@@ -50,7 +50,7 @@ my %definition_for = (
profile => 1,
cdn_id => 1,
cachegroup => 3,
- phys_location => 1,
+ phys_location => 100,
},
},
server_mid1 => {
@@ -85,7 +85,7 @@ my %definition_for = (
profile => 2,
cdn_id => 1,
cachegroup => 1,
- phys_location => 1,
+ phys_location => 100,
},
},
rascal_server => {
@@ -120,7 +120,7 @@ my %definition_for = (
profile => 3,
cdn_id => 2,
cachegroup => 1,
- phys_location => 1,
+ phys_location => 100,
},
},
riak_server1 => {
@@ -155,7 +155,7 @@ my %definition_for = (
profile => 5,
cdn_id => 1,
cachegroup => 1,
- phys_location => 1,
+ phys_location => 100,
},
},
rascal_server2 => {
@@ -190,7 +190,7 @@ my %definition_for = (
profile => 3,
cdn_id => 2,
cachegroup => 1,
- phys_location => 1,
+ phys_location => 100,
},
},
server_edge2 => {
@@ -225,7 +225,7 @@ my %definition_for = (
profile => 1,
cdn_id => 1,
cachegroup => 3,
- phys_location => 1,
+ phys_location => 100,
},
},
server_mid2 => {
@@ -260,7 +260,7 @@ my %definition_for = (
profile => 2,
cdn_id => 2,
cachegroup => 2,
- phys_location => 2,
+ phys_location => 200,
},
},
riak_server2 => {
@@ -295,7 +295,7 @@ my %definition_for = (
profile => 5,
cdn_id => 1,
cachegroup => 1,
- phys_location => 2,
+ phys_location => 200,
},
},
influxdb_server1 => {
@@ -330,7 +330,7 @@ my %definition_for = (
profile => 5,
cdn_id => 1,
cachegroup => 1,
- phys_location => 3,
+ phys_location => 300,
},
},
influxdb_server2 => {
@@ -365,7 +365,7 @@ my %definition_for = (
profile => 5,
cdn_id => 1,
cachegroup => 1,
- phys_location => 3,
+ phys_location => 300,
},
},
server_router => {
@@ -400,7 +400,7 @@ my %definition_for = (
profile => 1,
cdn_id => 1,
cachegroup => 3,
- phys_location => 1,
+ phys_location => 100,
},
},
server_edge_reported => {
@@ -435,7 +435,7 @@ my %definition_for = (
profile => 1,
cdn_id => 1,
cachegroup => 3,
- phys_location => 1,
+ phys_location => 100,
},
},
server_edge13 => {
@@ -470,7 +470,7 @@ my %definition_for = (
profile => 1,
cdn_id => 1,
cachegroup => 9,
- phys_location => 1,
+ phys_location => 100,
},
},
server_edge14 => {
@@ -505,7 +505,7 @@ my %definition_for = (
profile => 1,
cdn_id => 1,
cachegroup => 9,
- phys_location => 1,
+ phys_location => 100,
},
},
server_mid15 => {
@@ -540,7 +540,7 @@ my %definition_for = (
profile => 1,
cdn_id => 1,
cachegroup => 8,
- phys_location => 1,
+ phys_location => 100,
},
},
);
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a430a003/traffic_ops/app/lib/Fixtures/TmUser.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/TmUser.pm b/traffic_ops/app/lib/Fixtures/TmUser.pm
index 4b18fa7..eee7986 100644
--- a/traffic_ops/app/lib/Fixtures/TmUser.pm
+++ b/traffic_ops/app/lib/Fixtures/TmUser.pm
@@ -25,7 +25,7 @@ my %definition_for = (
admin => {
new => 'TmUser',
using => {
- id => 1,
+ id => 100,
username => 'admin',
role => 4,
uid => '1',
@@ -49,7 +49,7 @@ my %definition_for = (
portal => {
new => 'TmUser',
using => {
- id => 2,
+ id => 200,
username => 'portal',
role => 6,
uid => '1',
@@ -73,7 +73,7 @@ my %definition_for = (
codebig => {
new => 'TmUser',
using => {
- id => 3,
+ id => 300,
username => 'codebig',
role => 6,
uid => '1',
@@ -97,7 +97,7 @@ my %definition_for = (
migrations => {
new => 'TmUser',
using => {
- id => 4,
+ id => 400,
username => 'migration',
role => 5,
uid => '1',
@@ -121,7 +121,7 @@ my %definition_for = (
federation => {
new => 'TmUser',
using => {
- id => 5,
+ id => 500,
username => 'federation',
role => 7,
uid => '1',
@@ -145,7 +145,7 @@ my %definition_for = (
steering1 => {
new => 'TmUser',
using => {
- id => 6,
+ id => 600,
username => 'steering1',
role => 7,
uid => '1',
@@ -169,7 +169,7 @@ my %definition_for = (
steering2 => {
new => 'TmUser',
using => {
- id => 7,
+ id => 700,
username => 'steering2',
role => 7,
uid => '1',