Signed-off-by: ISHIDA Wataru <[email protected]>
---
ryu/services/protocols/bgp/operator/views/bgp.py | 53 +++++++++++---------
ryu/services/protocols/bgp/operator/views/other.py | 2 +-
2 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/ryu/services/protocols/bgp/operator/views/bgp.py
b/ryu/services/protocols/bgp/operator/views/bgp.py
index f78f2a9..bd96443 100644
--- a/ryu/services/protocols/bgp/operator/views/bgp.py
+++ b/ryu/services/protocols/bgp/operator/views/bgp.py
@@ -11,22 +11,24 @@ from ryu.lib.packet.bgp import BGP_ATTR_TYPE_MULTI_EXIT_DISC
from ryu.lib.packet.bgp import BGP_ATTR_TYPE_LOCAL_PREF
from ryu.lib.packet.bgp import BGP_ATTR_TYPE_EXTENDED_COMMUNITIES
+
class CoreServiceDetailView(OperatorDetailView):
rf_state = fields.RelatedViewField(
'rf_state',
- 'bgpspeaker.operator.views.bgp.RfStateDetailView'
+ 'ryu.services.protocols.bgp.operator.views.bgp.RfStateDetailView'
)
importmap_manager = fields.RelatedDictViewField(
'_importmap_manager',
- 'bgpspeaker.operator.views.other.ImportmapManagerDetailView'
+ 'ryu.services.protocols.bgp.operator'
+ '.views.other.ImportmapManagerDetailView'
)
table_manager = fields.RelatedViewField(
'_table_manager',
- 'bgpspeaker.operator.views.bgp.TableManagerDetailView'
+ 'ryu.services.protocols.bgp.operator.views.bgp.TableManagerDetailView'
)
peer_manager = fields.RelatedViewField(
'_peer_manager',
- 'bgpspeaker.operator.views.bgp.PeerManagerDetailView'
+ 'ryu.services.protocols.bgp.operator.views.bgp.PeerManagerDetailView'
)
router_id = fields.DataField('router_id')
@@ -34,15 +36,15 @@ class CoreServiceDetailView(OperatorDetailView):
class TableManagerDetailView(OperatorDetailView):
tables = fields.RelatedDictViewField(
'_tables',
- 'bgpspeaker.operator.views.bgp.TableDictView'
+ 'ryu.services.protocols.bgp.operator.views.bgp.TableDictView'
)
tables_for_rt = fields.RelatedDictViewField(
'_tables_for_rt',
- 'bgpspeaker.operator.views.bgp.TableDictView'
+ 'ryu.services.protocols.bgp.operator.views.bgp.TableDictView'
)
global_tables = fields.RelatedDictViewField(
'_global_tables',
- 'bgpspeaker.operator.views.bgp.TableDictView'
+ 'ryu.services.protocols.bgp.operator.views.bgp.TableDictView'
)
asbr_label_range = fields.DataField('_asbr_label_range')
next_hop_label = fields.DataField('_next_hop_label')
@@ -52,11 +54,11 @@ class TableManagerDetailView(OperatorDetailView):
class PeerManagerDetailView(OperatorDetailView):
peers = fields.RelatedListViewField(
'_peers',
- 'bgpspeaker.operator.views.bgp.PeerDictView'
+ 'ryu.services.protocols.bgp.operator.views.bgp.PeerDictView'
)
peers_summary = fields.RelatedListViewField(
'_peers',
- 'bgpspeaker.operator.views.bgp.PeerDictSummaryView'
+ 'ryu.services.protocols.bgp.operator.views.bgp.PeerDictSummaryView'
)
@@ -80,15 +82,15 @@ class PeerDetailView(OperatorDetailView):
enabled = fields.DataField('enabled')
neigh_conf = fields.RelatedViewField(
'_neigh_conf',
- 'bgpspeaker.operator.views.conf.ConfDetailView'
+ 'ryu.services.protocols.bgp.operator.views.conf.ConfDetailView'
)
common_conf = fields.RelatedViewField(
'_common_conf',
- 'bgpspeaker.operator.views.conf.ConfDetailView'
+ 'ryu.services.protocols.bgp.operator.views.conf.ConfDetailView'
)
state = fields.RelatedViewField(
'state',
- 'bgpspeaker.operator.views.bgp.PeerStateDetailView'
+ 'ryu.services.protocols.bgp.operator.views.bgp.PeerStateDetailView'
)
def encode(self):
@@ -113,7 +115,7 @@ class PeerRfDetailView(OperatorDetailView):
enabled = fields.DataField('enabled')
peer = fields.RelatedViewField(
'peer',
- 'bgpspeaker.operator.views.bgp.PeerDetailView'
+ 'ryu.services.protocols.bgp.operator.views.bgp.PeerDetailView'
)
@@ -122,25 +124,26 @@ class TableDetailView(OperatorDetailView):
route_family = fields.DataField('route_family')
destinations = fields.RelatedDictViewField(
'_destinations',
- 'bgpspeaker.operator.views.bgp.DestinationDictView'
+ 'ryu.services.protocols.bgp.operator.views.bgp.DestinationDictView'
)
class PathDetailView(OperatorDetailView):
source_version_num = fields.DataField('source_version_num')
route_family = fields.RelatedViewField(
- 'route_family', 'bgpspeaker.operator.views.bgp.RouteFamilyView'
+ 'route_family',
+ 'ryu.services.protocols.bgp.operator.views.bgp.RouteFamilyView'
)
nlri = fields.RelatedViewField(
'nlri',
- 'bgpspeaker.operator.views.bgp.NlriDetailView'
+ 'ryu.services.protocols.bgp.operator.views.bgp.NlriDetailView'
)
is_withdraw = fields.DataField('is_withdraw')
nexthop = fields.DataField('nexthop')
pathattr_map = fields.DataField('pathattr_map')
source = fields.RelatedViewField(
'source',
- 'bgpspeaker.operator.views.bgp.PeerDetailView'
+ 'ryu.services.protocols.bgp.operator.views.bgp.PeerDetailView'
)
def encode(self):
@@ -170,38 +173,38 @@ class PathDetailView(OperatorDetailView):
class SentRouteDetailView(OperatorDetailView):
path = fields.RelatedViewField(
'path',
- 'bgpspeaker.operator.views.bgp.PathDetailView',
+ 'ryu.services.protocols.bgp.operator.views.bgp.PathDetailView',
)
peer = fields.RelatedViewField(
'_sent_peer',
- 'bgpspeaker.operator.views.bgp.PeerDetailView'
+ 'ryu.services.protocols.bgp.operator.views.bgp.PeerDetailView'
)
class DestinationDetailView(OperatorDetailView):
table = fields.RelatedViewField(
'_table',
- 'bgpspeaker.operator.views.bgp.TableDetailView',
+ 'ryu.services.protocols.bgp.operator.views.bgp.TableDetailView',
)
best_path = fields.RelatedViewField(
'best_path',
- 'bgpspeaker.operator.views.bgp.PathDetailView'
+ 'ryu.services.protocols.bgp.operator.views.bgp.PathDetailView'
)
known_path_list = fields.RelatedListViewField(
'known_path_list',
- 'bgpspeaker.operator.views.bgp.PathListView'
+ 'ryu.services.protocols.bgp.operator.views.bgp.PathListView'
)
new_path_list = fields.RelatedListViewField(
'_new_path_list',
- 'bgpspeaker.operator.views.bgp.PathListView'
+ 'ryu.services.protocols.bgp.operator.views.bgp.PathListView'
)
withdraw_list = fields.RelatedListViewField(
'_withdraw_list',
- 'bgpspeaker.operator.views.bgp.PathListView'
+ 'ryu.services.protocols.bgp.operator.views.bgp.PathListView'
)
sent_routes = fields.RelatedListViewField(
'sent_routes',
- 'bgpspeaker.operator.views.bgp.SentRouteListView'
+ 'ryu.services.protocols.bgp.operator.views.bgp.SentRouteListView'
)
nlri = fields.DataField('nlri')
route_family = fields.DataField('route_family')
diff --git a/ryu/services/protocols/bgp/operator/views/other.py
b/ryu/services/protocols/bgp/operator/views/other.py
index 4ffec43..8e67cce 100644
--- a/ryu/services/protocols/bgp/operator/views/other.py
+++ b/ryu/services/protocols/bgp/operator/views/other.py
@@ -7,7 +7,7 @@ from ryu.services.protocols.bgp.operator.views import fields
class ImportmapManagerDetailView(OperatorDetailView):
importmaps = fields.RelatedDictViewField(
'_import_maps_by_name',
- 'bgpspeaker.operator.views.other.ImportmapDictView'
+ 'ryu.services.protocols.bgp.operator.views.other.ImportmapDictView'
)
--
1.7.9.5
------------------------------------------------------------------------------
Is your legacy SCM system holding you back? Join Perforce May 7 to find out:
• 3 signs your SCM is hindering your productivity
• Requirements for releasing software faster
• Expert tips and advice for migrating your SCM now
http://p.sf.net/sfu/perforce
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel
