Merge STF678_Task_3_EDGE-1/4 into STF678_Task1_2_3_4

Ikram Haqrequested to merge
STF678_Task_3_EDGE-1/4 into STF678_Task1_2_3_4

Add new feature service provisioning EEC registration and EAS discovery in app-support.

Merge request reports

charts/meep-app-enablement/values-template.yaml

+13 −0
Changes for charts/meep-app-enablement/values-template.yaml: 13 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -49,12 +49,19 @@ ingress: 
        - /{{.SandboxName}}/{{.MepName}}/service-apis

        - /{{.SandboxName}}/{{.MepName}}/published-apis

        - /{{.SandboxName}}/{{.MepName}}/capif-events

        - /{{.SandboxName}}/{{.MepName}}/eecs-serviceprovisioning

        - /{{.SandboxName}}/{{.MepName}}/eees-eecregistration

        - /{{.SandboxName}}/{{.MepName}}/eees-easdiscovery

        

        {{- else }}

        - /{{.SandboxName}}/mec_app_support

        - /{{.SandboxName}}/mec_service_mgmt

        - /{{.SandboxName}}/service-apis

        - /{{.SandboxName}}/published-apis

        - /{{.SandboxName}}/capif-events

        - /{{.SandboxName}}/eecs-serviceprovisioning

        - /{{.SandboxName}}/eees-eecregistration

        - /{{.SandboxName}}/eees-easdiscovery

        {{- end }}

  annotations:

    kubernetes.io/ingress.class: nginx
@@ -66,6 +73,9 @@ ingress: 
      rewrite ^/{{ .SandboxName }}/{{.MepName}}/service-apis(/|$)(.*)$ /service-apis/$2 break;

      rewrite ^/{{ .SandboxName }}/{{.MepName}}/published-apis(/|$)(.*)$ /published-apis/$2 break;

      rewrite ^/{{ .SandboxName }}/{{.MepName}}/capif-events(/|$)(.*)$ /capif-events/$2 break;

      rewrite ^/{{ .SandboxName }}/{{.MepName}}/eecs-serviceprovisioning(/|$)(.*)$ /eecs-serviceprovisioning/$2 break;

      rewrite ^/{{ .SandboxName }}/{{.MepName}}/eees-eecregistration(/|$)(.*)$ /eees-eecregistration/$2 break;

      rewrite ^/{{ .SandboxName }}/{{.MepName}}/eees-easdiscovery(/|$)(.*)$ /eees-easdiscovery/$2 break;

    {{- else }}

    nginx.ingress.kubernetes.io/configuration-snippet: |

      rewrite ^/{{ .SandboxName }}/mec_app_support(/|$)(.*)$ /mec_app_support/$2 break;
@@ -73,6 +83,9 @@ ingress: 
      rewrite ^/{{ .SandboxName }}/service-apis(/|$)(.*)$ /service-apis/$2 break;

      rewrite ^/{{ .SandboxName }}/published-apis(/|$)(.*)$ /published-apis/$2 break;

      rewrite ^/{{ .SandboxName }}/capif-events(/|$)(.*)$ /capif-events/$2 break;

      rewrite ^/{{ .SandboxName }}/eecs-serviceprovisioning(/|$)(.*)$ /eecs-serviceprovisioning/$2 break;

      rewrite ^/{{ .SandboxName }}/eees-eecregistration(/|$)(.*)$ /eees-eecregistration/$2 break;

      rewrite ^/{{ .SandboxName }}/eees-easdiscovery(/|$)(.*)$ /eees-easdiscovery/$2 break;

    {{- end }}

    {{- if .AuthEnabled }}

    nginx.ingress.kubernetes.io/auth-url: https://$http_host/auth/v1/authenticate?svc=meep-app-enablement&sbox={{.SandboxName}}&mep={{.MepName}}

go-apps/meep-app-enablement/api/app-support/swagger.yaml

+1409 −72

File changed.

Preview size limit exceeded, changes collapsed.

go-apps/meep-app-enablement/server/app-support/api_mec_app_support.go

+23 −0
Changes for go-apps/meep-app-enablement/server/app-support/api_mec_app_support.go: 23 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -59,6 +59,29 @@ func TimingCurrentTimeGET(w http.ResponseWriter, r *http.Request) { 
	timingCurrentTimeGET(w, r)

}



func GetEASDiscInfo(w http.ResponseWriter, r *http.Request) {

	getEASDiscInfo(w, r)

}



func RequestServProv(w http.ResponseWriter, r *http.Request) {

	requestServProv(w, r)

}



func DeleteIndEECReg(w http.ResponseWriter, r *http.Request) {

	deleteIndEECReg(w, r)

}



func CreateEECReg(w http.ResponseWriter, r *http.Request) {

	createEECReg(w, r)

}



func UpdateRegistrationPut(w http.ResponseWriter, r *http.Request) {

	updateRegistrationPut(w, r)

}

func GetRegistration(w http.ResponseWriter, r *http.Request) {

	getRegistration(w, r)

}



func AppRegistrationPOST(w http.ResponseWriter, r *http.Request) {

	appRegistrationPOST(w, r)

}

go-apps/meep-app-enablement/server/app-support/app-support.go

+743 −2

File changed.

Preview size limit exceeded, changes collapsed.

go-apps/meep-app-enablement/server/app-support/convert.go

+39 −0
Changes for go-apps/meep-app-enablement/server/app-support/convert.go: 39 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -77,3 +77,42 @@ func convertAppInfoToJson(obj *AppInfo) string { 


	return string(jsonInfo)

}



func convertEcsServProvReqInfoToJson(obj *EcsServProvReq) string {

	jsonInfo, err := json.Marshal(*obj)

	if err != nil {

		log.Error(err.Error())

		return ""

	}

	return string(jsonInfo)

}



func convertEecRegReqInfoToJson(obj *EecRegistration) string {

	jsonInfo, err := json.Marshal(*obj)

	if err != nil {

		log.Error(err.Error())

		return ""

	}

	return string(jsonInfo)

}



func convertEecPrevRegReqInfoToJson(jsonInfo string) *EecRegistration {

	var obj EecRegistration

	err := json.Unmarshal([]byte(jsonInfo), &obj)

	if err != nil {

		log.Error(err.Error())

		return nil

	}

	return &obj

}



func convertEasDiscoveryRespToJson(obj *EasDiscoveryResp) string {



	jsonInfo, err := json.Marshal(*obj)

	if err != nil {

		log.Error(err.Error())

		return ""

	}



	return string(jsonInfo)

}