Merge branch 'scheduler_integ'

Vipin Jain · Vipin Jain · commit 0a9fad0002df · 2015-03-17T15:46:46.000-07:00
diff --git a/examples/late_bindings/multiple_vxlan_nets.json b/examples/late_bindings/multiple_vxlan_nets.json
@@ -0,0 +1,36 @@
+
+{
+    "Hosts" : [{
+        "Name"                  : "host1",
+        "VtepIp"                : "192.168.2.10"
+    },
+    {
+        "Name"                  : "host2",
+        "VtepIp"                : "192.168.2.11"
+    }],
+    "Tenants" : [ {
+        "Name"                      : "tenant-one",
+        "DefaultNetType"            : "vxlan",
+        "SubnetPool"                : "11.1.0.0/16",
+        "AllocSubnetLen"            : 24,
+        "Vxlans"                    : "10001-20000",
+        "Networks"  : [ {
+            "Name"                  : "orange",
+            "Endpoints" : [ {
+                "Container"         : "myContainer1"
+            },
+            {
+                "Container"         : "myContainer3"
+            } ]
+        },
+        {
+            "Name"                  : "purple",
+            "Endpoints" : [ {
+                "Container"         : "myContainer2"
+            },
+            {
+                "Container"         : "myContainer4"
+            } ]
+        } ]
+    } ]
+}
diff --git a/examples/late_bindings/multiple_vxlan_nets_host_bindings.json b/examples/late_bindings/multiple_vxlan_nets_host_bindings.json
@@ -0,0 +1,17 @@
+
+[{
+    "Container"         : "myContainer1",
+    "Host"              : "host1"
+},
+{
+    "Container"         : "myContainer2",
+    "Host"              : "host1"
+},
+{
+    "Container"         : "myContainer3",
+    "Host"              : "host2"
+},
+{
+    "Container"         : "myContainer4",
+    "Host"              : "host2"
+}]
diff --git a/netdcli/cfg.go b/netdcli/cfg.go
@@ -233,18 +233,34 @@ func executeJsonCfg(defOpts *cliOpts) (err error) {
 		return err
 	}
 
-	allCfg := &netmaster.Config{}
-	err = json.Unmarshal(data, allCfg)
+	stateDriver, err := initEtcd(defOpts)
 	if err != nil {
-		log.Printf("unmarshal error '%s', tenants %v \n", err, allCfg)
+		log.Fatalf("Failed to init etcd driver. Error: %s", err)
+	}
+
+	if opts.cfgHostBindings {
+		epBindings := []netmaster.ConfigEp{}
+		err = json.Unmarshal(data, &epBindings)
+		if err != nil {
+			log.Printf("error '%s' unmarshing host bindings, data %s \n",
+				err, data)
+			return
+		}
+
+		err = netmaster.CreateEpBindings(stateDriver, &epBindings)
+		if err != nil {
+			log.Printf("error '%s' creating host bindings \n", err)
+		}
 		return
 	}
-	// log.Printf("parsed config %v \n", allCfg)
 
-	stateDriver, err := initEtcd(defOpts)
+	allCfg := &netmaster.Config{}
+	err = json.Unmarshal(data, allCfg)
 	if err != nil {
-		log.Fatalf("Failed to init etcd driver. Error: %s", err)
+		log.Printf("error '%s' unmarshaling tenant cfg, data %s \n", err, data)
+		return
 	}
