These types were just a straight map[string]XXX, with no methods or other
properties attached.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| ... | ... |
@@ -30,12 +30,8 @@ const ( |
| 30 | 30 |
flagVepa = "vepa" // ipvlan flag vepa |
| 31 | 31 |
) |
| 32 | 32 |
|
| 33 |
-type endpointTable map[string]*endpoint |
|
| 34 |
- |
|
| 35 |
-type networkTable map[string]*network |
|
| 36 |
- |
|
| 37 | 33 |
type driver struct {
|
| 38 |
- networks networkTable |
|
| 34 |
+ networks map[string]*network |
|
| 39 | 35 |
sync.Once |
| 40 | 36 |
sync.Mutex |
| 41 | 37 |
store *datastore.Store |
| ... | ... |
@@ -54,7 +50,7 @@ type endpoint struct {
|
| 54 | 54 |
|
| 55 | 55 |
type network struct {
|
| 56 | 56 |
id string |
| 57 |
- endpoints endpointTable |
|
| 57 |
+ endpoints map[string]*endpoint |
|
| 58 | 58 |
driver *driver |
| 59 | 59 |
config *configuration |
| 60 | 60 |
sync.Mutex |
| ... | ... |
@@ -64,7 +60,7 @@ type network struct {
|
| 64 | 64 |
func Register(r driverapi.Registerer, store *datastore.Store) error {
|
| 65 | 65 |
d := &driver{
|
| 66 | 66 |
store: store, |
| 67 |
- networks: networkTable{},
|
|
| 67 |
+ networks: map[string]*network{},
|
|
| 68 | 68 |
} |
| 69 | 69 |
if err := d.initStore(); err != nil {
|
| 70 | 70 |
return err |
| ... | ... |
@@ -24,12 +24,8 @@ const ( |
| 24 | 24 |
driverModeOpt = "macvlan_mode" // macvlan mode ux opt suffix |
| 25 | 25 |
) |
| 26 | 26 |
|
| 27 |
-type endpointTable map[string]*endpoint |
|
| 28 |
- |
|
| 29 |
-type networkTable map[string]*network |
|
| 30 |
- |
|
| 31 | 27 |
type driver struct {
|
| 32 |
- networks networkTable |
|
| 28 |
+ networks map[string]*network |
|
| 33 | 29 |
sync.Once |
| 34 | 30 |
sync.Mutex |
| 35 | 31 |
store *datastore.Store |
| ... | ... |
@@ -48,7 +44,7 @@ type endpoint struct {
|
| 48 | 48 |
|
| 49 | 49 |
type network struct {
|
| 50 | 50 |
id string |
| 51 |
- endpoints endpointTable |
|
| 51 |
+ endpoints map[string]*endpoint |
|
| 52 | 52 |
driver *driver |
| 53 | 53 |
config *configuration |
| 54 | 54 |
sync.Mutex |
| ... | ... |
@@ -58,7 +54,7 @@ type network struct {
|
| 58 | 58 |
func Register(r driverapi.Registerer, store *datastore.Store) error {
|
| 59 | 59 |
d := &driver{
|
| 60 | 60 |
store: store, |
| 61 |
- networks: networkTable{},
|
|
| 61 |
+ networks: map[string]*network{},
|
|
| 62 | 62 |
} |
| 63 | 63 |
if err := d.initStore(); err != nil {
|
| 64 | 64 |
return err |