diff options
| author |   Jordan Augé <jordan.auge+fdio@cisco.com> | 2017-03-25 02:00:42 +0100 |
|---|---|---|
| committer | Jordan Augé <jordan.auge+fdio@cisco.com> | 2017-03-25 02:02:14 +0100 |
| commit | 3c7c2275b2d4660b83db9495c5f6ece5c6557b43 (patch) | |
| tree | c4dbecb5b293f87714a4b456dd9f1b97593e9a2d /vicn/resource/node.py | |
| parent | 15ee4c78051f3a02b73df3171bb415cfd0326904 (diff) | |
Misc. improvements to vICN codebase detailed below.
- vICN core
. Added python setup script (allowing package installation)
. Better error handling
- Resources
. LXD : better handling of certificate generation
. Physical : generation of SSH keypair within vICN
. Link : code simplification
. EmulatedLteChannel: fixed typo in netmask configuration of emu-radio (missing /)
- Examples
. Added json file for tutorial #2 - Dumbell
. New tutorial #03 - Load balancing in WiFi/LTE hetnet
- Other minor changes incl. code cleanup (trailing spaces, etc.)
Change-Id: Id306ca71e27d9859aa72760f63a2bc364bfe8159
Signed-off-by: Jordan Augé <jordan.auge+fdio@cisco.com>
Diffstat (limited to 'vicn/resource/node.py')
| -rw-r--r-- | vicn/resource/node.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vicn/resource/node.py b/vicn/resource/node.py index bfb2f9ec..ad519666 100644 --- a/vicn/resource/node.py +++ b/vicn/resource/node.py @@ -27,10 +27,10 @@ from vicn.core.resource import Resource log = logging.getLogger(__name__) DEFAULT_USERNAME = 'root' -DEFAULT_SSH_PRIVATE_KEY = os.path.join(os.path.dirname(__file__), - '..', '..', 'config', 'ssh_client_cert', 'ssh_client_key') -DEFAULT_SSH_PUBLIC_KEY = os.path.join(os.path.dirname(__file__), - '..', '..', 'config', 'ssh_client_cert', 'ssh_client_key.pub') +DEFAULT_SSH_PRIVATE_KEY = os.path.expanduser(os.path.join( + '~', '.vicn', 'ssh_client_cert', 'ssh_client_key')) +DEFAULT_SSH_PUBLIC_KEY = os.path.expanduser(os.path.join( + '~', '.vicn', 'ssh_client_cert', 'ssh_client_key.pub')) class Node(Resource): """ |