Commit 45e467a3 authored by Mudassar Khan's avatar Mudassar Khan
Browse files

update acme code to connect with mec sandbox and corrected request bodies for... 

update acme code to connect with mec sandbox and corrected request bodies for registering with mec 033
parent 1465488e

go-apps/meep-iot-pltf/meep-acme-mn-cse/acme/protocols/MECClient.py

+8 −13
Original line number Diff line number Diff line
@@ -236,17 +236,13 @@ class MECClient(object): 
			if self.use_wss:

				userTransportInfo['endpoint']['uris'] = []

				userTransportInfo['endpoint']['uris'].append('wss://' + self.mqtt_address + ':' + str(self.mqtt_port) + self.wss_path)

			else:

				userTransportInfo['endpoint']['addresses'] = []

				address = {}

				address['host'] = self.mqtt_address

				address['port'] = self.mqtt_port

				userTransportInfo['endpoint']['addresses'].append(address)

			else:

				# userTransportInfo['endpoint']['addresses'] = []

				# address = {}

				# address['host'] = self.mqtt_address

				# address['port'] = self.mqtt_port

				# userTransportInfo['endpoint']['addresses'].append(address)

				userTransportInfo['endpoint']['uris'] = [ self.fullAddress ]

				# userTransportInfo['endpoint']['uris'] = [ self.fullAddress ]

			# address = {}

			# address['host'] = self.mqtt_address

			# address['port'] = self.mqtt_port
@@ -258,17 +254,16 @@ class MECClient(object): 
			customServicesTransportInfoList = []

			customServicesTransportInfo = {}

			customServicesTransportInfo['id'] = str(uuid.uuid4())

			customServicesTransportInfo['name'] = self.cse_resourceID

			customServicesTransportInfo['name'] = Configuration.cse_resourceName

			customServicesTransportInfo['description'] = 'ACME oneM2M CSE'

			customServicesTransportInfo['type'] = 'REST_HTTP'

			customServicesTransportInfo['protocol'] = 'REST_HTTP'

			customServicesTransportInfo['version'] = '4'

			customServicesTransportInfo['endpoint'] = {}

			customServicesTransportInfo['endpoint']['addresses'] = []

			address = {}

			address['host'] = self.cse_external_ip

			address['port'] = int(self.http_port) #int(self.cse_external_port)

			customServicesTransportInfo['endpoint']['addresses'].append(address)

			if self.fullAddress == '':

				customServicesTransportInfo['endpoint']['uris'] = [ 'https://' + self.cse_external_ip + ':' + str(self.http_port) ]

			else:

				customServicesTransportInfo['endpoint']['uris'] = [ self.fullAddress ]

			customServicesTransportInfo['security'] = {}

			customServicesTransportInfoList.append(customServicesTransportInfo)

			body_json['customServicesTransportInfo'] = customServicesTransportInfoList

go-apps/meep-iot-pltf/meep-acme-mn-cse/acme/runtime/CSE.py

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ def startup(args:argparse.Namespace, **kwargs:Dict[str, Any]) -> bool: 
		if Configuration.mec_enable:

				L.log('Initializing MEC client')

				if Configuration.mqtt_websocket_enable:

					mecClient = MECClient(Configuration.http_address, Configuration.http_port, Configuration.cse_resourceID, Configuration.cse_external_ip, Configuration.cse_external_port, Configuration.mqtt_websocket_enable, Configuration.mqtt_address, Configuration.mqtt_websocket_port, Configuration.fullAddress, Configuration.mec_app_instance_id, Configuration.mec_platform+"/"+Configuration.mec_sandbox_id+"/")	

					mecClient = MECClient(Configuration.http_address, Configuration.http_port, Configuration.cse_resourceID, Configuration.cse_external_ip, Configuration.cse_external_port, Configuration.mqtt_websocket_enable, Configuration.mqtt_address, Configuration.mqtt_websocket_port, Configuration.fullAddress, Configuration.mec_app_instance_id, Configuration.mqtt_websocket_path)	

				else:

					mecClient = MECClient(Configuration.http_address, Configuration.http_port, Configuration.cse_resourceID, Configuration.cse_external_ip, Configuration.cse_external_port, Configuration.mqtt_websocket_enable, Configuration.mqtt_address, Configuration.mqtt_port, Configuration.fullAddress, Configuration.mec_app_instance_id)

				if mecClient is None: