[IOT-3006] add WES and CNC Resources to DCRs 59/27259/4
authorNathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Wed, 17 Oct 2018 12:05:19 +0000 (05:05 -0700)
committerNathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Wed, 31 Oct 2018 05:27:09 +0000 (05:27 +0000)
The WES and CNC Resources should be in the list of
Device Configuration Resources.

Change-Id: I889f68cf87ee0b074ff341262a0de037af8a15fa
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
resource/csdk/security/SConscript
resource/csdk/security/src/srmutility.c

index 5b023eb..83d588d 100644 (file)
@@ -56,7 +56,8 @@ libocsrm_env.PrependUnique(CPPPATH=[
     '#/resource/csdk/security/include',
     '#/resource/csdk/security/include/internal',
     '#/resource/csdk/security/provisioning/include',
-    '#/extlibs/mbedtls/mbedtls/include'
+    '#/extlibs/mbedtls/mbedtls/include',
+    '#/service/easy-setup/inc'
 ])
 
 if target_os in ['windows', 'msys_nt']:
index 69b483e..687b6e3 100644 (file)
@@ -26,6 +26,7 @@
 #include "oic_malloc.h"
 #include "experimental/ocrandom.h"
 #include "experimental/doxmresource.h"
+#include "escommon.h"
 
 #define TAG  "OIC_SRM_UTILITY"
 
@@ -305,9 +306,11 @@ bool IsDeviceConfigurationResourceUri(const char *uri)
         OC_RSRVD_DEVICE_URI,
         OC_RSRVD_PLATFORM_URI,
         OC_RSRVD_WELL_KNOWN_URI,
-        OC_RSRVD_CLOUDCONF_URI
-        // TODO [IOT-3006]: add WES resources as needed to enable easy setup use cases
-        // TODO [IOT-3006]: add CNC resources as needed to enable CNC use cases
+        OC_RSRVD_CLOUDCONF_URI,
+        OC_RSRVD_ES_URI_EASYSETUP,
+        OC_RSRVD_ES_URI_WIFICONF,
+        OC_RSRVD_ES_URI_COAPCLOUDCONF,
+        OC_RSRVD_ES_URI_DEVCONF
     };
 
 #ifdef _MSC_VER