Merge pull request #158 from zigbee-alliance/not-found-fix

Author: andkononykhin

docs/static/openapi.yml

@@ -34,9 +34,35 @@ user_pubkey=$(echo $passphrase | dcld keys show $user -p)
 vid=$RANDOM
 pid=$RANDOM
 
+echo "Get not yet approved $user account"
+result=$(dcld query auth account --address=$user_address)
+check_response "$result" "Not Found"
+
+test_divider
+
+echo "Get not yet proposed $user account to revoke"
+result=$(dcld query auth proposed-account-to-revoke --address=$user_address)
+check_response "$result" "Not Found"
+
+test_divider
+
 echo "Get not yet proposed $user account"
-result=$(dcld query auth account --address=$user_address 2>&1) || true
-check_response "$result" "null"
+result=$(dcld query auth proposed-account --address=$user_address)
+check_response "$result" "Not Found"
+
+test_divider
+
+echo "Get all proposed accounts must be empty"
+result=$(dcld query auth all-proposed-accounts)
+check_response "$result" "\[\]"
+response_does_not_contain "$result" "\"address\": \"$user_address\""
+
+test_divider
+
+echo "Get all proposed accounts to revoke must be empty"
+result=$(dcld query auth all-proposed-accounts-to-revoke)
+check_response "$result" "\[\]"
+response_does_not_contain "$result" "\"address\": \"$user_address\""
 
 test_divider
 
@@ -52,6 +78,16 @@ response_does_not_contain "$result" "\"address\": \"$user_address\""
 
 test_divider
 
+echo "Get an account for $user is not found"
+result=$(dcld query auth account --address=$user_address)
+check_response "$result" "Not Found"
+
+echo "Get a proposed account for $user"
+result=$(dcld query auth proposed-account --address=$user_address)
+check_response "$result" "\"address\": \"$user_address\""
+
+test_divider
+
 echo "Get all proposed accounts. $user account in the list"
 result=$(dcld query auth all-proposed-accounts)
 check_response "$result" "\"address\": \"$user_address\""
@@ -94,6 +130,12 @@ check_response_and_report "$result" "\"address\": \"$user_address\""
 
 test_divider
 
+echo "Get a proposed account for $user is not found"
+result=$(dcld query auth proposed-account --address=$user_address)
+check_response "$result" "Not Found"
+
+test_divider
+
 productName="Device #1"
 echo "$user adds Model with VID: $vid PID: $pid"
 result=$(echo "test1234" | dcld tx model add-model --vid=$vid --pid=$pid --productName="$productName" --productLabel="Device Description"   --commissioningCustomFlow=0 --deviceTypeID=12 --partNumber=12 --from=$user_address --yes)
@@ -109,7 +151,7 @@ check_response_and_report "$result" "transaction should be signed by a vendor ac
 test_divider
 
 echo "$user updates Model with VID: $vid PID: $pid"
-result=$(echo "test1234" | dcld tx model update-model --vid=$vid --pid=$pid --productName="$productName" --productLabel="Device Description" --partNumber=12 --from=$user_address --yes 2>&1) || true
+result=$(echo "test1234" | dcld tx model update-model --vid=$vid --pid=$pid --productName="$productName" --productLabel="Device Description" --partNumber=12 --from=$user_address --yes)
 check_response_and_report "$result" "\"code\": 0"
 
 test_divider
@@ -149,6 +191,12 @@ check_response "$result" "\"address\": \"$user_address\""
 
 test_divider
 
+echo "Get a proposed account to revoke for $user"
+result=$(dcld query auth proposed-account-to-revoke --address="$user_address")
+check_response "$result" "\"address\": \"$user_address\""
+
+test_divider
+
 echo "Bob approves to revoke account for $user"
 result=$(echo $passphrase | dcld tx auth approve-revoke-account --address="$user_address" --from bob --yes)
 check_response "$result" "\"code\": 0"
@@ -173,17 +221,22 @@ check_response "$result" "\[\]"
 
 test_divider
 
-echo "Get $user account"
-result=$(dcld query auth account --address=$user_address 2>&1) || true
-check_response "$result" "null"
+echo "Get a proposed account to revoke for $user is not found"
+result=$(dcld query auth proposed-account-to-revoke --address="$user_address")
+check_response "$result" "Not Found"
 
 test_divider
 
