moved app-info api implementation to sandbox controller (ad0ecc08) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

.meepctl-repocfg.yaml

+1 −2

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@
		# See the License for the specific language governing permissions and
		# limitations under the License.

		version: 1.7.4
		version: 1.7.5
		repo:
		name: AdvantEDGE

		@@ -677,7 +677,6 @@ repo:
		api:
		meep-app-support: go-apps/meep-app-enablement/api/app-support/swagger.yaml
		meep-service-mgmt: go-apps/meep-app-enablement/api/service-mgmt/swagger.yaml
		meep-app-info: go-apps/meep-app-enablement/api/app-info/swagger.yaml

		#------------------------------
		# Dependencies

examples/demo1/src/demo-server/go/README.md

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@ To see how to make this your own, look here:
		[README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md)

		- API version: 0.0.1
		- Build date: 2021-07-28T14:50:07.897-04:00
		- Build date: 2021-07-29T15:25:22.618-04:00


		### Running the server

examples/demo1/src/iperf-proxy/go/README.md

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@ To see how to make this your own, look here:
		[README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md)

		- API version: 0.0.1
		- Build date: 2021-07-28T14:50:09.268-04:00
		- Build date: 2021-07-29T15:25:24.062-04:00


		### Running the server

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

deleted100644 → 0

+0 −365

