Xiangzhou/fix issue make post request

CHANGELOG.md

@@ -0,0 +1,15 @@
+# Changelog
+
+## [v2.0.0] - unreleased
+
+* Remove deploy module
+* Add rest.controller module
+* Rename client module to microservices
+
+## [v1.3.0]
+
+* Ability to deploy ioFog microservices, and connections through SDK are now available.
+    * This can be imported through iofog_python_sdk.deploy options.
+    * Previous standard iofog_python_sdk can be imported through iofog_python_sdk.microservices
+* Added standards for rest calls made to ioFog under deploy.create_rest_call
+* Fixed issue with python3 object handling

Docker/Dockerfile.recieve

@@ -5,6 +5,6 @@ COPY test/recieve.py recieve.py
 
 RUN pip install ws4py
 
-RUN python -m pip install iofog-python-sdk
+ADD iofog_python_sdk iofog_python_sdk
 
-ENTRYPOINT ["python", "recieve.py"]
+CMD export SELFNAME=iofog; python recieve.py

Docker/Dockerfile.send

@@ -5,6 +5,7 @@ COPY test/send.py send.py
 
 RUN pip install ws4py
 
-RUN python -m pip install iofog-python-sdk
+ADD iofog_python_sdk iofog_python_sdk
+
+CMD export SELFNAME=iofog; python send.py
 
-ENTRYPOINT ["python", "send.py"]

README.md

@@ -1,5 +1,18 @@
 # iofog-python-sdk
 
+This SDK provides the following modules:
+* microservices: Clients for Microservices to talk to ioFog (e.g. ioMessage and Web Socket clients)
+* rest.controller: Client for Controller REST API
+
+## Installation
+
+Install python package:
+```bash
+sudo python3 -m pip install iofog-python-sdk
+```
+
+## Client
+
 This module lets you easily build an ioElement. It gives you all the functionality to interact with ioFog via Local API. It contains all necessary methods for IoMessage transformation as well.
 
  - send new message to ioFog (post_message)
@@ -10,19 +23,14 @@ This module lets you easily build an ioElement. It gives you all the functionali
  - connect to ioFog Control Channel via WebSocket (establish_control_ws_connection)
  - connect to ioFog Message Channel via WebSocket (establish_message_ws_connection) and publish new message via this channel (post_message_via_socket)
 
-## Code snippets: 
-
-Install python package:
-```bash
-sudo python2 -m pip install iofog-python-sdk
-```
+### Code snippets: 
 
 Import iofog client and additional classes to your project:
 ```python
-from iofog_python_sdk.client import IoFogClient
-from iofog_python_sdk.exception import IoFogException
-from iofog_python_sdk.iomessage import IoMessage
-from iofog_python_sdk.listener import *
+from iofog_python_sdk.microservices.client import IoFogClient
+from iofog_python_sdk.microservices.exception import IoFogException
+from iofog_python_sdk.microservices.iomessage import IoMessage
+from iofog_python_sdk.microservices.listener import *
 ```
 
 Create IoFog client with default settings:
@@ -41,7 +49,7 @@ except IoFogException as e:
  # client creation failed, e contains description
 ```
 
-#### REST calls
+##### REST calls
 
 Get list of next unread IoMessages:
 ```python
@@ -94,7 +102,7 @@ except IoFogException, ex:
 ```
 
 
-#### WebSocket calls
+##### WebSocket calls
 
 To use websocket connections you should implement listeners as follows:
 ```python
@@ -126,7 +134,7 @@ client.post_message_via_socket(io_msg_instance)
 ```
 
 
-#### Message utils
+##### Message utils
 Construct IoMessage from JSON(both json string and python dictionary are acceptable):
 ```python
 msg = IoMessage.from_json(json_msg)
@@ -146,3 +154,16 @@ Pack IoMessage into bytearray:
 ```python
 msg_bytes = io_msg_instance.to_bytearray()
 ```
+## Deploy
+
+This module lets you easily communicate with the [Controller REST API](https://iofog.org/docs/1.3.0/controllers/rest-api.html).
+
+ - Deploy flow, microservices, agents, etc.
+ - Edit microservice configuration
+ - Edit flow routing
+
+#### Disclaimer
+
+These modules are a Work In Progress. It was first written as a set of helper functions used by a python script to deploy a set of microservices configured using yaml files.
+
+Our [golang SDK](https://github.com/eclipse-iofog/iofog-go-sdk) is highly recommended as Controller REST API client.

azure-pipelines.yml

@@ -1,8 +1,11 @@
 trigger:
+  tags:
+    include:
+      - v*
   branches:
     include:
-      - master
       - develop
+      - release*
   paths:
     exclude:
       - README.md
@@ -17,25 +20,30 @@ jobs:
   pool:
     vmImage: 'ubuntu-16.04'
   steps:
-    - task: UsePythonVersion-3.x
+    - task: UsePythonVersion@0
       inputs:
-        versionSpec: '3.5'
+        versionSpec: '3.7'
         addToPath: true
         architecture: 'x64'
     - script: |
         bash ./build.sh 'python3'
-      displayName: 'Building-3.x'
+      displayName: 'Building 3.7'
     - script: |
-        bash ./test.sh
-      displayName: 'Testing-3.x'
-    - task: UsePythonVersion-2.7
+        bash ./test.sh 'python3'
+      displayName: 'Testing 3.7'
+    - task: CopyFiles@2
       inputs:
-        versionSpec: '2.7'
-        addToPath: true
-        architecture: 'x64'
-    - script: |
-        bash ./build.sh
-      displayName: 'Building-2.7'
-    - script: |
-        bash ./test.sh
-      displayName: 'Testing-2.7'
+        SourceFolder: $(System.DefaultWorkingDirectory)
+        TargetFolder: $(Build.ArtifactStagingDirectory)
+        Contents: |
+          setup.py
+          requirements.txt
+          README.md
+          iofog_python_sdk/**/*
+        OverWrite: true
+      displayName: 'Copy artifacts'
+    - task: PublishBuildArtifacts@1
+      inputs:
+        PathtoPublish: '$(Build.ArtifactStagingDirectory)'
+        ArtifactName: 'sdk'
+      displayName: 'Publish artefacts'

build.sh

@@ -10,7 +10,3 @@ fi
 # Build Python Images
 docker build --build-arg TAG_NAME=${PYTHON_TAG} -t iofog/test-python-sdk-send:${PYTHON_VERSION} -f ./Docker/Dockerfile.send .
 docker build --build-arg TAG_NAME=${PYTHON_TAG} -t iofog/test-python-sdk-recieve:${PYTHON_VERSION} -f ./Docker/Dockerfile.recieve .
-
-# Push Python Images
-docker push iofog/test-python-sdk-send:${PYTHON_VERSION}
-docker push iofog/test-python-sdk-recieve:${PYTHON_VERSION}