Cleanup translib and cvl go test cases

cvl/cvl_test.go

@@ -20,7 +20,6 @@
 package cvl_test
 
 import (
- "github.com/Azure/sonic-mgmt-common/cvl"
  "encoding/json"
  "fmt"
  "github.com/go-redis/redis"
@@ -31,6 +30,7 @@ import (
  "syscall"
  "testing"
  "runtime"
+ "github.com/Azure/sonic-mgmt-common/cvl"
  . "github.com/Azure/sonic-mgmt-common/cvl/internal/util"
  "github.com/Azure/sonic-mgmt-common/cvl/internal/yparser"
 )
@@ -2862,35 +2862,18 @@ func TestValidateEditConfig_Delete_Entry_Then_Dep_Leafref_Positive(t *testing.T)
 }
 
 func TestBadSchema(t *testing.T) {
- env := os.Environ()
- env[0] = env[0] + " "
-
- if _, err := os.Stat("/usr/sbin/schema"); os.IsNotExist(err) {
- //Corrupt some schema file 
- exec.Command("/bin/sh", "-c", "/bin/cp testdata/schema/sonic-port.yin testdata/schema/sonic-port.yin.bad" + 
- " && /bin/sed -i '1 a <junk>' testdata/schema/sonic-port.yin.bad").Output()
-
- //Parse bad schema file
- if module, _ := yparser.ParseSchemaFile("testdata/schema/sonic-port.yin.bad"); module != nil { //should fail
- t.Errorf("Bad schema parsing should fail.")
- }
-
- //Revert to 
- exec.Command("/bin/sh", "-c", "/bin/rm testdata/schema/sonic-port.yin.bad").Output()
- } else {
- //Corrupt some schema file 
- exec.Command("/bin/sh", "-c", "/bin/cp /usr/sbin/schema/sonic-port.yin /usr/sbin/schema/sonic-port.yin.bad" + 
- " && /bin/sed -i '1 a <junk>' /usr/sbin/schema/sonic-port.yin.bad").Output()
+ badSchema, err := ioutil.TempFile("", "sonic-test-*.yin")
+ if err != nil {
+ t.Fatalf("could not create temp file")
+ }
 
- //Parse bad schema file
- if module, _ := yparser.ParseSchemaFile("/usr/sbin/schema/sonic-port.yin.bad"); module != nil { //should fail
- t.Errorf("Bad schema parsing should fail.")
- }
+ // write incomplete module data to temporary schema file
+ badSchema.WriteString("<module name=\"sonic-test\"></module>")
+ badSchema.Close()
 
-  //Revert to 
- exec.Command("/bin/sh", "-c", "/bin/rm /usr/sbin/schema/sonic-port.yin.bad").Output()
+ if module, _ := yparser.ParseSchemaFile(badSchema.Name()); module != nil { //should fail
+ t.Errorf("Bad schema parsing should fail.")
  }
-
 }
 
 

cvl/internal/util/util.go

@@ -32,7 +32,7 @@ import (
  log "github.com/golang/glog"
 )
 
-var CVL_SCHEMA string = "schema/"
+var CVL_SCHEMA string = "/usr/sbin/schema/"
 var CVL_CFG_FILE string = "/usr/sbin/cvl_cfg.json"
 
 //package init function 

translib/Makefile

@@ -37,7 +37,7 @@ $(TRANSLIB_PKG): $(TRANSLIB_MAIN_SRCS) $(YGOT_BINDS)
  $(GO) build -mod=vendor -gcflags="all=-N -l" -v -o $@ ../translib
 
 $(TRANSLIB_TEST_BIN): $(TRANSLIB_MAIN_SRCS) $(TRANSLIB_TEST_SRCS) $(YGOT_BINDS)
- $(GO) test -mod=vendor -cover -coverpkg=../translib,../translib/tlerr -c ../translib -o $@
+ $(GO) test -mod=vendor -tags test -cover -coverpkg=../translib,../translib/tlerr -c ../translib -o $@
 
 $(TRANSL_DB_TEST_BIN) : $(TRANSL_DB_ALL_SRCS)
  $(GO) test -mod=vendor -cover -c ../translib/db -o $@

translib/acl_app_test.go

@@ -17,35 +17,23 @@
 // //
 ////////////////////////////////////////////////////////////////////////////////
 
+// +build !test
+
 package translib
 
 import (
  "errors"
  "fmt"
- "os"
  "reflect"
  "strings"
  "testing"
+
  db "github.com/Azure/sonic-mgmt-common/translib/db"
 )
 
 func init() {
  fmt.Println("+++++ Init acl_app_test +++++")
-}
-
-func TestMain(m *testing.M) {
- if err := clearAclDataFromDb(); err != nil {
- os.Exit(-1)
- }
- fmt.Println("+++++ Removed All Acl Data from Db +++++")
-
- ret := m.Run()
-
- if err := clearAclDataFromDb(); err != nil {
- os.Exit(-1)
- }
-
- os.Exit(ret)
+ addCleanupFunc("ACL", clearAclDataFromDb)
 }
 
 // This will test GET on /openconfig-acl:acl
@@ -344,48 +332,6 @@ func Test_AclApp_NegativeTests(t *testing.T) {
  t.Run("Verify_Top_Level_Delete", processGetRequest(topLevelUrl, emptyJson, false))
 }
 
-func processGetRequest(url string, expectedRespJson string, errorCase bool) func(*testing.T) {
- return func(t *testing.T) {
- response, err := Get(GetRequest{url})
- if err != nil && !errorCase {
- t.Errorf("Error %v received for Url: %s", err, url)
- }
-
- respJson := response.Payload
- if string(respJson) != expectedRespJson {
- t.Errorf("Response for Url: %s received is not expected:\n%s", url, string(respJson))
- }
- }
-}
-
-func processSetRequest(url string, jsonPayload string, oper string, errorCase bool) func(*testing.T) {
- return func(t *testing.T) {
- var err error
- switch oper {
- case "POST":
- _, err = Create(SetRequest{Path: url, Payload: []byte(jsonPayload)})
- case "PATCH":
- _, err = Update(SetRequest{Path: url, Payload: []byte(jsonPayload)})
- case "PUT":
- _, err = Replace(SetRequest{Path: url, Payload: []byte(jsonPayload)})
- default:
- t.Errorf("Operation not supported")
- }
- if err != nil && !errorCase {
- t.Errorf("Error %v received for Url: %s", err, url)
- }
- }
-}
-
-func processDeleteRequest(url string) func(*testing.T) {
- return func(t *testing.T) {
- _, err := Delete(SetRequest{Path: url})
- if err != nil {
- t.Errorf("Error %v received for Url: %s", err, url)
- }
- }
-}
-
 // THis will delete ACL table and Rules Table from DB
 func clearAclDataFromDb() error {
  var err error
@@ -408,17 +354,6 @@ func clearAclDataFromDb() error {
  return err
 }
 
-func getConfigDb() *db.DB {
- configDb, _ := db.NewDB(db.Options{
- DBNo: db.ConfigDB,
- InitIndicator: "CONFIG_DB_INITIALIZED",
- TableNameSeparator: "|",
- KeySeparator: "|",
- })
-
- return configDb
-}
-
 func Test_AclApp_Subscribe(t *testing.T) {
  app := new(AclApp)
 

translib/api_tests_app.go

@@ -0,0 +1,188 @@
+////////////////////////////////////////////////////////////////////////////////
+// //
+// Copyright 2020 Broadcom. The term Broadcom refers to Broadcom Inc. and/or //
+// its subsidiaries. //
+// //
+// Licensed under the Apache License, Version 2.0 (the "License"); //
+// you may not use this file except in compliance with the License. //
+// You may obtain a copy of the License at //
+// //
+// http://www.apache.org/licenses/LICENSE-2.0 //
+// //
+// Unless required by applicable law or agreed to in writing, software //
+// distributed under the License is distributed on an "AS IS" BASIS, //
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. //
+// See the License for the specific language governing permissions and //
+// limitations under the License. //
+// //
+////////////////////////////////////////////////////////////////////////////////
+
+// +build test
+
+package translib
+
+import (
+ "encoding/json"
+ "reflect"
+ "strings"
+
+ "github.com/Azure/sonic-mgmt-common/translib/db"
+ "github.com/Azure/sonic-mgmt-common/translib/tlerr"
+ "github.com/golang/glog"
+)
+
+// apiTests is an app module for testing translib APIs.
+// Implements dummy handlers for paths starting with "/api-tests:".
+// Returns error if path contains "/error/"; see getError function.
+type apiTests struct {
+ path string
+ body []byte
+ appOptions
+
+ echoMsg string
+ echoErr string
+}
+
+func init() {
+ err := register("/api-tests:",
+ &appInfo{
+ appType: reflect.TypeOf(apiTests{}),
+ isNative: true,
+ tablesToWatch: nil})
+
+ if err != nil {
+ glog.Fatalf("Failed to register ApiTest app; %v", err)
+ }
+}
+
+func (app *apiTests) initialize(inp appData) {
+ app.path = inp.path
+ app.body = inp.payload
+ app.appOptions = inp.appOptions
+}
+
+func (app *apiTests) translateCreate(d *db.DB) ([]db.WatchKeys, error) {
+ return nil, app.translatePath()
+}
+
+func (app *apiTests) translateUpdate(d *db.DB) ([]db.WatchKeys, error) {
+ return nil, app.translatePath()
+}
+
+func (app *apiTests) translateReplace(d *db.DB) ([]db.WatchKeys, error) {
+ return nil, app.translatePath()
+}
+
+func (app *apiTests) translateDelete(d *db.DB) ([]db.WatchKeys, error) {
+ return nil, app.translatePath()
+}
+
+func (app *apiTests) translateGet(dbs [db.MaxDB]*db.DB) error {
+ return app.translatePath()
+}
+
+func (app *apiTests) translateAction(dbs [db.MaxDB]*db.DB) error {
+ var req struct {
+ Input struct {
+ Message string `json:"message"`
+ ErrType string `json:"error-type"`
+ } `json:"api-tests:input"`
+ }
+
+ err := json.Unmarshal(app.body, &req)
+ if err != nil {
+ glog.Errorf("Failed to parse rpc input; err=%v", err)
+ return tlerr.InvalidArgs("Invalid rpc input")
+ }
+
+ app.echoMsg = req.Input.Message
+ app.echoErr = req.Input.ErrType
+
+ return nil
+}
+
+func (app *apiTests) translateSubscribe(dbs [db.MaxDB]*db.DB, path string) (*notificationOpts, *notificationInfo, error) {
+ return nil, nil, nil
+}
+
+func (app *apiTests) processCreate(d *db.DB) (SetResponse, error) {
+ return app.processSet()
+}
+
+func (app *apiTests) processUpdate(d *db.DB) (SetResponse, error) {
+ return app.processSet()
+}
+
+func (app *apiTests) processReplace(d *db.DB) (SetResponse, error) {
+ return app.processSet()
+}
+
+func (app *apiTests) processDelete(d *db.DB) (SetResponse, error) {
+ return app.processSet()
+}
+
+func (app *apiTests) processGet(dbs [db.MaxDB]*db.DB) (GetResponse, error) {
+ var gr GetResponse
+ err := app.getError()
+ if err != nil {
+ return gr, err
+ }
+
+ resp := make(map[string]interface{})
+ resp["message"] = app.echoMsg
+ resp["path"] = app.path
+ resp["depth"] = app.depth
+
+ gr.Payload, err = json.Marshal(&resp)
+ return gr, err
+}
+
+func (app *apiTests) processAction(dbs [db.MaxDB]*db.DB) (ActionResponse, error) {
+ var ar ActionResponse
+
+ err := app.getError()
+ if err == nil {
+ var respData struct {
+ Output struct {
+ Message string `json:"message"`
+ } `json:"api-tests:output"`
+ }
+
+ respData.Output.Message = app.echoMsg
+ ar.Payload, err = json.Marshal(&respData)
+ }
+
+ return ar, err
+}
+
+func (app *apiTests) translatePath() error {
+ app.echoMsg = "Hello, world!"
+ k := strings.Index(app.path, "error/")
+ if k >= 0 {
+ app.echoErr = app.path[k+6:]
+ }
+ return nil
+}
+
+func (app *apiTests) processSet() (SetResponse, error) {
+ var sr SetResponse
+ err := app.getError()
+ return sr, err
+}
+
+func (app *apiTests) getError() error {
+ switch strings.ToLower(app.echoErr) {
+ case "invalid-args", "invalidargs":
+ return tlerr.InvalidArgs(app.echoMsg)
+ case "exists":
+ return tlerr.AlreadyExists(app.echoMsg)
+ case "not-found", "notfound":
+ return tlerr.NotFound(app.echoMsg)
+ case "not-supported", "notsupported", "unsupported":
+ return tlerr.NotSupported(app.echoMsg)
+ case "", "no", "none", "false":
+ return nil
+ default:
+ return tlerr.New(app.echoMsg)
+ }
+}