Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added VNF resource consumption functions #78

Merged
merged 11 commits into from
Aug 22, 2019
Merged

Added VNF resource consumption functions #78

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
952a518
Modified simulator interface to accept resource function path and rea…
ldklenner Aug 20, 2019
ed0c4a9
Update lists of available sf at a node
ldklenner Aug 21, 2019
97d12b2
External resource function definition
ldklenner Aug 21, 2019
3fb4e57
Check node capacitiy und set sf load
ldklenner Aug 21, 2019
2376eae
Make resource functions optional
ldklenner Aug 21, 2019
3064701
Adapt tests and fix swenutes network_stats assertion
ldklenner Aug 21, 2019
e77c13c
Further adaptions
ldklenner Aug 21, 2019
0f2beba
The available SFs are now also constructed from the initial placement
ldklenner Aug 21, 2019
389fbb6
Satisfy pedantic flake8
ldklenner Aug 21, 2019
af15ea7
Adapt travis.yaml
ldklenner Aug 21, 2019
269e202
Added assert and fixed typos
ldklenner Aug 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
External resource function definition
  • Loading branch information
@ldklenner
ldklenner committed Aug 21, 2019
commit 97d12b20de63f99de7e4fcaf56f2762341562d68
2 changes: 2 additions & 0 deletions params/services/resource_functions/A.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
def resource_function(load):
return load
2 changes: 2 additions & 0 deletions params/services/resource_functions/B.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
def resource_function(load):
return load
11 changes: 6 additions & 5 deletions src/coordsim/reader/reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import networkx as nx
from geopy.distance import distance as dist
import numpy as np
import logging as log
import logging
import yaml
import math
from collections import defaultdict
import importlib

log = logging.getLogger(__name__)

# Disclaimer: Some snippets of the following file were imported/modified from B-JointSP on GitHub.
# Original code can be found on https://github.com/CN-UPB/B-JointSP
Expand Down Expand Up @@ -47,12 +48,12 @@ def load_resource_function(name, path):
module = importlib.util.module_from_spec(spec)
spec.loader.exec_module(module)
except Exception as ex:
raise Exception(f'Cannot load file {name}.py located at {path}.')
raise Exception(f'Cannot load file {name}.py from specified location {path}.')

try:
return getattr(module, 'resource_function')
except Exception as ex:
raise Exception(f'There is no resource_function defined in file {name}.py')
raise Exception(f'There is no resource_function defined in file {name}.py.')


def get_sf(sf_file, resource_functions_path):
Expand Down Expand Up @@ -81,11 +82,11 @@ def get_sf(sf_file, resource_functions_path):
except Exception as ex:
sf_list[sf_name]["resource_function_id"] = 'default'
sf_list[sf_name]["resource_function"] = default_resource_function
log.warning(f'{repr(ex)} Default resource function will be used instead.')
log.warning(f'{str(ex)} SF {sf_name} will use default resource function instead.')
else:
sf_list[sf_name]["resource_function_id"] = 'default'
sf_list[sf_name]["resource_function"] = default_resource_function
log.warning(f'No resource function specified. Default resource function will be used instead.')
log.info(f'No resource function specified for SF {sf_name}. Default resource function will be used instead.')
return sf_list


Expand Down