Merge pull request #84 from oracle/sprint-8

Sprint 8

CHANGELOG.md

@@ -1,6 +1,21 @@
 # Release Notes
 
 
+## Version 0.10.0 
+**Release Date**: 26th August 2020
+### Features
+1. Modify the Hamburger menu to replace the mouseover events for menu display to mouse click events.
+2. Add OKE Cluster functionality. Corrently works in a similar way to the advanced console create (OKIT-13).
+3. Add count field to instance to allow generation of X duplicate version of an instance. Save time and space creating duplicates.
+4. Add ability to specify Subnet for Autonomous Database (Issue: #76 & Issue: #81).
+5. Add OKE example fragment.
+
+### Bug Fixes
+1. Add test for existing of image_id for edge cases when it is missing from query (Issue: #79).
+2. Querying of Dynamic Routing Gateway occasionally cause console error (Issue: #80).
+3. Internet Gateways could only be created on the first subnet in a vcn (Issue: #71).
+
+
 ## Version 0.9.2 
 **Release Date**: 7th August 2020
 ### Bug Fixes

README.md

@@ -1,4 +1,4 @@
-# OCI Designer Toolkit [0.9.2](CHANGELOG.md#version-0.9.2)
+# OCI Designer Toolkit [0.10.0](CHANGELOG.md#version-0.10.0)
 
 OCI designer toolKIT (OKIT) is a set of tools for enabling design, deploy and visualise OCI environments 
 through a graphical web based interface. 

containers/docker/docker-compose.yml

@@ -2,7 +2,7 @@
 # file: docker-compose
 # Copyright (c) 2020, 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.8'
+version: '3.1'
 services:
   okit:
     build:

documentation/Installation.md

@@ -22,22 +22,22 @@ python modules are installed and in addition provide a simple flask server that
 ## Clone Repository
 Before the building either the Docker or Vagrant Images the project will nee to be cloned from the Git Repository (or downloaded)
 and it is recommended that the latest Stable Release be cloned. The latest stable version number if shown in the README
-and the associated Release tag is in the format vX.Y.Z hence for the version 0.9.2 the Release tag will be 
-**v0.9.2**. The command shows how this can be cloned to the local machine.
+and the associated Release tag is in the format vX.Y.Z hence for the version 0.10.0 the Release tag will be 
+**v0.10.0**. The command shows how this can be cloned to the local machine.
 
 ```bash
-git clone -b v0.9.2 --depth 1 git@github.com:oracle/oci-designer-toolkit.git
+git clone -b v0.10.0 --depth 1 git@github.com:oracle/oci-designer-toolkit.git
 ```
 
 or 
 
 ```bash
-git clone -b v0.9.2 --depth 1 https://github.com/oracle/oci-designer-toolkit.git
+git clone -b v0.10.0 --depth 1 https://github.com/oracle/oci-designer-toolkit.git
 ```
 
 ### Download
 If you do not have git installed locally the current release of OKIT can be retrieved by downloading it as a zip file from
-https://github.com/oracle/oci-designer-toolkit/archive/v0.9.2.zip
+https://github.com/oracle/oci-designer-toolkit/archive/v0.10.0.zip
 
 
 ## OCI Config File

okitweb/okitOci.py

@@ -29,6 +29,7 @@
 from facades.ociAutonomousDatabases import OCIAutonomousDatabases
 from facades.ociBlockStorageVolumes import OCIBlockStorageVolumes
 from facades.ociCompartment import OCICompartments
+from facades.ociContainer import OCIContainers
 from facades.ociDatabaseSystem import OCIDatabaseSystems
 from facades.ociDatabaseSystemShape import OCIDatabaseSystemShapes
 from facades.ociDatabaseVersion import OCIDatabaseVersions
@@ -253,6 +254,10 @@ def ociArtifacts(artifact):
         logger.info('---- Processing Object Storage Buckets')
         oci_object_storage_buckets = OCIObjectStorageBuckets(config=config, profile=config_profile, compartment_id=query_json['compartment_id'])
         response_json = oci_object_storage_buckets.list(filter=query_json.get('object_storage_bucket_filter', None))
+    elif artifact == 'OkeCluster':
+        logger.info('---- Processing OKE Clusters')
+        oke_clusters = OCIContainers(config=config, profile=config_profile, compartment_id=query_json['compartment_id'])
+        response_json = oke_clusters.list(filter=query_json.get('oke_cluster_filter', None))
     elif artifact == 'RouteTable':
         logger.info('---- Processing Route Tables')
         oci_route_tables = OCIRouteTables(config=config, profile=config_profile, compartment_id=query_json['compartment_id'], vcn_id=query_json['vcn_id'])

okitweb/static/okit/css/okit_console.css

@@ -103,6 +103,14 @@ textarea {
     cursor: pointer;
 }
 
+.okit-width-100 {
+    min-width: 100%;
+}
+
+.okit-bottom-margin {
+    margin-bottom: 5px;
+}
+
 /*
 ** OCI Console Classes
  */
@@ -253,7 +261,7 @@ textarea {
     z-index: 101;
     width: 100%;
     height: 100%;
-    /*background-color: rgba(37, 49, 65, 0.1);*/
+    background-color: rgba(37, 49, 65, 0.1);
     direction: rtl;
     transition: all 0.25s;
     transform: translateX(-100%);
@@ -510,7 +518,6 @@ li a.parent-item:hover {
 }
 
 .okit-properties-table {
-    margin-top: 10px;
 }
 
 .okit-properties-table > .thead > .tr > .th:first-child {
@@ -522,6 +529,23 @@ li a.parent-item:hover {
     font-weight: bold;
 }
 
+.okit-properties-table select[multiple="multiple"] > option:before {content: "☐ "}
+.okit-properties-table select[multiple="multiple"] > option:checked:before {content: "☑ "}
+.okit-multiple-select {
+    border: #253141 solid 1px;
+    min-height: 3em;
+}
+
+.okit-properties-table .okit-row-details {
+    margin-top: 0;
+    margin-bottom: 0;
+}
+
+.okit-properties-table .okit-row-details > summary {
+    margin-top: 0;
+    margin-bottom: 0;
+}
+
 .collapsed {
     visibility: collapse;
     display: none;

okitweb/static/okit/css/okit_designer.css

@@ -207,7 +207,7 @@
 }
 
 .okit-property-sheet .okit-property-value {
-
+    font-weight: normal;
 }
 
 .okit-property-sheet .okit-property-label {