diff --git a/lib/helium_config/core/gwmp_opts.ex b/lib/helium_config/core/gwmp_opts.ex index 89d9120..5b036ae 100644 --- a/lib/helium_config/core/gwmp_opts.ex +++ b/lib/helium_config/core/gwmp_opts.ex @@ -47,6 +47,19 @@ defmodule HeliumConfig.Core.GwmpOpts do def region_from_web("AS923_2"), do: :AS923_2 def region_from_web("AS923_3"), do: :AS923_3 def region_from_web("AS923_4"), do: :AS923_4 + def region_from_web("AS923_1A"), do: :AS923_1A def region_from_web("AS923_1B"), do: :AS923_1B + def region_from_web("AS923_1C"), do: :AS923_1C + def region_from_web("AS923_1D"), do: :AS923_1D + def region_from_web("AS923_1E"), do: :AS923_1E + def region_from_web("AS923_1F"), do: :AS923_1F + def region_from_web("AU915_SB1"), do: :AU915_SB1 + def region_from_web("AU915_SB2"), do: :AU915_SB2 + def region_from_web("EU868_A"), do: :EU868_A + def region_from_web("EU868_B"), do: :EU868_B + def region_from_web("EU868_C"), do: :EU868_C + def region_from_web("EU868_D"), do: :EU868_D + def region_from_web("EU868_E"), do: :EU868_E + def region_from_web("EU868_F"), do: :EU868_F def region_from_web("CD900_1A"), do: :CD900_1A end diff --git a/lib/helium_config_web/views/route_view.ex b/lib/helium_config_web/views/route_view.ex index c35a080..9e0f95b 100644 --- a/lib/helium_config_web/views/route_view.ex +++ b/lib/helium_config_web/views/route_view.ex @@ -126,6 +126,19 @@ defmodule HeliumConfigWeb.RouteView do def region_json(:AS923_2), do: "AS923_2" def region_json(:AS923_3), do: "AS923_3" def region_json(:AS923_4), do: "AS923_4" + def region_json(:AS923_1A), do: "AS923_1A" def region_json(:AS923_1B), do: "AS923_1B" + def region_json(:AS923_1C), do: "AS923_1C" + def region_json(:AS923_1D), do: "AS923_1D" + def region_json(:AS923_1E), do: "AS923_1E" + def region_json(:AS923_1F), do: "AS923_1F" + def region_json(:AU915_SB1), do: "AU915_SB1" + def region_json(:AU915_SB2), do: "AU915_SB2" + def region_json(:EU868_A), do: "EU868_A" + def region_json(:EU868_B), do: "EU868_B" + def region_json(:EU868_C), do: "EU868_C" + def region_json(:EU868_D), do: "EU868_D" + def region_json(:EU868_E), do: "EU868_E" + def region_json(:EU868_F), do: "EU868_F" def region_json(:CD900_1A), do: "CD900_1A" end diff --git a/scripts/create_org.sh b/scripts/create_org.sh index d283e89..cb657a3 100644 --- a/scripts/create_org.sh +++ b/scripts/create_org.sh @@ -114,10 +114,62 @@ curl -v \ }, { "port": 10012, - "region": "AS923_1B" + "region": "AS923_1A" }, { "port": 10013, + "region": "AS923_1B" + }, + { + "port": 10014, + "region": "AS923_1C" + }, + { + "port": 10015, + "region": "AS923_1D" + }, + { + "port": 10016, + "region": "AS923_1E" + }, + { + "port": 10017, + "region": "AS923_1F" + }, + { + "port": 10018, + "region": "AU915_SB1" + }, + { + "port": 10019, + "region": "AU915_SB2" + }, + { + "port": 10020, + "region": "EU868_A" + }, + { + "port": 10021, + "region": "EU868_B" + }, + { + "port": 10022, + "region": "EU868_C" + }, + { + "port": 10023, + "region": "EU868_D" + }, + { + "port": 10024, + "region": "EU868_E" + }, + { + "port": 10025, + "region": "EU868_F" + }, + { + "port": 10026, "region": "CD900_1A" } ], diff --git a/scripts/update_org.sh b/scripts/update_org.sh index 12ef8e1..e8196db 100644 --- a/scripts/update_org.sh +++ b/scripts/update_org.sh @@ -113,10 +113,62 @@ curl -v \ }, { "port": 10012, - "region": "AS923_1B" + "region": "AS923_1A" }, { "port": 10013, + "region": "AS923_1B" + }, + { + "port": 10014, + "region": "AS923_1C" + }, + { + "port": 10015, + "region": "AS923_1D" + }, + { + "port": 10016, + "region": "AS923_1E" + }, + { + "port": 10017, + "region": "AS923_1F" + }, + { + "port": 10018, + "region": "AU915_SB1" + }, + { + "port": 10019, + "region": "AU915_SB2" + }, + { + "port": 10020, + "region": "EU868_A" + }, + { + "port": 10021, + "region": "EU868_B" + }, + { + "port": 10022, + "region": "EU868_C" + }, + { + "port": 10023, + "region": "EU868_D" + }, + { + "port": 10024, + "region": "EU868_E" + }, + { + "port": 10025, + "region": "EU868_F" + }, + { + "port": 10026, "region": "CD900_1A" } ], diff --git a/test/helium_config_grpc/route_view_test.exs b/test/helium_config_grpc/route_view_test.exs index 25d00b4..c1c0a77 100644 --- a/test/helium_config_grpc/route_view_test.exs +++ b/test/helium_config_grpc/route_view_test.exs @@ -72,8 +72,21 @@ defmodule HeliumConfigGRPC.RouteViewTest do %{region: :AS923_2, port: 1009}, %{region: :AS923_3, port: 10010}, %{region: :AS923_4, port: 10011}, - %{region: :AS923_1B, port: 10012}, - %{region: :CD900_1A, port: 10013} + %{region: :AS923_1A, port: 10012}, + %{region: :AS923_1B, port: 10013}, + %{region: :AS923_1C, port: 10014}, + %{region: "AS923_1D, port: 10015}, + %{region: :AS923_1E, port: 10016}, + %{region: :AS923_1F, port: 10017}, + %{region: :AU915_SB1, port: 10018}, + %{region: :AU915_SB2, port: 10019}, + %{region: :EU868_A, port: 10020}, + %{region: :EU868_B, port: 10021}, + %{region: :EU868_C, port: 10022}, + %{region: :EU868_D, port: 10023}, + %{region: :EU868_E, port: 10024}, + %{region: :EU868_F, port: 10025}, + %{region: :CD900_1A, port: 10026} ] }} }, diff --git a/test/helium_config_web/views/organization_view_test.exs b/test/helium_config_web/views/organization_view_test.exs index 73bb7ac..e9a0052 100644 --- a/test/helium_config_web/views/organization_view_test.exs +++ b/test/helium_config_web/views/organization_view_test.exs @@ -81,8 +81,21 @@ defmodule HeliumConfigWeb.OrganizationViewTest do %{port: 1009, region: "AS923_2"}, %{port: 10010, region: "AS923_3"}, %{port: 10011, region: "AS923_4"}, - %{port: 10012, region: "AS923_1B"}, - %{port: 10013, region: "CD900_1A"} + %{port: 10012, region: "AS923_1A"}, + %{port: 10013, region: "AS923_1B"}, + %{port: 10014, region: "AS923_1C"}, + %{port: 10015, region: "AS923_1D"}, + %{port: 10016, region: "AS923_1E"}, + %{port: 10017, region: "AS923_1F"}, + %{port: 10018, region: "AU915_SB1"}, + %{port: 10019, region: "AU915_SB2"}, + %{port: 10020, region: "EU868_A"}, + %{port: 10021, region: "EU868_B"}, + %{port: 10022, region: "EU868_C"}, + %{port: 10023, region: "EU868_D"}, + %{port: 10024, region: "EU868_E"}, + %{port: 10025, region: "EU868_F"}, + %{port: 10026, region: "CD900_1A"} ], type: "gwmp" } diff --git a/test/support/helium_config_fixtures.ex b/test/support/helium_config_fixtures.ex index 2ad77cc..2fad2a9 100644 --- a/test/support/helium_config_fixtures.ex +++ b/test/support/helium_config_fixtures.ex @@ -112,8 +112,21 @@ defmodule HeliumConfig.Fixtures do {:AS923_2, 1009}, {:AS923_3, 10010}, {:AS923_4, 10011}, - {:AS923_1B, 10012}, - {:CD900_1A, 10013} + {:AS923_1A, 10012}, + {:AS923_1B, 10013}, + {:AS923_1C, 10014}, + {:AS923_1D, 10015}, + {:AS923_1E, 10016}, + {:AS923_1F, 10017}, + {:AU915_SB1, 10018}, + {:AU915_SB2, 10019}, + {:EU868_A, 10020}, + {:EU868_B, 10021}, + {:EU868_C, 10022}, + {:EU868_D, 10023}, + {:EU868_E, 10024}, + {:EU868_F, 10025}, + {:CD900_1A, 10026} ] } })