Ci test

.dockerignore

@@ -1,4 +1,6 @@
 .git
+.github
+.dockerignore
 **.mdxml
 **/docs
 **build

.github/actions/Dockerfile

@@ -9,6 +9,4 @@ COPY autodoc.bash /autodoc.bash
 USER fprime
 
 # Code file to execute when the docker container starts up (`entrypoint.sh`)
-ENTRYPOINT ["/entrypoint.sh", "$1"]
-
-
+ENTRYPOINT ["/entrypoint.sh"]

.github/actions/entrypoint.sh

@@ -4,10 +4,10 @@
 set -e
 set -x
 cd "$GITHUB_WORKSPACE"
-if [ "$GITHUB_WORKFLOW" == "Autodocs" ]
+if "$GITHUB_WORKFLOW" == "Autodocs"
 then
     /autodoc.bash
 else
-    echo $1
-    #"$GITHUB_WORKSPACE/ci/master.bash" $1   
+    #echo "$INPUT_TEST1"
+    "$GITHUB_WORKSPACE/ci/master.bash" $INPUT_TEST   
 fi

.github/actions/github-ci-action.yml

@@ -1,12 +1,12 @@
 name: 'F prime CI'
 description: 'Runs continuous integration testing on F prime'
 inputs:
-  test_type:
+  test:
     description: Test number to run
     required: true
-    default: 1
+    default: ''
 runs:
   using: 'docker'
   image: 'Dockerfile'
   args:
-    - ${{ inputs.test_type }}
+    - ${{ inputs.test }}

.github/workflows/build-test.yml

@@ -12,8 +12,8 @@ on:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
-  build:
+  # This workflow contains 4 jobs. One for every CI test."
+  Framework:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
 
@@ -26,12 +26,81 @@ jobs:
       uses: ./.github/actions/
       id: github-ci-action
       with:
-        test_type: "QUICK"
+        test: Framework
     # Archive the outputs
     - name: 'Archive Logs'
       uses: actions/upload-artifact@v2
       if: always()
       with:
-        name: ci-logs
+        name: ci-framework-logs
         path: ci-logs.tar.gz
         retention-days: 5
+
+  Ref:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+    - uses: actions/checkout@v2
+    # Runs the CI action internal to the repository
+    - name: F prime CI step
+      uses: ./.github/actions/
+      id: github-ci-action
+      with:
+        test: 'Ref'
+    # Archive the outputs
+    - name: 'Archive Logs'
+      uses: actions/upload-artifact@v2
+      if: always()
+      with:
+        name: ci-ref-logs
+        path: ci-logs.tar.gz
+        retention-days: 5
+
+  RPI:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+    - uses: actions/checkout@v2
+    # Runs the CI action internal to the repository
+    - name: F prime CI step
+      uses: ./.github/actions/
+      id: github-ci-action
+      with:
+        test: 'RPI'
+    # Archive the outputs
+    - name: 'Archive Logs'
+      uses: actions/upload-artifact@v2
+      if: always()
+      with:
+        name: ci-rpi-logs
+        path: ci-logs.tar.gz
+        retention-days: 5
+
+  Integration:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+    - uses: actions/checkout@v2
+    # Runs the CI action internal to the repository
+    - name: F prime CI step
+      uses: ./.github/actions/
+      id: github-ci-action
+      with:
+        test: '30-ints'
+    # Archive the outputs
+    - name: 'Archive Logs'
+      uses: actions/upload-artifact@v2
+      if: always()
+      with:
+        name: ci-int-logs
+        path: ci-logs.tar.gz
+        retention-days: 5

.github/workflows/tutorial-support.yml

@@ -8,7 +8,7 @@ on:
   push:
     branches: [ master, devel ]
   pull_request:
-    branches: [ master, devel ]
+    branches: [ master ]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:

Autocoders/Python/schema/default/active_comp_schematron.rng

@@ -3,7 +3,7 @@
         xmlns="http://purl.oclc.org/dsdl/schematron">
     <pattern id="ASYNC_PORT">
         <rule context="component">
-            <assert test="(//component/@kind = 'active' and (count(//component/ports/port/@kind[. = 'async_input']) + count(//component/internal_interfaces/internal_interface) ) >= 1) or not (//component/@kind = 'active')">
+            <assert test="(//component/@kind = 'active' and (count(//component/ports/port/@kind[. = 'async_input']) + count(//component/commands/command/@kind[. = 'async']) + count(//component/internal_interfaces/internal_interface) ) >= 1) or not (//component/@kind = 'active')">
                 Active components should have at least 1 port of kind async_input or internal_interface.
             </assert>
         </rule>

Drv/BlockDriver/BlockDriverComponentAi.xml

@@ -60,7 +60,7 @@
             Internal interrupt reporting interface
             </comment>
             <args>
-                <arg name="interrupt" type="U32">
+                <arg name="interrupt_val" type="U32">
                     <comment>The interrupt register value</comment>
                 </arg>          
             </args>