+echo "Get $user account"
+result=$(dcld query auth account --address=$user_address)
+check_response "$result" "Not Found"
+
+test_divider
 
 pid=$RANDOM
 productName="Device #2"
 echo "$user adds Model with VID: $vid PID: $pid"
 result=$(echo "test1234" | dcld tx model add-model --vid=$vid --pid=$pid --productName="$productName" --productLabel="Device Description" --commissioningCustomFlow=0 --deviceTypeID=12 --partNumber=12 --from=$user_address --yes 2>&1) || true
-check_response "$result" "NotFound" raw
+check_response_and_report "$result" "key not found" raw
 
 echo "PASSED"

integration_tests/cli/auth-demo.sh

@@ -97,7 +97,7 @@ test_divider
 
 echo "Get Compliance Info with VID: ${vid} PID: ${pid} SV: ${sv} before compliance record was created"
 result=$(dcld query compliance compliance-info --vid=$vid --pid=$pid --softwareVersion=$sv --certificationType="zigbee")
-check_response "$result" "null"
+check_response "$result" "Not Found"
 response_does_not_contain "$result" "\"pid\": $pid"
 response_does_not_contain "$result" "\"vid\": $vid"
 echo $result
@@ -106,7 +106,7 @@ test_divider
 
 echo "Get Certified Model with VID: ${vid} PID: ${pid} SV: ${sv} before compliance record was created"
 result=$(dcld query compliance certified-model --vid=$vid --pid=$pid --softwareVersion=$sv --certificationType="zigbee")
-check_response "$result" "null"
+check_response "$result" "Not Found"
 response_does_not_contain "$result" "\"pid\": $pid"
 response_does_not_contain "$result" "\"vid\": $vid"
 echo $result
@@ -115,7 +115,7 @@ test_divider
 
 echo "Get Revoked Model with VID: ${vid} PID: ${pid} SV: ${sv} before compliance record was created"
 result=$(dcld query compliance revoked-model --vid=$vid --pid=$pid --softwareVersion=$sv --certificationType="zigbee")
-check_response "$result" "null"
+check_response "$result" "Not Found"
 response_does_not_contain "$result" "\"pid\": $pid"
 response_does_not_contain "$result" "\"vid\": $vid"
 echo "$result"
@@ -124,7 +124,7 @@ test_divider
 
 echo "Get Revoked Model with VID: ${vid} PID: ${pid} SV: ${sv} before compliance record was created"
 result=$(dcld query compliance provisional-model --vid=$vid --pid=$pid --softwareVersion=$sv --certificationType="zigbee")
-check_response "$result" "null"
+check_response "$result" "Not Found"
 response_does_not_contain "$result" "\"pid\": $pid"
 response_does_not_contain "$result" "\"vid\": $vid"
 echo "$result"

integration_tests/cli/compliance-demo.sh

@@ -98,7 +98,7 @@ test_divider
 
 echo "Get Certified Model with VID: ${vid} PID: ${pid} before compliance record was created for ZB"
 result=$(dcld query compliance certified-model --vid=$vid --pid=$pid  --softwareVersion=$sv --certificationType="$certification_type_zb")
-check_response "$result" "null"
+check_response "$result" "Not Found"
 response_does_not_contain "$result" "\"pid\": $pid"
 response_does_not_contain "$result" "\"vid\": $vid"
 response_does_not_contain "$result" "\"certification_type\": \"$certification_type_zb\""
@@ -108,7 +108,7 @@ test_divider
 
 echo "Get Certified Model with VID: ${vid} PID: ${pid} before compliance record was created for Matter"
 result=$(dcld query compliance certified-model --vid=$vid --pid=$pid  --softwareVersion=$sv --certificationType="$certification_type_matter")
-check_response "$result" "null"
+check_response "$result" "Not Found"
 response_does_not_contain "$result" "\"pid\": $pid"
 response_does_not_contain "$result" "\"vid\": $vid"
 response_does_not_contain "$result" "\"certification_type\": \"$certification_type_matter\""
@@ -119,7 +119,7 @@ test_divider
 
 echo "Get Revoked Model with VID: ${vid} PID: ${pid} and SV: ${sv} before compliance record was created for ZB"
 result=$(dcld query compliance revoked-model --vid=$vid --pid=$pid  --softwareVersion=$sv --certificationType="$certification_type_zb")
