Merge pull request #222 from oracle/sprint-15

Sprint 15

.gitignore

@@ -41,3 +41,8 @@ containers/ssh/*
 !containers/ssh/example_config
 
 !okitweb/static/model
+/docker-compose.yml
+/containers/runtime/
+/node/
+/node/node_modules
+/node/package-lock.json

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Release Notes
 
+
+## Version 0.17.0
+**Release Date**: 10th February 2021
+### Features
+1. Simple Tabular view added to display the required properties for resources in a table format (OKIT-124).
+2. Allow Subnets to be place in compartments that do not contain the associated Virtual Cloud Network (OKIT-128).
+3. Update Copyright
+
+### Bug Fixes
+1. Compartment name is now displayed correctly for queried compartment.
+
+
 ## Version 0.16.0
 **Release Date**: 20th January 2021
 ### Features

Dockerfile

@@ -1,13 +1,13 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 FROM oraclelinux:7-slim
 LABEL "provider"="Oracle" \
       "issues"="https://github.com/oracle/oci-designer-toolkit/issues" \
-      "version"="0.16.0" \
+      "version"="0.17.0" \
       "description"="OKIT Web Server Container." \
-      "copyright"="Copyright (c) 2020, Oracle and/or its affiliates."
+      "copyright"="Copyright (c) 2021, Oracle and/or its affiliates."
 SHELL ["/bin/bash", "-c"]
 ENV PYTHONIOENCODING=utf8 \
     PYTHONPATH=":/okit/visualiser:/okit/okitweb:/okit" \
@@ -41,6 +41,7 @@ RUN yum install -y \
  && python3 -m pip install --upgrade pip \
 # Install required python modules
  && pip3 install --no-cache-dir \
+        authlib==0.15.3 \
         flask==1.1.1 \
         gitpython==3.1.11 \
         git-url-parse==1.2.2 \

README.md

@@ -1,4 +1,4 @@
-# Oracle Cloud Infrastructure Designer and Visualisation Toolkit [0.16.0](CHANGELOG.md#version-0.16.0)
+# Oracle Cloud Infrastructure Designer and Visualisation Toolkit [0.17.0](CHANGELOG.md#version-0.17.0)
 
 OCI designer and visualisation toolKIT (OKIT) is a browser based tool that allows the user to [design](https://www.ateam-oracle.com/introduction-to-okit-the-oci-designer-toolkit), 
 [deploy](https://www.ateam-oracle.com/introduction-to-okit-the-oci-designer-toolkit) and visualise ([introspect/query](https://www.ateam-oracle.com/the-oci-designer-toolkit-query-feature)) 

containers/cloud/cloud_init.yml

@@ -12,7 +12,7 @@ runcmd:
   # Install Required Packages because the packages section may not complete before the runcmd
   - sudo bash -c "yum install -y git python-oci-cli oci-utils"
   # Install Required Python Modules
-  - sudo bash -c "pip3 install --no-cache-dir flask==1.1.1 gitpython==3.1.11 git-url-parse==1.2.2 gunicorn==20.0.4 oci==2.22.0 oci-cli==2.14.1 openpyxl==3.0.5 pandas==1.1.2 python-magic==0.4.18 pyyaml==5.3.1 requests==2.24.0 xlsxwriter==1.3.6"
+  - sudo bash -c "pip3 install --no-cache-dir authlib==0.15.3 flask==1.1.1 gitpython==3.1.11 git-url-parse==1.2.2 gunicorn==20.0.4 oci==2.22.0 oci-cli==2.14.1 openpyxl==3.0.5 pandas==1.1.2 python-magic==0.4.18 pyyaml==5.3.1 requests==2.24.0 xlsxwriter==1.3.6"
   # Clone OKIT
   - sudo bash -c "git clone -b master --depth 1 https://github.com/oracle/oci-designer-toolkit.git /okit"
   - sudo bash -c "mkdir /okit/{log,workspace}"

containers/cloud/okit-ws.json

@@ -51,7 +51,7 @@
       },
       "metadata": {
         "ssh_authorized_keys": "",
-        "user_data": "#cloud-config\nwrite_files:\n  # Add aliases to bash (Note: At time of writing the append flag does not appear to be working)\n  - path: /etc/.bashrc\n    append: true\n    content: |\n      alias lh='ls -lash'\n      alias lt='ls -last'\n      alias env='/usr/bin/env | sort'\n\nruncmd:\n  # Install Required Packages because the packages section may not complete before the runcmd\n  - sudo bash -c \"yum install -y git python-oci-cli oci-utils\"\n  # Install Required Python Modules\n  - sudo bash -c \"pip3 install --no-cache-dir flask==1.1.1 gitpython==3.1.11 git-url-parse==1.2.2 gunicorn==20.0.4 oci==2.22.0 oci-cli==2.14.1 openpyxl==3.0.5 pandas==1.1.2 python-magic==0.4.18 pyyaml==5.3.1 requests==2.24.0 xlsxwriter==1.3.6\"\n  # Clone OKIT\n  - sudo bash -c \"git clone -b master --depth 1 https://github.com/oracle/oci-designer-toolkit.git /okit\"\n  - sudo bash -c \"mkdir /okit/{log,workspace}\"\n  # Add additional environment information because append does not appear to work in write_file\n  - sudo bash -c \"echo 'source /etc/.bashrc' >> /etc/bashrc\"\n  - sudo bash -c \"echo 'export OCI_CLI_AUTH=instance_principal' >> /etc/bashrc\"\n  - sudo bash -c \"echo 'export OKIT_VM_COMPARTMENT=`oci-metadata -g \"compartmentID\" --value-only`' >> /etc/bashrc\"\n  # Copy GUnicorn Service File\n  - sudo bash -c 'sed \"s/{COMPARTMENT_OCID}/`oci-metadata -g compartmentID --value-only`/\" /okit/containers/services/gunicorn.service > /etc/systemd/system/gunicorn.service'\n  # Enable Gunicorn Service\n  - sudo systemctl enable gunicorn.service\n  - sudo systemctl start gunicorn.service\n\nfinal_message: \"**** The system is finally up, after $UPTIME seconds ****\"\n"
+        "user_data": "#cloud-config\nwrite_files:\n  # Add aliases to bash (Note: At time of writing the append flag does not appear to be working)\n  - path: /etc/.bashrc\n    append: true\n    content: |\n      alias lh='ls -lash'\n      alias lt='ls -last'\n      alias env='/usr/bin/env | sort'\n\nruncmd:\n  # Install Required Packages because the packages section may not complete before the runcmd\n  - sudo bash -c \"yum install -y git python-oci-cli oci-utils\"\n  # Install Required Python Modules\n  - sudo bash -c \"pip3 install --no-cache-dir authlib==0.15.3 flask==1.1.1 gitpython==3.1.11 git-url-parse==1.2.2 gunicorn==20.0.4 oci==2.22.0 oci-cli==2.14.1 openpyxl==3.0.5 pandas==1.1.2 python-magic==0.4.18 pyyaml==5.3.1 requests==2.24.0 xlsxwriter==1.3.6\"\n  # Clone OKIT\n  - sudo bash -c \"git clone -b master --depth 1 https://github.com/oracle/oci-designer-toolkit.git /okit\"\n  - sudo bash -c \"mkdir /okit/{log,workspace}\"\n  # Add additional environment information because append does not appear to work in write_file\n  - sudo bash -c \"echo 'source /etc/.bashrc' >> /etc/bashrc\"\n  - sudo bash -c \"echo 'export OCI_CLI_AUTH=instance_principal' >> /etc/bashrc\"\n  - sudo bash -c \"echo 'export OKIT_VM_COMPARTMENT=`oci-metadata -g \"compartmentID\" --value-only`' >> /etc/bashrc\"\n  # Copy GUnicorn Service File\n  - sudo bash -c 'sed \"s/{COMPARTMENT_OCID}/`oci-metadata -g compartmentID --value-only`/\" /okit/containers/services/gunicorn.service > /etc/systemd/system/gunicorn.service'\n  # Enable Gunicorn Service\n  - sudo systemctl enable gunicorn.service\n  - sudo systemctl start gunicorn.service\n\nfinal_message: \"**** The system is finally up, after $UPTIME seconds ****\"\n"
       },
       "block_storage_volume_ids": [],
       "object_storage_bucket_ids": [],

containers/docker/8-slim/Dockerfile

@@ -1,13 +1,13 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 FROM oraclelinux:8-slim
 LABEL "provider"="Oracle" \
       "issues"="https://github.com/oracle/oci-designer-toolkit/issues" \
-      "version"="0.16.0" \
+      "version"="0.17.0" \
       "description"="OKIT Web Server Container." \
-      "copyright"="Copyright (c) 2020, Oracle and/or its affiliates."
+      "copyright"="Copyright (c) 2021, Oracle and/or its affiliates."
 SHELL ["/bin/bash", "-c"]
 ENV PYTHONIOENCODING=utf8 \
     PYTHONPATH=":/okit/visualiser:/okit/okitweb:/okit" \

containers/docker/8-slim/docker-compose.yml

@@ -1,6 +1,6 @@
 ---
 # file: docker-compose
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 version: '3.1'
 services:

containers/docker/Dockerfile

@@ -1,13 +1,13 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 FROM oraclelinux:7-slim
 LABEL "provider"="Oracle" \
       "issues"="https://github.com/oracle/oci-designer-toolkit/issues" \
-      "version"="0.16.0" \
+      "version"="0.17.0" \
       "description"="OKIT Web Server Container." \
-      "copyright"="Copyright (c) 2020, Oracle and/or its affiliates."
+      "copyright"="Copyright (c) 2021, Oracle and/or its affiliates."
 SHELL ["/bin/bash", "-c"]
 ENV PYTHONIOENCODING=utf8 \
     PYTHONPATH=":/okit/visualiser:/okit/okitweb:/okit" \
@@ -33,7 +33,6 @@ RUN yum install -y \
         git \
         python36 \
         python3-pip \
-        git \
 #        python36-pyyaml \
 #        python36-oci-sdk \
 #        rh-nginx114 \
@@ -42,6 +41,7 @@ RUN yum install -y \
  && python3 -m pip install --upgrade pip \
 # Install required python modules
  && pip3 install --no-cache-dir \
+        authlib==0.15.3 \
         flask==1.1.1 \
         gitpython==3.1.11 \
         git-url-parse==1.2.2 \

containers/docker/docker-compose.yml

@@ -1,6 +1,6 @@
 ---
 # file: docker-compose
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 version: '3.1'
 services:

containers/docker/nginx.conf

@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # For more information on configuration, see:

containers/docker/okit_nginx.conf

@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 server {

containers/docker/run-server.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 echo "*******************************************************************"

containers/scripts/build-docker-image.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 export ROOT_DIR=$(cd $(dirname $0)/../..; pwd)

containers/scripts/start-okit-server.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 export ROOT_DIR=$(cd $(dirname $0)/../..; pwd)

containers/vagrant/Vagrantfile

@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # Vagrantfile API/syntax version.

containers/vagrant/configure_firewall.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 

containers/vagrant/configure_software.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 export PATH=/usr/local/bin:/usr/bin:${PATH}
@@ -38,13 +38,16 @@ python3 -m pip install --upgrade pip==20.0.2
 
 # Install required python modules
 pip3 install --no-cache-dir \
-      flask==1.1.1 \
-      gitpython==3.1.11 \
-      gunicorn==20.0.4 \
-      oci==2.22.0 \
-      pandas==1.1.2 \
-      python-magic==0.4.18 \
-      pyyaml==5.3.1 \
-      requests==2.24.0 \
-      xlsxwriter==1.3.6
+        authlib==0.15.3 \
+        flask==1.1.1 \
+        gitpython==3.1.11 \
+        git-url-parse==1.2.2 \
+        gunicorn==20.0.4 \
+        oci==2.22.0 \
+        openpyxl==3.0.5 \
+        pandas==1.1.2 \
+        python-magic==0.4.18 \
+        pyyaml==5.3.1 \
+        requests==2.24.0 \
+        xlsxwriter==1.3.6
 

containers/vagrant/enable_flask_service.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 source /etc/bashrc

containers/vagrant/enable_gunicorn_service.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 source /etc/bashrc

containers/vagrant/enable_nginx_service.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 source /etc/bashrc

containers/vagrant/nginx.conf

@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # For more information on configuration, see:

documentation/Development.md

@@ -68,7 +68,7 @@ INFO: Writing File: ../visualiser/facade/ociBlockStorageVolume.py
 Following generation a model file will be created in the **okitweb/static/okit/model/js/artefacts** directory as shown below.
 ```javascript
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Block Storage Volume Javascript');
@@ -160,7 +160,7 @@ any reference to it on delete. This is done by adding the deleteChildren() funct
 Following the update the model JavaScript will be modified as below:
 ```javascript
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Block Storage Volume Javascript');
@@ -259,7 +259,7 @@ OkitJson.prototype.deleteBlockStorageVolume = function(id) {
 Following generation a view file will be created in the **okitweb/static/okit/view/js/artefacts** directory as shown below.
 ```javascript
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Block Storage Volume View Javascript');
@@ -367,7 +367,7 @@ Instance it is attached to) by creating the following functions:
 Following the update the model JavaScript will be modified as below:
 ```javascript
 /*
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Block Storage Volume View Javascript');
@@ -512,7 +512,7 @@ Following the update the model JavaScript will be modified as below:
 Following generation a property sheet HTML file will be created in the **okitweb/templates/okit/propertysheets** directory as shown below.
 ```jinja2
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
@@ -532,7 +532,7 @@ worked example we will need add the following fields:
 
 ```jinja2
 <!--
-** Copyright (c) 2020, Oracle and/or its affiliates.
+** Copyright (c) 2021, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
@@ -566,7 +566,7 @@ Following generation a Python Facade file will be created in the **visualiser/fa
 ```python
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
@@ -628,7 +628,7 @@ to the correct name **self.client.list_volumes** which will result in the follow
 ```python
 #!/usr/bin/python
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
@@ -1009,5 +1009,5 @@ docker run -it --rm -p 80:80 --name okit --hostname okit \
     -v ${OKIT_GITHUB}/skeletons:/okit/skeletons \
     -v ${OKIT_GITHUB}/visualiser:/okit/visualiser \
     -v ${OKIT_WORKSPACE}/log:/okit/log \
-    -v ${OKIT_WORKSPACE}/dropdown.json:/okit/okitweb/static/okit/json/dropdown.json  okit'
+    okit
 ```

okitweb/__init__.py

@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description

okitweb/okitImport.py

@@ -20,7 +20,7 @@
 from common.okitLogging import getLogger
 from parsers.okitHclJsonParser import OkitHclJsonParser
 from parsers.okitCceJsonParser import OkitCceJsonParser
-from parsers.OkitCd3ExcelParser import OkitCd3ExcelParser
+from parsers.okitCd3ExcelParser import OkitCd3ExcelParser
 
 # Configure logging
 logger = getLogger()

okitweb/okitOci.py

@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description

okitweb/okitPricing.py

@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description

okitweb/okitWebDesigner.py

@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description

okitweb/static/okit/css/okit_console.css

@@ -1,5 +1,5 @@
 /*
-# Copyright (c) 2020, Oracle and/or its affiliates.
+# Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
 
@@ -607,6 +607,13 @@ li a.parent-item:hover {
     text-align: center;
 }
 
+.okit-tbody-alternating-colours > .tr:nth-child(odd) {
+}
+
+.okit-tbody-alternating-colours > .tr:nth-child(even) {
+    background-color: lightsteelblue;
+}
+
 .okit-properties-table {
 }