Drv/ByteStreamDriverModel/ByteStreamDriverComponentAi.xml

@@ -6,6 +6,7 @@
     <import_port_type>Drv/ByteStreamDriverModel/ByteStreamSendPortAi.xml</import_port_type>
     <import_port_type>Drv/ByteStreamDriverModel/ByteStreamRecvPortAi.xml</import_port_type>
     <import_port_type>Drv/ByteStreamDriverModel/ByteStreamPollPortAi.xml</import_port_type>
+    <import_port_type>Drv/ByteStreamDriverModel/ByteStreamReadyPortAi.xml</import_port_type>
     <import_port_type>Fw/Log/LogPortAi.xml</import_port_type>
     <import_port_type>Fw/Log/LogTextPortAi.xml</import_port_type>
     <import_port_type>Fw/Time/TimePortAi.xml</import_port_type>
@@ -21,6 +22,9 @@
         <port name="poll" data_type="Drv::ByteStreamPoll" kind="guarded_input" max_number="1">
         </port>
 
+        <port name="ready" data_type="Drv::ByteStreamReady" kind="output" max_number="1">
+        </port>
+
         <!-- Buffer request port used for incoming data -->
         <port name="allocate" data_type="Fw::BufferGet" kind="output" max_number="1">
         </port>

Drv/ByteStreamDriverModel/ByteStreamReadyPortAi.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<interface name="ByteStreamReady" namespace="Drv">
+</interface>

Drv/ByteStreamDriverModel/CMakeLists.txt

@@ -9,6 +9,7 @@ set(SOURCE_FILES
     "${CMAKE_CURRENT_LIST_DIR}/ByteStreamRecvPortAi.xml"
     "${CMAKE_CURRENT_LIST_DIR}/ByteStreamSendPortAi.xml"
     "${CMAKE_CURRENT_LIST_DIR}/ByteStreamPollPortAi.xml"
+    "${CMAKE_CURRENT_LIST_DIR}/ByteStreamReadyPortAi.xml"
     "${CMAKE_CURRENT_LIST_DIR}/ByteStreamDriverComponentAi.xml"
 )
 

Drv/CMakeLists.txt

@@ -14,8 +14,14 @@ add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/LinuxGpioDriver/")
 add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/LinuxSerialDriver/")
 add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/LinuxSpiDriver/")
 add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/LinuxI2cDriver/")
-add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Ip/")
-add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/TcpClient/")
-add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/TcpServer/")
-add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Udp/")
-add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/SocketIpDriver/")
+
+# IP Socket is only supported for Linux, Darwin, VxWorks
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR ${CMAKE_SYSTEM_NAME} STREQUAL "VxWorks")
+	add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Ip/")
+	add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/TcpClient/")
+	add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/TcpServer/")
+	add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Udp/")
+	add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/SocketIpDriver/")
+else()
+    message(STATUS "Cannot use IP sockets with platform ${CMAKE_SYSTEM_NAME}. Skipping.")
+endif()

Drv/Ip/IpSocket.cpp

