Skip to content

Commit

Permalink
kong: modifications for 1.0.0 release (#40)
Browse files Browse the repository at this point in the history
* New API's follow, unfollow created in 1.0.0
* catalogue changes 
* ACL historicdata changed to db
  • Loading branch information
harishanand95 authored Feb 22, 2018
1 parent bbfeb61 commit 409eef1
Show file tree
Hide file tree
Showing 5 changed files with 66 additions and 155 deletions.
33 changes: 17 additions & 16 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Web Page
- Tools and SDK's: https://github.com/rbccps-iisc/ideam-python-sdk

Architecture
=============
============
.. image:: https://rbccps.org/smartcity/lib/exe/fetch.php?media=mw_architecture.png

Requirements
Expand All @@ -23,18 +23,19 @@ Requirements
Release
=======

smartcity-middleware v0.1.0_
smartcity-middleware v1.0.0_


.. _v0.1.0: https://github.com/rbccps-iisc/ideam/releases/latest
.. _v1.0.0: https://github.com/rbccps-iisc/ideam/releases/latest

Configuration
=============

``middleware.conf v0.1.0``
middleware.conf_ v0.1.0

.. _middleware.conf: https://github.com/rbccps-iisc/ideam/blob/master/middleware.conf
middleware.conf::

DESCRIPTION

middleware.conf is the configuration file for the smartcity-middleware application.
Expand All @@ -52,7 +53,7 @@ middleware.conf::
for keeping log files.

SSH and other service ports can be mapped to host machine ports.

SYSTEM_CONFIG specify system specific configurations for the installation steps.

SSH_PUBLIC_KEY: Specify a ssh public key which will be used in ssh authentication of the user to
Expand All @@ -77,27 +78,27 @@ After configuring the ``middleware.conf`` file, do the following steps.
Comment
=======
- Please satisfy the requirements mentioned in ``middleware.conf`` file.
- Password of the root user in docker containers for the 0.1.0 release is rbccps@123456. This will be removed in the later release.
- If the setup fails at any stage for reasons like internet connection issues, you can continue the failed installation using the following command.
- Password of the root user in docker containers for the 1.0.0 release is rbccps@123456. This will be removed in the later release.
- If the setup fails at any stage for reasons like internet connection issues, you can continue the failed installation using the following command.
``python smartcity-middleware.py install --config-file middleware.conf -l kong,tomcat,hypercat,ldapd,elasticsearch,rabbitmq,apt_repo,pushpin``
- The application will be serving with a self-signed certificate. If you want to use your certificate, have your .crt and .key file as config/kong/default_443.crt and config/kong/default_443.key respectively and do a fresh installation.
- The application will be serving with a self-signed certificate. If you want to use your certificate, have your .crt and .key file as ``config/kong/default_443.crt`` and ``config/kong/default_443.key`` respectively and do a fresh installation.

+----------------------------------------------------------------+----------------------------------------------------------+
| RBCCPS MIDDLEWARE API URLs | MIDDLEWARE API URLs |
+================================================================+==========================================================+
| https://smartcity.rbccps.org/api/0.1.0/register | https://localhost:10443/api/0.1.0/register |
| https://smartcity.rbccps.org/api/1.0.0/register | https://localhost:10443/api/1.0.0/register |
+----------------------------------------------------------------+----------------------------------------------------------+
| https://smartcity.rbccps.org/api/0.1.0/publish | https://localhost:10443/api/0.1.0/publish |
| https://smartcity.rbccps.org/api/1.0.0/publish | https://localhost:10443/api/1.0.0/publish |
+----------------------------------------------------------------+----------------------------------------------------------+
| https://smartcity.rbccps.org/api/0.1.0/subscribe?name=testDemo | https://localhost:10443/api/0.1.0/subscribe?name=testDemo|
| https://smartcity.rbccps.org/api/1.0.0/subscribe?name=testDemo | https://localhost:10443/api/1.0.0/subscribe?name=testDemo|
+----------------------------------------------------------------+----------------------------------------------------------+
| https://smartcity.rbccps.org/api/0.1.0/subscribe/bind | https://localhost:10443/api/0.1.0/subscribe/bind |
| https://smartcity.rbccps.org/api/1.0.0/subscribe/bind | https://localhost:10443/api/1.0.0/subscribe/bind |
+----------------------------------------------------------------+----------------------------------------------------------+
| https://smartcity.rbccps.org/api/0.1.0/subscribe/unbind | https://localhost:10443/api/0.1.0/subscribe/unbind |
| https://smartcity.rbccps.org/api/1.0.0/subscribe/unbind | https://localhost:10443/api/1.0.0/subscribe/unbind |
+----------------------------------------------------------------+----------------------------------------------------------+
| https://smartcity.rbccps.org/api/0.1.0/cat | https://localhost:10443/api/0.1.0/cat |
| https://smartcity.rbccps.org/api/1.0.0/cat | https://localhost:10443/api/1.0.0/cat |
+----------------------------------------------------------------+----------------------------------------------------------+
| https://smartcity.rbccps.org/api/0.1.0/historicData | https://localhost:10443/api/0.1.0/historicData |
| https://smartcity.rbccps.org/api/1.0.0/historicData | https://localhost:10443/api/1.0.0/historicData |
+----------------------------------------------------------------+----------------------------------------------------------+

For example, registration of device to local middleware is as follows.
Expand Down
Binary file modified config/tomcat/RegisterAPI.war
Binary file not shown.
4 changes: 4 additions & 0 deletions install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,10 @@
args:
chdir: /home/ansible/cat-json-schema-server

- name: Create pwd test
shell: node pwd_script.js local123
args:
chdir: /home/ansible/cat-json-schema-server/
### Set up kong environment
# This playbook play will install Kong, iptables and api-auth plugin of Kong. Ansible will install and verify
# the working of the API at user and admin ports. But this verification will fail in any subsequent runs of
Expand Down
Loading

0 comments on commit 409eef1

Please sign in to comment.