Original line number	Diff line number	Diff line
		openapi: 3.0.2
		servers:
		- url: 'https://localhost/sandboxname/app_info/v1'
		info:
		title: AdvantEDGE Application Information API
		version: 1.0.0
		description: AdvantEDGE implementation to create an Application Instance information using OpenAPI. Developed as an extension to Application Enablement API.
		license:
		name: Apache 2.0
		url: 'https://github.com/InterDigitalInc/AdvantEDGE/blob/master/LICENSE'
		contact:
		name: InterDigital AdvantEDGE Support
		email: AdvantEDGE@InterDigital.com
		externalDocs:
		description: GitHub Wiki
		url: 'https://github.com/InterDigitalInc/AdvantEDGE/wiki'
		tags:
		- name: apps
		paths:
		'/applications':
		get:
		description: This method retrieves information about a list of mec application resources.
		operationId: Applications_GET
		tags:
		- apps
		parameters:
		- $ref: '#/components/parameters/Query.App_name'
		- $ref: '#/components/parameters/Query.App_state'
		responses:
		'200':
		$ref: '#/components/responses/Applications.200'
		'400':
		$ref: '#/components/responses/Error.400'
		'403':
		$ref: '#/components/responses/Error.403'
		'404':
		$ref: '#/components/responses/Error.404'
		'414':
		$ref: '#/components/responses/Error.414'
		post:
		description: This method is used to create a mec application resource.
		operationId: Applications_POST
		tags:
		- apps
		responses:
		'201':
		$ref: '#/components/responses/Application.201'
		'400':
		$ref: '#/components/responses/Error.400'
		'403':
		$ref: '#/components/responses/Error.403'
		'404':
		$ref: '#/components/responses/Error.404'
		requestBody:
		$ref: '#/components/requestBodies/ApplicationInfo'
		'/applications/{appInstanceId}':
		parameters:
		- $ref: '#/components/parameters/Path.AppInstanceId'
		get:
		description: This method retrieves information about a mec application resource.
		operationId: ApplicationsAppInstanceId_GET
		tags:
		- apps
		responses:
		'200':
		$ref: '#/components/responses/ApplicationAppInstanceId.200'
		'400':
		$ref: '#/components/responses/Error.400'
		'403':
		$ref: '#/components/responses/Error.403'
		'404':
		$ref: '#/components/responses/Error.404'
		put:
		description: This method updates the information about a mec application resource.
		operationId: ApplicationsAppInstanceId_PUT
		tags:
		- apps
		responses:
		'200':
		$ref: '#/components/responses/ApplicationAppInstanceId.200'
		'400':
		$ref: '#/components/responses/Error.400'
		'403':
		$ref: '#/components/responses/Error.403'
		'404':
		$ref: '#/components/responses/Error.404'
		'412':
		$ref: '#/components/responses/Error.412'
		requestBody:
		$ref: '#/components/requestBodies/ApplicationInfo'
		delete:
		description: This method deletes a mec application resource.
		operationId: ApplicationsAppInstanceId_DELETE
		tags:
		- apps
		responses:
		'204':
		description: No Content
		'403':
		$ref: '#/components/responses/Error.403'
		'404':
		$ref: '#/components/responses/Error.404'
		components:
		schemas:
		Empty:
		description: Empty schema
		ProblemDetails:
		type: object
		properties:
		type:
		$ref: '#/components/schemas/Problem.type'
		title:
		$ref: '#/components/schemas/Problem.title'
		status:
		$ref: '#/components/schemas/Problem.status'
		detail:
		$ref: '#/components/schemas/Problem.detail'
		instance:
		$ref: '#/components/schemas/Problem.instance'
		Problem.detail:
		type: string
		description: A human-readable explanation specific to this occurrence of the problem
		Problem.instance:
		type: string
		format: uri
		description: A URI reference that identifies the specific occurrence of the problem
		Problem.status:
		type: integer
		format: uint32
		description: The HTTP status code for this occurrence of the problem
		Problem.title:
		type: string
		description: 'A short, human-readable summary of the problem type'
		Problem.type:
		type: string
		format: uri
		description: >-
		A URI reference according to IETF RFC 3986 that identifies the problem
		type
		LocalityType:
		description: The scope of locality as expressed by "consumedLocalOnly" and "isLocal". If absent, defaults to MEC_HOST
		type: string
		enum:
		- MEC_SYSTEM
		- MEC_HOST
		- NFVI_POP
		- ZONE
		- ZONE_GROUP
		- NFVI_NODE
		example: 'MEC_SYSTEM'
		ApplicationState:
		description: This enumeration defines the possible states of an application.
		type: string
		enum:
		- ACTIVE
		- INACTIVE
		example: 'ACTIVE'
		ApplicationInfo:
		description: This type represents the general information of a MEC application.
		type: object
		required:
		- appInstanceId
		- state
		properties:
		appInstanceId:
		description: Application Instance Id
		type: string
		appName:
		description: Application Name
		type: string
		version:
		description: Application Version
		type: string
		state:
		$ref: '#/components/schemas/ApplicationState'
		parameters:
		Path.AppInstanceId:
		name: appInstanceId
		description: >-
		Represents a MEC application instance. Note that the
		appInstanceId is allocated by the MEC application manager POST method.
		in: path
		required: true
		schema:
		type: string
		Query.App_name:
		name: app_name
		description: >-
		A MEC application manager may use app_name as an input
		parameter to query the existence of a list of MEC application
		instances with the same name.
		in: query
		required: false
		schema:
		type: string
		Query.App_state:
		name: app_state
		description: >-
		A MEC application manager may use app_state as an input
		parameter to query the state of a list of MEC application
		instances with the same state.
		in: query
		required: false
		schema:
		type: string
		responses:
		Applications.200:
		description: >-
		It is used to indicate nonspecific success. The response body
		contains a representation of the resource.
		content:
		application/json:
		schema:
		type: array
		minItems: 0
		items:
		$ref: '#/components/schemas/ApplicationInfo'
		examples:
		ApplicationInfoList:
		$ref: '#/components/examples/ApplicationInfoList'
		Application.201:
		description: >-
		Upon success, the HTTP response shall include a Location HTTP header
		that contains the resource URI of the created resource.
		headers:
		location:
		description: The resource URI of the created resource
		schema:
		type: string
		format: uri
		content:
		application/json:
		schema:
		$ref: '#/components/schemas/ApplicationInfo'
		examples:
		ServiceInfo:
		$ref: '#/components/examples/ApplicationInfo'
		ApplicationAppInstanceId.200:
		description: >-
		It is used to indicate nonspecific success. The response body
		contains a representation of the resource.
		content:
		application/json:
		schema:
		$ref: '#/components/schemas/ApplicationInfo'
		examples:
		ServiceInfo:
		$ref: '#/components/examples/ApplicationInfo'
		Error.400:
		description: >-
		Bad Request.
		It is used to indicate that incorrect parameters were passed to the request.
		content:
		application/problem+json:
		schema:
		$ref: '#/components/schemas/ProblemDetails'
		text/plain:
		schema:
		$ref: '#/components/schemas/Empty'
		Error.401:
		description: >-
		Unauthorized.
		It is used when the client did not submit the appropriate credentials.
		content:
		application/problem+json:
		schema:
		$ref: '#/components/schemas/ProblemDetails'
		text/plain:
		schema:
		$ref: '#/components/schemas/Empty'
		Error.403:
		description: >-
		Forbidden.
		The operation is not allowed given the current status of the resource.
		content:
		application/problem+json:
		schema:
		$ref: '#/components/schemas/ProblemDetails'
		Error.404:
		description: >-
		Not Found.
		It is used when a client provided a URI that cannot be mapped
		to a valid resource URI.
		content:
		application/problem+json:
		schema:
		$ref: '#/components/schemas/ProblemDetails'
		text/plain:
		schema:
		$ref: '#/components/schemas/Empty'
		Error.409:
		description: >-
		Conflict.
		The operation cannot be executed currently, due to a conflict with
		the state of the resource. Typically, this is because the application
		instance resource is in NOT_INSTANTIATED state.
		content:
		application/problem+json:
		schema:
		$ref: '#/components/schemas/ProblemDetails'
		text/plain:
		schema:
		$ref: '#/components/schemas/Empty'
		Error.412:
		description: >-
		Precondition Failed.
		It is used when a condition has failed during conditional requests,
		e.g. when using ETags to avoid write conflicts.
		content:
		application/problem+json:
		schema:
		$ref: '#/components/schemas/ProblemDetails'
		text/plain:
		schema:
		$ref: '#/components/schemas/Empty'
		Error.414:
		description: >-
		It is used to indicate that the server is refusing to process the request because the request URI is longer than the server is willing or able to process.
		content:
		application/problem+json:
		schema:
		$ref: '#/components/schemas/ProblemDetails'
		text/plain:
		schema:
		$ref: '#/components/schemas/Empty'
		Error.429:
		description: >-
		Too Many Requests.
		It is used when a rate limiter has triggered.
		content:
		application/problem+json:
		schema:
		$ref: '#/components/schemas/ProblemDetails'
		text/plain:
		schema:
		$ref: '#/components/schemas/Empty'
		requestBodies:
		ApplicationInfo:
		content:
		application/json:
		schema:
		$ref: '#/components/schemas/ApplicationInfo'
		description: >-
		New ApplicationInfo with updated "state" is included as entity body of the
		request
		required: true
		examples:
		ApplicationInfo:
		value:
		appInstanceId: 'ApplicationInstance123'
		appName: 'MyAppName'
		version: 'ApplicationVersion1'
		state: 'ACTIVE'
		ApplicationInfoList:
		value:
		- appInstanceId: 'ApplicationInstance123'
		appName: 'MyAppName'
		version: 'ApplicationVersion1'
		state: 'ACTIVE'
		- appInstanceId: 'ApplicationInstance456'
		appName: 'MyAppName'
		version: 'ApplicationVersion2'
		state: 'INACTIVE'

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