@@ -72,20 +72,22 @@ SocketIpStatus IpSocket::setupTimeouts(NATIVE_INT_TYPE socketFd) {
     if (setsockopt(socketFd, SOL_SOCKET, SO_SNDTIMEO, (char*)&timeout, sizeof(timeout)) < 0) {
         return SOCK_FAILED_TO_SET_SOCKET_OPTIONS;
     }
-    return SOCK_SUCCESS;
 #endif
+    return SOCK_SUCCESS;
 }
 
 SocketIpStatus IpSocket::addressToIp4(const char* address, void* ip4) {
     FW_ASSERT(address != NULL);
     FW_ASSERT(ip4 != NULL);
     // Get the IP address from host
 #ifdef TGT_OS_TYPE_VXWORKS
-    U32 ip = inet_addr(address);
+    NATIVE_INT_TYPE ip = inet_addr(address);
     if (ip == ERROR) {
         return SOCK_INVALID_IP_ADDRESS;
     }
-    *ip4 = ip;
+    // from sin_addr, which has one struct
+    // member s_addr, which is unsigned int
+    *reinterpret_cast<unsigned long*>(ip4) = ip;
 #else
     // First IP address to socket sin_addr
     if (not ::inet_pton(AF_INET, address, ip4)) {

Drv/Ip/IpSocket.hpp

@@ -45,6 +45,7 @@ enum SocketIpStatus {
 class IpSocket {
   public:
     IpSocket();
+    virtual ~IpSocket(){};
     /**
      * \brief configure the ip socket with host and transmission timeouts
      *

Drv/Ip/SocketReadTask.cpp

@@ -37,7 +37,12 @@ void SocketReadTask::startSocketTask(const Fw::StringBase &name,
 }
 
 SocketIpStatus SocketReadTask::open() {
-    return this->getSocketHandler().open();
+    SocketIpStatus status = this->getSocketHandler().open();
+    // Call connected any time the open is successful
+    if (Drv::SOCK_SUCCESS == status) {
+        this->connected();
+    }
+    return status;
 }
 
 void SocketReadTask::close() {
@@ -60,7 +65,7 @@ void SocketReadTask::readTask(void* pointer) {
     do {
         // Open a network connection if it has not already been open
         if ((not self->getSocketHandler().isOpened()) and (not self->m_stop) and
-            ((status = self->getSocketHandler().open()) != SOCK_SUCCESS)) {
+            ((status = self->open()) != SOCK_SUCCESS)) {
             Fw::Logger::logMsg("[WARNING] Failed to open port with status %d and errno %d\n", status, errno);
             Os::Task::delay(SOCKET_RETRY_INTERVAL_MS);
         }

Drv/Ip/SocketReadTask.hpp

@@ -133,6 +133,11 @@ class SocketReadTask {
      */
     virtual void sendBuffer(Fw::Buffer buffer, SocketIpStatus status) = 0;
 
+    /**
+     * \brief called when the IPv4 system has been connected
+     */
+    virtual void connected() = 0;
+
     /**
      * \brief a task designed to read from the socket and output incoming data
      *

Drv/TcpClient/TcpClientComponentImpl.cpp

@@ -53,6 +53,13 @@ void TcpClientComponentImpl::sendBuffer(Fw::Buffer buffer, SocketIpStatus status
     this->recv_out(0, buffer, (status == SOCK_SUCCESS) ? RECV_OK : RECV_ERROR);
 }
 
+void TcpClientComponentImpl::connected() {
+    if (isConnected_ready_OutputPort(0)) {
+        this->ready_out(0);
+    }
+
+}
+
 // ----------------------------------------------------------------------
 // Handler implementations for user-defined typed input ports
 // ----------------------------------------------------------------------

Drv/TcpClient/TcpClientComponentImpl.hpp

@@ -103,6 +103,12 @@ class TcpClientComponentImpl : public ByteStreamDriverModelComponentBase, public
      */
     void sendBuffer(Fw::Buffer buffer, SocketIpStatus status);
 
+    /**
+     * \brief called when the IPv4 system has been connected
+    */
+    void connected();
+
+
   PRIVATE:
 
     // ----------------------------------------------------------------------

Drv/TcpClient/test/ut/Tester.cpp

@@ -85,14 +85,17 @@ void Tester ::test_with_loop(U32 iterations, bool recv_thread) {
                 while (not m_spinner) {}
             }
         }
-        this->component.close();
+        // Properly stop the client on the last iteration
+        if ((1 + i) == iterations && recv_thread) {
+            this->component.stopSocketTask();
+            this->component.joinSocketTask(NULL);
+        } else {
+            this->component.close();
+        }
         server.close();
     }
-    // Wait for the receiver to shutdown
-    if (recv_thread) {
-        this->component.stopSocketTask();
-        this->component.joinSocketTask(NULL);
-    }
+    server.shutdown();
+    ASSERT_from_ready_SIZE(iterations);
 }
 
 Tester ::Tester(void)
@@ -146,6 +149,10 @@ void Tester ::test_advanced_reconnect(void) {
     delete[] recvBuffer.getData();
 }
 
+void Tester ::from_ready_handler(const NATIVE_INT_TYPE portNum) {
+    this->pushFromPortEntry_ready();
+}
+
 Fw::Buffer Tester ::
     from_allocate_handler(
         const NATIVE_INT_TYPE portNum,
@@ -193,6 +200,12 @@ Fw::Buffer Tester ::
         this->get_from_recv(0)
     );
 
+    // recv
+    this->component.set_ready_OutputPort(
+      0,
+      this->get_from_ready(0)
+    );
+
     // allocate
     this->component.set_allocate_OutputPort(
         0,

Drv/TcpClient/test/ut/Tester.hpp

@@ -69,6 +69,12 @@ namespace Drv {
           RecvStatus recvStatus 
       );
 
+      //! Handler for from_ready
+      //!
+      void from_ready_handler(
+          const NATIVE_INT_TYPE portNum /*!< The port number*/
+      );
+
       //! Handler for from_allocate
       //!
       Fw::Buffer from_allocate_handler(

Drv/TcpServer/TcpServerComponentImpl.cpp

@@ -60,6 +60,13 @@ void TcpServerComponentImpl::sendBuffer(Fw::Buffer buffer, SocketIpStatus status
     this->recv_out(0, buffer, (status == SOCK_SUCCESS) ? RECV_OK : RECV_ERROR);
 }
 
+void TcpServerComponentImpl::connected() {
+    if (isConnected_ready_OutputPort(0)) {
+        this->ready_out(0);
+    }
+
+}
+
 // ----------------------------------------------------------------------
 // Handler implementations for user-defined typed input ports
 // ----------------------------------------------------------------------