feat: Make changes below before base structure PR

* Add native HTTP function by using manager module
* Clean test server info

Author: selengalp

core/modem.py

@@ -1448,7 +1448,6 @@ def open_mqtt_connection(self, cid=0, host="", port=8883):
 
         if result["status"] == Status.SUCCESS:
             result = self.atcom.get_response(desired_response, timeout=60)
-            return result
         return result
 
     def close_mqtt_connection(self, cid=0):
@@ -1477,7 +1476,6 @@ def close_mqtt_connection(self, cid=0):
         if result["status"] == Status.SUCCESS:
             desired_response = f"+QMTCLOSE: {cid},0"
             result = self.atcom.get_response(desired_response, timeout=60)
-            return result
         return result
 
     def connect_mqtt_broker(self, cid=0, client_id_string="picocell", username=None, password=None):
@@ -1528,7 +1526,6 @@ def connect_mqtt_broker(self, cid=0, client_id_string="picocell", username=None,
         if result["status"] == Status.SUCCESS:
             desired_response = f"+QMTCONN: {cid},0,0"
             result = self.atcom.get_response(desired_response, timeout=60)
-            return result
         return result
 
     def disconnect_mqtt_broker(self, cid=0):
@@ -1604,7 +1601,6 @@ def subscribe_mqtt_topic(self, cid=0, message_id=1, topic="", qos=0):
         if result["status"] == Status.SUCCESS:
             desired_response = f"+QMTSUB: {cid},{message_id},0"
             result = self.atcom.get_response(desired_response, timeout=60)
-            return result
         return result
 
     def unsubscribe_mqtt_topic(self, cid=0, message_id=1, topic=""):
@@ -1687,16 +1683,15 @@ def publish_mqtt_message(self, cid=0, message_id=1, qos=1, retain=0, topic="", p
                         2 --> Failed to send a packet
                     value : int
                         If <result> is 1, number of times a packet has been retransmitted.
-                        If <result> is 0 or 2, it will not be presente
+                        If <result> is 0 or 2, it will not be presented
         """
         command = f'AT+QMTPUB={cid},{message_id},{qos},{retain},"{topic}"'
         result = self.atcom.send_at_comm(command,">")
 
         if result["status"] == Status.SUCCESS:
-            self.atcom.send_at_comm_once(payload,"OK") # Send message
-            return self.atcom.send_at_comm(self.CTRL_Z,"OK") # Send end char --> CTRL+Z
-        else:
-            return result
+            self.atcom.send_at_comm_once(payload, line_end=False) # Send message
+            result = self.atcom.send_at_comm(self.CTRL_Z,"OK") # Send end char --> CTRL+Z
+        return result
 
     def check_any_mqtt_messages(self, cid=0):
         """
@@ -1985,6 +1980,17 @@ def publish_message_to_aws(self, payload, host=None, port=None, topic=None):
         """
         Function for publishing a message to AWS IoT by using MQTT.
 
+        Parameters
+        ----------
+        payload : str
+            Payload of the message.
+        host : str
+            Host of the MQTT broker.
+        port : int
+            Port of the MQTT broker.
+        topic : str
+            Topic of the message.
+
         Returns
         -------
         (status, modem_response) : tuple
@@ -2091,3 +2097,111 @@ def publish_message_to_aws(self, payload, host=None, port=None, topic=None):
             elif result["status"] == Status.ERROR:
                 return result
             time.sleep(result["interval"])
+
+    def publish_message_to_aws_https(self, payload, url=None):
+        """
+        Function for publishing a message to AWS IoT by using HTTPS.
+
+        Parameters
+        ----------
+        payload : str
+            Payload of the message.
+        url : str
+            URL of the AWS device shadow
+
+        Returns
+        -------
+        (status, modem_response) : tuple
+            status : int
+                Status of the command.
+            modem_response : str
+                Response of the modem.
+        """
+
+        step_network_reg = Step(
+            function=self.register_network,
+            name="register_network",
+            success="pdp_deactivate",
+            fail="failure",
+        )
+
+        step_pdp_deactivate = Step(
+            function=self.deactivate_pdp_context,
+            name="pdp_deactivate",
+            success="pdp_activate",
+            fail="failure",
+        )
+
+        step_pdp_activate= Step(
+            function=self.activate_pdp_context,
+            name="pdp_activate",
+            success="ssl_configuration",
+            fail="failure",
+            cachable=True,
+        )
+
+        step_ssl_configuration = Step(
+            function=self.configure_modem_ssl_for_x509_certification,
+            name="ssl_configuration",
+            success="http_ssl_configuration",
+            fail="failure",
+            cachable=True,
+        )
+
+        step_http_ssl_configuration = Step(
+            function=self.set_modem_http_ssl_context_id,
+            name="http_ssl_configuration",
+            success="set_server_url",
+            fail="failure",
+            function_params={"id": 2},
+            cachable=True,
+        )
+
+        step_set_server_url = Step(
+            function=self.set_modem_http_server_url,
+            name="set_server_url",
+            success="post_request",
+            fail="failure",
+            function_params={"url": url},
+            cachable=True,
+        )
+
+        step_post_request = Step(
+            function=self.http_post_request,
+            name="post_request",
+            success="read_response",
+            fail="failure",
+            function_params={"data": payload},
+            cachable=True,
+        )
+
+        step_read_response = Step(
+            function=self.http_read_response,
+            name="read_response",
+            success="success",
+            fail="failure",
+        )
+
+        # Add cache if it is not already existed
+        function_name = "publish_message_to_aws_https"
+
+        sm = StateManager(first_step = step_network_reg,
+                            cache=self.cache, function_name=function_name)
+
+        sm.add_step(step_network_reg)
+        sm.add_step(step_pdp_deactivate)
+        sm.add_step(step_pdp_activate)
+        sm.add_step(step_ssl_configuration)
+        sm.add_step(step_http_ssl_configuration)
+        sm.add_step(step_set_server_url)
+        sm.add_step(step_post_request)
+        sm.add_step(step_read_response)
+
+        while True:
+            result = sm.run()
+
+            if result["status"] == Status.SUCCESS:
+                return result
+            elif result["status"] == Status.ERROR:
+                return result
+            time.sleep(result["interval"])

examples/aws_https_example.py

@@ -17,8 +17,8 @@
 modem = Modem(config)
 atcom = ATCom()
 
-HOST = "a2q4ztq1aigmmt-ats.iot.us-west-2.amazonaws.com"
-TOPIC = "$aws/things/picocell_test/shadow/update"
+HOST = "[CHANGE WITH YOUR AWS IOT ENDPOINT]"
+TOPIC = "[CHANGE WITH YOUR AWS IOT TOPIC]"
 PAYLOAD_JSON = {"state": {"reported": {"Status": "HTTPS TEST MESSAGE!"}}}
 payload = json.dumps(PAYLOAD_JSON)
 publish_url = 'https://' + HOST + ':8443/topics/' + TOPIC + '?qos=1'

examples/aws_https_example_with_manager.py

@@ -11,12 +11,10 @@
 modem = Modem(config)
 atcom=ATCom()
 
-HOST = "a2q4ztq1aigmmt-ats.iot.us-west-2.amazonaws.com"
-PORT = 8883
-TOPIC = "$aws/things/picocell_test/shadow/update"
+HOST = "[CHANGE WITH YOUR AWS IOT ENDPOINT]"
+TOPIC = "[CHANGE WITH YOUR AWS IOT TOPIC]"
 PAYLOAD_JSON = {"state": {"reported": {"Status": "Test message from Picocell!"}}}
+server_url = 'https://' + HOST + ':8443/topics/' + TOPIC + '?qos=1'
 payload = json.dumps(PAYLOAD_JSON)
 
-print(modem.set_modem_http_context_id(1))
-time.sleep(1)
-print(atcom.send_at_comm('AT+QHTTPCFG="contextid"',"OK"))
+print(modem.publish_message_to_aws_https(payload, server_url))

examples/aws_mqtts_example.py

@@ -16,9 +16,9 @@
 modem = Modem(config)
 atcom = ATCom()
 
-HOST = "a2q4ztq1aigmmt-ats.iot.us-west-2.amazonaws.com"
+HOST = "[CHANGE WITH YOUR AWS IOT ENDPOINT]"
+TOPIC = "[CHANGE WITH YOUR AWS IOT TOPIC]"
 PORT = 8883
-TOPIC = "$aws/things/picocell_test/shadow/update"
 PAYLOAD_JSON = {"state": {"reported": {"Status": "Hello from Picocell!"}}}
 payload = json.dumps(PAYLOAD_JSON)
 

examples/aws_mqtts_example_with_manager.py

@@ -8,9 +8,9 @@
 config = {}
 modem = Modem(config)
 
-HOST = "a2q4ztq1aigmmt-ats.iot.us-west-2.amazonaws.com"
+HOST = "[CHANGE WITH YOUR AWS IOT ENDPOINT]"
+TOPIC = "[CHANGE WITH YOUR AWS IOT TOPIC]"
 PORT = 8883
-TOPIC = "$aws/things/picocell_test/shadow/update"
 PAYLOAD_JSON = {"state": {"reported": {"Status": "Test message from Picocell!"}}}
 payload = json.dumps(PAYLOAD_JSON)
 

examples/listener_example.py

@@ -12,12 +12,6 @@
 atcom = ATCom()
 modem = Modem(config)
 
-HOST = "a2q4ztq1aigmmt-ats.iot.us-west-2.amazonaws.com"
-PORT = 8883
-TOPIC = "$aws/things/picocell_test/shadow/update"
-PAYLOAD_JSON = {"state": {"reported": {"Status": "Test message from Picocell!"}}}
-payload = json.dumps(PAYLOAD_JSON)
-
 
 def callback(message):
     """Example callback function"""