+12 −21

Original line number	Diff line number	Diff line
		@@ -23,9 +23,8 @@ import (
		"strings"
		"sync"

		appInfo "github.com/InterDigitalInc/AdvantEDGE/go-apps/meep-app-enablement/server/app-info"
		appSupport "github.com/InterDigitalInc/AdvantEDGE/go-apps/meep-app-enablement/server/app-support"
		servMgmt "github.com/InterDigitalInc/AdvantEDGE/go-apps/meep-app-enablement/server/service-mgmt"
		as "github.com/InterDigitalInc/AdvantEDGE/go-apps/meep-app-enablement/server/app-support"
		sm "github.com/InterDigitalInc/AdvantEDGE/go-apps/meep-app-enablement/server/service-mgmt"
		httpLog "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-http-logger"
		log "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger"
		mod "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-model"
		@@ -96,28 +95,25 @@ func Init() (err error) {
		}
		log.Info("Active Scenario Model created")

		err = servMgmt.Init(sandboxName, mepName, hostUrl, &mutex)
		if err != nil {
		return err
		}

		err = appSupport.Init(sandboxName, mepName, hostUrl, &mutex)
		// Create message queue
		mqLocal, err = mq.NewMsgQueue(mq.GetLocalName(sandboxName), moduleName, sandboxName, redisAddr)
		if err != nil {
		log.Error("Failed to create Message Queue with error: ", err)
		return err
		}
		log.Info("Message Queue created")

		err = appInfo.Init(sandboxName, mepName, hostUrl, &mutex)
		// Initialize Service Management
		err = sm.Init(sandboxName, mepName, hostUrl, mqLocal, &mutex)
		if err != nil {
		return err
		}

		// Create message queue
		mqLocal, err = mq.NewMsgQueue(mq.GetLocalName(sandboxName), moduleName, sandboxName, redisAddr)
		// Initialize App Support
		err = as.Init(sandboxName, mepName, hostUrl, mqLocal, &mutex)
		if err != nil {
		log.Error("Failed to create Message Queue with error: ", err)
		return err
		}
		log.Info("Message Queue created")

		return nil
		}
		@@ -125,17 +121,12 @@ func Init() (err error) {
		// Run - Start App Enablement
		func Run() (err error) {

		err = servMgmt.Run()
		if err != nil {
		return err
		}

		err = appSupport.Run()
		err = sm.Run()
		if err != nil {
		return err
		}

		err = appInfo.Run()
		err = as.Run()
		if err != nil {
		return err
		}