Browse code

Minor: move 'ovsPluginName' to project_options.go, used by join-projects/isolate-projects/make-projects-global rename adminVNID to globalVNID

Ravi Sankar Penta authored on 2016/01/04 04:45:47
Showing 3 changed files
... ...
@@ -14,8 +14,6 @@ import (
14 14
 )
15 15
 
16 16
 const (
17
-	ovsPluginName = "redhat/openshift-ovs-multitenant"
18
-
19 17
 	JoinProjectsNetworkCommandName = "join-projects"
20 18
 
21 19
 	joinProjectsNetworkLong = `
... ...
@@ -13,7 +13,7 @@ import (
13 13
 )
14 14
 
15 15
 const (
16
-	adminVNID = uint(0)
16
+	globalVNID = uint(0)
17 17
 
18 18
 	MakeGlobalProjectsNetworkCommandName = "make-projects-global"
19 19
 
... ...
@@ -71,7 +71,7 @@ func (m *MakeGlobalOptions) Run() error {
71 71
 
72 72
 	errList := []error{}
73 73
 	for _, project := range projects {
74
-		err = m.Options.CreateOrUpdateNetNamespace(project.ObjectMeta.Name, adminVNID)
74
+		err = m.Options.CreateOrUpdateNetNamespace(project.ObjectMeta.Name, globalVNID)
75 75
 		if err != nil {
76 76
 			errList = append(errList, fmt.Errorf("Removing network isolation for project '%s' failed, error: %v", project.ObjectMeta.Name, err))
77 77
 		}
... ...
@@ -25,6 +25,10 @@ import (
25 25
 	sdnapi "github.com/openshift/origin/pkg/sdn/api"
26 26
 )
27 27
 
28
+const (
29
+	ovsPluginName = "redhat/openshift-ovs-multitenant"
30
+)
31
+
28 32
 type ProjectOptions struct {
29 33
 	DefaultNamespace string
30 34
 	Oclient          *osclient.Client