public inbox for [email protected]
help / color / mirror / Atom feed[pgAdmin4][Patch] - BigAnimal Fixes
2+ messages / 2 participants
[nested] [flat]
* [pgAdmin4][Patch] - BigAnimal Fixes
@ 2022-04-27 05:50 Khushboo Vashi <[email protected]>
0 siblings, 1 reply; 2+ messages in thread
From: Khushboo Vashi @ 2022-04-27 05:50 UTC (permalink / raw)
To: pgadmin-hackers
Hi,
While deploying the PostgreSQL on the BigAnimal cloud, the Public IP
addresses were not added, fixed this issue in the attached patch.
Thanks,
Khushboo
Attachments:
[application/octet-stream] cloud_public_ip_fixe.patch (3.6K, 3-cloud_public_ip_fixe.patch)
download | inline diff:
diff --git a/web/pgadmin/misc/cloud/biganimal/__init__.py b/web/pgadmin/misc/cloud/biganimal/__init__.py
index efbc494ee..4b4d0b55b 100644
--- a/web/pgadmin/misc/cloud/biganimal/__init__.py
+++ b/web/pgadmin/misc/cloud/biganimal/__init__.py
@@ -389,9 +389,9 @@ def deploy_on_biganimal(data):
_private_network
]
- if 'public_ip' in data['instance_details']:
+ if 'biganimal_public_ip' in data['instance_details']:
args.append('--public-ip')
- args.append(str(data['instance_details']['public_ip']))
+ args.append(str(data['instance_details']['biganimal_public_ip']))
_cmd_msg = '{0} {1} {2}'.format(_cmd, _cmd_script, ' '.join(args))
try:
diff --git a/web/pgadmin/misc/cloud/static/js/biganimal.js b/web/pgadmin/misc/cloud/static/js/biganimal.js
index b7b763ade..85d41e90a 100644
--- a/web/pgadmin/misc/cloud/static/js/biganimal.js
+++ b/web/pgadmin/misc/cloud/static/js/biganimal.js
@@ -157,7 +157,7 @@ export function getBigAnimalSummary(cloud, bigAnimalInstanceData, bigAnimalDatab
createData('Instance name', bigAnimalInstanceData.name),
createData('Region', bigAnimalInstanceData.region),
createData('Cluster type', bigAnimalInstanceData.cloud_type),
- createData('Public IPs', bigAnimalInstanceData.public_ip),
+ createData('Public IPs', bigAnimalInstanceData.biganimal_public_ip),
];
let instance_size = bigAnimalInstanceData.instance_size.split('||');
diff --git a/web/pgadmin/misc/cloud/static/js/cloud.js b/web/pgadmin/misc/cloud/static/js/cloud.js
index b57337d87..22f74ce6d 100644
--- a/web/pgadmin/misc/cloud/static/js/cloud.js
+++ b/web/pgadmin/misc/cloud/static/js/cloud.js
@@ -142,7 +142,7 @@ define('pgadmin.misc.cloud', [
onrestore:function(){
Alertify.cloudWizardDialog().elements.modal.style.maxHeight=0;
},
- }).resizeTo(920, 620);
+ }).resizeTo(920, 650);
},
diff --git a/web/pgadmin/misc/cloud/static/js/cloud_db_details_schema.ui.js b/web/pgadmin/misc/cloud/static/js/cloud_db_details_schema.ui.js
index ef906b5f5..69768239a 100644
--- a/web/pgadmin/misc/cloud/static/js/cloud_db_details_schema.ui.js
+++ b/web/pgadmin/misc/cloud/static/js/cloud_db_details_schema.ui.js
@@ -464,7 +464,7 @@ class BigAnimalNetworkSchema extends BaseUISchema {
super({
oid: undefined,
cloud_type: '',
- public_ip: '',
+ biganimal_public_ip: '',
...initValues
});
@@ -488,8 +488,10 @@ class BigAnimalNetworkSchema extends BaseUISchema {
{'label': gettext('Private'), 'value': 'private'},
{'label': gettext('Public'), 'value': 'public'},
], noEmpty: true,
+ helpMessage: gettext('Private networking allows only IP addresses within your private network to connect to your cluster.'
+ + ' Public means that any client can connect to your cluster’s public IP address over the internet.')
},{
- id: 'public_ip', label: gettext('Public IP range'), type: 'text',
+ id: 'biganimal_public_ip', label: gettext('Public IP range'), type: 'text',
mode: ['create'], deps: ['cloud_type'],
disabled: (state) => {
if (state.cloud_type == 'public') return false;
@@ -498,9 +500,9 @@ class BigAnimalNetworkSchema extends BaseUISchema {
depChange: (state, source)=> {
if(source[0] == 'cloud_type') {
if (state.cloud_type == 'public') {
- return {public_ip: obj.initValues.hostIP};
+ return {biganimal_public_ip: obj.initValues.hostIP};
} else {
- return {public_ip: ''};
+ return {biganimal_public_ip: ''};
}
}
},
^ permalink raw reply [nested|flat] 2+ messages in thread
* Re: [pgAdmin4][Patch] - BigAnimal Fixes
@ 2022-04-27 11:43 Akshay Joshi <[email protected]>
parent: Khushboo Vashi <[email protected]>
0 siblings, 0 replies; 2+ messages in thread
From: Akshay Joshi @ 2022-04-27 11:43 UTC (permalink / raw)
To: Khushboo Vashi <[email protected]>; +Cc: pgadmin-hackers
Thanks, the patch applied.
On Wed, Apr 27, 2022 at 11:20 AM Khushboo Vashi <
[email protected]> wrote:
> Hi,
>
> While deploying the PostgreSQL on the BigAnimal cloud, the Public IP
> addresses were not added, fixed this issue in the attached patch.
>
> Thanks,
> Khushboo
>
--
*Thanks & Regards*
*Akshay Joshi*
*pgAdmin Hacker | Principal Software Architect*
*EDB Postgres <http://edbpostgres.com>*
*Mobile: +91 976-788-8246*
^ permalink raw reply [nested|flat] 2+ messages in thread
end of thread, other threads:[~2022-04-27 11:43 UTC | newest]
Thread overview: 2+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
2022-04-27 05:50 [pgAdmin4][Patch] - BigAnimal Fixes Khushboo Vashi <[email protected]>
2022-04-27 11:43 ` Akshay Joshi <[email protected]>
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox