Commit 049abe16 authored by Yann Garcia's avatar Yann Garcia
Browse files

Bug fixed in SendRequest function

parent b025be4d

go-apps/meep-vis/server/vis_test.go

+13 −6
Original line number Diff line number Diff line
@@ -1193,7 +1193,6 @@ func testProvUuUniSubscriptionPost(t *testing.T, requestTestNotification bool, e 
	if err != nil {

		t.Fatalf(err.Error())

	}



	/******************************

	 * Comparing responses

	 ******************************/
@@ -2433,11 +2432,6 @@ func sendRequest(method string, url string, body io.Reader, vars map[string]stri 
		}

		req.URL.RawQuery = q.Encode()

	}

	// Set Location header in case of POST

	if location != nil {

		req.Header.Set("Location", *location)

	}



	// We create a ResponseRecorder (which satisfies http.ResponseWriter) to record the response.

	rr := httptest.NewRecorder()

	handler := http.HandlerFunc(f)
@@ -2453,5 +2447,18 @@ func sendRequest(method string, url string, body io.Reader, vars map[string]stri 
		s := fmt.Sprintf("Wrong status code - got %v want %v", status, code)

		return "", errors.New(s)

	}



	// Set Location header in case of POST

	if location != nil {

		s := rr.Header().Get("Location")

		if rr == nil {

			s := fmt.Sprintf("Header Location expected")

			return "", errors.New(s)

		} else if !strings.Contains(s, *location) {

			s := fmt.Sprintf("Wrong Header Location - got %s want %s", s, *location)

			return "", errors.New(s)

		}

	}



	return string(rr.Body.String()), nil

}

tools/HOWTO

+4 −4
Original line number Diff line number Diff line
@@ -11,10 +11,10 @@ docker run -it --rm -v `pwd`:/opt/local/etsi gizmotronic/oracle-java8 /bin/bash 
# Using command line

cd /opt/local/etsi

java -jar ./tools/swagger-codegen-cli-3.0.29.jar generate -h

java -jar ./tools/swagger-codegen-cli-3.0.29.jar generate --api-package ./tools/swagger-temlates/templates/go-server/ -i ./go-apps/meep-dai/api/swagger.yaml -l go-server -o ./out/go-server

java -jar ./tools/swagger-codegen-cli-3.0.29.jar generate --api-package ./tools/swagger-temlates/templates/go/ -i ./go-apps/meep-dai/api/swagger.yaml -l go -o ./out/go

java -jar ./tools/swagger-codegen-cli-3.0.29.jar generate --api-package ./tools/swagger-temlates/templates/go/ -i ./examples/demo4-ue/src/demo-server/backend/api/swagger.yaml -l go -o ./out/demo-server

java -jar ./tools/swagger-codegen-cli-3.0.29.jar generate --api-package ./tools/swagger-temlates/templates/go/ -i ./examples/demo4-ue/src/onboarded-demo/api/swagger.yaml -l go -o ./out/onboarded-demo

java -jar ./tools/swagger-codegen-cli-3.0.29.jar generate --api-package ./tools/swagger-/templates/go-server/ -i ./go-apps/meep-dai/api/swagger.yaml -l go-server -o ./out/go-server

java -jar ./tools/swagger-codegen-cli-3.0.29.jar generate --api-package ./tools/swagger-/templates/go/ -i ./go-apps/meep-dai/api/swagger.yaml -l go -o ./out/go

java -jar ./tools/swagger-codegen-cli-3.0.29.jar generate --api-package ./tools/swagger-/templates/go/ -i ./examples/demo4-ue/src/demo-server/backend/api/swagger.yaml -l go -o ./out/demo-server

java -jar ./tools/swagger-codegen-cli-3.0.29.jar generate --api-package ./tools/swagger-/templates/go/ -i ./examples/demo4-ue/src/onboarded-demo/api/swagger.yaml -l go -o ./out/onboarded-demo

chown -R 1000:1000 ./out



# using script with required MEC xxx already cloned:

tools/generate_stub.sh

+16 −12
Original line number Diff line number Diff line
@@ -11,14 +11,17 @@ function advantedge_aligner() { 
    for dir in $PROJECTS

    do

        cd $CUR_DIR/$OUT/$CMD_LANG_SERVER_GOLANG/$dir

	if [ -d go ]

        REP=`find . -type d -name go`

        if [ -d $REP ]

        then

            cd $REP

            mv go server

            cd server

            for f in `ls *.go`

            do

                sed --in-place 's/package swagger/package server/g' $f

            done

            cd -

        fi

        done
@@ -26,12 +29,8 @@ function advantedge_aligner() { 
    for dir in $PROJECTS

    do

        cd $CUR_DIR/$OUT/$CMD_LANG_CLIENT_GOLANG/$dir

        for f in `ls *.go`

        do

            sed --in-place 's/package swagger/package client/g' $f

        find . -name "*.go" -exec sed --in-place 's/package swagger/package client/g' {} \;

    done

    done



}



# Generate client/server stubs
@@ -64,11 +63,16 @@ function generate_stub() { 
function downgrade_open_api_file() {

    PARAM=$1

    sed --in-place 's/3\.1\.0/3\.0\.0/g' $PARAM

    sed --in-place 's/localhost/localhost\/sandboxname/g' $PARAM

    sed --in-place 's/examples/example/g' $PARAM

    sed --in-place '/contentMediaType/d' $PARAM

    sed --in-place '/jsonSchemaDialect/d' $PARAM

    sed --in-place '/contentEncoding/d' $PARAM

    # FIXME Issue with meep-sandbox-api

    if [ `basename $PARAM yaml` != "API_driven_swagger_v4." ]

    then

        sed --in-place 's/localhost/localhost\/sandboxname/g' $PARAM

        sed --in-place 's/127\.0\.0\.1:8081/localhost\/sandboxname/g' $PARAM

    fi

}



################# Starting point ###########################
@@ -81,7 +85,7 @@ apt install -y git 
# Setup variables

PROJECTS=`ls -d gs*`

JAVA_CMD='java -jar ./swagger-codegen-cli-3.0.29.jar generate'

TEMPLATE_PATH=./swagger-temlates/templates

TEMPLATE_PATH=./swagger-templates/templates

CMD_TEMPLATE_SERVER=go-server

CMD_TEMPLATE_CLIENT_GOLANG=go

CMD_TEMPLATE_CLIENT_PYTHON=python