Done some work

Client/PubSub/PubSub.cpp

@@ -305,7 +305,7 @@ namespace awsiotsdk {
 
 int main(int argc, char **argv) {
     std::shared_ptr<awsiotsdk::util::Logging::ConsoleLogSystem> p_log_system =
-        std::make_shared<awsiotsdk::util::Logging::ConsoleLogSystem>(awsiotsdk::util::Logging::LogLevel::Info);
+        std::make_shared<awsiotsdk::util::Logging::ConsoleLogSystem>(awsiotsdk::util::Logging::LogLevel::Debug);
     awsiotsdk::util::Logging::InitializeAWSLogging(p_log_system);
 
     std::unique_ptr<awsiotsdk::samples::PubSub>

patches/aws-client-id-fix.patch

+ samples/PubSub/PubSub.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/samples/PubSub/PubSub.cpp b/samples/PubSub/PubSub.cpp
+index 651aa19..bd221aa 100644
+--- a/samples/PubSub/PubSub.cpp
++++ b/samples/PubSub/PubSub.cpp
+@@ -238,8 +238,8 @@ namespace awsiotsdk {
+             }
+ 
+             util::String client_id_tagged = ConfigCommon::base_client_id_;
+-            client_id_tagged.append("_pub_sub_tester_");
+-            client_id_tagged.append(std::to_string(rand()));
++//            client_id_tagged.append("_pub_sub_tester_");
++//            client_id_tagged.append(std::to_string(rand()));
+             std::unique_ptr<Utf8String> client_id = Utf8String::Create(client_id_tagged);
+ 
+             rc = p_iot_client_->Connect(ConfigCommon::mqtt_command_timeout_, ConfigCommon::is_clean_session_,
+@@ -305,7 +305,7 @@ namespace awsiotsdk {
+ 
+ int main(int argc, char **argv) {
+     std::shared_ptr<awsiotsdk::util::Logging::ConsoleLogSystem> p_log_system =
+-        std::make_shared<awsiotsdk::util::Logging::ConsoleLogSystem>(awsiotsdk::util::Logging::LogLevel::Info);
++        std::make_shared<awsiotsdk::util::Logging::ConsoleLogSystem>(awsiotsdk::util::Logging::LogLevel::Debug);
+     awsiotsdk::util::Logging::InitializeAWSLogging(p_log_system);
+ 
+     std::unique_ptr<awsiotsdk::samples::PubSub>

rootfs/bin/start-pub-sub-sample

@@ -8,5 +8,13 @@ ls -l $SNAP/jrcp/lib
 ls -l $SNAP/certs
 ls -l $SNAP
 
-cd $SNAP
-./bin/pub-sub-sample configs
+
+
+if [ "$A71CH_CONFIG" == "A71CH_TOOL_CONFIG" ]; then
+    cd $SNAP
+    ./bin/pub-sub-sample configs
+else
+    $SNAP/jrcp/lib/nxp_iot_agent_demo
+    cd $SNAP_COMMON
+    $SNAP/bin/pub-sub-sample certs
+fi

rootfs/snapconf.yaml

@@ -3,6 +3,12 @@ conf-files:
     replace-template: 'export <config-key>="<value>"'
     conf-file: /var/snap/a71ch-aws-client/common/.bash_profile
     params:
+      - snap-key: a71ch-config
+        config-key: A71CH_CONFIG
+        validator-type: range
+        validator-type: regex
+        validator-value: '^(A71CH_TOOL_CONFIG|NXP_HUB_CONFIG)$'
+        default-value: NXP_HUB_CONFIG
       - snap-key: jrcp-port
         config-key: JRCP_PORT
         validator-type: range

snap/snapcraft.yaml

@@ -42,7 +42,7 @@ apps:
       OPENSSL_CONF: $SNAP/certs/opensslA71CH.cnf
       LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/jrcp/lib
     command: bin/start-pub-sub-sample
-    daemon: simple
-    restart-condition: always
+   # daemon: simple
+   # restart-condition: always
     plugs: &default-plugs [network-bind, network-control, network-setup-control, network, lib-cert, lib-engine]