From 9dea61b34ed7c1501871907c62f9fadd44bce111 Mon Sep 17 00:00:00 2001 From: Matt Griswold Date: Thu, 21 May 2020 03:53:49 -0500 Subject: [PATCH] Make spelling of traffic levels consistent #519 (#723) Co-authored-by: Stefan Pratter --- Pipfile | 2 +- Pipfile.lock | 225 ++++++++++-------- .../management/commands/pdb_api_test.py | 2 +- .../migrations/0035_traffic_levels.py | 52 ++++ tests/data/export/advancedsearch/net.csv | 6 +- tests/data/export/advancedsearch/net.json | 2 +- .../data/export/advancedsearch/net.jsonpretty | 6 +- tests/test_exporters.py | 2 +- 8 files changed, 187 insertions(+), 110 deletions(-) create mode 100644 peeringdb_server/migrations/0035_traffic_levels.py diff --git a/Pipfile b/Pipfile index 48aa5bb1..0e3be142 100644 --- a/Pipfile +++ b/Pipfile @@ -22,7 +22,7 @@ django = ">=2.2, <2.3" django-inet = ">=0.4.0, <0.5" django-handleref = ">=0.5.0, <0.6" django-namespace-perms = ">=0.6.0, <0.7" -django-peeringdb = ">=2,<2.1" +django-peeringdb = {file = "https://github.com/peeringdb/django-peeringdb/archive/gh_pdb_519.zip"} djangorestframework = ">=3.9.1, <3.12" mysqlclient = ">=1.3.9" peeringdb = ">=1.0.0, <2" diff --git a/Pipfile.lock b/Pipfile.lock index df2879bb..7b529fb9 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "ab41b2b20749dd187949664c4ecfd3cd32ade051ca2d6525b3341e4098fdc298" + "sha256": "b037b6a2761495fdbf25794ddf6c566c718137db5dba50795a40a53c301cff78" }, "pipfile-spec": 6, "requires": { @@ -25,11 +25,11 @@ }, "bleach": { "hashes": [ - "sha256:cc8da25076a1fe56c3ac63671e2194458e0c4d9c7becfd52ca251650d517903c", - "sha256:e78e426105ac07026ba098f04de8abe9b6e3e98b5befbf89b51a5ef0a4292b03" + "sha256:2bce3d8fab545a6528c8fa5d9f9ae8ebc85a56da365c7f85180bfe96a35ef22f", + "sha256:3c4c520fdb9db59ef139915a5db79f8b51bc2a7257ea0389f30c846883430a4b" ], "index": "pypi", - "version": "==3.1.4" + "version": "==3.1.5" }, "certifi": { "hashes": [ @@ -54,10 +54,10 @@ }, "click": { "hashes": [ - "sha256:8a18b4ea89d8820c5d0c7da8a64b2c324b4dabb695804dbfea19b9be9d88c0cc", - "sha256:e345d143d80bf5ee7534056164e5e112ea5e22716bbb1ce727941f4c8b471b9a" + "sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a", + "sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc" ], - "version": "==7.1.1" + "version": "==7.1.2" }, "coreapi": { "hashes": [ @@ -105,19 +105,19 @@ }, "django-bootstrap3": { "hashes": [ - "sha256:760f8664a15f9e1e6e0495265cebd3d4c65b1026e93e476e8322f10e1375f0b8", - "sha256:d161d23824fc2f43c18449285961b994fc3fe620d782b13240e382a7b233344a" + "sha256:0c5a3d7150069843ed0006d4d9cae16ea4624402aa3d569cddb4c3979642a055", + "sha256:4b495d2135ac3152367d2ddd0ce75dd861a9a0bd9a34cfdb1a33e612e17984e7" ], "index": "pypi", - "version": "==12.0.3" + "version": "==12.1.0" }, "django-cors-headers": { "hashes": [ - "sha256:a5960addecc04527ab26617e51b8ed42f0adab4594b24bb0f3c33e2bd3857c3f", - "sha256:a785b5f446f6635810776d9f5f5d23e6a2a2f728ea982648370afaf0dfdf2627" + "sha256:48d267c10d11d8e17805bf896071c0a3e8efb6f79f6634a90e6faac4c2f8a1a0", + "sha256:73d654950b5f5e7e4f67c05183d2169d4f7518ceb87734eb0d68f9e43be59f1c" ], "index": "pypi", - "version": "==3.2.1" + "version": "==3.3.0" }, "django-cors-middleware": { "hashes": [ @@ -137,11 +137,11 @@ }, "django-crispy-forms": { "hashes": [ - "sha256:50032184708ce351e3c9f0008ac35d659d9d5973fa2db218066f2e0a76eb41d9", - "sha256:67e73ac863d3159500029fbbcdcb788f287a3fd357becebc1a0b51f73896dce3" + "sha256:ad943285508f0ed0e271d00399b9399c22b8795a4f969029bce0fd29522a8e2d", + "sha256:fbe9c2c9698b6590afe37940cb08194d1e722015f6bc5bee83f679362406ea30" ], "index": "pypi", - "version": "==1.9.0" + "version": "==1.9.1" }, "django-debug-toolbar": { "hashes": [ @@ -161,10 +161,10 @@ }, "django-grappelli": { "hashes": [ - "sha256:1ac962129025bec8cca4647c87d2a538ddb4d481cb218b88042d676d1c726825" + "sha256:206d34525007e996dc989f1a0deef653b1fae5e0972a1fb24a59a3ad7e67141a" ], "index": "pypi", - "version": "==2.14.1" + "version": "==2.14.2" }, "django-handleref": { "hashes": [ @@ -204,11 +204,7 @@ "version": "==1.3.2" }, "django-peeringdb": { - "hashes": [ - "sha256:18d8edce8b98b45d12c07657cef8c6f8a0da5ee980617ce79de6d1fd494b1181" - ], - "index": "pypi", - "version": "==2.0.0" + "file": "https://github.com/peeringdb/django-peeringdb/archive/gh_pdb_519.zip" }, "django-phonenumber-field": { "hashes": [ @@ -287,11 +283,10 @@ }, "googlemaps": { "hashes": [ - "sha256:511b2c20842d812d4fa03d70e4264147dd7fd6b88ee0819e502934329c4ac454", - "sha256:e081f51d352780993d340f7346a139f1072dd4f16807838b304c0a13f564f463" + "sha256:0336594884640d5a299b84d2ec1700908d5d1d049ea08e7efddca5fc94226d23" ], "index": "pypi", - "version": "==4.2.0" + "version": "==4.4.0" }, "idna": { "hashes": [ @@ -300,11 +295,20 @@ ], "version": "==2.9" }, + "importlib-metadata": { + "hashes": [ + "sha256:2a688cbaa90e0cc587f1df48bdc97a6eadccdcd9c35fb3f976a09e3b5016d90f", + "sha256:34513a8a0c4962bc66d35b359558fd8a5e10cd472d37aec5f66858addef32c1e" + ], + "markers": "python_version < '3.8'", + "version": "==1.6.0" + }, "itypes": { "hashes": [ - "sha256:c6e77bb9fd68a4bfeb9d958fea421802282451a25bac4913ec94db82a899c073" + "sha256:03da6872ca89d29aef62773672b2d408f490f80db48b23079a4b194c86dd04c6", + "sha256:af886f129dea4a2a1e3d36595a2d139589e4dd287f5cab0b40e799ee81570ff1" ], - "version": "==1.1.0" + "version": "==1.2.0" }, "jinja2": { "hashes": [ @@ -315,11 +319,11 @@ }, "markdown": { "hashes": [ - "sha256:90fee683eeabe1a92e149f7ba74e5ccdc81cd397bd6c516d93a8da0ef90b6902", - "sha256:e4795399163109457d4c5af2183fbe6b60326c17cfdf25ce6e7474c6624f725d" + "sha256:1fafe3f1ecabfb514a5285fca634a53c1b32a81cb0feb154264d55bf2ff22c17", + "sha256:c467cd6233885534bf0fe96e62e3cf46cfc1605112356c4f9981512b8174de59" ], "index": "pypi", - "version": "==3.2.1" + "version": "==3.2.2" }, "markupsafe": { "hashes": [ @@ -388,6 +392,13 @@ ], "version": "==1.3.2" }, + "packaging": { + "hashes": [ + "sha256:4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8", + "sha256:998416ba6962ae7fbd6596850b80e17859a5753ba17c32284f67bfff33784181" + ], + "version": "==20.4" + }, "passlib": { "hashes": [ "sha256:68c35c98a7968850e17f1b6892720764cc7eed0ef2b7cb3116a89a28e43fe177", @@ -405,38 +416,45 @@ }, "phonenumbers": { "hashes": [ - "sha256:59ae9cb25fb03027c9f2bf5584098e699be7eca12c443838b83752956be15cda", - "sha256:bebf881ef0e775b93062fbd107bf164b5baef877a7b8f702e93a9a5d24ae4065" + "sha256:46c5997fe076026aa2d4b66d0c53eea4babae2e808e8a5f39c09e2dfa6612d08", + "sha256:c6c43d6459aac85b646d6b7a7ab79b3b629eb168f0e9b851b331e2e5872bbd01" ], "index": "pypi", - "version": "==8.12.1" + "version": "==8.12.4" }, "pillow": { "hashes": [ - "sha256:04a10558320eba9137d6a78ca6fc8f4a5801f1b971152938851dc4629d903579", - "sha256:0f89ddc77cf421b8cd34ae852309501458942bf370831b4a9b406156b599a14e", - "sha256:251e5618125ec12ac800265d7048f5857a8f8f1979db9ea3e11382e159d17f68", - "sha256:291bad7097b06d648222b769bbfcd61e40d0abdfe10df686d20ede36eb8162b6", - "sha256:2f0b52a08d175f10c8ea36685115681a484c55d24d0933f9fd911e4111c04144", - "sha256:3713386d1e9e79cea1c5e6aaac042841d7eef838cc577a3ca153c8bedf570287", - "sha256:433bbc2469a2351bea53666d97bb1eb30f0d56461735be02ea6b27654569f80f", - "sha256:4510c6b33277970b1af83c987277f9a08ec2b02cc20ac0f9234e4026136bb137", - "sha256:50a10b048f4dd81c092adad99fa5f7ba941edaf2f9590510109ac2a15e706695", - "sha256:670e58d3643971f4afd79191abd21623761c2ebe61db1c2cb4797d817c4ba1a7", - "sha256:6c1924ed7dbc6ad0636907693bbbdd3fdae1d73072963e71f5644b864bb10b4d", - "sha256:721c04d3c77c38086f1f95d1cd8df87f2f9a505a780acf8575912b3206479da1", - "sha256:8d5799243050c2833c2662b824dfb16aa98e408d2092805edea4300a408490e7", - "sha256:90cd441a1638ae176eab4d8b6b94ab4ec24b212ed4c3fbee2a6e74672481d4f8", - "sha256:a5dc9f28c0239ec2742d4273bd85b2aa84655be2564db7ad1eb8f64b1efcdc4c", - "sha256:b2f3e8cc52ecd259b94ca880fea0d15f4ebc6da2cd3db515389bb878d800270f", - "sha256:b7453750cf911785009423789d2e4e5393aae9cbb8b3f471dab854b85a26cb89", - "sha256:b99b2607b6cd58396f363b448cbe71d3c35e28f03e442ab00806463439629c2c", - "sha256:cd47793f7bc9285a88c2b5551d3f16a2ddd005789614a34c5f4a598c2a162383", - "sha256:d6bf085f6f9ec6a1724c187083b37b58a8048f86036d42d21802ed5d1fae4853", - "sha256:da737ab273f4d60ae552f82ad83f7cbd0e173ca30ca20b160f708c92742ee212", - "sha256:eb84e7e5b07ff3725ab05977ac56d5eeb0c510795aeb48e8b691491be3c5745b" + "sha256:04766c4930c174b46fd72d450674612ab44cca977ebbcc2dde722c6933290107", + "sha256:0e2a3bceb0fd4e0cb17192ae506d5f082b309ffe5fc370a5667959c9b2f85fa3", + "sha256:0f01e63c34f0e1e2580cc0b24e86a5ccbbfa8830909a52ee17624c4193224cd9", + "sha256:12e4bad6bddd8546a2f9771485c7e3d2b546b458ae8ff79621214119ac244523", + "sha256:1f694e28c169655c50bb89a3fa07f3b854d71eb47f50783621de813979ba87f3", + "sha256:3d25dd8d688f7318dca6d8cd4f962a360ee40346c15893ae3b95c061cdbc4079", + "sha256:4b02b9c27fad2054932e89f39703646d0c543f21d3cc5b8e05434215121c28cd", + "sha256:9744350687459234867cbebfe9df8f35ef9e1538f3e729adbd8fde0761adb705", + "sha256:a0b49960110bc6ff5fead46013bcb8825d101026d466f3a4de3476defe0fb0dd", + "sha256:ae2b270f9a0b8822b98655cb3a59cdb1bd54a34807c6c56b76dd2e786c3b7db3", + "sha256:b37bb3bd35edf53125b0ff257822afa6962649995cbdfde2791ddb62b239f891", + "sha256:b532bcc2f008e96fd9241177ec580829dee817b090532f43e54074ecffdcd97f", + "sha256:b67a6c47ed963c709ed24566daa3f95a18f07d3831334da570c71da53d97d088", + "sha256:b943e71c2065ade6fef223358e56c167fc6ce31c50bc7a02dd5c17ee4338e8ac", + "sha256:ccc9ad2460eb5bee5642eaf75a0438d7f8887d484490d5117b98edd7f33118b7", + "sha256:d23e2aa9b969cf9c26edfb4b56307792b8b374202810bd949effd1c6e11ebd6d", + "sha256:eaa83729eab9c60884f362ada982d3a06beaa6cc8b084cf9f76cae7739481dfa", + "sha256:ee94fce8d003ac9fd206496f2707efe9eadcb278d94c271f129ab36aa7181344", + "sha256:f455efb7a98557412dc6f8e463c1faf1f1911ec2432059fa3e582b6000fc90e2", + "sha256:f46e0e024346e1474083c729d50de909974237c72daca05393ee32389dabe457", + "sha256:f54be399340aa602066adb63a86a6a5d4f395adfdd9da2b9a0162ea808c7b276", + "sha256:f784aad988f12c80aacfa5b381ec21fd3f38f851720f652b9f33facc5101cf4d" ], - "version": "==7.1.1" + "version": "==7.1.2" + }, + "pyparsing": { + "hashes": [ + "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1", + "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b" + ], + "version": "==2.4.7" }, "python3-openid": { "hashes": [ @@ -447,10 +465,10 @@ }, "pytz": { "hashes": [ - "sha256:1c557d7d0e871de1f5ccd5833f60fb2550652da6be2693c1e02300743d21500d", - "sha256:b02c06db6cf09c12dd25137e563b31700d3b80fcc4ad23abb7a315f2789819be" + "sha256:a494d53b6d39c3c6e44c3bec237336e14305e4f29bbf800b599253057fbb79ed", + "sha256:c35965d010ce31b23eeb663ed3cc8c906275d6be1a34393a1d73a41febf4a048" ], - "version": "==2019.3" + "version": "==2020.1" }, "pyyaml": { "hashes": [ @@ -526,15 +544,15 @@ }, "tld": { "hashes": [ - "sha256:670f30e23ed35a7f9ee459801950e49b02554477d4d3e72cd2d92d39b2267470", - "sha256:72c7170f68ade92a07be43b363afc8e42a98ffa3700d899a984fdbeedb339bac", - "sha256:a31d333253cc3033999ad5e6a2a34e9453bf9ac700de82da5f1e7487e4acbdaa", - "sha256:d13fe1171c8d9d383ce822c50915d35ba52c3b78fb7caacb10035230e2e113f7", - "sha256:f466c6eb96e7dbc51817d2dbc9a832e78b0cad6661740334016a79bfdb1477b1", - "sha256:fc8267ee1d78ba02b8970199af0c0efb4624ac3e2177e50cbf05916bd5df8b12" + "sha256:3e7ecadbc58632af78b2aa887d6eaf0d20983061720c070e5bd5639c2bcf63cb", + "sha256:5eb6f39835c286189cd3bab7613e1d611fd03e91a5b1926172020c978881daef", + "sha256:66d1b79284d014a40c36d675c1a56ec22a716d87da2a190b12fe2b267c5a95e9", + "sha256:7a172dc412bb46624f6c61c7afa9ba581a9147699c94386b802830836752ba9f", + "sha256:afc49c2d8d03ebd3cb686fc958747c03d0db5f51a5c5038c893a44fdae4a1987", + "sha256:cf8410a7ed7b9477f563fa158dabef5117d8374cba55f65142ba0af6dcd15d4d" ], "index": "pypi", - "version": "==0.11.11" + "version": "==0.12.2" }, "twentyc.rpc": { "hashes": [ @@ -559,10 +577,10 @@ }, "urllib3": { "hashes": [ - "sha256:2f3db8b19923a873b3e5256dc9c2dedfa883e33d87c690d9c7913e1f40673cdc", - "sha256:87716c2d2a7121198ebcb7ce7cccf6ce5e9ba539041cfbaeecfb641dc0bf6acc" + "sha256:3018294ebefce6572a474f0604c2021e33b3fd8006ecd11d62107a5d2a963527", + "sha256:88206b0eb87e6d677d424843ac5209e3fb9d0190d0ee169599165ec25e9d9115" ], - "version": "==1.25.8" + "version": "==1.25.9" }, "uwsgi": { "hashes": [ @@ -577,15 +595,22 @@ "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923" ], "version": "==0.5.1" + }, + "zipp": { + "hashes": [ + "sha256:aa36550ff0c0b7ef7fa639055d797116ee891440eac1a56f378e2d3179e0320b", + "sha256:c599e4d75c98f6798c509911d08a22e6c021d074469042177c8c86fb92eefd96" + ], + "version": "==3.1.0" } }, "develop": { "appdirs": { "hashes": [ - "sha256:9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92", - "sha256:d8b24664561d0d34ddfaec54636d502d7cea6e29c3eaf68f3df6180863e2166e" + "sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41", + "sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128" ], - "version": "==1.4.3" + "version": "==1.4.4" }, "attrs": { "hashes": [ @@ -611,10 +636,10 @@ }, "click": { "hashes": [ - "sha256:8a18b4ea89d8820c5d0c7da8a64b2c324b4dabb695804dbfea19b9be9d88c0cc", - "sha256:e345d143d80bf5ee7534056164e5e112ea5e22716bbb1ce727941f4c8b471b9a" + "sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a", + "sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc" ], - "version": "==7.1.1" + "version": "==7.1.2" }, "coverage": { "hashes": [ @@ -710,10 +735,10 @@ }, "more-itertools": { "hashes": [ - "sha256:5dd8bcf33e5f9513ffa06d5ad33d78f31e1931ac9a18f33d37e77a180d393a7c", - "sha256:b1ddb932186d8a6ac451e1d95844b382f55e12686d51ca0c68b6f61f2ab7a507" + "sha256:558bb897a2232f5e4f8e2399089e35aecb746e1f9191b6584a151647e89267be", + "sha256:7818f596b1e87be009031c7653d01acc46ed422e6656b394b0f765ce66ed4982" ], - "version": "==8.2.0" + "version": "==8.3.0" }, "munge": { "hashes": [ @@ -723,10 +748,10 @@ }, "packaging": { "hashes": [ - "sha256:3c292b474fda1671ec57d46d739d072bfd495a4f51ad01a055121d81e952b7a3", - "sha256:82f77b9bee21c1bafbf35a84905d604d5d1223801d639cf3ed140bd651c08752" + "sha256:4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8", + "sha256:998416ba6962ae7fbd6596850b80e17859a5753ba17c32284f67bfff33784181" ], - "version": "==20.3" + "version": "==20.4" }, "pluggy": { "hashes": [ @@ -757,11 +782,11 @@ }, "pytest": { "hashes": [ - "sha256:0e5b30f5cb04e887b91b1ee519fa3d89049595f428c1db76e73bd7f17b09b172", - "sha256:84dde37075b8805f3d1f392cc47e38a0e59518fb46a431cfdaf7cf1ce805f970" + "sha256:95c710d0a72d91c13fae35dce195633c929c3792f54125919847fdcdf7caa0d3", + "sha256:eb2b5e935f6a019317e455b6da83dd8650ac9ffd2ee73a7b657a30873d67a698" ], "index": "pypi", - "version": "==5.4.1" + "version": "==5.4.2" }, "pytest-cov": { "hashes": [ @@ -811,10 +836,10 @@ }, "requests-mock": { "hashes": [ - "sha256:510df890afe08d36eca5bb16b4aa6308a6f85e3159ad3013bac8b9de7bd5a010", - "sha256:88d3402dd8b3c69a9e4f9d3a73ad11b15920c6efd36bc27bf1f701cf4a8e4646" + "sha256:11215c6f4df72702aa357f205cf1e537cffd7392b3e787b58239bde5fb3db53b", + "sha256:e68f46844e4cee9d447150343c9ae875f99fa8037c6dcf5f15bf1fe9ab43d226" ], - "version": "==1.7.0" + "version": "==1.8.0" }, "six": { "hashes": [ @@ -825,18 +850,18 @@ }, "toml": { "hashes": [ - "sha256:229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c", - "sha256:235682dd292d5899d361a811df37e04a8828a5b1da3115886b73cf81ebc9100e" + "sha256:926b612be1e5ce0634a2ca03470f95169cf16f939018233a670519cb4ac58b0f", + "sha256:bda89d5935c2eac546d648028b9901107a595863cb36bae0c73ac804a9b4ce88" ], - "version": "==0.10.0" + "version": "==0.10.1" }, "tox": { "hashes": [ - "sha256:a4a6689045d93c208d77230853b28058b7513f5123647b67bf012f82fa168303", - "sha256:b2c4b91c975ea5c11463d9ca00bebf82654439c5df0f614807b9bdec62cc9471" + "sha256:322dfdf007d7d53323f767badcb068a5cfa7c44d8aabb698d131b28cf44e62c4", + "sha256:8c9ad9b48659d291c5bc78bcabaa4d680d627687154b812fa52baedaa94f9f83" ], "index": "pypi", - "version": "==3.14.6" + "version": "==3.15.1" }, "twentyc.rpc": { "hashes": [ @@ -852,17 +877,17 @@ }, "urllib3": { "hashes": [ - "sha256:2f3db8b19923a873b3e5256dc9c2dedfa883e33d87c690d9c7913e1f40673cdc", - "sha256:87716c2d2a7121198ebcb7ce7cccf6ce5e9ba539041cfbaeecfb641dc0bf6acc" + "sha256:3018294ebefce6572a474f0604c2021e33b3fd8006ecd11d62107a5d2a963527", + "sha256:88206b0eb87e6d677d424843ac5209e3fb9d0190d0ee169599165ec25e9d9115" ], - "version": "==1.25.8" + "version": "==1.25.9" }, "virtualenv": { "hashes": [ - "sha256:00cfe8605fb97f5a59d52baab78e6070e72c12ca64f51151695407cc0eb8a431", - "sha256:c8364ec469084046c779c9a11ae6340094e8a0bf1d844330fc55c1cefe67c172" + "sha256:a116629d4e7f4d03433b8afa27f43deba09d48bc48f5ecefa4f015a178efb6cf", + "sha256:a730548b27366c5e6cbdf6f97406d861cccece2e22275e8e1a757aeff5e00c70" ], - "version": "==20.0.17" + "version": "==20.0.21" }, "wcwidth": { "hashes": [ diff --git a/peeringdb_server/management/commands/pdb_api_test.py b/peeringdb_server/management/commands/pdb_api_test.py index 03143c61..8d949748 100644 --- a/peeringdb_server/management/commands/pdb_api_test.py +++ b/peeringdb_server/management/commands/pdb_api_test.py @@ -317,7 +317,7 @@ class TestJSON(unittest.TestCase): "info_type": "NSP", "info_prefixes4": 11000, "info_prefixes6": 12000, - "info_traffic": "1 Tbps+", + "info_traffic": "1-5Tbps", "info_ratio": "Mostly Outbound", "info_scope": "Global", "info_unicast": True, diff --git a/peeringdb_server/migrations/0035_traffic_levels.py b/peeringdb_server/migrations/0035_traffic_levels.py new file mode 100644 index 00000000..7d4b3138 --- /dev/null +++ b/peeringdb_server/migrations/0035_traffic_levels.py @@ -0,0 +1,52 @@ +# Generated by Django 2.2.12 on 2020-05-21 06:13 + +from django.db import migrations, models + +def adjust_traffic_levels(apps, schema_editor): + Network = apps.get_model("peeringdb_server", "Network") + + for net in Network.handleref.all(): + + # only save networks that actually had to have their value + # adjusted + + save = False + + # remove spaces + + if net.info_traffic.find(" ") > -1: + net.info_traffic = net.info_traffic.replace(" ","") + save = True + + # replace values + + if net.info_traffic == "100+Gbps": + net.info_traffic = "100-200Gbps" + save = True + + elif net.info_traffic == "1Tbps+": + net.info_traffic = "1-5Tbps" + save = True + + elif net.info_traffic == "10Tbps+": + net.info_traffic = "10-20Tbps" + save = True + + if save: + net.save() + + +class Migration(migrations.Migration): + + dependencies = [ + ('peeringdb_server', '0034_net_operational'), + ] + + operations = [ + migrations.RunPython(adjust_traffic_levels), + migrations.AlterField( + model_name='network', + name='info_traffic', + field=models.CharField(blank=True, choices=[('', 'Not Disclosed'), ('0-20Mbps', '0-20Mbps'), ('20-100Mbps', '20-100Mbps'), ('100-1000Mbps', '100-1000Mbps'), ('1-5Gbps', '1-5Gbps'), ('5-10Gbps', '5-10Gbps'), ('10-20Gbps', '10-20Gbps'), ('20-50Gbps', '20-50Gbps'), ('50-100Gbps', '50-100Gbps'), ('100-200Gbps', '100-200Gbps'), ('200-300Gbps', '200-300Gbps'), ('300-500Gbps', '300-500Gbps'), ('500-1000Gbps', '500-1000Gbps'), ('1-5Tbps', '1-5Tbps'), ('5-10Tbps', '5-10Tbps'), ('10-20Tbps', '10-20Tbps'), ('20-50Tbps', '20-50Tbps'), ('50-100Tbps', '50-100Tbps'), ('100+Tbps', '100+Tbps')], max_length=39), + ), + ] diff --git a/tests/data/export/advancedsearch/net.csv b/tests/data/export/advancedsearch/net.csv index a588d729..fc1e7c4d 100644 --- a/tests/data/export/advancedsearch/net.csv +++ b/tests/data/export/advancedsearch/net.csv @@ -1,4 +1,4 @@ Name,Also known as,ASN,General Policy,Network Type,Network Scope,Traffic Levels,Traffic Ratio,Exchanges,Facilities -Network 1,AKA 1,1,Open,Not Disclosed,Not Disclosed,0-20 Mbps,Not Disclosed,1,1 -Network 2,AKA 2,2,Open,Not Disclosed,Not Disclosed,0-20 Mbps,Not Disclosed,1,1 -Network 3,AKA 3,3,Open,Not Disclosed,Not Disclosed,0-20 Mbps,Not Disclosed,1,1 +Network 1,AKA 1,1,Open,Not Disclosed,Not Disclosed,0-20Mbps,Not Disclosed,1,1 +Network 2,AKA 2,2,Open,Not Disclosed,Not Disclosed,0-20Mbps,Not Disclosed,1,1 +Network 3,AKA 3,3,Open,Not Disclosed,Not Disclosed,0-20Mbps,Not Disclosed,1,1 diff --git a/tests/data/export/advancedsearch/net.json b/tests/data/export/advancedsearch/net.json index 4e02117f..52e47668 100644 --- a/tests/data/export/advancedsearch/net.json +++ b/tests/data/export/advancedsearch/net.json @@ -1 +1 @@ -{"results": [{"Name": "Network 1", "Also known as": "AKA 1", "ASN": 1, "General Policy": "Open", "Network Type": "Not Disclosed", "Network Scope": "Not Disclosed", "Traffic Levels": "0-20 Mbps", "Traffic Ratio": "Not Disclosed", "Exchanges": 1, "Facilities": 1}, {"Name": "Network 2", "Also known as": "AKA 2", "ASN": 2, "General Policy": "Open", "Network Type": "Not Disclosed", "Network Scope": "Not Disclosed", "Traffic Levels": "0-20 Mbps", "Traffic Ratio": "Not Disclosed", "Exchanges": 1, "Facilities": 1}, {"Name": "Network 3", "Also known as": "AKA 3", "ASN": 3, "General Policy": "Open", "Network Type": "Not Disclosed", "Network Scope": "Not Disclosed", "Traffic Levels": "0-20 Mbps", "Traffic Ratio": "Not Disclosed", "Exchanges": 1, "Facilities": 1}]} +{"results": [{"Name": "Network 1", "Also known as": "AKA 1", "ASN": 1, "General Policy": "Open", "Network Type": "Not Disclosed", "Network Scope": "Not Disclosed", "Traffic Levels": "0-20Mbps", "Traffic Ratio": "Not Disclosed", "Exchanges": 1, "Facilities": 1}, {"Name": "Network 2", "Also known as": "AKA 2", "ASN": 2, "General Policy": "Open", "Network Type": "Not Disclosed", "Network Scope": "Not Disclosed", "Traffic Levels": "0-20Mbps", "Traffic Ratio": "Not Disclosed", "Exchanges": 1, "Facilities": 1}, {"Name": "Network 3", "Also known as": "AKA 3", "ASN": 3, "General Policy": "Open", "Network Type": "Not Disclosed", "Network Scope": "Not Disclosed", "Traffic Levels": "0-20Mbps", "Traffic Ratio": "Not Disclosed", "Exchanges": 1, "Facilities": 1}]} diff --git a/tests/data/export/advancedsearch/net.jsonpretty b/tests/data/export/advancedsearch/net.jsonpretty index 867b3c17..53122a1f 100644 --- a/tests/data/export/advancedsearch/net.jsonpretty +++ b/tests/data/export/advancedsearch/net.jsonpretty @@ -7,7 +7,7 @@ "General Policy": "Open", "Network Type": "Not Disclosed", "Network Scope": "Not Disclosed", - "Traffic Levels": "0-20 Mbps", + "Traffic Levels": "0-20Mbps", "Traffic Ratio": "Not Disclosed", "Exchanges": 1, "Facilities": 1 @@ -19,7 +19,7 @@ "General Policy": "Open", "Network Type": "Not Disclosed", "Network Scope": "Not Disclosed", - "Traffic Levels": "0-20 Mbps", + "Traffic Levels": "0-20Mbps", "Traffic Ratio": "Not Disclosed", "Exchanges": 1, "Facilities": 1 @@ -31,7 +31,7 @@ "General Policy": "Open", "Network Type": "Not Disclosed", "Network Scope": "Not Disclosed", - "Traffic Levels": "0-20 Mbps", + "Traffic Levels": "0-20Mbps", "Traffic Ratio": "Not Disclosed", "Exchanges": 1, "Facilities": 1 diff --git a/tests/test_exporters.py b/tests/test_exporters.py index 89a96d66..0aab67d5 100644 --- a/tests/test_exporters.py +++ b/tests/test_exporters.py @@ -56,7 +56,7 @@ class AdvancedSearchExportTest(ClientCase): status="ok", aka="AKA {}".format(i), policy_general="Open", - info_traffic="0-20 Mbps", + info_traffic="0-20Mbps", asn=i, org=cls.org[i - 1], )