iotedgedev 3.3.4__zip → 3.3.5__zip

s/iotedgedev/cli.py

@@ -3,6 +3,11 @@ import socket
 import sys
 
 import click
+import copy
+import typing as t
+
+from click import Command
+from click import Group
 from fstrings import f
 
 from .azurecli import AzureCli
@@ -19,6 +24,16 @@ from .simulator import Simulator
 from .solution import Solution
 from .utility import Utility
 
+# Extend click.Group#add_command(cmd, name) to take deprecated=bool flag by monkey patching.
+def add_command_with_deprecation(self, cmd: Command, name: t.Optional[str] = None, deprecated = False):
+    # Directly changing the deprecated flag of the cmd has side-effects on the reference source.
+    # To avoid this, copy the cmd object with deepcopy.
+    copied_command = copy.deepcopy(cmd)
+    copied_command.deprecated = deprecated
+    self.add_command(copied_command, name)
+
+Group.add_command_with_deprecation = add_command_with_deprecation
+
 CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'], max_content_width=120)
 
 output = Output()
@@ -84,14 +99,16 @@ def new(name, module, template, edge_runtime_version, group_id):
     sol = Solution(output, utility)
     sol.create(name, module, template, edge_runtime_version, group_id)
 
-
-main.add_command(new)
+main.add_command_with_deprecation(new, deprecated=True)
 
 
 @solution.command(context_settings=CONTEXT_SETTINGS,
                   help="Create a new IoT Edge solution and provision Azure resources",
                   # hack to prevent Click truncating help messages
                   short_help="Create a new IoT Edge solution and provision Azure resources")
+@click.argument("name",
+                required=False,
+                default=".")
 @click.option("--edge-runtime-version",
               "-er",
               default="1.2",
@@ -100,28 +117,22 @@ main.add_command(new)
               help="Specify the IoT Edge Runtime Version. Currently available 1.0, 1.1, 1.2")
 @add_module_options(envvars, init=True)
 @with_telemetry
-def init(module, template, group_id, edge_runtime_version):
+def init(name, module, template, group_id, edge_runtime_version):
     if edge_runtime_version is not None:
         if (str(edge_runtime_version) != "1.0" and str(edge_runtime_version) != "1.1" and str(edge_runtime_version) != "1.2"):
             output.info('-edge-runtime-version `{0}` is not valid. Currently supported versions are 1.0, 1.1, 1.2'.format(edge_runtime_version))
             sys.exit()
     utility = Utility(envvars, output)
 
-    if template == "java":
-        solcmd = "iotedgedev new . --module {0} --template {1} --edge-runtime-version {2} --group-id {3}".format(module, template, edge_runtime_version, group_id)
-    else:
-        solcmd = "iotedgedev new . --module {0} --template {1} --edge-runtime-version {2}".format(module, template, edge_runtime_version)
-    output.header(solcmd)
-    ret = utility.call_proc(solcmd.split())
+    sol = Solution(output, utility)
+    sol.create(name, module, template, edge_runtime_version, group_id)
 
-    if ret == 0:
-        azsetupcmd = "iotedgedev iothub setup --update-dotenv"
-        output.header(azsetupcmd)
-        # Had to use call_proc, because @click.invoke doesn't honor prompts
-        utility.call_proc(azsetupcmd.split())
+    azsetupcmd = "iotedgedev iothub setup --update-dotenv"
+    output.header(azsetupcmd)
+    utility.call_proc(azsetupcmd.split())
 
 
-main.add_command(init)
+main.add_command_with_deprecation(init, deprecated=True)
 
 
 @solution.command(context_settings=CONTEXT_SETTINGS, help="Push, deploy, start, monitor")
@@ -144,7 +155,7 @@ def add(name, template, group_id):
     mod.add(name, template, group_id)
 
 
-main.add_command(add)
+main.add_command_with_deprecation(add, deprecated=True)
 
 
 @solution.command(context_settings=CONTEXT_SETTINGS, help="Build the solution")
@@ -186,7 +197,7 @@ def build(ctx, push, do_deploy, template_file, platform):
         ctx.invoke(deploy)
 
 
-main.add_command(build)
+main.add_command_with_deprecation(build, deprecated=True)
 
 
 @solution.command(context_settings=CONTEXT_SETTINGS, help="Push module images to container registry")
@@ -227,7 +238,7 @@ def push(ctx, do_deploy, no_build, template_file, platform):
         ctx.invoke(deploy)
 
 
