From 07778b76a8c19acd48b763c74ddcd61553e53406 Mon Sep 17 00:00:00 2001
From: YashTatkondawar <yashtatkondawar@gmail.com>
Date: Mon, 16 Dec 2019 15:54:01 +0530
Subject: [PATCH 1/2] FOGL-3539: Corrected the github paths in scripts

Signed-off-by: YashTatkondawar <yashtatkondawar@gmail.com>
---
 tests/system/python/scripts/install_c_plugin      | 4 ++--
 tests/system/python/scripts/install_c_service     | 2 +-
 tests/system/python/scripts/install_python_plugin | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/system/python/scripts/install_c_plugin b/tests/system/python/scripts/install_c_plugin
index ce8cc3884f..cca6b5d521 100755
--- a/tests/system/python/scripts/install_c_plugin
+++ b/tests/system/python/scripts/install_c_plugin
@@ -38,7 +38,7 @@ clean () {
 }
 
 clone_repo () {
-   git clone -b ${BRANCH_NAME} --single-branch https://github.com/fledge/${REPO_NAME}.git /tmp/${REPO_NAME}
+   git clone -b ${BRANCH_NAME} --single-branch https://github.com/fledge-iot/${REPO_NAME}.git /tmp/${REPO_NAME}
 }
 
 install_requirement (){
@@ -51,7 +51,7 @@ install_binary_file () {
    then
         # fledge-service-notification repo is required to build notificationRule Plugins
         service_repo_name='fledge-service-notification'
-        git clone -b ${BRANCH_NAME} --single-branch https://github.com/fledge/${service_repo_name}.git /tmp/${service_repo_name}
+        git clone -b ${BRANCH_NAME} --single-branch https://github.com/fledge-iot/${service_repo_name}.git /tmp/${service_repo_name}
         export NOTIFICATION_SERVICE_INCLUDE_DIRS=/tmp/${service_repo_name}/C/services/common/include
    fi
 
diff --git a/tests/system/python/scripts/install_c_service b/tests/system/python/scripts/install_c_service
index 124873adb0..7f51343fe0 100755
--- a/tests/system/python/scripts/install_c_service
+++ b/tests/system/python/scripts/install_c_service
@@ -25,7 +25,7 @@ clean () {
 }
 
 clone_repo () {
-   git clone -b ${BRANCH_NAME} --single-branch https://github.com/fledge/${REPO_NAME}.git /tmp/${REPO_NAME}
+   git clone -b ${BRANCH_NAME} --single-branch https://github.com/fledge-iot/${REPO_NAME}.git /tmp/${REPO_NAME}
 }
 
 install_binary_file () {
diff --git a/tests/system/python/scripts/install_python_plugin b/tests/system/python/scripts/install_python_plugin
index 04fddd9f46..b220d92f50 100755
--- a/tests/system/python/scripts/install_python_plugin
+++ b/tests/system/python/scripts/install_python_plugin
@@ -37,7 +37,7 @@ clean () {
 }
 
 clone_repo () {
-   git clone -b ${BRANCH_NAME} --single-branch https://github.com/fledge/${REPO_NAME}.git /tmp/${REPO_NAME}
+   git clone -b ${BRANCH_NAME} --single-branch https://github.com/fledge-iot/${REPO_NAME}.git /tmp/${REPO_NAME}
 }
 
 copy_file_and_requirement () {

From 6422aa5005d308a1cf39bcc898877f064eeb47a5 Mon Sep 17 00:00:00 2001
From: YashTatkondawar <yashtatkondawar@gmail.com>
Date: Mon, 16 Dec 2019 18:57:17 +0530
Subject: [PATCH 2/2] Replaced Fledge with fledge

Signed-off-by: YashTatkondawar <yashtatkondawar@gmail.com>
---
 tests/system/python/pair/test_e2e_fledge_pair.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/system/python/pair/test_e2e_fledge_pair.py b/tests/system/python/pair/test_e2e_fledge_pair.py
index 5bcc19c338..27064eee3f 100644
--- a/tests/system/python/pair/test_e2e_fledge_pair.py
+++ b/tests/system/python/pair/test_e2e_fledge_pair.py
@@ -75,7 +75,7 @@ def reset_and_start_fledge_remote(self, storage_plugin, remote_user, remote_ip,
                 remote_fledge_path: Path where Fledge is cloned and built
             """
         if remote_fledge_path is None:
-            remote_fledge_path = '/home/{}/Fledge'.format(remote_user)
+            remote_fledge_path = '/home/{}/fledge'.format(remote_user)
         subprocess.run(["ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i {} {}@{} 'export FLEDGE_ROOT={};$FLEDGE_ROOT/scripts/fledge kill'".format(key_path, remote_user,
                                                                                                       remote_ip,
                                                                                                       remote_fledge_path)], shell=True, check=True)
@@ -106,7 +106,7 @@ def start_south_north_remote(self, reset_and_start_fledge_remote, use_pip_cache,
             """
 
         if remote_fledge_path is None:
-            remote_fledge_path = '/home/{}/Fledge'.format(remote_user)
+            remote_fledge_path = '/home/{}/fledge'.format(remote_user)
         fledge_url = "{}:8081".format(remote_ip)
         south_plugin = "http"
         south_service = "http_south"