Merge remote-tracking branch 'upstream/master' into return_operationa…

…l_device_proxy
project-chip · Nov 24, 2021 · f504542 · f504542
2 parents 6fbd391 + 8bfdc13
commit f504542
Show file tree

Hide file tree

Showing 610 changed files with 202,665 additions and 69,701 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -91,7 +91,7 @@ jobs:
               timeout-minutes: 20
               run: scripts/run_in_build_env.sh "ninja -C ./out"
     build_linux:
-        name: Build on Linux (gcc_release, clang, mbedtls)
+        name: Build on Linux (gcc_release, clang, mbedtls, simulated)
         timeout-minutes: 60
 
         runs-on: ubuntu-latest
@@ -135,6 +135,14 @@ jobs:
                   path: |
                    .environment/gn_out/.ninja_log
                    .environment/pigweed-venv/*.log
+            - name: Setup and Build Simulated Device
+              timeout-minutes: 5
+              run: |
+                    BUILD_TYPE=simulated
+                    GN_ARGS='chip_tests_zap_config="app1" chip_project_config_include_dirs=["../../examples/placeholder/linux/apps/app1/include", "../../config/standalone"] chip_config_network_layer_ble=false'
+                    CHIP_ROOT_PATH=examples/placeholder/linux
+                    CHIP_ROOT_PATH="$CHIP_ROOT_PATH" BUILD_TYPE="$BUILD_TYPE" scripts/build/gn_gen.sh --args="$GN_ARGS"
+                    scripts/run_in_build_env.sh "ninja -C ./out/$BUILD_TYPE"
             - name: Setup Build, Run Build and Run Tests
               timeout-minutes: 50
               run: |
@@ -217,7 +225,7 @@ jobs:
                   scripts/run_in_build_env.sh 'pip3 install ./out/controller/python/chip-0.0-cp37-abi3-linux_x86_64.whl'
                   scripts/run_in_build_env.sh '(cd src/controller/python/test/unit_tests/ && python3 -m unittest -v)'
     build_darwin:
-        name: Build on Darwin (clang, python_lib)
+        name: Build on Darwin (clang, python_lib, simulated)
         timeout-minutes: 90
         runs-on: macos-latest
         if: github.actor != 'restyled-io[bot]'
@@ -251,6 +259,14 @@ jobs:
                   path: |
                    .environment/gn_out/.ninja_log
                    .environment/pigweed-venv/*.log
+            - name: Setup and Build Simulated Device
+              timeout-minutes: 5
+              run: |
+                    BUILD_TYPE=simulated
+                    GN_ARGS='chip_tests_zap_config="app1" chip_project_config_include_dirs=["../../examples/placeholder/linux/apps/app1/include", "../../config/standalone"] chip_config_network_layer_ble=false'
+                    CHIP_ROOT_PATH=examples/placeholder/linux
+                    CHIP_ROOT_PATH="$CHIP_ROOT_PATH" BUILD_TYPE="$BUILD_TYPE" scripts/build/gn_gen.sh --args="$GN_ARGS"
+                    scripts/run_in_build_env.sh "ninja -C ./out/$BUILD_TYPE"
             - name: Setup Build, Run Build and Run Tests
               timeout-minutes: 75
               # Just go ahead and do the "all" build; on Darwin that's fairly

diff --git a/.github/workflows/unit_integration_test.yaml b/.github/workflows/unit_integration_test.yaml
@@ -40,7 +40,6 @@ jobs:
             image: connectedhomeip/chip-build:0.5.28
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
-                - "/tmp/happy_test_logs:/tmp/happy_test_logs"
             options:
                 --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
 
@@ -52,10 +51,7 @@ jobs:
             - name: Bootstrap
               timeout-minutes: 10
               run: |
-                  mkdir -p /tmp/happy_test_logs ;
                   mkdir -p /tmp/log_output ;
-                  scripts/tests/happy_tests.sh install_packages ;
-                  scripts/tests/happy_tests.sh bootstrap ;
                   scripts/build/gn_bootstrap.sh ;
             - name: Uploading bootstrap logs
               uses: actions/upload-artifact@v2
@@ -82,20 +78,13 @@ jobs:
                      *) ;;
                   esac
 
-                  scripts/build/gn_gen.sh --args="$GN_ARGS chip_enable_happy_tests=true"
+                  scripts/build/gn_gen.sh --args="$GN_ARGS"
             - name: Run Build
               timeout-minutes: 8
               run: scripts/run_in_build_env.sh "ninja -C out/$BUILD_TYPE"
             - name: Run Tests
               timeout-minutes: 15
-              run: RUN_HAPPY_TESTS=1 scripts/tests/gn_tests.sh
-            - name: Uploading Happy Test Log
-              uses: actions/upload-artifact@v2
-              if: ${{ always() }} && ${{ !env.ACT }}
-              with:
-                  name:
-                      happy_log-${{ steps.outsuffix.outputs.value }}-${{ matrix.type }}
-                  path: /tmp/happy_test_logs/
+              run: scripts/tests/gn_tests.sh
             # TODO Log Upload https://github.com/project-chip/connectedhomeip/issues/2227
             # TODO https://github.com/project-chip/connectedhomeip/issues/1512
             # - name: Run Code Coverage

diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml
@@ -39,7 +39,7 @@ jobs:
               uses: actions/setup-node@v1
               with:
                 node-version: '14.x'
-            - name: Use Java 
+            - name: Use Java
               uses: actions/setup-java@v2
               with:
                 distribution: 'zulu'
@@ -56,7 +56,7 @@ jobs:
                 npm rebuild canvas --update-binary
                 npm run build-spa
             - name: Generate all
-              timeout-minutes: 5
+              timeout-minutes: 15
               run: scripts/tools/zap_regen_all.py
             - name: Check for uncommited changes
               run: |

diff --git a/.gitmodules b/.gitmodules
@@ -46,10 +46,6 @@
 	path = third_party/cirque/repo
 	url = https://github.com/openweave/cirque.git
 	branch  = master
-[submodule "happy"]
-	path = third_party/happy/repo
-	url = https://github.com/openweave/happy.git
-	branch  = master
 [submodule "nanopb"]
 	path = third_party/nanopb/repo
 	url = https://github.com/nanopb/nanopb.git

diff --git a/BUILD.gn b/BUILD.gn
@@ -57,7 +57,6 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
       "$dir_pw_watch/py",
       "integrations/mobly:chip_mobly",
       "scripts:requirements",
-      "third_party/happy",
     ]
   }
 
@@ -163,15 +162,6 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
       ]
     }
   }
-
-  # We don't always want to run happy tests, make them a seperate group.
-  if (chip_enable_happy_tests) {
-    group("happy_tests") {
-      if (chip_link_tests) {
-        deps = [ "//src:happy_tests" ]
-      }
-    }
-  }
 } else {
   # This is the unified build. Configure various real toolchains.
   import("${chip_root}/build/chip/chip_build.gni")

diff --git a/build/chip/happy_test.gni b/build/chip/happy_test.gni
diff --git a/build/chip/tests.gni b/build/chip/tests.gni
@@ -20,9 +20,6 @@ import("${chip_root}/src/platform/device.gni")
 declare_args() {
   # Enable building tests.
   chip_build_tests = current_os != "freertos"
-
-  # Enable happy tests.
-  chip_enable_happy_tests = false
 }
 
 declare_args() {

diff --git a/config/nrfconnect/app/overlay-ota_requestor.conf b/config/nrfconnect/app/overlay-ota_requestor.conf
@@ -0,0 +1,17 @@
+#
+#   Copyright (c) 2021 Project CHIP Authors
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+CONFIG_CHIP_OTA_REQUESTOR=y
diff --git a/config/nrfconnect/chip-module/CMakeLists.txt b/config/nrfconnect/chip-module/CMakeLists.txt
@@ -196,6 +196,7 @@ chip_gn_arg_bool  ("chip_enable_openthread"                 CONFIG_NET_L2_OPENTH
 chip_gn_arg_bool  ("chip_config_network_layer_ble"          CONFIG_BT)
 chip_gn_arg_bool  ("chip_inet_config_enable_ipv4"           CONFIG_NET_IPV4)
 chip_gn_arg_bool  ("chip_enable_nfc"                        CONFIG_CHIP_NFC_COMMISSIONING)
+chip_gn_arg_bool  ("chip_enable_ota_requestor"              CONFIG_CHIP_OTA_REQUESTOR)
 chip_gn_arg_bool  ("chip_build_tests"                       CONFIG_CHIP_BUILD_TESTS)
 chip_gn_arg_bool  ("chip_monolithic_tests"                  CONFIG_CHIP_BUILD_TESTS)
 chip_gn_arg_bool  ("chip_inet_config_enable_tcp_endpoint"   CONFIG_CHIP_BUILD_TESTS)

diff --git a/config/nrfconnect/chip-module/Kconfig b/config/nrfconnect/chip-module/Kconfig
@@ -26,4 +26,11 @@ config CHIP_NFC_COMMISSIONING
 	imply NFC_NDEF_URI_REC
 	imply NFC_NDEF_URI_MSG
 	help
-	  Enables NFC commissioning by sharing onboarding payload in NFC tag.
+	  Enables NFC commissioning by sharing onboarding payload in NFC tag.
+
+# See config/zephyr/Kconfig for full definition
+config CHIP_OTA_REQUESTOR
+	bool
+	imply DFU_TARGET
+	imply STREAM_FLASH
+	imply STREAM_FLASH_ERASE
diff --git a/config/zephyr/Kconfig b/config/zephyr/Kconfig
@@ -101,6 +101,13 @@ config CHIP_ENABLE_SLEEPY_END_DEVICE_SUPPORT
 	help
 	  Enables Thread Sleepy End Device support in Matter.
 
+config CHIP_OTA_REQUESTOR
+	bool "Enable OTA requestor"
+	help
+	  Enables OTA (Over-the-air) Requestor role that allows a device to perform
+	  Device Firmware Upgrade by quering and downloading a new firmware image
+	  from an external OTA Provider node.
+
 config APP_LINK_WITH_CHIP
 	bool "Link 'app' with Connected Home over IP"
 	default y