From f0aa3df485172e8419d37186b08cd480f0a2a7d9 Mon Sep 17 00:00:00 2001
From: "Jose M. Guisado" <jguisado@soleta.eu>
Date: Thu, 3 Dec 2020 12:29:50 +0000
Subject: [PATCH] Rename 'linux' folder and operations to 'live'

ogLive related operations are named inside a 'Linux' folder, also its
python class is named OgLinuxOperations. Rename every 'linux' occurrence
with live to further clarify this folder and operations.

 - OgLinuxOperations -> OgLiveOperations
 - src/linux/ -> src/live/

Fixes: 1377acee ('Rename 'linux' mode to 'live' mode')
---
 setup.py                            | 2 +-
 src/{linux => live}/__init__.py     | 0
 src/{linux => live}/ogOperations.py | 2 +-
 src/ogRest.py                       | 4 ++--
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename src/{linux => live}/__init__.py (100%)
 rename src/{linux => live}/ogOperations.py (99%)

diff --git a/setup.py b/setup.py
index cefd789..762aca2 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ setup(name='ogclient',
       author='Soleta OpenGnsys Support Team',
       author_email='soporte-og@soleta.eu',
       url='https://github.com/opengnsys/ogClient',
-      packages=['src', 'src.linux', 'src.virtual'],
+      packages=['src', 'src.live', 'src.virtual'],
       scripts=['ogclient'],
       data_files=[('cfg', ['cfg/ogclient.json']),
                   ('', ['COPYING'])]
diff --git a/src/linux/__init__.py b/src/live/__init__.py
similarity index 100%
rename from src/linux/__init__.py
rename to src/live/__init__.py
diff --git a/src/linux/ogOperations.py b/src/live/ogOperations.py
similarity index 99%
rename from src/linux/ogOperations.py
rename to src/live/ogOperations.py
index 58dff3a..b7e6801 100644
--- a/src/linux/ogOperations.py
+++ b/src/live/ogOperations.py
@@ -13,7 +13,7 @@ from src.ogClient import ogClient
 
 OG_SHELL = '/bin/bash'
 
-class OgLinuxOperations:
+class OgLiveOperations:
     def __init__(self, config):
         self._url = config['opengnsys']['url']
         self._url_log = config['opengnsys']['url_log']
diff --git a/src/ogRest.py b/src/ogRest.py
index 86ff68f..bd9b65c 100644
--- a/src/ogRest.py
+++ b/src/ogRest.py
@@ -256,8 +256,8 @@ class ogRest():
 		self.samba_config = self.CONFIG['samba']
 
 		if self.mode == 'live':
-			from src.linux.ogOperations import OgLinuxOperations
-			self.operations = OgLinuxOperations(self.CONFIG)
+			from src.live.ogOperations import OgLiveOperations
+			self.operations = OgLiveOperations(self.CONFIG)
 		elif self.mode == 'virtual':
 			from src.virtual.ogOperations import \
 				OgVirtualOperations