+	// log.Printf("parsed config %v \n", allCfg)
 
 	if defOpts.cfgDesired {
 		err = deleteDelta(stateDriver, allCfg)
@@ -256,8 +272,11 @@ func executeJsonCfg(defOpts *cliOpts) (err error) {
 
 	if defOpts.cfgDeletions {
 		err = processDeletions(stateDriver, allCfg)
-	} else {
+	} else if defOpts.cfgAdditions || defOpts.cfgDesired {
 		err = processAdditions(stateDriver, allCfg)
+	} else {
+		log.Fatalf("invalid json config file type\n")
+		return
 	}
 	if err != nil {
 		log.Printf("error processing cfg '%s' \n", err)
diff --git a/netdcli/netdcli.go b/netdcli/netdcli.go
@@ -104,30 +104,31 @@ func (c *Construct) Get() interface{} {
 }
 
 type cliOpts struct {
-	help           bool
-	cfgDesired     bool
-	cfgAdditions   bool
-	cfgDeletions   bool
-	oper           Operation
-	construct      Construct
-	etcdUrl        string
-	tenant         string
-	netId          string
-	pktTag         string
-	pktTagType     string
-	subnetCidr     string
-	ipAddr         string
-	contName       string
-	subnetIp       string
-	subnetLen      uint
-	allocSubnetLen uint
-	defaultGw      string
-	idStr          string
-	vlans          string
-	vxlans         string
-	homingHost     string
-	vtepIp         string
-	intfName       string
+	help            bool
+	cfgDesired      bool
+	cfgAdditions    bool
+	cfgDeletions    bool
+	cfgHostBindings bool
+	oper            Operation
+	construct       Construct
+	etcdUrl         string
+	tenant          string
+	netId           string
+	pktTag          string
+	pktTagType      string
+	subnetCidr      string
+	ipAddr          string
+	contName        string
+	subnetIp        string
+	subnetLen       uint
+	allocSubnetLen  uint
+	defaultGw       string
+	idStr           string
+	vlans           string
+	vxlans          string
+	homingHost      string
+	vtepIp          string
+	intfName        string
 }
 
 var opts cliOpts
@@ -141,6 +142,10 @@ func init() {
 	flagSet.Var(&opts.construct,
 		"construct",
 		"Construct to operate on i.e network or endpoint")
+	flagSet.BoolVar(&opts.cfgHostBindings,
+		"host-bindings-cfg",
+		false,
+		"Json file describing container to host bindings")
 	flagSet.BoolVar(&opts.cfgAdditions,
 		"add-cfg",
 		false,
@@ -461,7 +466,7 @@ func main() {
 	}
 	opts.idStr = flagSet.Arg(0)
 
-	if opts.cfgDesired || opts.cfgDeletions || opts.cfgAdditions {
+	if opts.cfgDesired || opts.cfgDeletions || opts.cfgAdditions || opts.cfgHostBindings {
 		err = executeJsonCfg(&opts)
 	} else {
 		err = executeOpts(&opts)
diff --git a/netmaster/netmaster.go b/netmaster/netmaster.go
@@ -13,10 +13,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// netmaster  - implements the network intent translation to plugin
-// events; uses state distribution to achieve intent realization
-// netmaster runs as a logically centralized unit on in the cluster
-
 package netmaster
 
 import (
@@ -697,6 +693,9 @@ func validateEndpointConfig(stateDriver core.StateDriver, tenant *ConfigTenant)
 		}
 
 		for _, ep := range network.Endpoints {
+			if ep.Container == "" {
+				return errors.New("invalid container name for the endpoint")
+			}
 			if ep.IpAddress != "" {
 				nwMasterCfg := &MasterNwConfig{StateDriver: stateDriver}
 				err = nwMasterCfg.Read(network.Name)
@@ -927,3 +926,49 @@ func DeleteEndpoints(stateDriver core.StateDriver, tenant *ConfigTenant) error {
 
 	return err
 }
+
+func validateEpBindings(epBindings *[]ConfigEp) error {
+	for _, ep := range *epBindings {
+		if ep.Host == "" {
+			return errors.New("invalid host name for the endpoint")
+		}
+		if ep.Container == "" {
+			return errors.New("invalid container name for the endpoint")
+		}
+	}
+
+	return nil
+}
+
+func CreateEpBindings(stateDriver core.StateDriver, epBindings *[]ConfigEp) error {
+
+	err := validateEpBindings(epBindings)
+	if err != nil {
+		log.Printf("error '%s' validating the ep bindings \n", err)
+		return err
+	}
+
+	epCfgs, err := drivers.ReadAllOvsCfgEndpoints(stateDriver)
+	if err != nil {
+		log.Printf("error '%s' fetching eps \n", err)
+		return err
+	}
+	for _, ep := range *epBindings {
+		log.Printf("creating binding between container '%s' and host '%s' \n",
+			ep.Container, ep.Host)
+
+		for _, epCfg := range epCfgs {
+			if epCfg.ContName != ep.Container {
+				continue
+			}
+			epCfg.HomingHost = ep.Host
+			err = epCfg.Write()
+			if err != nil {
+				log.Printf("error '%s' updating epCfg \n", err)
+				return err
+			}
+		}
+	}
+
+	return nil
+}
diff --git a/netmaster/netmaster_test.go b/netmaster/netmaster_test.go
@@ -32,7 +32,7 @@ type ValueData struct {
 var testState map[string]ValueData
 
 // fake implementation of state driver for the tests
-var d = &fakeStateDriver{}
+var fakeDriver = &fakeStateDriver{}
 
 type fakeStateDriver struct {
 }
@@ -123,32 +123,32 @@ func applyConfig(t *testing.T, cfgBytes []byte) {
 		t.Fatalf("error '%s' parsing config '%s'\n", err, cfgBytes)
 	}
 
-	d.Init(nil)
+	fakeDriver.Init(nil)
 	for _, host := range cfg.Hosts {
-		err = CreateHost(d, &host)
+		err = CreateHost(fakeDriver, &host)
 		if err != nil {
 			t.Fatalf("error '%s' creating host\n", err)
 		}
 	}
 
 	for _, tenant := range cfg.Tenants {
-		err = CreateTenant(d, &tenant)
+		err = CreateTenant(fakeDriver, &tenant)
 		if err != nil {
 			t.Fatalf("error '%s' creating tenant\n", err)
 		}
 
-		err = CreateNetworks(d, &tenant)
+		err = CreateNetworks(fakeDriver, &tenant)
 		if err != nil {
 			t.Fatalf("error '%s' creating networks\n", err)
 		}
 
-		err = CreateEndpoints(d, &tenant)
+		err = CreateEndpoints(fakeDriver, &tenant)
 		if err != nil {
 			t.Fatalf("error '%s' creating endpoints\n", err)
 		}
 	}
 
-	d.DumpState()
+	fakeDriver.DumpState()
 }
 
 func verifyKeys(t *testing.T, keys []string) {
@@ -304,3 +304,80 @@ func TestVxlanConfig(t *testing.T) {
 
 	verifyKeys(t, keys)
 }
+
+func TestVxlanConfigWithLateHostBindings(t *testing.T) {
+	cfgBytes := []byte(`{
+        "Hosts" : [{
+        "Name"                  : "host1",
+        "VtepIp"                : "192.168.2.11"
+    },
+    {
+        "Name"                  : "host2",
+        "VtepIp"                : "192.168.2.12"
+    }],
+    "Tenants" : [{
+        "Name"                  : "tenant-one",
+        "DefaultNetType"        : "vxlan",
+        "SubnetPool"            : "11.1.0.0/16",
+        "AllocSubnetLen"        : 24,
+        "Vxlans"                : "10001-20000",
+        "Networks"  : [{
+            "Name"              : "orange",
+            "Endpoints" : [
+            {
+                "Container"     : "myContainer1"
+            },
+            {
+                "Container"     : "myContainer3"
+            }
+            ]
+        },
+        {
+            "Name"              : "purple",
+            "Endpoints" : [{
+                "Container"     : "myContainer2"
+            },
+            {
+                "Container"     : "myContainer4"
+            }]
+        }]
+    }]}`)
+
+	applyConfig(t, cfgBytes)
+	fakeDriver.DumpState()
+
+	keys := []string{"tenant-one", "nets/orange", "nets/purple",
+		"orange-host1", "purple-host1",
+		"purple-host2", "orange-host2"}
+
+	verifyKeys(t, keys)
+
+	epBindings := []ConfigEp{{
+		Container: "myContainer1",
+		Host:      "host1",
+	}, {
+		Container: "myContainer2",
+		Host:      "host1",
+	}, {
+		Container: "myContainer3",
+		Host:      "host2",
+	}, {
+		Container: "myContainer4",
+		Host:      "host2",
+	}}
+
+	err := CreateEpBindings(fakeDriver, &epBindings)
+	if err != nil {
+		t.Fatalf("error '%s' creating tenant\n", err)
+	}
+
+	keys = []string{"tenant-one", "nets/orange", "nets/purple",
+		"myContainer1", "myContainer2",
+		"myContainer3", "myContainer4",
+		"orange-host1", "purple-host1",
+		"purple-host2", "orange-host2"}
+
+	fakeDriver.DumpState()
+
+	verifyKeys(t, keys)
+}
diff --git a/systemtests/twohosts/regression_test.go b/systemtests/twohosts/regression_test.go
diff --git a/systemtests/utils/utils.go b/systemtests/utils/utils.go