-check_response "$result" "null"
+check_response "$result" "Not Found"
 response_does_not_contain "$result" "\"pid\": $pid"
 response_does_not_contain "$result" "\"vid\": $vid"
 response_does_not_contain "$result" "\"certification_type\": \"$certification_type_zb\""
@@ -129,7 +129,7 @@ test_divider
 
 echo "Get Revoked Model with VID: ${vid} PID: ${pid} and SV: ${sv} before compliance record was created for Matter"
 result=$(dcld query compliance revoked-model --vid=$vid --pid=$pid  --softwareVersion=$sv --certificationType="$certification_type_matter")
-check_response "$result" "null"
+check_response "$result" "Not Found"
 response_does_not_contain "$result" "\"pid\": $pid"
 response_does_not_contain "$result" "\"vid\": $vid"
 response_does_not_contain "$result" "\"certification_type\": \"$certification_type_matter\""

integration_tests/cli/compliance-provisioning.sh

@@ -79,7 +79,7 @@ test_divider
 
 echo "Get Certified Model with VID: ${vid} PID: ${pid} before compliance record was created for ZB"
 result=$(dcld query compliance certified-model --vid=$vid --pid=$pid  --softwareVersion=$sv --certificationType="$certification_type")
-check_response "$result" "null"
+check_response "$result" "Not Found"
 response_does_not_contain "$result" "\"pid\": $pid"
 response_does_not_contain "$result" "\"vid\": $vid"
 response_does_not_contain "$result" "\"certification_type\": \"$certification_type\""
@@ -89,7 +89,7 @@ test_divider
 
 echo "Get Certified Model with VID: ${vid} PID: ${pid} before compliance record was created for Matter"
 result=$(dcld query compliance certified-model --vid=$vid --pid=$pid  --softwareVersion=$sv --certificationType="$certification_type_matter")
-check_response "$result" "null"
+check_response "$result" "Not Found"
 response_does_not_contain "$result" "\"pid\": $pid"
 response_does_not_contain "$result" "\"vid\": $vid"
 response_does_not_contain "$result" "\"certification_type\": \"$certification_type_matter\""
@@ -179,7 +179,7 @@ test_divider
 
 echo "Get Provisional Model with VID: ${vid} PID: ${pid} SV: ${sv} for zigbee certification"
 result=$(dcld query compliance provisional-model --vid=$vid --pid=$pid --softwareVersion=$sv --certificationType=$certification_type)
-check_response "$result" "null"
+check_response "$result" "Not Found"
 response_does_not_contain "$result" "\"pid\": $pid"
 response_does_not_contain "$result" "\"vid\": $vid"
 echo "$result"
@@ -261,7 +261,7 @@ test_divider
 
 echo "Get Certified Model with VID: ${vid} PID: ${pid} and SV: ${sv} for Matter"
 result=$(dcld query compliance certified-model --vid=$vid --pid=$pid  --softwareVersion=$sv --certificationType="$certification_type_matter")
-check_response "$result" "null"
+check_response "$result" "Not Found"
 response_does_not_contain "$result" "\"pid\": $pid"
 response_does_not_contain "$result" "\"vid\": $vid"
 response_does_not_contain "$result" "\"certification_type\": \"$certification_type_matter\""

integration_tests/cli/compliance-revocation.sh

@@ -48,7 +48,7 @@ test_divider
 echo "Get Testing Result for Unknown Model"
 unknown_pid=$RANDOM
 result=$(dcld query compliancetest test-result --vid=$vid --pid=$unknown_pid --softwareVersion=$sv)
-check_response "$result" "null"
+check_response "$result" "Not Found"
 response_does_not_contain "$result" "\"pid\": $unknown_pid"
 response_does_not_contain "$result" "\"vid\": $vid"
 echo "$result"
@@ -57,7 +57,7 @@ test_divider
 
 echo "Get Testing Result for Unknown Test Results"
 result=$(dcld query compliancetest test-result --vid=$vid --pid=$pid --softwareVersion=$sv)
-check_response "$result" "null"
+check_response "$result" "Not Found"
 response_does_not_contain "$result" "\"pid\": $pid"
 response_does_not_contain "$result" "\"vid\": $vid"
 echo "$result"

integration_tests/cli/compliancetest-demo.sh

@@ -28,6 +28,27 @@ test_divider
 
 # Body
 
+echo "Query non existant model"
+result=$(dcld query model get-model --vid=$vid --pid=$pid)
+check_response "$result" "Not Found"
+echo "$result"
+
+test_divider
+
+echo "Query non existant Vendor Models"
+result=$(dcld query model vendor-models --vid=$vid)
+check_response "$result" "Not Found"
+echo "$result"
+
+test_divider
+
+echo "Request all models must be empty"
+result=$(dcld query model all-models)
+check_response "$result" "\[\]"
+echo "$result"
+
+test_divider
+
 productLabel="Device #1"
 echo "Add Model with VID: $vid PID: $pid"
 result=$(echo "test1234" | dcld tx model add-model --vid=$vid --pid=$pid --deviceTypeID=1 --productName=TestProduct --productLabel="$productLabel" --partNumber=1 --commissioningCustomFlow=0 --from=$vendor_account --yes)

integration_tests/cli/model-demo.sh

@@ -60,8 +60,8 @@ test_divider
 
 # Query non existant model version 
 echo "Query Device Model Version with VID: $vid PID: $pid SV: 123456"
-result=$(dcld query model get-model-version --vid=$vid --pid=$pid --softwareVersion=123456 2>&1) || true
-check_response_and_report "$result" "rpc error: code = NotFound desc = not found" raw
+result=$(dcld query model get-model-version --vid=$vid --pid=$pid --softwareVersion=123456)
+check_response "$result" "Not Found"
 
 test_divider
 

integration_tests/cli/modelversion-demo.sh

@@ -48,7 +48,7 @@ test_divider
 
 echo "Request approved certificate must be empty"
 result=$(dcld query pki x509-cert --subject="$root_cert_subject" --subject-key-id="$root_cert_subject_key_id")
-check_response "$result" "null"
+check_response "$result" "Not Found"
 response_does_not_contain "$result" "\"subject\": \"$root_cert_subject\""
 response_does_not_contain "$result" "\"subject_key_id\": \"$root_cert_subject_key_id\""
 response_does_not_contain "$result" "\"serial_number\": \"$root_cert_serial_number\""
@@ -66,7 +66,7 @@ test_divider
 
 echo "Request proposed Root certificate must be empty"
 result=$(dcld query pki proposed-x509-root-cert --subject="$root_cert_subject" --subject-key-id="$root_cert_subject_key_id")
-check_response "$result" "null"
+check_response "$result" "Not Found"
 response_does_not_contain "$result" "\"subject\": \"$root_cert_subject\""
 response_does_not_contain "$result" "\"subject_key_id\": \"$root_cert_subject_key_id\""
 response_does_not_contain "$result" "\"serial_number\": \"$root_cert_serial_number\""
@@ -85,7 +85,7 @@ test_divider
 
 echo "Request revoked certificate must be empty"
 result=$(dcld query pki revoked-x509-cert --subject="$root_cert_subject" --subject-key-id="$root_cert_subject_key_id")
-check_response "$result" "null"
+check_response "$result" "Not Found"
 response_does_not_contain "$result" "\"subject\": \"$root_cert_subject\""
 response_does_not_contain "$result" "\"subject_key_id\": \"$root_cert_subject_key_id\""
 echo "$result"
@@ -100,7 +100,7 @@ echo "$result"
 
 echo "Request all certificates by subject must be empty"
 result=$(dcld query pki all-subject-x509-certs --subject="$root_cert_subject")
-check_response "$result" "null"
+check_response "$result" "Not Found"
 response_does_not_contain "$result" "\"$root_cert_subject\""
 response_does_not_contain "$result" "\"$root_cert_subject_key_id\""
 echo "$result"
@@ -127,7 +127,7 @@ test_divider
 
 echo "Request root certificate proposed to revoke must be empty"
 result=$(dcld query pki proposed-x509-root-cert-to-revoke --subject="$root_cert_subject" --subject-key-id="$root_cert_subject_key_id")
-check_response "$result" "null"
+check_response "$result" "Not Found"
 response_does_not_contain "$result" "\"$root_cert_subject\""
 response_does_not_contain "$result" "\"$root_cert_subject_key_id\""
 echo "$result"
@@ -145,7 +145,7 @@ test_divider
 
 echo "Request all child certificates must be empty"
 result=$(dcld query pki all-child-x509-certs --subject="$root_cert_subject" --subject-key-id="$root_cert_subject_key_id")
