Commit 006901a6 authored by Yann Garcia's avatar Yann Garcia
Browse files

Bug fixed in demo6

parent ed058a70

examples/demo6/golang/docker_run.sh

+1 −1
Changes for examples/demo6/golang/docker_run.sh: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ set -e 
set +x



docker pull golang

docker run --rm --expose 80 -it -v$PWD:/opt/local/etsi/demo6 golang bash -c "cd /opt/local/etsi/demo6/bin && ./demo6 ../app_instance.yaml"

docker run --rm --expose 80 --expose 443 -it -v$PWD:/opt/local/etsi/demo6  -v$HOME/var:/opt/local/etsi/var golang bash -c "cd /opt/local/etsi/demo6/bin && ./demo6 ../app_instance.yaml"



echo ""

echo ">>> Done"

examples/demo6/golang/main.go

+22 −2
Changes for examples/demo6/golang/main.go: 22 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -697,6 +697,7 @@ func mec011_send_registration() (body []byte, response *http.Response, err error 
	if err != nil {

		return nil, nil, err

	}

	defer response.Body.Close()

	fmt.Println("mec011_send_registration: status: " + response.Status)

	fmt.Println("mec011_send_registration: Location: ", response.Header["Location"][0])

	isRegistered = true
@@ -779,7 +780,7 @@ func mec011_create_service() (resId string, response *http.Response, err error) 
	if err != nil {

		return "", nil, err

	}

	fmt.Println("mec011_create_service: body: " + string(body))

	defer response.Body.Close()

	if response.StatusCode != 201 {

		return "", nil, errors.New("Invalid Status: " + response.Status)

	}
@@ -843,6 +844,7 @@ func mec011_get_mec_services() (body []byte, response *http.Response, err error) 
	if err != nil {

		return nil, nil, err

	}

	defer response.Body.Close()



	return body, nil, nil

}
@@ -931,6 +933,7 @@ func mec030_get_v2x_uu_unicast_setting() (body []byte, response *http.Response, 
	if err != nil {

		return nil, nil, err

	}

	defer response.Body.Close()



	return body, response, nil

}
@@ -965,6 +968,7 @@ func mec030_subscribe_v2x_messages() (body []byte, response *http.Response, err 
	if err != nil {

		return nil, nil, err

	}

	defer response.Body.Close()



	return body, response, nil

}
@@ -1013,6 +1017,7 @@ func mec40_get_systems_list() (body []byte, response *http.Response, err error) 
	if err != nil {

		return nil, nil, err

	}

	defer response.Body.Close()



	return body, response, nil

}
@@ -1032,7 +1037,22 @@ func mec40_get_services_list(choice string) (body []byte, response *http.Respons 
	url := mecUrl + "/" + sandboxName + "/" + mecPlateform + "/fed_enablement/v1/fed_resources/systems/" + choice + "/services"

	fmt.Println("mec40_get_services_list: url: " + url)

	// Send request and await response

	body, response, err = send_mec_service_request(http.MethodGet, url, nil, nil, nil, nil)

	// FIXME Using send_mec_service_request raised 'x509: certificate signed by unknown authority' error response

	// body, response, err = send_mec_service_request(http.MethodGet, url, nil, nil, nil, nil)

	// if err != nil {

	// 	return nil, nil, err

	// }

	req, err := http.NewRequest("GET", "https://mec-platform.etsi.org/sbxykqjr17/mep1/mec_service_mgmt/v1/services", nil)

	if err != nil {

		return nil, nil, err

	}

	req.Header.Set("Content-Type", "application/json")

	response, err = http.DefaultClient.Do(req)

	if err != nil {

		return nil, nil, err

	}

	defer response.Body.Close()

	body, err = ioutil.ReadAll(response.Body)

	if err != nil {

		return nil, nil, err

	}

examples/demo6/golang/client/client.go

+10 −10

File changed.

Contains only whitespace changes.