Configuration rename branch (#2)

Minor changes in renaming conf.py in connectorconf.py to avoid readthedocs.org conflicts
Engineering-Research-and-Development · Jun 9, 2022 · 8bca53a · 8bca53a
1 parent 49cb9e1
commit 8bca53a
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -33,7 +33,7 @@ RUN unzip main.zip
 RUN mkdir ../PySpark/
 
 RUN mv fiware-orion-pyspark-connector-main/receiver/connector_lib.py ../PySpark/
-RUN mv fiware-orion-pyspark-connector-main/receiver/conf.py ../PySpark/
+RUN mv fiware-orion-pyspark-connector-main/receiver/connectorconf.py ../PySpark/
 RUN mv fiware-orion-pyspark-connector-main/replier/replier_lib.py ../PySpark/
 RUN mv fiware-orion-pyspark-connector-main/replier/replyconf.py ../PySpark/
 

diff --git a/docs/quick_start.md b/docs/quick_start.md
@@ -4,7 +4,7 @@
 
 Once installed the requirements, it is possible to use the connector by following these steps:
 - Load files on the same machine running the spark job
-- Modify the `conf.py` file in the repository to set up the IP address and port for both the HTTP Server and the multi-threading socket. 
+- Modify the `connectorconf.py` file in the repository to set up the IP address and port for both the HTTP Server and the multi-threading socket. 
    - If your PySpark job is running in a docker container, make sure that both the server and multi-thread socket *IP addresses* are the same of that container
    - **Don't use the same (address, port) couple for the HTPP Server and the Sockets**
    -  Currently, the user has to make sure that the chosen ports are free. In future versions, automatic port setting is evaluated for the multi-thread socket.

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -17,4 +17,4 @@ pages:
   - "Home - Getting Started": "index.md"
   - "User & Programmers Manual": "quick_start.md"
   - "Docker": "docker.md"
-  - "Roadmap": "roadmap.md"
+  - "Roadmap": "roadmap.md"
diff --git a/receiver/connector_lib.py b/receiver/connector_lib.py
@@ -13,7 +13,7 @@
 import time
 from datetime import datetime
 
-import conf as connectorconf
+import connectorconf
 
 '''
 from py4j.java_gateway import java_import, is_instance_of

diff --git a/receiver/conf.py → receiver/connectorconf.py b/receiver/conf.py → receiver/connectorconf.py
@@ -1,4 +1,3 @@
-#HTTPADDRESS = '192.168.49.1'
 HTTPADDRESS = "10.0.2.15"
 HTTPPORT = 8061
 SOCKETADDRESS = 'localhost'