From fad2238b75cdcaaa02a2ce5c654ab5808d98ba52 Mon Sep 17 00:00:00 2001
From: Tobias Kurze <kurze.tobias@googlemail.com>
Date: Fri, 3 May 2019 15:52:52 +0200
Subject: [PATCH] added ports to api model

---
 .idea/workspace.xml |  54 ++++++++++++++++++++------------------------
 api/recorder_api.py |   5 ++++
 app.db              | Bin 167936 -> 167936 bytes
 3 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e81392b..fb9e5c2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,13 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="dbc2bdbd-c8f7-46d2-961a-6a2b77f8f4c5" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/backend.iml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/api/recorder_api.py" beforeDir="false" afterPath="$PROJECT_DIR$/api/recorder_api.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/room_api.py" beforeDir="false" afterPath="$PROJECT_DIR$/api/room_api.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app.db" beforeDir="false" afterPath="$PROJECT_DIR$/app.db" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -19,11 +13,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/api/recorder_api.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="874">
-              <caret line="197" column="54" selection-start-line="197" selection-start-column="54" selection-end-line="197" selection-end-column="54" />
+            <state relative-caret-position="414">
+              <caret line="23" column="59" selection-start-line="23" selection-start-column="59" selection-end-line="23" selection-end-column="59" />
               <folding>
                 <element signature="e#267#310#0" expanded="true" />
               </folding>
@@ -49,7 +43,7 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/api/room_api.py">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="1332">
@@ -69,8 +63,8 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/api/recorder_api.py" />
         <option value="$PROJECT_DIR$/api/room_api.py" />
+        <option value="$PROJECT_DIR$/api/recorder_api.py" />
       </list>
     </option>
   </component>
@@ -151,12 +145,12 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1556266469460</updated>
-      <workItem from="1556266473180" duration="10365000" />
+      <workItem from="1556266473180" duration="14572000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="10365000" />
+    <option name="totallyTimeSpent" value="14572000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="3840" y="146" width="1200" height="1894" extended-state="6" />
@@ -189,13 +183,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/models/recorder_model.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="810">
-          <caret line="52" column="8" selection-start-line="52" selection-start-column="8" selection-end-line="52" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.virtualenvs/wassS_backend-Ko2xORm-/lib/python3.7/site-packages/flask_restplus/fields.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2368">
@@ -203,16 +190,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/api/recorder_api.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="874">
-          <caret line="197" column="54" selection-start-line="197" selection-start-column="54" selection-end-line="197" selection-end-column="54" />
-          <folding>
-            <element signature="e#267#310#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/models/room_model.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="450">
@@ -230,5 +207,22 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/models/recorder_model.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="810">
+          <caret line="52" column="8" selection-start-line="52" selection-start-column="8" selection-end-line="52" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/api/recorder_api.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="414">
+          <caret line="23" column="59" selection-start-line="23" selection-start-column="59" selection-end-line="23" selection-end-column="59" />
+          <folding>
+            <element signature="e#267#310#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/api/recorder_api.py b/api/recorder_api.py
index 4cc6174..d4796b4 100644
--- a/api/recorder_api.py
+++ b/api/recorder_api.py
@@ -20,6 +20,11 @@ recorder_model = api_recorder.model('Recorder', {
     'description': fields.String(required=False, description='The recorder\'s description'),
     'ip': fields.String(required=False, description='The recorder\'s IP address'),
     'network_name': fields.String(required=False, description='The recorder\'s network name'),
+    'ssh_port': fields.Integer(required=True, default=443, description='The recorder\'s SSH port number'),
+    'telnet_port': fields.Integer(required=True, default=23, description='The recorder\'s telned port number'),
+    'use_telnet_instead_ssh': fields.Boolean(required=False, default=False,
+                                             description='If this is set, telnet will be used instead of ssh. '
+                                                         'This might require specific commands.'),
     'recorder_model': fields.Nested(api_recorder.model('recorder_model',
                                                        {'id': fields.Integer(), 'name': fields.String()}),
                                     required=False,
diff --git a/app.db b/app.db
index dba5758b1fbb7aedc473c5b7a56bedef0de926ec..589aa59764df980b32819779af054a924d923df2 100644
GIT binary patch
delta 33
pcmZozz}2vTYl1YR=|mZ4M$^WG)&$0_2~08ZjGWu|#xpq^006X~3P%6{

delta 33
pcmZozz}2vTYl1YR$wV1vMw7;b)&$0_2~08Zj11fN#xpq^006W#3OoP+