Skip to content

Commit

Permalink
Merge branch 'dev' into feature-increase-ssh-timeout
Browse files Browse the repository at this point in the history
  • Loading branch information
XaverStiensmeier committed Mar 28, 2024
2 parents 4f2ca97 + 94645c9 commit acaa2b9
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 8 deletions.
33 changes: 33 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: bug
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behaviour:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behaviour**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Setup (please complete the following information):**
- OS: [e.g. Ubuntu 22.04]
- Cloud Location [e.g. Bielefeld]
- Configuration
- BiBiGrid Version

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: enhancement
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
2 changes: 1 addition & 1 deletion bibigrid/core/startup.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def run_action(args, configurations, config_path):
exit_state = ide.ide(args.cluster_id, providers[0], configurations[0], LOG)
elif args.update:
LOG.info("Action update selected")
exit_state = update.update(args.cluster_id, providers[0], configurations[0])
exit_state = update.update(args.cluster_id, providers[0], configurations[0], LOG)
for provider in providers:
provider.close()
else:
Expand Down
10 changes: 3 additions & 7 deletions bibigrid/core/utility/validate_configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,7 @@ def check_instance_type_image_combination(self, instance_type, instance_image, p
self.log.warning(f"Flavor {instance_type} does not exist on {provider.cloud_specification['identifier']}.\n"
f"Available flavors:\n{available_flavors}")
return False

type_max_disk_space = flavor["disk"]
type_max_ram = flavor["ram"]
image_min_disk_space = provider.get_image_by_id_or_name(instance_image)["min_disk"]
Expand Down Expand Up @@ -389,12 +390,8 @@ def check_network(self):
f"Subnet '{subnet_name_or_id}' not found on {provider.cloud_specification['identifier']}")
success = False
else:
self.log.info(f"Subnet '{subnet_name_or_id}' found on {provider.cloud_specification['identifier']}")
else:
self.log.warning(f"Neither 'network' nor 'subnet' defined in configuration on "
f"{provider.cloud_specification['identifier']}.")
success = False
return success
self.log.info(f"Subnet '{subnet_name_or_id}' found")
return bool(success and (network_name_or_id or subnet_name_or_id))

def check_server_group(self):
"""
Expand Down Expand Up @@ -471,7 +468,6 @@ def check_nfs(self):
@return: True
"""
self.log.info("Checking nfs...")
success = True
master_configuration = self.configurations[0]
nfs_shares = master_configuration.get("nfsShares")
nfs = master_configuration.get("nfs")
Expand Down

0 comments on commit acaa2b9

Please sign in to comment.