IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an issue while deploying the PostgreSQL on the BigAnimal, the Public IP addresses were not added.

Browse Source
This commit is contained in:
Khushboo Vashi 2022-04-27 17:12:28 +05:30 committed by Akshay Joshi
parent f725cc2307
commit a86a8c6a34
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/pgadmin/misc/cloud/biganimal/__init__.py
View File

@ -389,9 +389,9 @@ def deploy_on_biganimal(data):
_private_network _private_network
] ]
if 'public_ip' in data['instance_details']: if 'biganimal_public_ip' in data['instance_details']:
args.append('--public-ip') 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)) _cmd_msg = '{0} {1} {2}'.format(_cmd, _cmd_script, ' '.join(args))
try: try:

2
web/pgadmin/misc/cloud/static/js/biganimal.js
View File

@ -157,7 +157,7 @@ export function getBigAnimalSummary(cloud, bigAnimalInstanceData, bigAnimalDatab
createData('Instance name', bigAnimalInstanceData.name), createData('Instance name', bigAnimalInstanceData.name),
createData('Region', bigAnimalInstanceData.region), createData('Region', bigAnimalInstanceData.region),
createData('Cluster type', bigAnimalInstanceData.cloud_type), 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('||'); let instance_size = bigAnimalInstanceData.instance_size.split('||');

2
web/pgadmin/misc/cloud/static/js/cloud.js
View File

@ -142,7 +142,7 @@ define('pgadmin.misc.cloud', [
onrestore:function(){ onrestore:function(){
Alertify.cloudWizardDialog().elements.modal.style.maxHeight=0; Alertify.cloudWizardDialog().elements.modal.style.maxHeight=0;
}, },
}).resizeTo(920, 620); }).resizeTo(920, 650);
}, },

10
web/pgadmin/misc/cloud/static/js/cloud_db_details_schema.ui.js
View File

@ -464,7 +464,7 @@ class BigAnimalNetworkSchema extends BaseUISchema {
super({ super({
oid: undefined, oid: undefined,
cloud_type: '', cloud_type: '',
public_ip: '', biganimal_public_ip: '',
...initValues ...initValues
}); });
@ -488,8 +488,10 @@ class BigAnimalNetworkSchema extends BaseUISchema {
{'label': gettext('Private'), 'value': 'private'}, {'label': gettext('Private'), 'value': 'private'},
{'label': gettext('Public'), 'value': 'public'}, {'label': gettext('Public'), 'value': 'public'},
], noEmpty: true, ], 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'], mode: ['create'], deps: ['cloud_type'],
disabled: (state) => { disabled: (state) => {
if (state.cloud_type == 'public') return false; if (state.cloud_type == 'public') return false;
@ -498,9 +500,9 @@ class BigAnimalNetworkSchema extends BaseUISchema {
depChange: (state, source)=> { depChange: (state, source)=> {
if(source[0] == 'cloud_type') { if(source[0] == 'cloud_type') {
if (state.cloud_type == 'public') { if (state.cloud_type == 'public') {
return {public_ip: obj.initValues.hostIP}; return {biganimal_public_ip: obj.initValues.hostIP};
} else { } else {
return {public_ip: ''}; return {biganimal_public_ip: ''};
} }
} }
}, },