-check_response "$result" "null"
+check_response "$result" "Not Found"
 response_does_not_contain "$result" "\"$root_cert_subject\""
 response_does_not_contain "$result" "\"$root_cert_subject_key_id\""
 echo "$result"
@@ -195,7 +195,7 @@ test_divider
 
 echo "Approved certificate must be empty"
 result=$(dcld query pki x509-cert --subject="$root_cert_subject" --subject-key-id="$root_cert_subject_key_id")
-check_response "$result" "null"
+check_response "$result" "Not Found"
 response_does_not_contain "$result" "\"subject\": \"$root_cert_subject\""
 response_does_not_contain "$result" "\"subject_key_id\": \"$root_cert_subject_key_id\""
 response_does_not_contain "$result" "\"serial_number\": \"$root_cert_serial_number\""
@@ -547,7 +547,7 @@ test_divider
 
 echo "Request all child certificates for leaf"
 result=$(dcld query pki all-child-x509-certs --subject="$leaf_cert_subject" --subject-key-id="$leaf_cert_subject_key_id")
-check_response "$result" "null"
+check_response "$result" "Not Found"
 response_does_not_contain "$result" "\"subject\": \"$root_cert_subject\""
 response_does_not_contain "$result" "\"subject_key_id\": \"$root_cert_subject_key_id\""
 response_does_not_contain "$result" "\"subject\": \"$intermediate_cert_subject\""
@@ -675,7 +675,7 @@ test_divider
 
 echo "Approved Intermediate certificate must be empty"
 result=$(dcld query pki x509-cert --subject="$intermediate_cert_subject" --subject-key-id="$intermediate_cert_subject_key_id")
-check_response "$result" "null"
+check_response "$result" "Not Found"
 response_does_not_contain "$result" "\"subject\": \"$intermediate_cert_subject\""
 response_does_not_contain "$result" "\"subject_key_id\": \"$intermediate_cert_subject_key_id\""
 response_does_not_contain "$result" "\"serial_number\": \"$intermediate_cert_serial_number\""
@@ -685,7 +685,7 @@ test_divider
 
 echo "Approved Leaf certificate must be empty"
 result=$(dcld query pki x509-cert --subject="$leaf_cert_subject" --subject-key-id="$leaf_cert_subject_key_id")
-check_response "$result" "null"
+check_response "$result" "Not Found"
 response_does_not_contain "$result" "\"subject\": \"$leaf_cert_subject\""
 response_does_not_contain "$result" "\"subject_key_id\": \"$leaf_cert_subject_key_id\""
 response_does_not_contain "$result" "\"serial_number\": \"$leaf_cert_serial_number\""
@@ -878,7 +878,7 @@ test_divider
 
 echo "Approved Intermediate certificate must be empty"
 result=$(dcld query pki x509-cert --subject="$intermediate_cert_subject" --subject-key-id="$intermediate_cert_subject_key_id")
-check_response "$result" "null"
+check_response "$result" "Not Found"
 response_does_not_contain "$result" "\"subject\": \"$intermediate_cert_subject\""
 response_does_not_contain "$result" "\"subject_key_id\": \"$intermediate_cert_subject_key_id\""
 response_does_not_contain "$result" "\"serial_number\": \"$intermediate_cert_serial_number\""
@@ -888,7 +888,7 @@ test_divider
 
 echo "Approved Leaf certificate must be empty"
 result=$(dcld query pki x509-cert --subject="$leaf_cert_subject" --subject-key-id="$leaf_cert_subject_key_id")
-check_response "$result" "null"
+check_response "$result" "Not Found"
 response_does_not_contain "$result" "\"subject\": \"$leaf_cert_subject\""
 response_does_not_contain "$result" "\"subject_key_id\": \"$leaf_cert_subject_key_id\""
 response_does_not_contain "$result" "\"serial_number\": \"$leaf_cert_serial_number\""
@@ -898,7 +898,7 @@ test_divider
 
 echo "Approved Root certificate must be empty"
 result=$(dcld query pki x509-cert --subject="$root_cert_subject" --subject-key-id="$root_cert_subject_key_id")
-check_response "$result" "null"
+check_response "$result" "Not Found"
 response_does_not_contain "$result" "\"subject\": \"$root_cert_subject\""
 response_does_not_contain "$result" "\"subject_key_id\": \"$root_cert_subject_key_id\""
 response_does_not_contain "$result" "\"serial_number\": \"$root_cert_serial_number\""