Skip to content

Commit 6c9c51a

Browse files
shalemanshaleman
authored
Merge pull request #552 from shaleman/dscp
rebase and resubmit dscp changes
2 parents b65db7b + 2cd249f commit 6c9c51a

21 files changed

+975
-295
lines changed

‎Godeps/Godeps.json

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎drivers/ovsSwitch.go

+27-6
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ func getOvsPortName(intfName string, skipVethPair bool) string {
272272
}
273273

274274
// CreatePort creates a port in ovs switch
275-
func (sw *OvsSwitch) CreatePort(intfName string, cfgEp *mastercfg.CfgEndpointState, pktTag, nwPktTag, burst int, skipVethPair bool, bandwidth int64) error {
275+
func (sw *OvsSwitch) CreatePort(intfName string, cfgEp *mastercfg.CfgEndpointState, pktTag, nwPktTag, burst, dscp int, skipVethPair bool, bandwidth int64) error {
276276
var ovsIntfType string
277277

278278
// Get OVS port name
@@ -358,6 +358,7 @@ func (sw *OvsSwitch) CreatePort(intfName string, cfgEp *mastercfg.CfgEndpointSta
358358
Ipv6Addr: net.ParseIP(cfgEp.IPv6Address),
359359
EndpointGroup: cfgEp.EndpointGroupID,
360360
EndpointGroupVlan: uint16(pktTag),
361+
Dscp: dscp,
361362
}
362363

363364
log.Infof("Adding local endpoint: {%+v}", endpoint)
@@ -372,20 +373,39 @@ func (sw *OvsSwitch) CreatePort(intfName string, cfgEp *mastercfg.CfgEndpointSta
372373
return nil
373374
}
374375

375-
//UpdateBandwidth calls the UpdateBandwidth
376-
func (sw *OvsSwitch) UpdateBandwidth(intfName string, burst int, epgBandwidth int64) error {
376+
// UpdateEndpoint updates endpoint state
377+
func (sw *OvsSwitch) UpdateEndpoint(ovsPortName string, burst, dscp int, epgBandwidth int64) error {
378+
// update bandwidth
379+
err := sw.ovsdbDriver.UpdatePolicingRate(ovsPortName, burst, epgBandwidth)
380+
if err != nil {
381+
return err
382+
}
377383

378-
log.Infof("Coming inside UpdateBandwidth")
384+
// Get the openflow port number for the interface
385+
ofpPort, err := sw.ovsdbDriver.GetOfpPortNo(ovsPortName)
386+
if err != nil {
387+
log.Errorf("Could not find the OVS port %s. Err: %v", ovsPortName, err)
388+
return err
389+
}
390+
391+
// Build the updated endpoint info
392+
endpoint := ofnet.EndpointInfo{
393+
PortNo: ofpPort,
394+
Dscp: dscp,
395+
}
379396

380-
err := sw.ovsdbDriver.UpdatePolicingRate(intfName, burst, epgBandwidth)
397+
// update endpoint state in ofnet
398+
err = sw.ofnetAgent.UpdateLocalEndpoint(endpoint)
381399
if err != nil {
400+
log.Errorf("Error updating local port %s to ofnet. Err: %v", ovsPortName, err)
382401
return err
383402
}
403+
384404
return nil
385405
}
386406

387407
// UpdatePort updates an OVS port without creating it
388-
func (sw *OvsSwitch) UpdatePort(intfName string, cfgEp *mastercfg.CfgEndpointState, pktTag, nwPktTag int, skipVethPair bool) error {
408+
func (sw *OvsSwitch) UpdatePort(intfName string, cfgEp *mastercfg.CfgEndpointState, pktTag, nwPktTag, dscp int, skipVethPair bool) error {
389409

390410
// Get OVS port name
391411
ovsPortName := getOvsPortName(intfName, skipVethPair)
@@ -409,6 +429,7 @@ func (sw *OvsSwitch) UpdatePort(intfName string, cfgEp *mastercfg.CfgEndpointSta
409429
Ipv6Addr: net.ParseIP(cfgEp.IPv6Address),
410430
EndpointGroup: cfgEp.EndpointGroupID,
411431
EndpointGroupVlan: uint16(pktTag),
432+
Dscp: dscp,
412433
}
413434

414435
// Add the local port to ofnet

‎drivers/ovsdriver.go

+8-5
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,7 @@ func (d *OvsDriver) CreateEndpoint(id string) error {
319319
intfName string
320320
epgKey string
321321
epgBandwidth int64
322+
dscp int
322323
)
323324

324325
cfgEp := &mastercfg.CfgEndpointState{}
@@ -350,6 +351,7 @@ func (d *OvsDriver) CreateEndpoint(id string) error {
350351
pktTagType = cfgEpGroup.PktTagType
351352
pktTag = cfgEpGroup.PktTag
352353
epgKey = cfgEp.EndpointGroupKey
354+
dscp = cfgEpGroup.DSCP
353355
log.Infof("Received endpoint create with bandwidth:%s", cfgEpGroup.Bandwidth)
354356
if cfgEpGroup.Bandwidth != "" {
355357
epgBandwidth = netutils.ConvertBandwidth(cfgEpGroup.Bandwidth)
@@ -385,7 +387,7 @@ func (d *OvsDriver) CreateEndpoint(id string) error {
385387
log.Printf("Found matching oper state for ep %s, noop", id)
386388

387389
// Ask the switch to update the port
388-
err = sw.UpdatePort(operEp.PortName, cfgEp, pktTag, cfgNw.PktTag, skipVethPair)
390+
err = sw.UpdatePort(operEp.PortName, cfgEp, pktTag, cfgNw.PktTag, dscp, skipVethPair)
389391
if err != nil {
390392
log.Errorf("Error creating port %s. Err: %v", intfName, err)
391393
return err
@@ -413,7 +415,7 @@ func (d *OvsDriver) CreateEndpoint(id string) error {
413415
ovsPortName := getOvsPortName(intfName, skipVethPair)
414416

415417
// Ask the switch to create the port
416-
err = sw.CreatePort(intfName, cfgEp, pktTag, cfgNw.PktTag, cfgEpGroup.Burst, skipVethPair, epgBandwidth)
418+
err = sw.CreatePort(intfName, cfgEp, pktTag, cfgNw.PktTag, cfgEpGroup.Burst, dscp, skipVethPair, epgBandwidth)
417419
if err != nil {
418420
log.Errorf("Error creating port %s. Err: %v", intfName, err)
419421
return err
@@ -478,15 +480,16 @@ func (d *OvsDriver) UpdateEndpointGroup(id string) error {
478480

479481
for _, epInfo := range d.oper.LocalEpInfo {
480482
if epInfo.EpgKey == id {
481-
log.Infof("Applying bandwidth: %s on: %s ", cfgEpGroup.Bandwidth, epInfo.Ovsportname)
483+
log.Debugf("Applying bandwidth: %s on: %s ", cfgEpGroup.Bandwidth, epInfo.Ovsportname)
482484
// Find the switch based on network type
483-
// var sw *OvsSwitch
484485
if epInfo.BridgeType == "vxlan" {
485486
sw = d.switchDb["vxlan"]
486487
} else {
487488
sw = d.switchDb["vlan"]
488489
}
489-
err = sw.UpdateBandwidth(epInfo.Ovsportname, cfgEpGroup.Burst, epgBandwidth)
490+
491+
// update the endpoint in ovs switch
492+
err = sw.UpdateEndpoint(epInfo.Ovsportname, cfgEpGroup.Burst, cfgEpGroup.DSCP, epgBandwidth)
490493
if err != nil {
491494
log.Errorf("Error adding bandwidth %v , err: %+v", epgBandwidth, err)
492495
return err

‎netplugin/agent/docker_event.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
// container start and die event*/
3333
func handleDockerEvents(event *dockerclient.Event, ec chan error, args ...interface{}) {
3434

35-
log.Printf("Received Docker event: {%#v}\n", *event)
35+
log.Debugf("Received Docker event: {%#v}\n", *event)
3636
endpointUpdReq := &master.UpdateEndpointRequest{}
3737
switch event.Status {
3838
case "start":

‎test/integration/endpoint_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -301,4 +301,5 @@ func (its *integTestSuite) TestEndpointGroupInspect(c *C) {
301301
}
302302

303303
assertNoErr(its.client.EndpointGroupDelete("default", "epgA"), c, "deleting endpointGroup")
304+
assertNoErr(its.client.NetworkDelete("default", "test"), c, "deleting network")
304305
}

‎test/integration/mesos_test.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,19 @@ import (
1919
"bytes"
2020
"encoding/json"
2121
"fmt"
22-
log "github.com/Sirupsen/logrus"
23-
"github.com/contiv/contivmodel/client"
24-
"github.com/contiv/netplugin/mgmtfn/mesosplugin/cniapi"
25-
"github.com/samalba/dockerclient"
26-
. "gopkg.in/check.v1"
2722
"io/ioutil"
2823
"net"
2924
"net/http"
3025
"os/exec"
3126
"strconv"
3227
"strings"
3328
"time"
29+
30+
log "github.com/Sirupsen/logrus"
31+
"github.com/contiv/contivmodel/client"
32+
"github.com/contiv/netplugin/mgmtfn/mesosplugin/cniapi"
33+
"github.com/samalba/dockerclient"
34+
. "gopkg.in/check.v1"
3435
)
3536

3637
// track containers
@@ -128,16 +129,15 @@ func (cfg1 *testConfigData) deleteNetwork(its *integTestSuite, c *C) {
128129
return
129130
}
130131

131-
if _, err := its.client.NetworkGet(cfg1.tenantName, cfg1.networkName); err == nil {
132-
intLog.Infof("delete network %s", cfg1.networkName)
133-
if len(cfg1.tenantName) > 0 {
134-
err := its.client.NetworkDelete(cfg1.tenantName, cfg1.networkName)
135-
assertNoErr(err, c, "delete network")
136-
} else {
137-
err := its.client.NetworkDelete("default", cfg1.networkName)
138-
assertNoErr(err, c, "delete network")
139-
}
132+
tenantName := "default"
133+
if len(cfg1.tenantName) > 0 {
134+
tenantName = cfg1.tenantName
135+
}
140136

137+
if _, err := its.client.NetworkGet(tenantName, cfg1.networkName); err == nil {
138+
intLog.Infof("delete network %s", tenantName)
139+
err := its.client.NetworkDelete(tenantName, cfg1.networkName)
140+
assertNoErr(err, c, "delete network")
141141
} else {
142142
intLog.Warnf("no network %s", cfg1.networkName)
143143
}

0 commit comments

Comments
 (0)