diff options
author | Marcel Enguehard <mengueha+fdio@cisco.com> | 2017-05-29 13:13:32 +0200 |
---|---|---|
committer | Marcel Enguehard <mengueha+fdio@cisco.com> | 2017-05-29 13:13:32 +0200 |
commit | a836e5c16ea7df38646c46f2e9ffc6163ab05f06 (patch) | |
tree | d5cf3b799af7e9a328db245647a5cdce0ba744f4 /vicn/resource/icn | |
parent | be0b435d307173598c30fcacc421b17112137099 (diff) |
Misc bug fixes
*IP assignment
*Node is a key attribute
*Up-to-date packages
*Trailing whitespaces
...
Change-Id: Id8e2a5f7b2c4506f326b3c4bc991fa65f53fca5c
Signed-off-by: Marcel Enguehard <mengueha+fdio@cisco.com>
Diffstat (limited to 'vicn/resource/icn')
-rw-r--r-- | vicn/resource/icn/forwarder.py | 10 | ||||
-rw-r--r-- | vicn/resource/icn/icn_application.py | 8 |
2 files changed, 8 insertions, 10 deletions
diff --git a/vicn/resource/icn/forwarder.py b/vicn/resource/icn/forwarder.py index a719caf7..748532cf 100644 --- a/vicn/resource/icn/forwarder.py +++ b/vicn/resource/icn/forwarder.py @@ -40,19 +40,17 @@ class Forwarder(ICNApplication, ABC): faces = Attribute(Face, description = 'ICN ffaces of the forwarder', multiplicity = Multiplicity.OneToMany, reverse_name = 'forwarder') - routes = Attribute(Route, description = 'Routes in the ICN FIB', + routes = Attribute(Route, description = 'Routes in the ICN FIB', multiplicity = Multiplicity.OneToMany, reverse_name = 'forwarder') - cache_size = Attribute(Integer, + cache_size = Attribute(Integer, description = 'Size of the cache (in chunks)', default = DEFAULT_CACHE_SIZE) - cache_policy = Attribute(String, description = 'Cache policy', + cache_policy = Attribute(String, description = 'Cache policy', default = DEFAULT_CACHE_POLICY) - strategy = Attribute(String, description = 'Forwarding Strategy', + strategy = Attribute(String, description = 'Forwarding Strategy', default = DEFAULT_STRATEGY) config_file = Attribute(String, description = 'Configuration file') - port = Attribute(Integer, description = 'Default listening port', - default = lambda self: self._get_default_port()) log_file = Attribute(String, description = 'Log file') # Overloaded attributes diff --git a/vicn/resource/icn/icn_application.py b/vicn/resource/icn/icn_application.py index 5abee3c5..817d9403 100644 --- a/vicn/resource/icn/icn_application.py +++ b/vicn/resource/icn/icn_application.py @@ -16,19 +16,19 @@ # limitations under the License. # -from vicn.resource.linux.application import LinuxApplication +from vicn.resource.linux.application import LinuxApplication from vicn.core.attribute import Attribute from netmodel.model.type import Integer -ICN_SUITE_CCNX_1_0=0 -ICN_SUITE_NDN=1 +ICN_SUITE_CCNX_1_0=1 +ICN_SUITE_NDN=2 class ICNApplication(LinuxApplication): """ Resource: ICNApplication """ - protocol_suites = Attribute(Integer, + protocol_suites = Attribute(Integer, description = 'Protocol suites supported by the application', default = lambda self: self._def_protocol_suite()) |