Skip to content
Snippets Groups Projects
Commit 1c737778 authored by Łukasz Łopatowski's avatar Łukasz Łopatowski
Browse files

Added label for namespace and basic test

parent 86432a1b
No related branches found
No related tags found
No related merge requests found
...@@ -716,9 +716,15 @@ func (s *namespaceServiceServer) CreateNamespace(ctx context.Context, req *v1.Na ...@@ -716,9 +716,15 @@ func (s *namespaceServiceServer) CreateNamespace(ctx context.Context, req *v1.Na
if err := checkAPI(req.Api, apiVersion); err != nil { if err := checkAPI(req.Api, apiVersion); err != nil {
return nil, err return nil, err
} }
logLine(fmt.Sprintf("Creating namespace %s with %d annotations", req.Namespace, len(req.Annotations)))
ns := apiv1.Namespace{} ns := apiv1.Namespace{}
ns.Name = req.Namespace ns.Name = req.Namespace
labels := make(map[string]string)
labels["name"] = req.Namespace
ns.SetLabels(labels)
annotations := make(map[string]string) annotations := make(map[string]string)
for _, a := range req.Annotations { for _, a := range req.Annotations {
annotations[a.Key] = a.Value annotations[a.Key] = a.Value
......
...@@ -464,4 +464,23 @@ func TestPodServiceServer_RetrievePodLogs(t *testing.T) { ...@@ -464,4 +464,23 @@ func TestPodServiceServer_RetrievePodLogs(t *testing.T) {
if err != nil || res.Status != v1.Status_OK || len(res.Lines) != 1 { if err != nil || res.Status != v1.Status_OK || len(res.Lines) != 1 {
t.Fail() t.Fail()
} }
}
func TestNamespaceServiceServer_CreateNamespace(t *testing.T) {
client := testclient.NewSimpleClientset()
server := NewNamespaceServiceServer(client)
//Fail on API version check
nsReq := v1.NamespaceRequest{Api:"invalid", Namespace:"ns1", Annotations:nil}
res, err := server.CreateNamespace(context.Background(), &nsReq)
if err == nil || res != nil {
t.Fail()
}
nsReq = v1.NamespaceRequest{Api:apiVersion, Namespace:"ns1", Annotations:nil}
//Pass
res, err = server.CreateNamespace(context.Background(), &nsReq)
if err != nil || res.Status != v1.Status_OK {
t.Fail()
}
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment