Use name@provider instead of provider@name.

pkg/api/handler.go

@@ -464,5 +464,5 @@ func getIntParam(request *http.Request, key string, defaultValue int) (int, erro
 }
 
 func getProviderName(id string) string {
-	return strings.SplitN(id, ".", 2)[0]
+	return strings.SplitN(id, "@", 2)[1]
 }

pkg/api/handler_test.go

@@ -47,20 +47,20 @@ func TestHandlerTCP_API(t *testing.T) {
 			path: "/api/tcp/routers",
 			conf: config.RuntimeConfiguration{
 				TCPRouters: map[string]*config.TCPRouterInfo{
-					"myprovider@test": {
+					"test@myprovider": {
 						TCPRouter: &config.TCPRouter{
 							EntryPoints: []string{"web"},
-							Service:     "myprovider@foo-service",
+							Service:     "foo-service@myprovider",
 							Rule:        "Host(`foo.bar.other`)",
 							TLS: &config.RouterTCPTLSConfig{
 								Passthrough: false,
 							},
 						},
 					},
-					"myprovider@bar": {
+					"bar@myprovider": {
 						TCPRouter: &config.TCPRouter{
 							EntryPoints: []string{"web"},
-							Service:     "myprovider@foo-service",
+							Service:     "foo-service@myprovider",
 							Rule:        "Host(`foo.bar`)",
 						},
 					},
@@ -77,24 +77,24 @@ func TestHandlerTCP_API(t *testing.T) {
 			path: "/api/tcp/routers?page=2&per_page=1",
 			conf: config.RuntimeConfiguration{
 				TCPRouters: map[string]*config.TCPRouterInfo{
-					"myprovider@bar": {
+					"bar@myprovider": {
 						TCPRouter: &config.TCPRouter{
 							EntryPoints: []string{"web"},
-							Service:     "myprovider@foo-service",
+							Service:     "foo-service@myprovider",
 							Rule:        "Host(`foo.bar`)",
 						},
 					},
-					"myprovider@baz": {
+					"baz@myprovider": {
 						TCPRouter: &config.TCPRouter{
 							EntryPoints: []string{"web"},
-							Service:     "myprovider@foo-service",
+							Service:     "foo-service@myprovider",
 							Rule:        "Host(`toto.bar`)",
 						},
 					},
-					"myprovider@test": {
+					"test@myprovider": {
 						TCPRouter: &config.TCPRouter{
 							EntryPoints: []string{"web"},
-							Service:     "myprovider@foo-service",
+							Service:     "foo-service@myprovider",
 							Rule:        "Host(`foo.bar.other`)",
 						},
 					},
@@ -108,13 +108,13 @@ func TestHandlerTCP_API(t *testing.T) {
 		},
 		{
 			desc: "one TCP router by id",
-			path: "/api/tcp/routers/myprovider@bar",
+			path: "/api/tcp/routers/bar@myprovider",
 			conf: config.RuntimeConfiguration{
 				TCPRouters: map[string]*config.TCPRouterInfo{
-					"myprovider@bar": {
+					"bar@myprovider": {
 						TCPRouter: &config.TCPRouter{
 							EntryPoints: []string{"web"},
-							Service:     "myprovider@foo-service",
+							Service:     "foo-service@myprovider",
 							Rule:        "Host(`foo.bar`)",
 						},
 					},
@@ -127,13 +127,13 @@ func TestHandlerTCP_API(t *testing.T) {
 		},
 		{
 			desc: "one TCP router by id, that does not exist",
-			path: "/api/tcp/routers/myprovider@foo",
+			path: "/api/tcp/routers/foo@myprovider",
 			conf: config.RuntimeConfiguration{
 				TCPRouters: map[string]*config.TCPRouterInfo{
-					"myprovider@bar": {
+					"bar@myprovider": {
 						TCPRouter: &config.TCPRouter{
 							EntryPoints: []string{"web"},
-							Service:     "myprovider@foo-service",
+							Service:     "foo-service@myprovider",
 							Rule:        "Host(`foo.bar`)",
 						},
 					},
@@ -145,7 +145,7 @@ func TestHandlerTCP_API(t *testing.T) {
 		},
 		{
 			desc: "one TCP router by id, but no config",
-			path: "/api/tcp/routers/myprovider@bar",
+			path: "/api/tcp/routers/bar@myprovider",
 			conf: config.RuntimeConfiguration{},
 			expected: expected{
 				statusCode: http.StatusNotFound,
@@ -166,7 +166,7 @@ func TestHandlerTCP_API(t *testing.T) {
 			path: "/api/tcp/services",
 			conf: config.RuntimeConfiguration{
 				TCPServices: map[string]*config.TCPServiceInfo{
-					"myprovider@bar": {
+					"bar@myprovider": {
 						TCPService: &config.TCPService{
 							LoadBalancer: &config.TCPLoadBalancerService{
 								Servers: []config.TCPServer{
@@ -176,9 +176,9 @@ func TestHandlerTCP_API(t *testing.T) {
 								},
 							},
 						},
-						UsedBy: []string{"myprovider@foo", "myprovider@test"},
+						UsedBy: []string{"foo@myprovider", "test@myprovider"},
 					},
-					"myprovider@baz": {
+					"baz@myprovider": {
 						TCPService: &config.TCPService{
 							LoadBalancer: &config.TCPLoadBalancerService{
 								Servers: []config.TCPServer{
@@ -188,7 +188,7 @@ func TestHandlerTCP_API(t *testing.T) {
 								},
 							},
 						},
-						UsedBy: []string{"myprovider@foo"},
+						UsedBy: []string{"foo@myprovider"},
 					},
 				},
 			},
@@ -203,7 +203,7 @@ func TestHandlerTCP_API(t *testing.T) {
 			path: "/api/tcp/services?page=2&per_page=1",
 			conf: config.RuntimeConfiguration{
 				TCPServices: map[string]*config.TCPServiceInfo{
-					"myprovider@bar": {
+					"bar@myprovider": {
 						TCPService: &config.TCPService{
 							LoadBalancer: &config.TCPLoadBalancerService{
 								Servers: []config.TCPServer{
@@ -213,9 +213,9 @@ func TestHandlerTCP_API(t *testing.T) {
 								},
 							},
 						},
-						UsedBy: []string{"myprovider@foo", "myprovider@test"},
+						UsedBy: []string{"foo@myprovider", "test@myprovider"},
 					},
-					"myprovider@baz": {
+					"baz@myprovider": {
 						TCPService: &config.TCPService{
 							LoadBalancer: &config.TCPLoadBalancerService{
 								Servers: []config.TCPServer{
@@ -225,9 +225,9 @@ func TestHandlerTCP_API(t *testing.T) {
 								},
 							},
 						},
-						UsedBy: []string{"myprovider@foo"},
+						UsedBy: []string{"foo@myprovider"},
 					},
-					"myprovider@test": {
+					"test@myprovider": {
 						TCPService: &config.TCPService{
 							LoadBalancer: &config.TCPLoadBalancerService{
 								Servers: []config.TCPServer{
@@ -248,10 +248,10 @@ func TestHandlerTCP_API(t *testing.T) {
 		},
 		{
 			desc: "one tcp service by id",
-			path: "/api/tcp/services/myprovider@bar",
+			path: "/api/tcp/services/bar@myprovider",
 			conf: config.RuntimeConfiguration{
 				TCPServices: map[string]*config.TCPServiceInfo{
-					"myprovider@bar": {
+					"bar@myprovider": {
 						TCPService: &config.TCPService{
 							LoadBalancer: &config.TCPLoadBalancerService{
 								Servers: []config.TCPServer{
@@ -261,7 +261,7 @@ func TestHandlerTCP_API(t *testing.T) {
 								},
 							},
 						},
-						UsedBy: []string{"myprovider@foo", "myprovider@test"},
+						UsedBy: []string{"foo@myprovider", "test@myprovider"},
 					},
 				},
 			},
@@ -272,10 +272,10 @@ func TestHandlerTCP_API(t *testing.T) {
 		},
 		{
 			desc: "one tcp service by id, that does not exist",
-			path: "/api/tcp/services/myprovider@nono",
+			path: "/api/tcp/services/nono@myprovider",
 			conf: config.RuntimeConfiguration{
 				TCPServices: map[string]*config.TCPServiceInfo{
-					"myprovider@bar": {
+					"bar@myprovider": {
 						TCPService: &config.TCPService{
 							LoadBalancer: &config.TCPLoadBalancerService{
 								Servers: []config.TCPServer{
@@ -285,7 +285,7 @@ func TestHandlerTCP_API(t *testing.T) {
 								},
 							},
 						},
-						UsedBy: []string{"myprovider@foo", "myprovider@test"},
+						UsedBy: []string{"foo@myprovider", "test@myprovider"},
 					},
 				},
 			},
@@ -295,7 +295,7 @@ func TestHandlerTCP_API(t *testing.T) {
 		},
 		{
 			desc: "one tcp service by id, but no config",
-			path: "/api/tcp/services/myprovider@foo",
+			path: "/api/tcp/services/foo@myprovider",
 			conf: config.RuntimeConfiguration{},
 			expected: expected{
 				statusCode: http.StatusNotFound,
@@ -379,20 +379,20 @@ func TestHandlerHTTP_API(t *testing.T) {
 			path: "/api/http/routers",
 			conf: config.RuntimeConfiguration{
 				Routers: map[string]*config.RouterInfo{
-					"myprovider@test": {
+					"test@myprovider": {
 						Router: &config.Router{
 							EntryPoints: []string{"web"},
-							Service:     "myprovider@foo-service",
+							Service:     "foo-service@myprovider",
 							Rule:        "Host(`foo.bar.other`)",
 							Middlewares: []string{"addPrefixTest", "auth"},
 						},
 					},
-					"myprovider@bar": {
+					"bar@myprovider": {
 						Router: &config.Router{
 							EntryPoints: []string{"web"},
-							Service:     "myprovider@foo-service",
+							Service:     "foo-service@myprovider",
 							Rule:        "Host(`foo.bar`)",
-							Middlewares: []string{"auth", "anotherprovider@addPrefixTest"},
+							Middlewares: []string{"auth", "addPrefixTest@anotherprovider"},
 						},
 					},
 				},
@@ -408,25 +408,25 @@ func TestHandlerHTTP_API(t *testing.T) {
 			path: "/api/http/routers?page=2&per_page=1",
 			conf: config.RuntimeConfiguration{
 				Routers: map[string]*config.RouterInfo{
-					"myprovider@bar": {
+					"bar@myprovider": {
 						Router: &config.Router{
 							EntryPoints: []string{"web"},
-							Service:     "myprovider@foo-service",
+							Service:     "foo-service@myprovider",
 							Rule:        "Host(`foo.bar`)",
-							Middlewares: []string{"auth", "anotherprovider@addPrefixTest"},
+							Middlewares: []string{"auth", "addPrefixTest@anotherprovider"},
 						},
 					},
-					"myprovider@baz": {
+					"baz@myprovider": {
 						Router: &config.Router{
 							EntryPoints: []string{"web"},
-							Service:     "myprovider@foo-service",
+							Service:     "foo-service@myprovider",
 							Rule:        "Host(`toto.bar`)",
 						},
 					},
-					"myprovider@test": {
+					"test@myprovider": {
 						Router: &config.Router{
 							EntryPoints: []string{"web"},
-							Service:     "myprovider@foo-service",
+							Service:     "foo-service@myprovider",
 							Rule:        "Host(`foo.bar.other`)",
 							Middlewares: []string{"addPrefixTest", "auth"},
 						},
@@ -473,15 +473,15 @@ func TestHandlerHTTP_API(t *testing.T) {
 		},
 		{
 			desc: "one router by id",
-			path: "/api/http/routers/myprovider@bar",
+			path: "/api/http/routers/bar@myprovider",
 			conf: config.RuntimeConfiguration{
 				Routers: map[string]*config.RouterInfo{
-					"myprovider@bar": {
+					"bar@myprovider": {
 						Router: &config.Router{
 							EntryPoints: []string{"web"},
-							Service:     "myprovider@foo-service",
+							Service:     "foo-service@myprovider",
 							Rule:        "Host(`foo.bar`)",
-							Middlewares: []string{"auth", "anotherprovider@addPrefixTest"},
+							Middlewares: []string{"auth", "addPrefixTest@anotherprovider"},
 						},
 					},
 				},
@@ -493,15 +493,15 @@ func TestHandlerHTTP_API(t *testing.T) {
 		},
 		{
 			desc: "one router by id, that does not exist",
-			path: "/api/http/routers/myprovider@foo",
+			path: "/api/http/routers/foo@myprovider",
 			conf: config.RuntimeConfiguration{
 				Routers: map[string]*config.RouterInfo{
-					"myprovider@bar": {
+					"bar@myprovider": {
 						Router: &config.Router{
 							EntryPoints: []string{"web"},
-							Service:     "myprovider@foo-service",
+							Service:     "foo-service@myprovider",
 							Rule:        "Host(`foo.bar`)",
-							Middlewares: []string{"auth", "anotherprovider@addPrefixTest"},
+							Middlewares: []string{"auth", "addPrefixTest@anotherprovider"},
 						},
 					},
 				},
@@ -512,7 +512,7 @@ func TestHandlerHTTP_API(t *testing.T) {
 		},
 		{
 			desc: "one router by id, but no config",
-			path: "/api/http/routers/myprovider@foo",
+			path: "/api/http/routers/foo@myprovider",
 			conf: config.RuntimeConfiguration{},
 			expected: expected{
 				statusCode: http.StatusNotFound,
@@ -533,7 +533,7 @@ func TestHandlerHTTP_API(t *testing.T) {
 			path: "/api/http/services",
 			conf: config.RuntimeConfiguration{
 				Services: map[string]*config.ServiceInfo{
-					"myprovider@bar": func() *config.ServiceInfo {
+					"bar@myprovider": func() *config.ServiceInfo {
 						si := &config.ServiceInfo{
 							Service: &config.Service{
 								LoadBalancer: &config.LoadBalancerService{
@@ -544,12 +544,12 @@ func TestHandlerHTTP_API(t *testing.T) {
 									},
 								},
 							},
-							UsedBy: []string{"myprovider@foo", "myprovider@test"},
+							UsedBy: []string{"foo@myprovider", "test@myprovider"},
 						}
 						si.UpdateStatus("http://127.0.0.1", "UP")
 						return si
 					}(),
-					"myprovider@baz": func() *config.ServiceInfo {
+					"baz@myprovider": func() *config.ServiceInfo {
 						si := &config.ServiceInfo{
 							Service: &config.Service{
 								LoadBalancer: &config.LoadBalancerService{
@@ -560,7 +560,7 @@ func TestHandlerHTTP_API(t *testing.T) {
 									},
 								},
 							},
-							UsedBy: []string{"myprovider@foo"},
+							UsedBy: []string{"foo@myprovider"},
 						}
 						si.UpdateStatus("http://127.0.0.2", "UP")
 						return si
@@ -578,7 +578,7 @@ func TestHandlerHTTP_API(t *testing.T) {
 			path: "/api/http/services?page=2&per_page=1",
 			conf: config.RuntimeConfiguration{
 				Services: map[string]*config.ServiceInfo{
-					"myprovider@bar": func() *config.ServiceInfo {
+					"bar@myprovider": func() *config.ServiceInfo {
 						si := &config.ServiceInfo{
 							Service: &config.Service{
 								LoadBalancer: &config.LoadBalancerService{
@@ -589,12 +589,12 @@ func TestHandlerHTTP_API(t *testing.T) {
 									},
 								},
 							},
-							UsedBy: []string{"myprovider@foo", "myprovider@test"},
+							UsedBy: []string{"foo@myprovider", "test@myprovider"},
 						}
 						si.UpdateStatus("http://127.0.0.1", "UP")
 						return si
 					}(),
-					"myprovider@baz": func() *config.ServiceInfo {
+					"baz@myprovider": func() *config.ServiceInfo {
 						si := &config.ServiceInfo{
 							Service: &config.Service{
 								LoadBalancer: &config.LoadBalancerService{
@@ -605,12 +605,12 @@ func TestHandlerHTTP_API(t *testing.T) {
 									},
 								},
 							},
-							UsedBy: []string{"myprovider@foo"},
+							UsedBy: []string{"foo@myprovider"},
 						}
 						si.UpdateStatus("http://127.0.0.2", "UP")
 						return si
 					}(),
-					"myprovider@test": func() *config.ServiceInfo {
+					"test@myprovider": func() *config.ServiceInfo {
 						si := &config.ServiceInfo{
 							Service: &config.Service{
 								LoadBalancer: &config.LoadBalancerService{
@@ -621,7 +621,7 @@ func TestHandlerHTTP_API(t *testing.T) {
 									},
 								},
 							},
-							UsedBy: []string{"myprovider@foo", "myprovider@test"},
+							UsedBy: []string{"foo@myprovider", "test@myprovider"},
 						}
 						si.UpdateStatus("http://127.0.0.4", "UP")
 						return si
@@ -636,10 +636,10 @@ func TestHandlerHTTP_API(t *testing.T) {
 		},
 		{
 			desc: "one service by id",
-			path: "/api/http/services/myprovider@bar",
+			path: "/api/http/services/bar@myprovider",
 			conf: config.RuntimeConfiguration{
 				Services: map[string]*config.ServiceInfo{
-					"myprovider@bar": func() *config.ServiceInfo {
+					"bar@myprovider": func() *config.ServiceInfo {
 						si := &config.ServiceInfo{
 							Service: &config.Service{
 								LoadBalancer: &config.LoadBalancerService{
@@ -650,7 +650,7 @@ func TestHandlerHTTP_API(t *testing.T) {
 									},
 								},
 							},
-							UsedBy: []string{"myprovider@foo", "myprovider@test"},
+							UsedBy: []string{"foo@myprovider", "test@myprovider"},
 						}
 						si.UpdateStatus("http://127.0.0.1", "UP")
 						return si
@@ -664,10 +664,10 @@ func TestHandlerHTTP_API(t *testing.T) {
 		},
 		{
 			desc: "one service by id, that does not exist",
-			path: "/api/http/services/myprovider@nono",
+			path: "/api/http/services/nono@myprovider",
 			conf: config.RuntimeConfiguration{
 				Services: map[string]*config.ServiceInfo{
-					"myprovider@bar": func() *config.ServiceInfo {
+					"bar@myprovider": func() *config.ServiceInfo {
 						si := &config.ServiceInfo{
 							Service: &config.Service{
 								LoadBalancer: &config.LoadBalancerService{
@@ -678,7 +678,7 @@ func TestHandlerHTTP_API(t *testing.T) {
 									},
 								},
 							},
-							UsedBy: []string{"myprovider@foo", "myprovider@test"},
+							UsedBy: []string{"foo@myprovider", "test@myprovider"},
 						}
 						si.UpdateStatus("http://127.0.0.1", "UP")
 						return si
@@ -691,7 +691,7 @@ func TestHandlerHTTP_API(t *testing.T) {
 		},
 		{
 			desc: "one service by id, but no config",
-			path: "/api/http/services/myprovider@foo",
+			path: "/api/http/services/foo@myprovider",
 			conf: config.RuntimeConfiguration{},
 			expected: expected{
 				statusCode: http.StatusNotFound,
@@ -712,29 +712,29 @@ func TestHandlerHTTP_API(t *testing.T) {
 			path: "/api/http/middlewares",
 			conf: config.RuntimeConfiguration{
 				Middlewares: map[string]*config.MiddlewareInfo{
-					"myprovider@auth": {
+					"auth@myprovider": {
 						Middleware: &config.Middleware{
 							BasicAuth: &config.BasicAuth{
 								Users: []string{"admin:admin"},
 							},
 						},
-						UsedBy: []string{"myprovider@bar", "myprovider@test"},
+						UsedBy: []string{"bar@myprovider", "test@myprovider"},
 					},
-					"myprovider@addPrefixTest": {
+					"addPrefixTest@myprovider": {
 						Middleware: &config.Middleware{
 							AddPrefix: &config.AddPrefix{
 								Prefix: "/titi",
 							},
 						},
-						UsedBy: []string{"myprovider@test"},
+						UsedBy: []string{"test@myprovider"},
 					},
-					"anotherprovider@addPrefixTest": {
+					"addPrefixTest@anotherprovider": {
 						Middleware: &config.Middleware{
 							AddPrefix: &config.AddPrefix{
 								Prefix: "/toto",
 							},
 						},
-						UsedBy: []string{"myprovider@bar"},
+						UsedBy: []string{"bar@myprovider"},
 					},
 				},
 			},
@@ -749,29 +749,29 @@ func TestHandlerHTTP_API(t *testing.T) {
 			path: "/api/http/middlewares?page=2&per_page=1",
 			conf: config.RuntimeConfiguration{
 				Middlewares: map[string]*config.MiddlewareInfo{
-					"myprovider@auth": {
+					"auth@myprovider": {
 						Middleware: &config.Middleware{
 							BasicAuth: &config.BasicAuth{
 								Users: []string{"admin:admin"},
 							},
 						},
-						UsedBy: []string{"myprovider@bar", "myprovider@test"},
+						UsedBy: []string{"bar@myprovider", "test@myprovider"},
 					},
-					"myprovider@addPrefixTest": {
+					"addPrefixTest@myprovider": {
 						Middleware: &config.Middleware{
 							AddPrefix: &config.AddPrefix{
 								Prefix: "/titi",
 							},
 						},
-						UsedBy: []string{"myprovider@test"},
+						UsedBy: []string{"test@myprovider"},
 					},
-					"anotherprovider@addPrefixTest": {
+					"addPrefixTest@anotherprovider": {
 						Middleware: &config.Middleware{
 							AddPrefix: &config.AddPrefix{
 								Prefix: "/toto",
 							},
 						},
-						UsedBy: []string{"myprovider@bar"},
+						UsedBy: []string{"bar@myprovider"},
 					},
 				},
 			},
@@ -783,32 +783,32 @@ func TestHandlerHTTP_API(t *testing.T) {
 		},
 		{
 			desc: "one middleware by id",
-			path: "/api/http/middlewares/myprovider@auth",
+			path: "/api/http/middlewares/auth@myprovider",
 			conf: config.RuntimeConfiguration{
 				Middlewares: map[string]*config.MiddlewareInfo{
-					"myprovider@auth": {
+					"auth@myprovider": {
 						Middleware: &config.Middleware{
 							BasicAuth: &config.BasicAuth{
 								Users: []string{"admin:admin"},
 							},
 						},
-						UsedBy: []string{"myprovider@bar", "myprovider@test"},
+						UsedBy: []string{"bar@myprovider", "test@myprovider"},
 					},
-					"myprovider@addPrefixTest": {
+					"addPrefixTest@myprovider": {
 						Middleware: &config.Middleware{
 							AddPrefix: &config.AddPrefix{
 								Prefix: "/titi",
 							},
 						},
-						UsedBy: []string{"myprovider@test"},
+						UsedBy: []string{"test@myprovider"},
 					},
-					"anotherprovider@addPrefixTest": {
+					"addPrefixTest@anotherprovider": {
 						Middleware: &config.Middleware{
 							AddPrefix: &config.AddPrefix{
 								Prefix: "/toto",
 							},
 						},
-						UsedBy: []string{"myprovider@bar"},
+						UsedBy: []string{"bar@myprovider"},
 					},
 				},
 			},
@@ -819,16 +819,16 @@ func TestHandlerHTTP_API(t *testing.T) {
 		},
 		{
 			desc: "one middleware by id, that does not exist",
-			path: "/api/http/middlewares/myprovider@foo",
+			path: "/api/http/middlewares/foo@myprovider",
 			conf: config.RuntimeConfiguration{
 				Middlewares: map[string]*config.MiddlewareInfo{
-					"myprovider@auth": {
+					"auth@myprovider": {
 						Middleware: &config.Middleware{
 							BasicAuth: &config.BasicAuth{
 								Users: []string{"admin:admin"},
 							},
 						},
-						UsedBy: []string{"myprovider@bar", "myprovider@test"},
+						UsedBy: []string{"bar@myprovider", "test@myprovider"},
 					},
 				},
 			},
@@ -838,7 +838,7 @@ func TestHandlerHTTP_API(t *testing.T) {
 		},
 		{
 			desc: "one middleware by id, but no config",
-			path: "/api/http/middlewares/myprovider@foo",
+			path: "/api/http/middlewares/foo@myprovider",
 			conf: config.RuntimeConfiguration{},
 			expected: expected{
 				statusCode: http.StatusNotFound,
@@ -912,7 +912,7 @@ func TestHandler_Configuration(t *testing.T) {
 			path: "/api/rawdata",
 			conf: config.RuntimeConfiguration{
 				Services: map[string]*config.ServiceInfo{
-					"myprovider@foo-service": {
+					"foo-service@myprovider": {
 						Service: &config.Service{
 							LoadBalancer: &config.LoadBalancerService{
 								Servers: []config.Server{
@@ -925,21 +925,21 @@ func TestHandler_Configuration(t *testing.T) {
 					},
 				},
 				Middlewares: map[string]*config.MiddlewareInfo{
-					"myprovider@auth": {
+					"auth@myprovider": {
 						Middleware: &config.Middleware{
 							BasicAuth: &config.BasicAuth{
 								Users: []string{"admin:admin"},
 							},
 						},
 					},
-					"myprovider@addPrefixTest": {
+					"addPrefixTest@myprovider": {
 						Middleware: &config.Middleware{
 							AddPrefix: &config.AddPrefix{
 								Prefix: "/titi",
 							},
 						},
 					},
-					"anotherprovider@addPrefixTest": {
+					"addPrefixTest@anotherprovider": {
 						Middleware: &config.Middleware{
 							AddPrefix: &config.AddPrefix{
 								Prefix: "/toto",
@@ -948,25 +948,25 @@ func TestHandler_Configuration(t *testing.T) {
 					},
 				},
 				Routers: map[string]*config.RouterInfo{
-					"myprovider@bar": {
+					"bar@myprovider": {
 						Router: &config.Router{
 							EntryPoints: []string{"web"},
-							Service:     "myprovider@foo-service",
+							Service:     "foo-service@myprovider",
 							Rule:        "Host(`foo.bar`)",
-							Middlewares: []string{"auth", "anotherprovider@addPrefixTest"},
+							Middlewares: []string{"auth", "addPrefixTest@anotherprovider"},
 						},
 					},
-					"myprovider@test": {
+					"test@myprovider": {
 						Router: &config.Router{
 							EntryPoints: []string{"web"},
-							Service:     "myprovider@foo-service",
+							Service:     "foo-service@myprovider",
 							Rule:        "Host(`foo.bar.other`)",
 							Middlewares: []string{"addPrefixTest", "auth"},
 						},
 					},
 				},
 				TCPServices: map[string]*config.TCPServiceInfo{
-					"myprovider@tcpfoo-service": {
+					"tcpfoo-service@myprovider": {
 						TCPService: &config.TCPService{
 							LoadBalancer: &config.TCPLoadBalancerService{
 								Servers: []config.TCPServer{
@@ -979,23 +979,22 @@ func TestHandler_Configuration(t *testing.T) {
 					},
 				},
 				TCPRouters: map[string]*config.TCPRouterInfo{
-					"myprovider@tcpbar": {
+					"tcpbar@myprovider": {
 						TCPRouter: &config.TCPRouter{
 							EntryPoints: []string{"web"},
-							Service:     "myprovider@tcpfoo-service",
+							Service:     "tcpfoo-service@myprovider",
 							Rule:        "HostSNI(`foo.bar`)",
 						},
 					},
-					"myprovider@tcptest": {
+					"tcptest@myprovider": {
 						TCPRouter: &config.TCPRouter{
 							EntryPoints: []string{"web"},
-							Service:     "myprovider@tcpfoo-service",
+							Service:     "tcpfoo-service@myprovider",
 							Rule:        "HostSNI(`foo.bar.other`)",
 						},
 					},
 				},
 			},
-
 			expected: expected{
 				statusCode: http.StatusOK,
 				json:       "testdata/getrawdata.json",
@@ -1011,6 +1010,7 @@ func TestHandler_Configuration(t *testing.T) {
 			// TODO: server status
 
 			rtConf := &test.conf
+
 			rtConf.PopulateUsedBy()
 			handler := New(static.Configuration{API: &static.API{}, Global: &static.Global{}}, rtConf)
 			router := mux.NewRouter()
@@ -1054,10 +1054,10 @@ func TestHandler_Configuration(t *testing.T) {
 func generateHTTPRouters(nbRouters int) map[string]*config.RouterInfo {
 	routers := make(map[string]*config.RouterInfo, nbRouters)
 	for i := 0; i < nbRouters; i++ {
-		routers[fmt.Sprintf("myprovider@bar%2d", i)] = &config.RouterInfo{
+		routers[fmt.Sprintf("bar%2d@myprovider", i)] = &config.RouterInfo{
 			Router: &config.Router{
 				EntryPoints: []string{"web"},
-				Service:     "myprovider@foo-service",
+				Service:     "foo-service@myprovider",
 				Rule:        "Host(`foo.bar" + strconv.Itoa(i) + "`)",
 			},
 		}

pkg/api/testdata/getrawdata.json

@@ -1,17 +1,17 @@
 {
 	"routers": {
-		"myprovider@bar": {
+		"bar@myprovider": {
 			"entryPoints": [
 				"web"
 			],
 			"middlewares": [
 				"auth",
-				"anotherprovider@addPrefixTest"
+				"addPrefixTest@anotherprovider"
 			],
-			"service": "myprovider@foo-service",
+			"service": "foo-service@myprovider",
 			"rule": "Host(`foo.bar`)"
 		},
-		"myprovider@test": {
+		"test@myprovider": {
 			"entryPoints": [
 				"web"
 			],
@@ -19,41 +19,41 @@
 				"addPrefixTest",
 				"auth"
 			],
-			"service": "myprovider@foo-service",
+			"service": "foo-service@myprovider",
 			"rule": "Host(`foo.bar.other`)"
 		}
 	},
 	"middlewares": {
-		"anotherprovider@addPrefixTest": {
+		"addPrefixTest@anotherprovider": {
 			"addPrefix": {
 				"prefix": "/toto"
 			},
 			"usedBy": [
-				"myprovider@bar"
+				"bar@myprovider"
 			]
 		},
-		"myprovider@addPrefixTest": {
+		"addPrefixTest@myprovider": {
 			"addPrefix": {
 				"prefix": "/titi"
 			},
 			"usedBy": [
-				"myprovider@test"
+				"test@myprovider"
 			]
 		},
-		"myprovider@auth": {
+		"auth@myprovider": {
 			"basicAuth": {
 				"users": [
 					"admin:admin"
 				]
 			},
 			"usedBy": [
-				"myprovider@bar",
-				"myprovider@test"
+				"bar@myprovider",
+				"test@myprovider"
 			]
 		}
 	},
 	"services": {
-		"myprovider@foo-service": {
+		"foo-service@myprovider": {
 			"loadbalancer": {
 				"servers": [
 					{
@@ -63,29 +63,29 @@
 				"passHostHeader": false
 			},
 			"usedBy": [
-				"myprovider@bar",
-				"myprovider@test"
+				"bar@myprovider",
+				"test@myprovider"
 			]
 		}
 	},
 	"tcpRouters": {
-		"myprovider@tcpbar": {
+		"tcpbar@myprovider": {
 			"entryPoints": [
 				"web"
 			],
-			"service": "myprovider@tcpfoo-service",
+			"service": "tcpfoo-service@myprovider",
 			"rule": "HostSNI(`foo.bar`)"
 		},
-		"myprovider@tcptest": {
+		"tcptest@myprovider": {
 			"entryPoints": [
 				"web"
 			],
-			"service": "myprovider@tcpfoo-service",
+			"service": "tcpfoo-service@myprovider",
 			"rule": "HostSNI(`foo.bar.other`)"
 		}
 	},
 	"tcpServices": {
-		"myprovider@tcpfoo-service": {
+		"tcpfoo-service@myprovider": {
 			"loadbalancer": {
 				"servers": [
 					{
@@ -94,8 +94,8 @@
 				]
 			},
 			"usedBy": [
-				"myprovider@tcpbar",
-				"myprovider@tcptest"
+				"tcpbar@myprovider",
+				"tcptest@myprovider"
 			]
 		}
 	}

pkg/api/testdata/middleware-auth.json

@@ -4,10 +4,10 @@
 			"admin:admin"
 		]
 	},
-	"name": "myprovider@auth",
-	"provider": "myprovider@auth",
+	"name": "auth@myprovider",
+	"provider": "myprovider",
 	"usedBy": [
-		"myprovider@bar",
-		"myprovider@test"
+		"bar@myprovider",
+		"test@myprovider"
 	]
 }

pkg/api/testdata/middlewares-page2.json

@@ -3,10 +3,10 @@
 		"addPrefix": {
 			"prefix": "/titi"
 		},
-		"name": "myprovider@addPrefixTest",
-		"provider": "myprovider@addPrefixTest",
+		"name": "addPrefixTest@myprovider",
+		"provider": "myprovider",
 		"usedBy": [
-			"myprovider@test"
+			"test@myprovider"
 		]
 	}
 ]

pkg/api/testdata/middlewares.json

@@ -3,20 +3,20 @@
 		"addPrefix": {
 			"prefix": "/toto"
 		},
-		"name": "anotherprovider@addPrefixTest",
-		"provider": "anotherprovider@addPrefixTest",
+		"name": "addPrefixTest@anotherprovider",
+		"provider": "anotherprovider",
 		"usedBy": [
-			"myprovider@bar"
+			"bar@myprovider"
 		]
 	},
 	{
 		"addPrefix": {
 			"prefix": "/titi"
 		},
-		"name": "myprovider@addPrefixTest",
-		"provider": "myprovider@addPrefixTest",
+		"name": "addPrefixTest@myprovider",
+		"provider": "myprovider",
 		"usedBy": [
-			"myprovider@test"
+			"test@myprovider"
 		]
 	},
 	{
@@ -25,11 +25,11 @@
 				"admin:admin"
 			]
 		},
-		"name": "myprovider@auth",
-		"provider": "myprovider@auth",
+		"name": "auth@myprovider",
+		"provider": "myprovider",
 		"usedBy": [
-			"myprovider@bar",
-			"myprovider@test"
+			"bar@myprovider",
+			"test@myprovider"
 		]
 	}
 ]

pkg/api/testdata/router-bar.json

@@ -4,10 +4,10 @@
 	],
 	"middlewares": [
 		"auth",
-		"anotherprovider@addPrefixTest"
+		"addPrefixTest@anotherprovider"
 	],
-	"name": "myprovider@bar",
-	"provider": "myprovider@bar",
+	"name": "bar@myprovider",
+	"provider": "myprovider",
 	"rule": "Host(`foo.bar`)",
-	"service": "myprovider@foo-service"
+	"service": "foo-service@myprovider"
 }

pkg/api/testdata/routers-many-lastpage.json

@@ -3,45 +3,45 @@
 		"entryPoints": [
 			"web"
 		],
-		"name": "myprovider@bar14",
-		"provider": "myprovider@bar14",
+		"name": "bar14@myprovider",
+		"provider": "myprovider",
 		"rule": "Host(`foo.bar14`)",
-		"service": "myprovider@foo-service"
+		"service": "foo-service@myprovider"
 	},
 	{
 		"entryPoints": [
 			"web"
 		],
-		"name": "myprovider@bar15",
-		"provider": "myprovider@bar15",
+		"name": "bar15@myprovider",
+		"provider": "myprovider",
 		"rule": "Host(`foo.bar15`)",
-		"service": "myprovider@foo-service"
+		"service": "foo-service@myprovider"
 	},
 	{
 		"entryPoints": [
 			"web"
 		],
-		"name": "myprovider@bar16",
-		"provider": "myprovider@bar16",
+		"name": "bar16@myprovider",
+		"provider": "myprovider",
 		"rule": "Host(`foo.bar16`)",
-		"service": "myprovider@foo-service"
+		"service": "foo-service@myprovider"
 	},
 	{
 		"entryPoints": [
 			"web"
 		],
-		"name": "myprovider@bar17",
-		"provider": "myprovider@bar17",
+		"name": "bar17@myprovider",
+		"provider": "myprovider",
 		"rule": "Host(`foo.bar17`)",
-		"service": "myprovider@foo-service"
+		"service": "foo-service@myprovider"
 	},
 	{
 		"entryPoints": [
 			"web"
 		],
-		"name": "myprovider@bar18",
-		"provider": "myprovider@bar18",
+		"name": "bar18@myprovider",
+		"provider": "myprovider",
 		"rule": "Host(`foo.bar18`)",
-		"service": "myprovider@foo-service"
+		"service": "foo-service@myprovider"
 	}
 ]

pkg/api/testdata/routers-page2.json

@@ -3,9 +3,9 @@
 		"entryPoints": [
 			"web"
 		],
-		"name": "myprovider@baz",
-		"provider": "myprovider@baz",
+		"name": "baz@myprovider",
+		"provider": "myprovider",
 		"rule": "Host(`toto.bar`)",
-		"service": "myprovider@foo-service"
+		"service": "foo-service@myprovider"
 	}
 ]

pkg/api/testdata/routers.json

@@ -5,12 +5,12 @@
 		],
 		"middlewares": [
 			"auth",
-			"anotherprovider@addPrefixTest"
+			"addPrefixTest@anotherprovider"
 		],
-		"name": "myprovider@bar",
-		"provider": "myprovider@bar",
+		"name": "bar@myprovider",
+		"provider": "myprovider",
 		"rule": "Host(`foo.bar`)",
-		"service": "myprovider@foo-service"
+		"service": "foo-service@myprovider"
 	},
 	{
 		"entryPoints": [
@@ -20,9 +20,9 @@
 			"addPrefixTest",
 			"auth"
 		],
-		"name": "myprovider@test",
-		"provider": "myprovider@test",
+		"name": "test@myprovider",
+		"provider": "myprovider",
 		"rule": "Host(`foo.bar.other`)",
-		"service": "myprovider@foo-service"
+		"service": "foo-service@myprovider"
 	}
 ]

pkg/api/testdata/service-bar.json

@@ -7,13 +7,13 @@
 			}
 		]
 	},
-	"name": "myprovider@bar",
-	"provider": "myprovider@bar",
+	"name": "bar@myprovider",
+	"provider": "myprovider",
 	"serverStatus": {
 		"http://127.0.0.1": "UP"
 	},
 	"usedBy": [
-		"myprovider@foo",
-		"myprovider@test"
+		"foo@myprovider",
+		"test@myprovider"
 	]
 }

pkg/api/testdata/services-page2.json

@@ -8,13 +8,13 @@
 				}
 			]
 		},
-		"name": "myprovider@baz",
-		"provider": "myprovider@baz",
+		"name": "baz@myprovider",
+		"provider": "myprovider",
 		"serverStatus": {
 			"http://127.0.0.2": "UP"
 		},
 		"usedBy": [
-			"myprovider@foo"
+			"foo@myprovider"
 		]
 	}
 ]

pkg/api/testdata/services.json

@@ -8,14 +8,14 @@
 				}
 			]
 		},
-		"name": "myprovider@bar",
-		"provider": "myprovider@bar",
+		"name": "bar@myprovider",
+		"provider": "myprovider",
 		"serverStatus": {
 			"http://127.0.0.1": "UP"
 		},
 		"usedBy": [
-			"myprovider@foo",
-			"myprovider@test"
+			"foo@myprovider",
+			"test@myprovider"
 		]
 	},
 	{
@@ -27,13 +27,13 @@
 				}
 			]
 		},
-		"name": "myprovider@baz",
-		"provider": "myprovider@baz",
+		"name": "baz@myprovider",
+		"provider": "myprovider",
 		"serverStatus": {
 			"http://127.0.0.2": "UP"
 		},
 		"usedBy": [
-			"myprovider@foo"
+			"foo@myprovider"
 		]
 	}
 ]

pkg/api/testdata/tcprouter-bar.json

@@ -2,8 +2,8 @@
 	"entryPoints": [
 		"web"
 	],
-	"name": "myprovider@bar",
-	"provider": "myprovider@bar",
+	"name": "bar@myprovider",
+	"provider": "myprovider",
 	"rule": "Host(`foo.bar`)",
-	"service": "myprovider@foo-service"
+	"service": "foo-service@myprovider"
 }

pkg/api/testdata/tcprouters-page2.json

@@ -3,9 +3,9 @@
 		"entryPoints": [
 			"web"
 		],
-		"name": "myprovider@baz",
-		"provider": "myprovider@baz",
+		"name": "baz@myprovider",
+		"provider": "myprovider",
 		"rule": "Host(`toto.bar`)",
-		"service": "myprovider@foo-service"
+		"service": "foo-service@myprovider"
 	}
 ]

pkg/api/testdata/tcprouters.json

@@ -3,19 +3,19 @@
 		"entryPoints": [
 			"web"
 		],
-		"name": "myprovider@bar",
-		"provider": "myprovider@bar",
+		"name": "bar@myprovider",
+		"provider": "myprovider",
 		"rule": "Host(`foo.bar`)",
-		"service": "myprovider@foo-service"
+		"service": "foo-service@myprovider"
 	},
 	{
 		"entryPoints": [
 			"web"
 		],
-		"name": "myprovider@test",
-		"provider": "myprovider@test",
+		"name": "test@myprovider",
+		"provider": "myprovider",
 		"rule": "Host(`foo.bar.other`)",
-		"service": "myprovider@foo-service",
+		"service": "foo-service@myprovider",
 		"tls": {
 			"passthrough": false
 		}

pkg/api/testdata/tcpservice-bar.json

@@ -6,10 +6,10 @@
 			}
 		]
 	},
-	"name": "myprovider@bar",
-	"provider": "myprovider@bar",
+	"name": "bar@myprovider",
+	"provider": "myprovider",
 	"usedBy": [
-		"myprovider@foo",
-		"myprovider@test"
+		"foo@myprovider",
+		"test@myprovider"
 	]
 }

pkg/api/testdata/tcpservices-page2.json

@@ -7,10 +7,10 @@
 				}
 			]
 		},
-		"name": "myprovider@baz",
-		"provider": "myprovider@baz",
+		"name": "baz@myprovider",
+		"provider": "myprovider",
 		"usedBy": [
-			"myprovider@foo"
+			"foo@myprovider"
 		]
 	}
 ]

pkg/api/testdata/tcpservices.json

@@ -7,11 +7,11 @@
 				}
 			]
 		},
-		"name": "myprovider@bar",
-		"provider": "myprovider@bar",
+		"name": "bar@myprovider",
+		"provider": "myprovider",
 		"usedBy": [
-			"myprovider@foo",
-			"myprovider@test"
+			"foo@myprovider",
+			"test@myprovider"
 		]
 	},
 	{
@@ -22,10 +22,10 @@
 				}
 			]
 		},
-		"name": "myprovider@baz",
-		"provider": "myprovider@baz",
+		"name": "baz@myprovider",
+		"provider": "myprovider",
 		"usedBy": [
-			"myprovider@foo"
+			"foo@myprovider"
 		]
 	}
 ]