Merge pull request #8 from projectcalico/fix

Fix generate_binapi script & go.sum

Author: AloysAugustin

go.sum

@@ -425,6 +425,8 @@ github.com/lucas-clemente/quic-go v0.10.2/go.mod h1:hvaRS9IHjFLMq76puFJeWNfmn+H7
 github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced/go.mod h1:NCcRLrOTZbzhZvixZLlERbJtDtYsmMw8Jc4vS8Z0g58=
 github.com/lunixbochs/struc v0.0.0-20190916212049-a5c72983bc42 h1:PzBD7QuxXSgSu61TKXxRwVGzWO5d9QZ0HxFFpndZMCg=
 github.com/lunixbochs/struc v0.0.0-20190916212049-a5c72983bc42/go.mod h1:vy1vK6wD6j7xX6O6hXe621WabdtNkou2h7uRtTfRMyg=
+github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 h1:EnfXoSqDfSNJv0VBNqY/88RNnhSGYkrHaO0mmFGbVsc=
+github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40/go.mod h1:vy1vK6wD6j7xX6O6hXe621WabdtNkou2h7uRtTfRMyg=
 github.com/magiconair/properties v1.7.3/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=

vpp-manager/main.go

@@ -29,12 +29,12 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/projectcalico/vpp-dataplane/vpplink"
-	"github.com/projectcalico/vpp-dataplane/vpplink/types"
 	"github.com/pkg/errors"
 	calicoapi "github.com/projectcalico/libcalico-go/lib/apis/v3"
 	calicocli "github.com/projectcalico/libcalico-go/lib/clientv3"
 	calicoopts "github.com/projectcalico/libcalico-go/lib/options"
+	"github.com/projectcalico/vpp-dataplane/vpplink"
+	"github.com/projectcalico/vpp-dataplane/vpplink/types"
 	log "github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 )
@@ -961,40 +961,45 @@ func clearVppManagerFiles() error {
 	return writeFile("-1", VppManagerTapIdxFile)
 }
 
-func setCorePattern() {
+func setCorePattern() error {
 	if params.corePattern == "" {
-		return
+		return nil
 	}
 	log.Infof("Setting corePattern to : %s", params.corePattern)
 	err := writeFile(params.corePattern, "/proc/sys/kernel/core_pattern")
 	if err != nil {
-		log.Errorf("Error writing corePattern: %+v", err)
+		return errors.Wrap(err, "Error writing corePattern")
 	}
+	return nil
 }
 
 func main() {
 	vppDeadChan = make(chan bool, 1)
 	vppAlive = false
 
-	/* Run this first in case this is a script
-	 * that's responsible for creating a VF */
-	err := generateVppConfigExecFile()
+	err := parseEnvVariables()
 	if err != nil {
-		log.Errorf("Error generating VPP config Exec: %s", err)
+		log.Errorf("Error parsing env varibales: %+v", err)
 		return
 	}
-
 	err = clearVppManagerFiles()
 	if err != nil {
 		log.Errorf("Error clearing config files: %+v", err)
 		return
 	}
-	err = parseEnvVariables()
+	/* Run this before getLinuxConfig() in case this is a script
+	 * that's responsible for creating the interface */
+	err = generateVppConfigExecFile()
 	if err != nil {
-		log.Errorf("Error parsing env varibales: %+v", err)
+		log.Errorf("Error generating VPP config Exec: %s", err)
+		return
+	}
+
+	err = setCorePattern()
+	if err != nil {
+		log.Errorf("Error setting core pattern: %s", err)
 		return
 	}
-	setCorePattern()
 
 	err = configureContainer()
 	if err != nil {

vpplink/binapi/generate_binapi.sh

@@ -107,7 +107,7 @@ function update_version_number ()
 
 	if [[ x$RESP = xyes ]]; then
 		find . -path ./binapi -prune -o -name '*.go' \
-			-exec sed -i '[email protected]/calico-vpp/vpplink/binapi/[.~0-9a-z_-]*/'"@github.com/calico-vpp/vpplink/binapi/$VPP_VERSION/@g" {} \;
+			-exec sed -i '[email protected]/projectcalico/vpp-dataplane/vpplink/binapi/[.~0-9a-z_-]*/'"@github.com/projectcalico/vpp-dataplane/vpplink/binapi/$VPP_VERSION/@g" {} \;
 	fi
 }