From 6a20bfebba1cc206f0e4bd3ddc77eb66ba92a2a6 Mon Sep 17 00:00:00 2001 From: Andrew Hopkinson Date: Thu, 15 Jul 2021 11:12:45 +0100 Subject: [PATCH 1/4] Modify NATGateway to NatGateway --- .../okit/model/js/artefacts/nat_gateway.js | 4 ++-- .../js/artefacts/virtual_cloud_network.js | 4 ++-- okitweb/static/okit/model/js/okit_model.js | 15 ++++++------- .../static/okit/query/oci/js/okit_query.js | 4 ++-- .../view/designer/js/artefacts/fragment.js | 16 +++++++------- .../view/designer/js/artefacts/nat_gateway.js | 8 +++---- .../js/artefacts/virtual_cloud_network.js | 4 ++-- okitweb/static/okit/view/js/okit_view.js | 21 +++++++++---------- 8 files changed, 36 insertions(+), 40 deletions(-) diff --git a/okitweb/static/okit/model/js/artefacts/nat_gateway.js b/okitweb/static/okit/model/js/artefacts/nat_gateway.js index 9995b5d7b..de6024080 100644 --- a/okitweb/static/okit/model/js/artefacts/nat_gateway.js +++ b/okitweb/static/okit/model/js/artefacts/nat_gateway.js @@ -7,7 +7,7 @@ console.info('Loaded NAT Gateway Javascript'); /* ** Define NAT Gateway Class */ -class NATGateway extends OkitArtifact { +class NatGateway extends OkitArtifact { /* ** Create */ @@ -28,7 +28,7 @@ class NATGateway extends OkitArtifact { ** Clone Functionality */ clone() { - return new NATGateway(JSON.clone(this), this.getOkitJson()); + return new NatGateway(JSON.clone(this), this.getOkitJson()); } diff --git a/okitweb/static/okit/model/js/artefacts/virtual_cloud_network.js b/okitweb/static/okit/model/js/artefacts/virtual_cloud_network.js index ed821bd02..7000f5051 100644 --- a/okitweb/static/okit/model/js/artefacts/virtual_cloud_network.js +++ b/okitweb/static/okit/model/js/artefacts/virtual_cloud_network.js @@ -159,7 +159,7 @@ class VirtualCloudNetwork extends OkitArtifact { // Internet Gateways gateways.push(...this.getInternetGateways()); // NAT Gateways - gateways.push(...this.getNATGateways()); + gateways.push(...this.getNatGateways()); // Local Peering Gateways gateways.push(...this.getLocalPeeringGateways()); // Service Gateways @@ -180,7 +180,7 @@ class VirtualCloudNetwork extends OkitArtifact { return gateways; } - getNATGateways() { + getNatGateways() { let gateways = []; // NAT Gateways for (let gateway of this.getOkitJson().nat_gateways) { diff --git a/okitweb/static/okit/model/js/okit_model.js b/okitweb/static/okit/model/js/okit_model.js index 2e2a0e606..47679b557 100644 --- a/okitweb/static/okit/model/js/okit_model.js +++ b/okitweb/static/okit/model/js/okit_model.js @@ -192,7 +192,7 @@ class OkitJson { // NAT Gateway if (okit_json.hasOwnProperty('nat_gateways')) { for (let artefact of okit_json['nat_gateways']) { - let obj = this.newNATGateway(artefact); + let obj = this.newNatGateway(artefact); } } // Route Tables @@ -740,24 +740,21 @@ class OkitJson { } // NAT Gateway - newNatGateway(data) {return this.newNATGateway(data)} - newNATGateway(data) { + newNatGateway(data) { console.info('New NAT Gateway'); - this.nat_gateways.push(new NATGateway(data, this)); + this.nat_gateways.push(new NatGateway(data, this)); return this.nat_gateways[this.nat_gateways.length - 1]; } getNatGateways() {return this.nat_gateways;} - getNatGateway(id='') {return this.getNATGateway(id)} - getNATGateways() {return this.nat_gateways;} - getNATGateway(id='') { - for (let artefact of this.getNATGateways()) { + getNatGateway(id='') { + for (let artefact of this.getNatGateways()) { if (artefact.id === id) { return artefact; } } return undefined; } - deleteNATGateway(id) { + deleteNatGateway(id) { for (let i = 0; i < this.nat_gateways.length; i++) { if (this.nat_gateways[i].id === id) { this.nat_gateways[i].delete(); diff --git a/okitweb/static/okit/query/oci/js/okit_query.js b/okitweb/static/okit/query/oci/js/okit_query.js index 64a23de88..613b86bd3 100644 --- a/okitweb/static/okit/query/oci/js/okit_query.js +++ b/okitweb/static/okit/query/oci/js/okit_query.js @@ -685,7 +685,7 @@ class OkitOCIQuery { }); } - queryNATGateways(request) { + queryNatGateways(request) { console.info('------------- NAT Gateway Query --------------------'); console.info('------------- Compartment : ' + request.compartment_id); console.info('------------- Virtual Cloud Network : ' + request.vcn_id); @@ -965,7 +965,7 @@ class OkitOCIQuery { } queryVirtualCLoudNetworkSubComponents(request) { this.queryInternetGateways(request); - this.queryNATGateways(request); + this.queryNatGateways(request); this.queryNetworkSecurityGroups(request); this.queryServiceGateways(request); this.queryLocalPeeringGateways(request); diff --git a/okitweb/static/okit/view/designer/js/artefacts/fragment.js b/okitweb/static/okit/view/designer/js/artefacts/fragment.js index 085212e6d..975949635 100644 --- a/okitweb/static/okit/view/designer/js/artefacts/fragment.js +++ b/okitweb/static/okit/view/designer/js/artefacts/fragment.js @@ -79,7 +79,7 @@ class FragmentView extends OkitContainerDesignerArtefactView { this.mergeInternetGateways(root_compartment_id); this.mergeLoadBalancers(root_compartment_id); this.mergeLocalPeeringGateways(root_compartment_id); - this.mergeNATGateways(root_compartment_id); + this.mergeNatGateways(root_compartment_id); this.mergeNetworkSecurityGroups(root_compartment_id); this.mergeObjectStorageBuckets(root_compartment_id); this.mergeOkeClusters(root_compartment_id); @@ -108,7 +108,7 @@ class FragmentView extends OkitContainerDesignerArtefactView { this.mergeInternetGateways(root_compartment_id, root_vcn_id); this.mergeLoadBalancers(root_compartment_id, root_vcn_id); this.mergeLocalPeeringGateways(root_compartment_id, root_vcn_id); - this.mergeNATGateways(root_compartment_id, root_vcn_id); + this.mergeNatGateways(root_compartment_id, root_vcn_id); this.mergeNetworkSecurityGroups(root_compartment_id, root_vcn_id); this.mergeOkeClusters(root_compartment_id, root_vcn_id); this.mergeSecurityLists(root_compartment_id, root_vcn_id); @@ -317,21 +317,21 @@ class FragmentView extends OkitContainerDesignerArtefactView { } } - mergeNATGateways(root_compartment_id, root_vcn_id = null) { - for (let artefact of this.artefact.getNATGateways()) { + mergeNatGateways(root_compartment_id, root_vcn_id = null) { + for (let artefact of this.artefact.getNatGateways()) { // Remove existing reference to fragment OKIT Json so it can be replaced with the Json View version. delete artefact.getOkitJson; if (artefact.vcn_id === root_vcn_id) { - let clone = this.json_view.getOkitJson().newNATGateway(artefact); + let clone = this.json_view.getOkitJson().newNatGateway(artefact); clone.vcn_id = this.target_id; clone.compartment_id = this.json_view.getOkitJson().getVirtualCloudNetwork(this.target_id).compartment_id; - this.json_view.newNATGateway(clone); + this.json_view.newNatGateway(clone); } else { - let clone = this.json_view.getOkitJson().newNATGateway(artefact); + let clone = this.json_view.getOkitJson().newNatGateway(artefact); if (clone.compartment_id === root_compartment_id) { clone.compartment_id = this.target_id; } - this.json_view.newNATGateway(clone); + this.json_view.newNatGateway(clone); } } } diff --git a/okitweb/static/okit/view/designer/js/artefacts/nat_gateway.js b/okitweb/static/okit/view/designer/js/artefacts/nat_gateway.js index d27215c86..0fcb12ba6 100644 --- a/okitweb/static/okit/view/designer/js/artefacts/nat_gateway.js +++ b/okitweb/static/okit/view/designer/js/artefacts/nat_gateway.js @@ -2,12 +2,12 @@ ** Copyright (c) 2020, 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 Designer NATGateway View Javascript'); +console.info('Loaded Designer NatGateway View Javascript'); /* -** Define NATGateway View Artifact Class +** Define NatGateway View Artifact Class */ -class NATGatewayView extends OkitDesignerArtefactView { +class NatGatewayView extends OkitDesignerArtefactView { constructor(artefact=null, json_view) { super(artefact, json_view); } @@ -41,7 +41,7 @@ class NATGatewayView extends OkitDesignerArtefactView { ** Static Functionality */ static getArtifactReference() { - return NATGateway.getArtifactReference(); + return NatGateway.getArtifactReference(); } static getDropTargets() { diff --git a/okitweb/static/okit/view/designer/js/artefacts/virtual_cloud_network.js b/okitweb/static/okit/view/designer/js/artefacts/virtual_cloud_network.js index 4c16d44a8..21ed3c867 100644 --- a/okitweb/static/okit/view/designer/js/artefacts/virtual_cloud_network.js +++ b/okitweb/static/okit/view/designer/js/artefacts/virtual_cloud_network.js @@ -15,7 +15,7 @@ class VirtualCloudNetworkView extends OkitContainerDesignerArtefactView { get parent_id() {return this.artefact.compartment_id;} get parent() {return this.getJsonView().getCompartment(this.parent_id);} get children() {return [...this.json_view.getSubnets(), ...this.json_view.getInternetGateways(), - ...this.json_view.getNATGateways(), ...this.json_view.getRouteTables(), ...this.json_view.getSecurityLists(), ...this.json_view.getDhcpOptions(), + ...this.json_view.getNatGateways(), ...this.json_view.getRouteTables(), ...this.json_view.getSecurityLists(), ...this.json_view.getDhcpOptions(), ...this.json_view.getNetworkSecurityGroups(), ...this.json_view.getServiceGateways(), ...this.json_view.getDynamicRoutingGateways(), ...this.json_view.getLocalPeeringGateways(), ...this.json_view.getOkeClusters()].filter(child => child.parent_id === this.artefact.id);} @@ -68,7 +68,7 @@ class VirtualCloudNetworkView extends OkitContainerDesignerArtefactView { ** Child Artifact Functions */ getTopEdgeArtifacts() { - return [InternetGateway.getArtifactReference(), NATGateway.getArtifactReference()]; + return [InternetGateway.getArtifactReference(), NatGateway.getArtifactReference()]; } getTopArtifacts() { diff --git a/okitweb/static/okit/view/js/okit_view.js b/okitweb/static/okit/view/js/okit_view.js index 858860b30..092b1d463 100644 --- a/okitweb/static/okit/view/js/okit_view.js +++ b/okitweb/static/okit/view/js/okit_view.js @@ -124,7 +124,7 @@ class OkitJsonView { for (let artefact of this.okitjson.load_balancers) {this.newLoadBalancer(artefact);} for (let artefact of this.okitjson.local_peering_gateways) {this.newLocalPeeringGateway(artefact);} for (let artefact of this.okitjson.mysql_database_systems) {this.newMySQLDatabaseSystem(artefact);} - for (let artefact of this.okitjson.nat_gateways) {this.newNATGateway(artefact);} + for (let artefact of this.okitjson.nat_gateways) {this.newNatGateway(artefact);} for (let artefact of this.okitjson.network_security_groups) {this.newNetworkSecurityGroup(artefact);} for (let artefact of this.okitjson.object_storage_buckets) {this.newObjectStorageBucket(artefact);} for (let artefact of this.okitjson.oke_clusters) {this.newOkeCluster(artefact);} @@ -627,7 +627,7 @@ class OkitJsonView { } // NAT Gateway - dropNATGatewayView(target) { + dropNatGatewayView(target) { // Check if Gateway Already exists for (let gateway of this.nat_gateways) { if (gateway.vcn_id === target.id) { @@ -635,35 +635,34 @@ class OkitJsonView { return null; } } - let view_artefact = this.newNATGateway(); + let view_artefact = this.newNatGateway(); view_artefact.getArtefact().vcn_id = target.id; view_artefact.getArtefact().compartment_id = target.compartment_id; view_artefact.recalculate_dimensions = true; return view_artefact; } - newNatGateway(gateway) {return this.newNATGateway(gateway)} - newNATGateway(gateway) { - let ng = gateway ? new NATGatewayView(gateway, this) : new NATGatewayView(this.okitjson.newNATGateway(), this); + newNatGateway(gateway) { + let ng = gateway ? new NatGatewayView(gateway, this) : new NatGatewayView(this.okitjson.newNatGateway(), this); if (ng.artefact === null) { return null; } this.nat_gateways.push(ng); return this.nat_gateways[this.nat_gateways.length - 1]; } - getNATGateways() { + getNatGateways() { return this.nat_gateways; } - getNATGateway(id='') { - for (let artefact of this.getNATGateways()) { + getNatGateway(id='') { + for (let artefact of this.getNatGateways()) { if (artefact.id === id) { return artefact; } } return undefined; } - loadNATGateways(nat_gateways) { + loadNatGateways(nat_gateways) { for (const artefact of nat_gateways) { - this.nat_gateways.push(new NATGatewayView(new NATGateway(artefact, this.okitjson), this)); + this.nat_gateways.push(new NatGatewayView(new NatGateway(artefact, this.okitjson), this)); } } From b2a608773232aa80149e62c6567bea276e311dc8 Mon Sep 17 00:00:00 2001 From: Andrew Hopkinson Date: Thu, 15 Jul 2021 11:19:18 +0100 Subject: [PATCH 2/4] Change MySQLDatabase to MysqlDatabase --- .../js/artefacts/mysql_database_system.js | 4 ++-- okitweb/static/okit/model/js/okit_model.js | 15 ++++++------- .../static/okit/query/oci/js/okit_query.js | 4 ++-- .../js/artefacts/mysql_database_system.js | 8 +++---- .../okit/view/designer/js/artefacts/subnet.js | 4 ++-- okitweb/static/okit/view/js/okit_view.js | 21 +++++++++---------- 6 files changed, 26 insertions(+), 30 deletions(-) diff --git a/okitweb/static/okit/model/js/artefacts/mysql_database_system.js b/okitweb/static/okit/model/js/artefacts/mysql_database_system.js index 096a71f8a..ef7231eae 100644 --- a/okitweb/static/okit/model/js/artefacts/mysql_database_system.js +++ b/okitweb/static/okit/model/js/artefacts/mysql_database_system.js @@ -7,7 +7,7 @@ console.info('Loaded Database System Javascript'); /* ** Define Autonomous Database Class */ -class MySQLDatabaseSystem extends OkitArtifact { +class MysqlDatabaseSystem extends OkitArtifact { /* ** Create */ @@ -45,7 +45,7 @@ class MySQLDatabaseSystem extends OkitArtifact { ** Clone Functionality */ clone() { - return new MySQLDatabaseSystem(JSON.clone(this), this.getOkitJson()); + return new MysqlDatabaseSystem(JSON.clone(this), this.getOkitJson()); } diff --git a/okitweb/static/okit/model/js/okit_model.js b/okitweb/static/okit/model/js/okit_model.js index 47679b557..bac5da2ec 100644 --- a/okitweb/static/okit/model/js/okit_model.js +++ b/okitweb/static/okit/model/js/okit_model.js @@ -254,7 +254,7 @@ class OkitJson { // MySQL Database Systems if (okit_json.hasOwnProperty('mysql_database_systems')) { for (let artefact of okit_json['mysql_database_systems']) { - let obj = this.newMySQLDatabaseSystem(artefact); + let obj = this.newMysqlDatabaseSystem(artefact); } } // Instances @@ -712,24 +712,21 @@ class OkitJson { } // MySQL Database System - newMysqlDatabaseSystem(data) {return this.newMySQLDatabaseSystem(data)} - newMySQLDatabaseSystem(data) { + newMysqlDatabaseSystem(data) { console.info('New MySQL Database System'); - this.mysql_database_systems.push(new MySQLDatabaseSystem(data, this)); + this.mysql_database_systems.push(new MysqlDatabaseSystem(data, this)); return this.mysql_database_systems[this.mysql_database_systems.length - 1]; } getMysqlDatabaseSystems() {return this.mysql_database_systems;} - getMysqlDatabaseSystem(id='') {return this.getMySQLDatabaseSystem(id)} - getMySQLDatabaseSystems() {return this.mysql_database_systems;} - getMySQLDatabaseSystem(id='') { - for (let artefact of this.getMySQLDatabaseSystems()) { + getMysqlDatabaseSystem(id='') { + for (let artefact of this.getMysqlDatabaseSystems()) { if (artefact.id === id) { return artefact; } } return undefined; } - deleteMySQLDatabaseSystem(id) { + deleteMysqlDatabaseSystem(id) { for (let i = 0; i < this.mysql_database_systems.length; i++) { if (this.mysql_database_systems[i].id === id) { this.mysql_database_systems[i].delete(); diff --git a/okitweb/static/okit/query/oci/js/okit_query.js b/okitweb/static/okit/query/oci/js/okit_query.js index 613b86bd3..790b653d3 100644 --- a/okitweb/static/okit/query/oci/js/okit_query.js +++ b/okitweb/static/okit/query/oci/js/okit_query.js @@ -241,7 +241,7 @@ class OkitOCIQuery { this.queryIPSecConnections(request); this.queryRemotePeeringConnections(request); this.queryDatabaseSystems(request); - this.queryMySQLDatabaseSystems(request); + this.queryMysqlDatabaseSystems(request); this.queryFileStorageSystems(request); this.queryOkeClusters(request); } @@ -659,7 +659,7 @@ class OkitOCIQuery { }); } - queryMySQLDatabaseSystems(request) { + queryMysqlDatabaseSystems(request) { console.info('------------- Autonomous Database Query --------------------'); console.info('------------- Compartment : ' + request.compartment_id); let me = this; diff --git a/okitweb/static/okit/view/designer/js/artefacts/mysql_database_system.js b/okitweb/static/okit/view/designer/js/artefacts/mysql_database_system.js index e21844588..61fa61254 100644 --- a/okitweb/static/okit/view/designer/js/artefacts/mysql_database_system.js +++ b/okitweb/static/okit/view/designer/js/artefacts/mysql_database_system.js @@ -2,12 +2,12 @@ ** Copyright (c) 2020, 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 Designer MySQLDatabaseSystem View Javascript'); +console.info('Loaded Designer MysqlDatabaseSystem View Javascript'); /* -** Define MySQLDatabaseSystem View Artifact Class +** Define MysqlDatabaseSystem View Artifact Class */ -class MySQLDatabaseSystemView extends OkitDesignerArtefactView { +class MysqlDatabaseSystemView extends OkitDesignerArtefactView { constructor(artefact=null, json_view) { super(artefact, json_view); } @@ -69,7 +69,7 @@ class MySQLDatabaseSystemView extends OkitDesignerArtefactView { ** Static Functionality */ static getArtifactReference() { - return MySQLDatabaseSystem.getArtifactReference(); + return MysqlDatabaseSystem.getArtifactReference(); } static getDropTargets() { diff --git a/okitweb/static/okit/view/designer/js/artefacts/subnet.js b/okitweb/static/okit/view/designer/js/artefacts/subnet.js index 39e046c70..9c7c75383 100644 --- a/okitweb/static/okit/view/designer/js/artefacts/subnet.js +++ b/okitweb/static/okit/view/designer/js/artefacts/subnet.js @@ -25,7 +25,7 @@ class SubnetView extends OkitContainerDesignerArtefactView { get parent() {return this.getJsonView().getVirtualCloudNetwork(this.parent_id) ? this.getJsonView().getVirtualCloudNetwork(this.parent_id) : this.getJsonView().getCompartment(this.parent_id);} get children() {return [...this.json_view.getInstances(), ...this.json_view.getLoadBalancers(), ...this.json_view.getFileStorageSystems(), ...this.json_view.getAutonomousDatabases(), - ...this.json_view.getDatabaseSystems(), ...this.json_view.getMySQLDatabaseSystems()].filter(child => child.parent_id === this.artefact.id);} + ...this.json_view.getDatabaseSystems(), ...this.json_view.getMysqlDatabaseSystems()].filter(child => child.parent_id === this.artefact.id);} get type_text() {return this.prohibit_public_ip_on_vnic ? `Private ${this.getArtifactReference()}` : `Public ${this.getArtifactReference()}`;} get info_text() {return this.artefact.cidr_block;} get summary_tooltip() {return `Name: ${this.display_name} \nCIDR: ${this.artefact.cidr_block} \nDNS: ${this.artefact.dns_label}`;} @@ -163,7 +163,7 @@ class SubnetView extends OkitContainerDesignerArtefactView { getBottomArtifacts() { return [Instance.getArtifactReference(), InstancePool.getArtifactReference(), DatabaseSystem.getArtifactReference(), - AutonomousDatabase.getArtifactReference(), MySQLDatabaseSystem.getArtifactReference(), AnalyticsInstance.getArtifactReference()]; + AutonomousDatabase.getArtifactReference(), MysqlDatabaseSystem.getArtifactReference(), AnalyticsInstance.getArtifactReference()]; } getLeftArtifacts() { diff --git a/okitweb/static/okit/view/js/okit_view.js b/okitweb/static/okit/view/js/okit_view.js index 092b1d463..3c1319f50 100644 --- a/okitweb/static/okit/view/js/okit_view.js +++ b/okitweb/static/okit/view/js/okit_view.js @@ -123,7 +123,7 @@ class OkitJsonView { for (let artefact of this.okitjson.ipsec_connections) {this.newIPSecConnection(artefact);} for (let artefact of this.okitjson.load_balancers) {this.newLoadBalancer(artefact);} for (let artefact of this.okitjson.local_peering_gateways) {this.newLocalPeeringGateway(artefact);} - for (let artefact of this.okitjson.mysql_database_systems) {this.newMySQLDatabaseSystem(artefact);} + for (let artefact of this.okitjson.mysql_database_systems) {this.newMysqlDatabaseSystem(artefact);} for (let artefact of this.okitjson.nat_gateways) {this.newNatGateway(artefact);} for (let artefact of this.okitjson.network_security_groups) {this.newNetworkSecurityGroup(artefact);} for (let artefact of this.okitjson.object_storage_buckets) {this.newObjectStorageBucket(artefact);} @@ -597,32 +597,31 @@ class OkitJsonView { } // MySQL Database System - dropMySQLDatabaseSystemView(target) { - let view_artefact = this.newMySQLDatabaseSystem(); + dropMysqlDatabaseSystemView(target) { + let view_artefact = this.newMysqlDatabaseSystem(); view_artefact.getArtefact().subnet_id = target.id; view_artefact.getArtefact().compartment_id = target.compartment_id; view_artefact.recalculate_dimensions = true; return view_artefact; } - newMysqlDatabaseSystem(database) {return this.newMySQLDatabaseSystem(database)} - newMySQLDatabaseSystem(database) { - this.mysql_database_systems.push(database ? new MySQLDatabaseSystemView(database, this) : new MySQLDatabaseSystemView(this.okitjson.newMySQLDatabaseSystem(), this)); + newMysqlDatabaseSystem(database) { + this.mysql_database_systems.push(database ? new MysqlDatabaseSystemView(database, this) : new MysqlDatabaseSystemView(this.okitjson.newMysqlDatabaseSystem(), this)); return this.mysql_database_systems[this.mysql_database_systems.length - 1]; } - getMySQLDatabaseSystems() { + getMysqlDatabaseSystems() { return this.mysql_database_systems; } - getMySQLDatabaseSystem(id='') { - for (let artefact of this.getMySQLDatabaseSystems()) { + getMysqlDatabaseSystem(id='') { + for (let artefact of this.getMysqlDatabaseSystems()) { if (artefact.id === id) { return artefact; } } return undefined; } - loadMySQLDatabaseSystems(database_systems) { + loadMysqlDatabaseSystems(database_systems) { for (const artefact of database_systems) { - this.mysql_database_systems.push(new MySQLDatabaseSystemView(new MySQLDatabaseSystem(artefact, this.okitjson), this)); + this.mysql_database_systems.push(new MysqlDatabaseSystemView(new MysqlDatabaseSystem(artefact, this.okitjson), this)); } } From b4a25fd23b17cd452729e0d3803aa4885b3bb24c Mon Sep 17 00:00:00 2001 From: Andrew Hopkinson Date: Thu, 15 Jul 2021 11:27:02 +0100 Subject: [PATCH 3/4] Change IPSecConnection to IpsecConnection --- CHANGELOG.md | 8 +++++++ .../model/js/artefacts/ipsec_connection.js | 6 +++--- okitweb/static/okit/model/js/okit_model.js | 15 ++++++------- .../static/okit/query/oci/js/okit_query.js | 4 ++-- .../view/designer/js/artefacts/compartment.js | 4 ++-- .../designer/js/artefacts/ipsec_connection.js | 8 +++---- okitweb/static/okit/view/js/okit_view.js | 21 +++++++++---------- 7 files changed, 35 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6deac6717..30f14d62c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ # Release Notes +## Version 0.24.4 +**Release Date**: 15th July 2021 +### Bug Fixes +1. Resolve issue with dropping NAT Gateways on canvas +2. Resolve issue with Dropping MySQL Database Systems on canvas +3. Resolve issue with dropping IPSec Connection on canvas + + ## Version 0.24.3 **Release Date**: 13th July 2021 ### Bug Fixes diff --git a/okitweb/static/okit/model/js/artefacts/ipsec_connection.js b/okitweb/static/okit/model/js/artefacts/ipsec_connection.js index d8d7a399c..9314ff70b 100644 --- a/okitweb/static/okit/model/js/artefacts/ipsec_connection.js +++ b/okitweb/static/okit/model/js/artefacts/ipsec_connection.js @@ -2,12 +2,12 @@ ** Copyright (c) 2020, 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 IPSecConnection Javascript'); +console.info('Loaded IpsecConnection Javascript'); /* ** Define Block Storage Volume Class */ -class IPSecConnection extends OkitArtifact { +class IpsecConnection extends OkitArtifact { /* ** Create */ @@ -31,7 +31,7 @@ class IPSecConnection extends OkitArtifact { ** Clone Functionality */ clone() { - return new IPSecConnection(JSON.clone(this), this.getOkitJson()); + return new IpsecConnection(JSON.clone(this), this.getOkitJson()); } diff --git a/okitweb/static/okit/model/js/okit_model.js b/okitweb/static/okit/model/js/okit_model.js index bac5da2ec..564881dc9 100644 --- a/okitweb/static/okit/model/js/okit_model.js +++ b/okitweb/static/okit/model/js/okit_model.js @@ -172,7 +172,7 @@ class OkitJson { // IPSec Connections if (okit_json.hasOwnProperty('ipsec_connections')) { for (let artefact of okit_json['ipsec_connections']) { - let obj = this.newIPSecConnection(artefact); + let obj = this.newIpsecConnection(artefact); } } // RemotePeering Connections @@ -630,24 +630,21 @@ class OkitJson { } // IPSec Connection - newIpsecConnection(data) {return this.newIPSecConnection(data)} - newIPSecConnection(data) { + newIpsecConnection(data) { console.info('New IPSec Connection'); - this.ipsec_connections.push(new IPSecConnection(data, this)); + this.ipsec_connections.push(new IpsecConnection(data, this)); return this.ipsec_connections[this.ipsec_connections.length - 1]; } getIpsecConnections() {return this.ipsec_connections;} - getIpsecConnection(id='') {return this.getIPSecConnection(id)} - getIPSecConnections() {return this.ipsec_connections;} - getIPSecConnection(id='') { - for (let artefact of this.getIPSecConnections()) { + getIpsecConnection(id='') { + for (let artefact of this.getIpsecConnections()) { if (artefact.id === id) { return artefact; } } return undefined; } - deleteIPSecConnection(id) { + deleteIpsecConnection(id) { for (let i = 0; i < this.ipsec_connections.length; i++) { if (this.ipsec_connections[i].id === id) { this.ipsec_connections[i].delete(); diff --git a/okitweb/static/okit/query/oci/js/okit_query.js b/okitweb/static/okit/query/oci/js/okit_query.js index 790b653d3..aa6504660 100644 --- a/okitweb/static/okit/query/oci/js/okit_query.js +++ b/okitweb/static/okit/query/oci/js/okit_query.js @@ -238,7 +238,7 @@ class OkitOCIQuery { this.queryFastConnects(request); this.queryInstances(request); this.queryInstancePools(request); - this.queryIPSecConnections(request); + this.queryIpsecConnections(request); this.queryRemotePeeringConnections(request); this.queryDatabaseSystems(request); this.queryMysqlDatabaseSystems(request); @@ -579,7 +579,7 @@ class OkitOCIQuery { }); } - queryIPSecConnections(request) { + queryIpsecConnections(request) { console.info('------------- Autonomous IPSec Connection Query --------------------'); console.info('------------- Compartment : ' + request.compartment_id); let me = this; diff --git a/okitweb/static/okit/view/designer/js/artefacts/compartment.js b/okitweb/static/okit/view/designer/js/artefacts/compartment.js index 4617d6549..42c14eb44 100644 --- a/okitweb/static/okit/view/designer/js/artefacts/compartment.js +++ b/okitweb/static/okit/view/designer/js/artefacts/compartment.js @@ -24,7 +24,7 @@ class CompartmentView extends OkitContainerDesignerArtefactView { ...this.json_view.getBlockStorageVolumes(), ...this.json_view.getDynamicRoutingGateways(), ...this.json_view.getAutonomousDatabases(), ...this.json_view.getCustomerPremiseEquipments(), ...this.json_view.getObjectStorageBuckets(), ...this.json_view.getFastConnects(), - ...this.json_view.getIPSecConnections(), ...this.json_view.getRemotePeeringConnections(), + ...this.json_view.getIpsecConnections(), ...this.json_view.getRemotePeeringConnections(), ...this.json_view.getInstances()].filter(child => child.parent_id === this.artefact.id);} get minimum_dimensions() { if (this.isTopLevel()) { @@ -88,7 +88,7 @@ class CompartmentView extends OkitContainerDesignerArtefactView { getRightArtifacts() { return [DynamicRoutingGateway.getArtifactReference(), AutonomousDatabase.getArtifactReference(), ObjectStorageBucket.getArtifactReference(), FastConnect.getArtifactReference(), - IPSecConnection.getArtifactReference(), RemotePeeringConnection.getArtifactReference()]; + IpsecConnection.getArtifactReference(), RemotePeeringConnection.getArtifactReference()]; } getRightEdgeArtifacts() { diff --git a/okitweb/static/okit/view/designer/js/artefacts/ipsec_connection.js b/okitweb/static/okit/view/designer/js/artefacts/ipsec_connection.js index 0480f232a..af88ac0d6 100644 --- a/okitweb/static/okit/view/designer/js/artefacts/ipsec_connection.js +++ b/okitweb/static/okit/view/designer/js/artefacts/ipsec_connection.js @@ -2,12 +2,12 @@ ** Copyright (c) 2020, 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 Designer IPSecConnection View Javascript'); +console.info('Loaded Designer IpsecConnection View Javascript'); /* -** Define IPSecConnection View Artifact Class +** Define IpsecConnection View Artifact Class */ -class IPSecConnectionView extends OkitDesignerArtefactView { +class IpsecConnectionView extends OkitDesignerArtefactView { constructor(artefact=null, json_view) { super(artefact, json_view); } @@ -65,7 +65,7 @@ class IPSecConnectionView extends OkitDesignerArtefactView { ** Static Functionality */ static getArtifactReference() { - return IPSecConnection.getArtifactReference(); + return IpsecConnection.getArtifactReference(); } static getDropTargets() { diff --git a/okitweb/static/okit/view/js/okit_view.js b/okitweb/static/okit/view/js/okit_view.js index 3c1319f50..31af5c6d8 100644 --- a/okitweb/static/okit/view/js/okit_view.js +++ b/okitweb/static/okit/view/js/okit_view.js @@ -120,7 +120,7 @@ class OkitJsonView { for (let artefact of this.okitjson.instances) {this.newInstance(artefact);} for (let artefact of this.okitjson.instance_pools) {this.newInstancePool(artefact);} for (let artefact of this.okitjson.internet_gateways) {this.newInternetGateway(artefact);} - for (let artefact of this.okitjson.ipsec_connections) {this.newIPSecConnection(artefact);} + for (let artefact of this.okitjson.ipsec_connections) {this.newIpsecConnection(artefact);} for (let artefact of this.okitjson.load_balancers) {this.newLoadBalancer(artefact);} for (let artefact of this.okitjson.local_peering_gateways) {this.newLocalPeeringGateway(artefact);} for (let artefact of this.okitjson.mysql_database_systems) {this.newMysqlDatabaseSystem(artefact);} @@ -510,31 +510,30 @@ class OkitJsonView { } // IPSec Connection - dropIPSecConnectionView(target) { - let view_artefact = this.newIPSecConnection(); + dropIpsecConnectionView(target) { + let view_artefact = this.newIpsecConnection(); view_artefact.getArtefact().compartment_id = target.id; view_artefact.recalculate_dimensions = true; return view_artefact; } - newIpsecConnection(connect) {return this.newIPSecConnection(connect)} - newIPSecConnection(connect) { - this.ipsec_connections.push(connect ? new IPSecConnectionView(connect, this) : new IPSecConnectionView(this.okitjson.newIPSecConnection(), this)); + newIpsecConnection(connect) { + this.ipsec_connections.push(connect ? new IpsecConnectionView(connect, this) : new IpsecConnectionView(this.okitjson.newIpsecConnection(), this)); return this.ipsec_connections[this.ipsec_connections.length - 1]; } - getIPSecConnections() { + getIpsecConnections() { return this.ipsec_connections; } - getIPSecConnection(id='') { - for (let artefact of this.getIPSecConnections()) { + getIpsecConnection(id='') { + for (let artefact of this.getIpsecConnections()) { if (artefact.id === id) { return artefact; } } return undefined; } - loadIPSecConnections(fast_connects) { + loadIpsecConnections(fast_connects) { for (const artefact of fast_connects) { - this.ipsec_connections.push(new IPSecConnectionView(new IPSecConnection(artefact, this.okitjson), this)); + this.ipsec_connections.push(new IpsecConnectionView(new IpsecConnection(artefact, this.okitjson), this)); } } From 0baba07d3520d9b8a8ad6deb6809c571b4e2d2fc Mon Sep 17 00:00:00 2001 From: Andrew Hopkinson Date: Thu, 15 Jul 2021 11:30:14 +0100 Subject: [PATCH 4/4] Update Version Number --- Dockerfile | 2 +- README.md | 2 +- containers/docker/Dockerfile | 2 +- okitweb/package.json | 2 +- okitweb/static/okit/js/okit_console.js | 4 ++-- okitweb/static/okit/json/release.json | 4 ++-- visualiser/facades/ociConnection.py | 2 +- visualiser/generators/okitGenerator.py | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5112e58fe..cb0711fae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ FROM oraclelinux:7-slim LABEL "provider"="Oracle" \ "issues"="https://github.com/oracle/oci-designer-toolkit/issues" \ - "version"="0.24.3" \ + "version"="0.24.4" \ "description"="OKIT Web Server Container." \ "copyright"="Copyright (c) 2020, 2021, Oracle and/or its affiliates." SHELL ["/bin/bash", "-c"] diff --git a/README.md b/README.md index beda429e1..30f2267ba 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Oracle Cloud Infrastructure Designer and Visualisation Toolkit [0.24.3](CHANGELOG.md#version-0.24.3) +# Oracle Cloud Infrastructure Designer and Visualisation Toolkit [0.24.4](CHANGELOG.md#version-0.24.4) 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)) diff --git a/containers/docker/Dockerfile b/containers/docker/Dockerfile index 20268935b..241b7bd26 100644 --- a/containers/docker/Dockerfile +++ b/containers/docker/Dockerfile @@ -5,7 +5,7 @@ FROM oraclelinux:7-slim LABEL "provider"="Oracle" \ "issues"="https://github.com/oracle/oci-designer-toolkit/issues" \ - "version"="0.24.3" \ + "version"="0.24.4" \ "description"="OKIT Web Server Container." \ "copyright"="Copyright (c) 2020, 2021, Oracle and/or its affiliates." SHELL ["/bin/bash", "-c"] diff --git a/okitweb/package.json b/okitweb/package.json index 052df7b61..ad5178b9e 100644 --- a/okitweb/package.json +++ b/okitweb/package.json @@ -1,6 +1,6 @@ { "name": "okitweb", - "version": "0.24.3", + "version": "0.24.4", "description": "OKIT Web application", "scripts": {}, "author": "Oracle", diff --git a/okitweb/static/okit/js/okit_console.js b/okitweb/static/okit/js/okit_console.js index 58c169652..5ef489f42 100644 --- a/okitweb/static/okit/js/okit_console.js +++ b/okitweb/static/okit/js/okit_console.js @@ -4,8 +4,8 @@ */ console.info('Loaded Console Javascript'); -const okitVersion = '0.24.3'; -const okitReleaseDate = '13th July 2021'; +const okitVersion = '0.24.4'; +const okitReleaseDate = '15th July 2021'; // Validation const validate_error_colour = "#ff4d4d"; const validate_warning_colour = "#ffd633"; diff --git a/okitweb/static/okit/json/release.json b/okitweb/static/okit/json/release.json index ab49f94b4..3e3062c05 100644 --- a/okitweb/static/okit/json/release.json +++ b/okitweb/static/okit/json/release.json @@ -1,4 +1,4 @@ { - "release": "0.24.3", - "tag": "v0.24.3" + "release": "0.24.4", + "tag": "v0.24.4" } \ No newline at end of file diff --git a/visualiser/facades/ociConnection.py b/visualiser/facades/ociConnection.py index b284311e7..9b78a769f 100644 --- a/visualiser/facades/ociConnection.py +++ b/visualiser/facades/ociConnection.py @@ -25,7 +25,7 @@ class OCIConnection(object): PAGINATION_LIMIT = 1000 - OKIT_VERSION = 'v0.24.3' + OKIT_VERSION = 'v0.24.4' def __init__(self, config=None, configfile=None, profile=None, region=None): self.tenancy_ocid = '' diff --git a/visualiser/generators/okitGenerator.py b/visualiser/generators/okitGenerator.py index d79070aa6..8828e8851 100644 --- a/visualiser/generators/okitGenerator.py +++ b/visualiser/generators/okitGenerator.py @@ -57,7 +57,7 @@ def initialiseJinja2Variables(self): # -- Add Standard Author / Copyright variables self.jinja2_variables["author"] = __author__ self.jinja2_variables["copyright"] = __copyright__ - self.jinja2_variables["okit_version"] = "0.24.3" + self.jinja2_variables["okit_version"] = "0.24.4" def get(self, artifact_type, id): artifact = {};