Epif cleanup #16
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| /*** | ||
| Copyright 2014 Cisco Systems Inc. All rights reserved. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package crt | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "errors" | ||
| "reflect" | ||
|
|
||
| "github.com/contiv/netplugin/core" | ||
| "github.com/contiv/netplugin/crt/docker" | ||
| ) | ||
|
|
||
| type Crt struct { | ||
| ContainerIf core.ContainerIf | ||
| } | ||
|
|
||
| type CrtConfig struct { | ||
| Crt struct { | ||
| Type string | ||
| } | ||
| } | ||
|
|
||
| type ContainerIfTypes struct { | ||
| CrtType reflect.Type | ||
| CrtConfigType reflect.Type | ||
| } | ||
|
|
||
| var ContainerIfRegistry = map[string]ContainerIfTypes{ | ||
| "docker": ContainerIfTypes{ | ||
| CrtType: reflect.TypeOf(docker.Docker{}), | ||
| CrtConfigType: reflect.TypeOf(docker.DockerConfig{}), | ||
| }, | ||
| } | ||
|
|
||
| type ContainerEpContext struct { | ||
| NewContName string | ||
| CurrContName string | ||
| InterfaceId string | ||
| IpAddress string | ||
| SubnetLen uint | ||
| DefaultGw string | ||
| } | ||
|
|
||
| func (c *Crt) AttachEndpoint(contEpContext *core.ContainerEpContext) error { | ||
| return c.ContainerIf.AttachEndpoint(contEpContext) | ||
| } | ||
|
|
||
| func (c *Crt) DetachEndpoint(contEpContext *core.ContainerEpContext) error { | ||
| return c.ContainerIf.DetachEndpoint(contEpContext) | ||
| } | ||
|
|
||
| func (c *Crt) GetContainerId(contName string) string { | ||
| return c.ContainerIf.GetContainerId(contName) | ||
| } | ||
|
|
||
| func (c *Crt) GetContainerName(contId string) (string, error) { | ||
| return c.ContainerIf.GetContainerName(contId) | ||
| } | ||
|
|
||
| func (c *Crt) Deinit() { | ||
| c.ContainerIf.Deinit() | ||
| } | ||
|
|
||
| func (c *Crt) Init(configStr string) error { | ||
|
|
||
| cfg := &CrtConfig{} | ||
| err := json.Unmarshal([]byte(configStr), cfg) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if _, ok := ContainerIfRegistry[cfg.Crt.Type]; !ok { | ||
| return errors.New("unregistered container run time") | ||
| } | ||
|
|
||
| crtConfigType := ContainerIfRegistry[cfg.Crt.Type].CrtConfigType | ||
| crtConfig := reflect.New(crtConfigType).Interface() | ||
| err = json.Unmarshal([]byte(configStr), crtConfig) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| config := &core.Config{V: crtConfig} | ||
| crtType := ContainerIfRegistry[cfg.Crt.Type].CrtType | ||
| crtif := reflect.New(crtType).Interface() | ||
| c.ContainerIf = crtif.(core.ContainerIf) | ||
| err = c.ContainerIf.Init(config) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| /*** | ||
| Copyright 2014 Cisco Systems Inc. All rights reserved. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package crt | ||
|
|
||
| import ( | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestCrtInit(t *testing.T) { | ||
| configStr := `{ | ||
| "docker" : { | ||
| "socket" : "unix:///var/run/docker.sock" | ||
| }, | ||
| "crt" : { | ||
| "type": "docker" | ||
| } | ||
| }` | ||
| crt := Crt{} | ||
| err := crt.Init(configStr) | ||
| if err != nil { | ||
| t.Fatalf("crt init failed: Error: %s", err) | ||
| } | ||
| defer func() { crt.Deinit() }() | ||
| } | ||
|
|
||
| func TestCrtInitInvalidConfigMissingCrt(t *testing.T) { | ||
| configStr := `{ | ||
| "docker" : { | ||
| "socket" : "unix:///var/run/docker.sock" | ||
| } | ||
| }` | ||
| crt := Crt{} | ||
| err := crt.Init(configStr) | ||
| if err == nil { | ||
| t.Fatalf("crt init succeeded!") | ||
| } | ||
| } | ||
|
|
||
| func TestCrtInitInvalidConfigMissingCrtIf(t *testing.T) { | ||
| configStr := `{ | ||
| "crt" : { | ||
| "type": "docker" | ||
| } | ||
| }` | ||
| crt := Crt{} | ||
| err := crt.Init(configStr) | ||
| if err == nil { | ||
| t.Fatalf("crt init succeeded!") | ||
| } | ||
| } | ||
|
|
||
| func TestCrtInitInvalidConfigInvalidCrt(t *testing.T) { | ||
| configStr := `{ | ||
| "crt" : { | ||
| "type": "rocket" | ||
| } | ||
| }` | ||
| crt := Crt{} | ||
| err := crt.Init(configStr) | ||
| if err == nil { | ||
| t.Fatalf("crt init succeeded!") | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggest to move the UpdateContainerId() out as well? Please ignore, if you were planning it for later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Update ContainerID is just a name of the function, there is nothing specific to container runtime there. I was hoping to not do updates to Ep record from oustide drivers code.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hmm, it does imply that Endpoint driver Interface has something to do with containers, which is not the case.
Looks like this API updates the container-id in the EP oper-state in current implementation, should we just do it as part of attach/detach endpoint in the crt's logic? this looks more like some config meta for container runtime than network programming driver.