Made additions to e2e test and samples to iothub client

Azure · Jan 29, 2018 · 0c8ec59 · 0c8ec59
1 parent 8eff31a
commit 0c8ec59
Show file tree

Hide file tree

Showing 62 changed files with 370 additions and 2,948 deletions.
diff --git a/build_all/tizenRT/Make.defs b/build_all/tizenRT/Make.defs
@@ -38,7 +38,7 @@ $(AZURE_UTIL_DIR)/adapters/tickcounter_linux.c $(AZURE_UTIL_DIR)/adapters/httpap
 CSRCS += $(wildcard $(AZURE_SERIAL_DIR)/src/*.c)
 
 ifeq ($(CONFIG_CLOUD_AZURE_SAMPLES),y)
-CSRCS += $(AZURE_CLIENT_DIR)/samples/iothub_client_sample_http/iothub_client_sample_http.c
+CSRCS += $(AZURE_CLIENT_DIR)/samples/iothub_ll_telemetry_sample/iothub_ll_telemetry_sample.c
 CSRCS += $(AZURE_SERIAL_DIR)/samples/simplesample_http/simplesample_http.c
 endif
 

diff --git a/build_all/windows/build.cmd b/build_all/windows/build.cmd
@@ -155,11 +155,7 @@ if %build-samples%==yes (
         )
     )
 
-    rem call nuget restore -config "%current-path%\NuGet.Config" "%build-root%\iothub_client\samples\iothub_client_sample_amqp\windows\iothub_client_sample_amqp.sln"
-    if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
-    call nuget restore -config "%current-path%\NuGet.Config" "%build-root%\iothub_client\samples\iothub_client_sample_http\windows\iothub_client_sample_http.sln"
-    if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
-    call nuget restore -config "%current-path%\NuGet.Config" "%build-root%\iothub_client\samples\iothub_client_sample_mqtt\windows\iothub_client_sample_mqtt.sln"
+    call nuget restore -config "%current-path%\NuGet.Config" "%build-root%\iothub_client\samples\iothub_ll_telemetry_sample\windows\iothub_ll_telemetry_sample.sln"
     if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
 
     call nuget restore -config "%current-path%\NuGet.Config" "%build-root%\serializer\samples\simplesample_http\windows\simplesample_http.sln"
@@ -180,17 +176,9 @@ rem ----------------------------------------------------------------------------
 
 if %build-clean%==1 (
     if %build-samples%==yes (
-        rem call nuget restore "%build-root%\iothub_client\samples\iothub_client_sample_amqp\windows\iothub_client_sample_amqp.sln"
-        rem call :clean-a-solution "%build-root%\iothub_client\samples\iothub_client_sample_amqp\windows\iothub_client_sample_amqp.sln"
-        rem if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
-
-        call nuget restore "%build-root%\iothub_client\samples\iothub_client_sample_http\windows\iothub_client_sample_http.sln"
-        call :clean-a-solution "%build-root%\iothub_client\samples\iothub_client_sample_http\windows\iothub_client_sample_http.sln"
+        call nuget restore "%build-root%\iothub_client\samples\iothub_ll_telemetry_sample\windows\iothub_ll_telemetry_sample.sln"
+        call :clean-a-solution "%build-root%\iothub_client\samples\iothub_ll_telemetry_sample\windows\iothub_ll_telemetry_sample.sln"
         if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
-
-        rem call nuget restore "%build-root%\iothub_client\samples\iothub_client_sample_mqtt\windows\iothub_client_sample_mqtt.sln"
-        rem call :clean-a-solution "%build-root%\iothub_client\samples\iothub_client_sample_mqtt\windows\iothub_client_sample_mqtt.sln"
-        rem if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
 
         call :clean-a-solution "%build-root%\serializer\samples\simplesample_http\windows\simplesample_http.sln"
         if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
@@ -214,15 +202,9 @@ rem -- build solutions
 rem -----------------------------------------------------------------------------
 
 if %build-samples%==yes (
-    rem call :build-a-solution "%build-root%\iothub_client\samples\iothub_client_sample_amqp\windows\iothub_client_sample_amqp.sln"
-    rem if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
-
-    call :build-a-solution "%build-root%\iothub_client\samples\iothub_client_sample_http\windows\iothub_client_sample_http.sln"
+    call :build-a-solution "%build-root%\iothub_client\samples\iothub_ll_telemetry_sample\windows\iothub_ll_telemetry_sample.sln"
     if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
 
-    rem call :build-a-solution "%build-root%\iothub_client\samples\iothub_client_sample_mqtt\windows\iothub_client_sample_mqtt.sln"
-    rem if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
-
     rem call :build-a-solution "%build-root%\serializer\samples\simplesample_amqp\windows\simplesample_amqp.sln"
     rem if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
 

diff --git a/build_all/windowsce/build.cmd b/build_all/windowsce/build.cmd
@@ -41,7 +41,7 @@ rem no error checking
 
 pushd "%USERPROFILE%\cmake_ce8"
 
-rem if you plan to use a different SDK you need to change SDKNAME to the name of your SDK. Ensure that this is also changed in the sample solutions iothub_client_sample_http, simplesample_http and remote_monitoring
+rem if you plan to use a different SDK you need to change SDKNAME to the name of your SDK. Ensure that this is also changed in the sample solutions iothub_ll_telemetry_sample, simplesample_http and remote_monitoring
 set SDKNAME=TORADEX_CE800
 set PROCESSOR=arm
 
@@ -50,8 +50,5 @@ cmake -DWINCE=TRUE -DCMAKE_SYSTEM_NAME=WindowsCE -DCMAKE_SYSTEM_VERSION=8.0 -DCM
 if not %errorlevel%==0 exit /b %errorlevel%
 
 rem Currently, only building of HTTP sample is supported
-msbuild "%USERPROFILE%\cmake_ce8\iothub_client\samples\iothub_client_sample_http\iothub_client_sample_http.vcxproj
-if not %errorlevel%==0 exit /b %errorlevel%
-
-
-
+rem msbuild "%USERPROFILE%\cmake_ce8\iothub_client\samples\iothub_ll_telemetry_sample\iothub_ll_telemetry_sample.vcxproj
+rem if not %errorlevel%==0 exit /b %errorlevel%
diff --git a/iothub_client/build/mbed/build.cmd b/iothub_client/build/mbed/build.cmd
@@ -28,7 +28,7 @@ goto args-done
 :longhaul_tests_download_bin_path
 shift
 if NOT "%1" equ "" (
-	set longhaul_tests_download_bin_path=%1
+    set longhaul_tests_download_bin_path=%1
 )
 goto args-continue
 
@@ -72,25 +72,19 @@ call %build-root%\..\c-utility\tools\mbed_build_scripts\release_mbed_project.cmd
 if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
 
 if %skip_samples%==0 (
-	rem -----------------------------------------------------------------------------
-	rem -- build iothub client samples
-	rem -----------------------------------------------------------------------------
+    rem -----------------------------------------------------------------------------
+    rem -- build iothub client samples
+    rem -----------------------------------------------------------------------------
 
-	call :compile iothub_client_sample_amqp %build-root%\samples\iothub_client_sample_amqp\mbed
-	if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
+    call :compile iothub_client_sample_http %build-root%\samples\iothub_ll_telemetry_sample\mbed
+    if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
 
-	call :compile iothub_client_sample_http %build-root%\samples\iothub_client_sample_http\mbed
-	if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
+    rem -----------------------------------------------------------------------------
+    rem -- build a serializer client sample
+    rem -----------------------------------------------------------------------------
 
-	call :compile iothub_client_sample_mqtt %build-root%\samples\iothub_client_sample_mqtt\mbed
-	if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
-
-	rem -----------------------------------------------------------------------------
-	rem -- build a serializer client sample
-	rem -----------------------------------------------------------------------------
-
-	call :compile simplesample_amqp %build-root%\..\serializer\samples\simplesample_amqp\mbed
-	if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
+    call :compile simplesample_amqp %build-root%\..\serializer\samples\simplesample_amqp\mbed
+    if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
 )
 
 rem -----------------------------------------------------------------------------

diff --git a/iothub_client/samples/CMakeLists.txt b/iothub_client/samples/CMakeLists.txt
@@ -12,8 +12,10 @@ function(add_sample_directory whatIsBuilding)
                FOLDER "IoTHub_Samples")
 endfunction()
 
+
+add_sample_directory(iothub_ll_telemetry_sample)
+
 if(${use_http})
-    add_sample_directory(iothub_client_sample_http)
     add_sample_directory(iothub_client_sample_http_shared)
     if(NOT ${dont_use_uploadtoblob})
         add_sample_directory(iothub_client_sample_upload_to_blob)
@@ -22,23 +24,19 @@ if(${use_http})
 endif()
 
 if(${use_mqtt})
-    add_sample_directory(iothub_client_sample_mqtt)
     add_sample_directory(iothub_client_sample_mqtt_esp8266)
     if(${use_amqp})
         add_sample_directory(iothub_client_sample_device_method)
     endif()
     if(LINUX)
         add_sample_directory(iothub_client_sample_mqtt_dm)
     endif()
-    add_sample_directory(iothub_client_sample_mqtt_websockets)
 endif()
 
 if(${use_amqp})
-    add_sample_directory(iothub_client_sample_amqp)
     add_sample_directory(iothub_client_sample_amqp_shared)
     add_sample_directory(iothub_ll_client_sample_amqp_shared)
 
-    add_sample_directory(iothub_client_sample_amqp_websockets)
     add_sample_directory(iothub_client_sample_amqp_websockets_shared)
     add_sample_directory(iothub_client_sample_amqp_shared_ws_methods)
 endif()

diff --git a/iothub_client/samples/iothub_client_sample_amqp/CMakeLists.txt b/iothub_client/samples/iothub_client_sample_amqp/CMakeLists.txt
diff --git a/iothub_client/samples/iothub_client_sample_amqp/freertos/.gitignore b/iothub_client/samples/iothub_client_sample_amqp/freertos/.gitignore