#706 Remove Model/Model-Version dependency while provisioning model version (#712)

* #706 Enable skipping the check for Model Version existence while provisioning Model Version

Signed-off-by: Abdulbois <abdulbois.tursunov@dsr-corporation.com>

Author: Abdulbois

docs/transactions/compliance.md

@@ -141,7 +141,7 @@ is written on the ledger (`CERTIFY_MODEL` was called), or
 
 Sets provisional state for the Model Version.
 
-The corresponding Model and Model Version is required to be present in the ledger.
+The corresponding Model and Model Version are not required to be present in the ledger. It can be added later by Vendors.
 
 Can not be set if there is already a certification record on the ledger (certified or revoked).
 

integration_tests/cli/compliance-provisioning.sh

@@ -44,6 +44,28 @@ schema_version_0=0
 
 test_divider
 
+echo "Provision unknown Model with VID: $vid PID: $pid  SV: ${sv} with zigbee certification"
+result=$(echo "$passphrase" | dcld tx compliance provision-model --vid=$vid --pid=$pid --softwareVersion=$sv --softwareVersionString=$svs --certificationType=$certification_type_zb --provisionalDate="$provision_date" --cdCertificateId="$cd_certificate_id" --cdVersionNumber=1 --from $zb_account --yes)
+result=$(get_txn_result "$result")
+echo "$result"
+check_response "$result" "\"code\": 0"
+
+echo "Get Compliance Info for Model with VID: ${vid} PID: ${pid} SV: ${sv} for ZB"
+result=$(dcld query compliance compliance-info --vid=$vid --pid=$pid --softwareVersion=$sv --certificationType=$certification_type_zb)
+check_response "$result" "\"vid\": $vid"
+check_response "$result" "\"pid\": $pid"
+check_response "$result" "\"softwareVersion\": $sv"
+check_response "$result" "\"softwareVersionString\": \"$svs\""
+check_response "$result" "\"certificationType\": \"$certification_type_zb\""
+check_response "$result" "\"date\": \"$provision_date\""
+check_response "$result" "\"cDCertificateId\": \"$cd_certificate_id\""
+
+echo "Delete compliance info vid=$vid pid=$pid softwareVersion=$sv certificationType=$certification_type_zb"
+result=$(echo "$passphrase" | dcld tx compliance delete-compliance-info --vid=$vid --pid=$pid --softwareVersion=$sv --certificationType=$certification_type_zb --from=$zb_account --yes)
+result=$(get_txn_result "$result")
+
+test_divider
+
 echo "Add Model and a New Model Version with VID: $vid PID: $pid SV: $sv"
 create_model_and_version $vid $pid $sv $svs $vendor_account
 

x/compliance/handler_provision_model_test.go

@@ -101,6 +101,18 @@ func TestHandler_ProvisionModel_WithAllOptionalFlagsForAllCertificationTypes(t *
 	}
 }
 
+func TestHandler_ProvisionModelWhenModelVersionDoesNotExist(t *testing.T) {
+	setup := setup(t)
+	vid, pid, softwareVersion := testconstants.Vid, testconstants.Pid, testconstants.SoftwareVersion
+	setup.setNoModelVersionForKey(vid, pid, softwareVersion)
+
+	provisionModelMsg, provisionModelErr := setup.provisionModel(vid, pid, softwareVersion, testconstants.SoftwareVersionString, types.ZigbeeCertificationType, setup.CertificationCenter)
+	require.NoError(t, provisionModelErr)
+
+	setup.checkComplianceInfoEqualsProvisionModelMsgData(t, provisionModelMsg)
+	setup.checkModelProvisioned(t, provisionModelMsg)
+}
+
 func TestHandler_ProvisionModel_ByWrongRoles(t *testing.T) {
 	setup, vid, pid, softwareVersion, softwareVersionString, certificationType := setupProvisionModel(t)
 

x/compliance/keeper/msg_server_provision_model.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/zigbee-alliance/distributed-compliance-ledger/x/compliance/types"
 	dclauthtypes "github.com/zigbee-alliance/distributed-compliance-ledger/x/dclauth/types"
-	modeltypes "github.com/zigbee-alliance/distributed-compliance-ledger/x/model/types"
 )
 
 func (k msgServer) ProvisionModel(goCtx context.Context, msg *types.MsgProvisionModel) (*types.MsgProvisionModelResponse, error) {
@@ -46,16 +45,15 @@ func (k msgServer) ProvisionModel(goCtx context.Context, msg *types.MsgProvision
 
 	modelVersion, isFound := k.modelKeeper.GetModelVersion(ctx, msg.Vid, msg.Pid, msg.SoftwareVersion)
 
-	if !isFound {
-		return nil, modeltypes.NewErrModelVersionDoesNotExist(msg.Vid, msg.Pid, msg.SoftwareVersion)
-	}
-
-	if modelVersion.SoftwareVersionString != msg.SoftwareVersionString {
-		return nil, types.NewErrModelVersionStringDoesNotMatch(msg.Vid, msg.Pid, msg.SoftwareVersion, msg.SoftwareVersionString)
-	}
+	if isFound {
+		// check if softwareVersionString matches with what is stored for the given version
+		if modelVersion.SoftwareVersionString != msg.SoftwareVersionString {
+			return nil, types.NewErrModelVersionStringDoesNotMatch(msg.Vid, msg.Pid, msg.SoftwareVersion, msg.SoftwareVersionString)
+		}
 
-	if modelVersion.CdVersionNumber != int32(msg.CDVersionNumber) {
-		return nil, types.NewErrModelVersionCDVersionNumberDoesNotMatch(msg.Vid, msg.Pid, msg.SoftwareVersion, msg.CDVersionNumber)
+		if modelVersion.CdVersionNumber != int32(msg.CDVersionNumber) {
+			return nil, types.NewErrModelVersionCDVersionNumberDoesNotMatch(msg.Vid, msg.Pid, msg.SoftwareVersion, msg.CDVersionNumber)
+		}
 	}
 
 	complianceInfo = types.ComplianceInfo{