-main.add_command(push)
+main.add_command_with_deprecation(push, deprecated=True)
 
 
 @solution.command(context_settings=CONTEXT_SETTINGS, help="Deploy solution to IoT Edge device")
@@ -245,7 +256,7 @@ def deploy(manifest_file):
     edge.deploy(manifest_file)
 
 
-main.add_command(deploy)
+main.add_command_with_deprecation(deploy, deprecated=True)
 
 
 @iothub.command(
@@ -340,7 +351,7 @@ def genconfig(template_file, platform, fail_on_validation_error):
     mod.build_push(template_file, platform, no_build=True, no_push=True, fail_on_validation_error=fail_on_validation_error)
 
 
-main.add_command(genconfig)
+main.add_command_with_deprecation(genconfig, deprecated=True)
 
 
 @simulator.command(context_settings=CONTEXT_SETTINGS,
@@ -363,7 +374,7 @@ def setup_simulator(gateway_host, iothub_connection_string):
     sim.setup(gateway_host, iothub_connection_string)
 
 
-main.add_command(setup_simulator)
+main.add_command_with_deprecation(setup_simulator, deprecated=True)
 
 
 @simulator.command(context_settings=CONTEXT_SETTINGS,
@@ -438,7 +449,7 @@ def start_simulator(setup, solution, build, manifest_file, platform, verbose, in
         sim.start_single(inputs, port)
 
 
-main.add_command(start_simulator)
+main.add_command_with_deprecation(start_simulator, deprecated=True)
 
 
 @simulator.command(context_settings=CONTEXT_SETTINGS,
@@ -450,7 +461,7 @@ def stop_simulator():
     sim.stop()
 
 
-main.add_command(stop_simulator)
+main.add_command_with_deprecation(stop_simulator, deprecated=True)
 
 
 @simulator.command(context_settings=CONTEXT_SETTINGS,
@@ -490,7 +501,7 @@ def monitor(timeout):
     ih.monitor_events(timeout)
 
 
-main.add_command(monitor)
+main.add_command_with_deprecation(monitor, deprecated=True)
 
 
 def ensure_azure_cli_iot_ext():
@@ -824,7 +835,7 @@ def log(show, save):
     dock.handle_logs_cmd(show, save)
 
 
-main.add_command(log)
+main.add_command_with_deprecation(log, deprecated=True)
 
 if __name__ == "__main__":
     main()

s/iotedgedev/connectionstring.py

@@ -2,8 +2,8 @@ from .utility import Utility
 
 
 class ConnectionString:
-    def __init__(self, value):
-        self.connection_string = value
+    def __init__(self, connection_string: str):
+        self.connection_string = connection_string
         self.data = dict()
 
         if self.connection_string:
@@ -22,25 +22,27 @@ class ConnectionString:
                 else:
                     # unexpected input of connection. Set to None and throw error
                     self.connection_string = None
-               
+
     def __getitem__(self, key):
         return self.data[key]
 
 
 class IoTHubConnectionString(ConnectionString):
-    def __init__(self, value):
-        ConnectionString.__init__(self, value)
+    def __init__(self, connection_string: str):
+        super().__init__(connection_string)
 
         if self.connection_string:
             self.shared_access_key_name = self["sharedaccesskeyname"]
 
 
 class DeviceConnectionString(ConnectionString):
-    def __init__(self, value):
-        ConnectionString.__init__(self, value)
+    def __init__(self, connection_string: str):
+        super().__init__(connection_string)
 
-        if self.connection_string:
+        if("deviceid" in self.data):
             self.device_id = self["deviceid"]
+        else:
+            self.device_id = None
 
 
 class IoTHubHost:

s/iotedgedev/edge.py

@@ -14,7 +14,7 @@ class Edge:
         self.output.header("DEPLOYING CONFIGURATION")
 
         self.envvars.verify_envvar_has_val("IOTHUB_CONNECTION_STRING", self.envvars.IOTHUB_CONNECTION_INFO)
-        self.envvars.verify_envvar_has_val("DEVICE_CONNECTION_STRING", self.envvars.DEVICE_CONNECTION_INFO)
+        self.envvars.verify_envvar_has_val("EDGE_DEVICE_ID", self.envvars.DEVICE_CONNECTION_INFO.device_id)
         self.envvars.verify_envvar_has_val("DEPLOYMENT_CONFIG_FILE", self.envvars.DEPLOYMENT_CONFIG_FILE)
 
         if self.azure_cli.set_modules(config=manifest_file,

s/iotedgedev.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: iotedgedev
-Version: 3.3.4
+Version: 3.3.5
 Summary: The Azure IoT Edge Dev Tool greatly simplifies the IoT Edge development process by automating many routine manual tasks, such as building, deploying, pushing modules and configuring the IoT Edge Runtime.
 Home-page: https://github.com/azure/iotedgedev
 Author: Microsoft Corporation

s/iotedgedev.egg-info/SOURCES.txt

@@ -59,6 +59,8 @@ tests/test_iotedgedev_iothub_deploy.py
 tests/test_iotedgedev_simulator.py
 tests/test_iotedgedev_solution.py
 tests/test_iotedgedev_solution_build.py
+tests/test_iotedgedev_solution_deploy.py
+tests/test_iotedgedev_solution_init.py
 tests/test_iotedgedev_solution_tag.py
 tests/test_utility.py
 tests/utility.py
@@ -79,7 +81,6 @@ tests/assets/test_solution_shared_lib/deployment.debug.template.json
 tests/assets/test_solution_shared_lib/deployment.escapedpath.template.json
 tests/assets/test_solution_shared_lib/deployment.template.json
 tests/assets/test_solution_shared_lib/layered_deployment.flattened_props.template.json
-tests/assets/test_solution_shared_lib/layered_deployment.no_modules.template.json
 tests/assets/test_solution_shared_lib/.vscode/launch.json
 tests/assets/test_solution_shared_lib/libs/sharedlib/Class1.cs
 tests/assets/test_solution_shared_lib/libs/sharedlib/sharedlib.csproj

s/iotedgedev.egg-info/requires.txt

@@ -4,7 +4,7 @@ docker>=3.7.0
 python-dotenv
 requests<=2.25.1,>=2.20.0
 fstrings
-azure-cli-core>=2.25.0
+azure-cli-core<2.35.0,>=2.34.1
 iotedgehubdev==0.14.14
 applicationinsights==0.11.9
 commentjson==0.9.0

s/requirements.txt

@@ -3,10 +3,10 @@ docker==5.0.3
 python-dotenv==0.19.0
 requests==2.25.1
 fstrings==0.1.0
-msrestazure==0.4.34
+msrestazure==0.6.4
 iotedgehubdev==0.14.14
 applicationinsights==0.11.9
 commentjson==0.9.0
-azure-cli-core==2.25.0
+azure-cli-core==2.34.1
 pypiwin32==219; sys_platform == 'win32' and python_version < '3.6'
 pypiwin32==223; sys_platform == 'win32' and python_version >= '3.6'

s/setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.3.4
+current_version = 3.3.5
 commit = True
 tag = True
 

s/setup.py

@@ -12,7 +12,9 @@ requirements = [
     'python-dotenv',
     'requests >= 2.20.0, <= 2.25.1',
     'fstrings',
-    'azure-cli-core >= 2.25.0',
+    # Note >=2.35.0 cannot be used as is not compatible with the docker dependency;
+    # docker requires websocket-client==0.56.0 and azure-cli-core>=2.35.0 requires websocket-client==1.31.1.
+    'azure-cli-core >= 2.34.1, < 2.35.0',
     'iotedgehubdev == 0.14.14',
     'applicationinsights == 0.11.9',
     'commentjson == 0.9.0',
@@ -31,7 +33,7 @@ test_requirements = [
 
 setup(
     name='iotedgedev',
-    version='3.3.4',
+    version='3.3.5',
     description='The Azure IoT Edge Dev Tool greatly simplifies the IoT Edge development process by automating many routine manual tasks, such as building, deploying, pushing modules and configuring the IoT Edge Runtime.',
     long_description='See https://github.com/azure/iotedgedev for usage instructions.',
     author='Microsoft Corporation',

s/tests/__init__.py

@@ -2,4 +2,4 @@
 
 __author__ = 'Microsoft Corporation'
 __email__ = 'opencode@microsoft.com'
-__version__ = '3.3.4'
+__version__ = '3.3.5'

s/tests/assets/test_solution_shared_lib/deployment.template.json

@@ -13,7 +13,7 @@
               "testacr": {
                 "username": "$USERNAME",
                 "password": "$PASSWORD",
-                "address": "$CONTAINER_REGISTRY_PASSWORD"
+                "address": "$CONTAINER_REGISTRY_SERVER"
               }
             }
           }

s/tests/assets/test_solution_shared_lib/layered_deployment.flattened_props.template.json

@@ -2,19 +2,53 @@
     "content": {
         "modulesContent": {
             "$edgeAgent": {
-                "properties.desired.modules.sample_module": {
-                    "version": "1.0",
-                    "type": "docker",
-                    "status": "running",
-                    "restartPolicy": "always",
-                    "settings": {
-                        "image": "${MODULES.sample_module}",
-                        "createOptions": {}
+                "properties.desired": {
+                    "schemaVersion": "${EDGEAGENT_SCHEMA_VERSION}",
+                    "runtime": {
+                      "type": "docker",
+                      "settings": {
+                        "minDockerVersion": "v1.25",
+                        "loggingOptions": "",
+                        "registryCredentials": {}
+                      }
+                    },
+                    "modules": {
+                        "sample_module": {
+                            "version": "1.0",
+                            "type": "docker",
+                            "status": "running",
+                            "restartPolicy": "always",
+                            "settings": {
+                                "image": "${MODULES.sample_module}",
+                                "createOptions": {}
+                            }
+                        }
+                    },
+                    "systemModules": {
+                        "edgeAgent": {
+                            "type": "docker",
+                            "settings": {
+                                "image": "mcr.microsoft.com/azureiotedge-agent:${EDGE_RUNTIME_VERSION}"
+                            }
+                        },
+                        "edgeHub": {
+                            "type": "docker",
+                            "status": "running",
+                            "settings": {
+                                "image": "mcr.microsoft.com/azureiotedge-hub:${EDGE_RUNTIME_VERSION}"
+                            },
+                            "restartPolicy": "always"
+                        }
                     }
                 }
             },
             "$edgeHub": {
-                "properties.desired.routes.upstream": "FROM /messages/* INTO $upstream"
+                "properties.desired": {
+                    "schemaVersion": "${EDGEHUB_SCHEMA_VERSION}",
+                    "routes": {
+                        "route": "FROM /messages/* INTO $upstream"
+                    }
+                }
             }
         }
     }

s/tests/test_iotedgedev_iothub_deploy.py

@@ -21,7 +21,6 @@ test_solution_shared_lib_dir = os.path.join(os.getcwd(), "tests", "assets", "tes
     "config, manifest",
     [
         ("layered_deployment.flattened_props.template.json", "layered_deployment.flattened_props.json"),
-        ("layered_deployment.no_modules.template.json", "layered_deployment.no_modules.json"),
         ("deployment.template.json", f"deployment.{get_platform_type()}.json")
     ]
 )

s/tests/test_iotedgedev_solution.py

@@ -201,7 +201,7 @@ def test_module_add_invalid_name(prepare_solution_with_env):
     assert "already exists under" in result.output
 
 
-@pytest.fixture
+@ pytest.fixture
 def test_push_modules():
     result = runner_invoke(['push', '-P', get_platform_type()])
 
@@ -210,7 +210,7 @@ def test_push_modules():
     assert 'ERROR' not in result.output
 
 
-@pytest.fixture
+@ pytest.fixture
 def test_deploy_modules():
     if get_docker_os_type() == "windows":
         result = runner_invoke(['deploy', '-f', os.path.join('config', 'deployment.' + get_platform_type() + '.json')])
@@ -221,7 +221,7 @@ def test_deploy_modules():
     assert 'ERROR' not in result.output.replace('ERROR: Error while checking for extension', '')
 
 
-@pytest.fixture
+@ pytest.fixture
 def test_monitor(capfd):
     runner_invoke(['monitor', '--timeout', '5'])
 
@@ -371,7 +371,6 @@ def test_validate_deployment_template_and_manifest_success():
             result = runner_invoke(['genconfig', '-f', deployment_file_name])
 
         assert "ERROR" not in result.output
-        assert "Deployment manifest schema validation passed" in result.output
         assert "Warning: Deployment manifest schema validation failed" not in result.output
         assert "Validation for all createOptions passed" in result.output
         assert "Warning: Errors found during createOptions validation" not in result.output

s/tests/test_iotedgedev_solution_build.py

@@ -69,25 +69,6 @@ def test_solution_build_and_push_with_layered_deployment():
     assert 'ERROR' not in result.output
 
 
-def test_solution_build_and_push_with_layered_deployment_no_modules():
-    # Arrange
-    os.chdir(test_solution_shared_lib_dir)
-    new_config_deployment_path = os.path.join(test_solution_shared_lib_dir, 'config', 'layered_deployment.no_modules.json')
-
-    # Act
-    result = runner_invoke(['build', '--push', '-f', "layered_deployment.no_modules.template.json", '-P', get_platform_type()])
-
-    # Assert
-
-    with open(new_config_deployment_path, "r") as f:
-        content = json.load(f)
-
-    set_property = content["content"]["modulesContent"]["exampleModule"]["properties.desired"]["foo"]
-
-    assert 'ERROR' not in result.output
-    assert 'bar-1.2' == set_property
-
-
 def test_solution_build_and_push_with_platform():
     os.chdir(test_solution_shared_lib_dir)
 

s/tests/test_iotedgedev_solution_deploy.py

@@ -0,0 +1,197 @@
+import json
+import os
+import shutil
+import time
+from unittest import mock
+
+import pytest
+from iotedgedev.envvars import EnvVars
+from iotedgedev.output import Output
+from iotedgedev.version import PY35
+
+from .utility import (get_docker_os_type,
+                      get_platform_type, runner_invoke)
+
+pytestmark = pytest.mark.e2e
+
+output = Output()
+envvars = EnvVars(output)
+
+root_dir = os.getcwd()
+tests_dir = os.path.join(root_dir, "tests")
+tests_assets_dir = os.path.join(tests_dir, "assets")
+
+env_file_name = envvars.get_dotenv_file()
+env_file_path = envvars.get_dotenv_path(env_file_name)
+
+launch_json_file = os.path.join(tests_dir, "assets", "launch.json")
+launch_json_file_without_nodejs = os.path.join(tests_dir, "assets", "launch_without_nodejs.json")
+
+test_solution = "test_solution"
+test_solution_dir = os.path.join(tests_dir, test_solution)
+
+test_solution_shared_lib = "test_solution_shared_lib"
+test_solution_shared_lib_dir = os.path.join(tests_dir, "assets", test_solution_shared_lib)
+
+templates = ["c", "csharp", "java", "nodejs", "python", "csharpfunction"]
+
+
+def create_solution(template, custom_module_name=None):
+    if custom_module_name is None:
+        module_name = template + "module"
+    else:
+        module_name = custom_module_name
+    result = runner_invoke(['new', test_solution, '-m', module_name, '-t', template])
+
+    return result
+
+
+def clean_folder(folder_path):
+    os.chdir(tests_dir)
+    time.sleep(5)
+    shutil.rmtree(folder_path, ignore_errors=True)
+
+
+@pytest.fixture
+def prepare_solution_with_env():
+    os.chdir(tests_dir)
+
+    template = "csharp"
+    module_name = "filtermodule"
+    result = create_solution(template, module_name)
+    if 'AZURE IOT EDGE SOLUTION CREATED' not in result.output:
+        raise Exception(result.stdout)
+
+    shutil.copyfile(env_file_path, os.path.join(test_solution_dir, env_file_name))
+
+    os.chdir(test_solution_dir)
+
+    yield prepare_solution_with_env
+    clean_folder(test_solution_dir)
+
+    return
+
+
+def assert_solution_folder_structure(template):
+    module_name = template + "module"
+
+    expected_files = [".env", "deployment.template.json", "deployment.debug.template.json",
+                      os.path.join(".vscode", "launch.json"),
+                      os.path.join("modules", module_name, "Dockerfile.amd64"),
+                      os.path.join("modules", module_name, "Dockerfile.amd64.debug"),
+                      os.path.join("modules", module_name, "Dockerfile.arm32v7"),
+                      os.path.join("modules", module_name, "module.json")]
+    for expected_file in expected_files:
+        assert os.path.exists(os.path.join(test_solution_dir, expected_file))
+
+    expected_template_files = [os.environ["DEPLOYMENT_CONFIG_TEMPLATE_FILE"], os.environ["DEPLOYMENT_CONFIG_DEBUG_TEMPLATE_FILE"]]
+
+    for expected_template_file in expected_template_files:
+        with open(os.path.join(test_solution_dir, expected_template_file)) as f:
+            content = json.load(f)
+
+        assert module_name in content["modulesContent"]["$edgeAgent"]["properties.desired"]["modules"]
+        assert module_name in content["modulesContent"]["$edgeAgent"]["properties.desired"]["modules"][module_name]["settings"]["image"]
+        assert module_name in content["modulesContent"]["$edgeHub"]["properties.desired"]["routes"]["sensorTo" + module_name]
+        assert module_name in content["modulesContent"]["$edgeHub"]["properties.desired"]["routes"][module_name + "ToIoTHub"]
+
+
+def assert_module_folder_structure(template):
+    module_name = template + "module"
+    expected_template_files = [os.environ["DEPLOYMENT_CONFIG_TEMPLATE_FILE"], os.environ["DEPLOYMENT_CONFIG_DEBUG_TEMPLATE_FILE"]]
+
+    for expected_template_file in expected_template_files:
+        with open(expected_template_file) as f:
+            content = json.load(f)
+
+        assert module_name in content["modulesContent"]["$edgeAgent"]["properties.desired"]["modules"]
+        assert module_name in content["modulesContent"]["$edgeAgent"]["properties.desired"]["modules"][module_name]["settings"]["image"]
+        assert module_name in content["modulesContent"]["$edgeHub"]["properties.desired"]["routes"][module_name + "ToIoTHub"]
+
+        if expected_template_file == os.environ["DEPLOYMENT_CONFIG_DEBUG_TEMPLATE_FILE"]:
+            if module_name in ["cmodule", "pythonmodule", "nodejsmodule", "javamodule"]:
+                assert "HostConfig" in content["modulesContent"]["$edgeAgent"]["properties.desired"]["modules"][module_name]["settings"]["createOptions"]
+
+
+@pytest.fixture
+def test_push_modules():
+    result = runner_invoke(['push', '-P', get_platform_type()])
+
+    assert 'BUILD COMPLETE' in result.output
+    assert 'PUSH COMPLETE' in result.output
+    assert 'ERROR' not in result.output
+
+
+@pytest.fixture
+def test_deploy_modules():
+    if get_docker_os_type() == "windows":
+        result = runner_invoke(['deploy', '-f', os.path.join('config', 'deployment.' + get_platform_type() + '.json')])
+    else:
+        result = runner_invoke(['deploy'])
+
+    assert 'DEPLOYMENT COMPLETE' in result.output
+    assert 'ERROR' not in result.output.replace('ERROR: Error while checking for extension', '')
+
+
+@pytest.fixture
+def test_monitor(capfd):
+    runner_invoke(['monitor', '--timeout', '5'])
+
+    out, err = capfd.readouterr()
+    if not PY35:
+        assert 'Monitoring events from device' in out
+    else:
+        assert not err
+
+
+def get_connection_string_value(key: str) -> str:
+
+    connection_string_values = os.environ["DEVICE_CONNECTION_STRING"].split(';')
+    device_id = None
+
+    for item in connection_string_values:
+        if key in item:
+            device_id = item.split('=')[1]
+
+    return device_id
+
+
+@ mock.patch.dict(os.environ, {"DEVICE_CONNECTION_STRING": f"HostName={get_connection_string_value('HostName')};DeviceId={get_connection_string_value('DeviceId')};=testaccesskey"})
+def test_solution_deploy_with_sas_connection_string():
+    # Arrange
+    os.chdir(test_solution_shared_lib_dir)
+
+    # Act
+    result = runner_invoke(['solution', 'deploy'])
+
+    # Assert
+    assert 'DEPLOYMENT COMPLETE' in result.output
+    assert 'ERROR' not in result.output
+
+
+@ mock.patch.dict(os.environ, {"DEVICE_CONNECTION_STRING": f"HostName={get_connection_string_value('HostName')};DeviceId={get_connection_string_value('DeviceId')};x509=true;"})
+def test_solution_deploy_with_x509_connection_string():
+    # Arrange
+    os.chdir(test_solution_shared_lib_dir)
+
+    # Act
+    runner_invoke(['build', '-f', "deployment.template.json", '-P', get_platform_type()])
+    result = runner_invoke(['solution', 'deploy'])
+
+    # Assert
+    assert 'DEPLOYMENT COMPLETE' in result.output
+    assert 'ERROR' not in result.output
+
+
+@ mock.patch.dict(os.environ, {"DEVICE_CONNECTION_STRING": "HostName=test-iothub.azure-devices.net;SharedAccessKey=testaccesskey"})
+def test_connection_string_no_device_id_throws_env_error():
+    # Arrange
+    os.chdir(test_solution_shared_lib_dir)
+
+    # Act
+    runner_invoke(['build', '-f', "deployment.template.json", '-P', get_platform_type()])
+    with pytest.raises(Exception) as context:
+        runner_invoke(['solution', 'deploy'])
+
+    # Assert
+    assert "ERROR: Environment Variable EDGE_DEVICE_ID not set." in str(context.value)