commit 0819e9d41c9d4ba12b461874fcb46e4e11e741b0
author Matteo Scandolo <teo@onlab.us> Tue Sep 27 10:15:07 2016 -0700
committer Gerrit Code Review <gerrit@localhost> Tue Sep 27 10:15:07 2016 -0700
tree f54c201f064bd85248807b3105dada83a4c5e454
parent 83ebc430fc57506ce3a3eff47ca1cf352b3ae0b9
parent ddce4ec7d27509c8a8a60525f98990bddc223545

Merge "Defining TOSCA resource for NetworkDevice"

xos/api/service/metronetworkservice/metronetworkservice.py

diff --git a/xos/api/service/metronetworkservice.py b/xos/api/service/metronetworkservice/metronetworkservice.py
similarity index 97%
rename from xos/api/service/metronetworkservice.py
rename to xos/api/service/metronetworkservice/metronetworkservice.py
index a7945fc..368e52f 100644
--- a/xos/api/service/metronetworkservice.py
+++ b/xos/api/service/metronetworkservice/metronetworkservice.py
@@ -22,7 +22,7 @@
 
 class MetroNetworkServiceViewSet(XOSViewSet):
     base_name = "metronetworkservice"
-    method_name = "metronetworkservice/metronetwork"
+    method_name = "metronetwork"
     method_kind = "viewset"
     queryset = MetroNetworkService.get_service_objects().all()
     serializer_class = MetroNetworkServiceSerializer
@@ -65,7 +65,7 @@
 
 class NetworkEdgePortViewSet(XOSViewSet):
     base_name = "SCA_ETH_FPP_UNI_N"
-    method_name = "metronetworkservice/SCA_ETH_FPP_UNI_N"
+    method_name = "SCA_ETH_FPP_UNI_N"
     method_kind = "viewset"
     queryset = NetworkEdgePort.objects.all()
     serializer_class = NetworkEdgePortSerializer
@@ -106,7 +106,7 @@
 
 class NetworkEdgeToEdgePointConnectionViewSet(XOSViewSet):
     base_name = "SCA_ETH_FDFr_EC"
-    method_name = "metronetworkservice/SCA_ETH_FDFr_EC"
+    method_name = "SCA_ETH_FDFr_EC"
     method_kind = "viewset"
     queryset = NetworkEdgeToEdgePointConnection.objects.all()
     serializer_class = NetworkEdgeToEdgePointConnectionSerializer

xos/metronetworkservice-onboard.yaml

diff --git a/xos/metronetworkservice-onboard.yaml b/xos/metronetworkservice-onboard.yaml
index 985500d..2a522eb 100644
--- a/xos/metronetworkservice-onboard.yaml
+++ b/xos/metronetworkservice-onboard.yaml
@@ -15,7 +15,7 @@
           # base_url is non-null.
           models: models.py
           admin: admin.py
-          rest_service: api/service/metronetworkservice.py
+          rest_service: subdirectory:metronetworkservice api/service/metronetworkservice/metronetworkservice.py
           synchronizer: synchronizer/manifest
           synchronizer_run: metronetworkervice-synchronizer.py
           tosca_resource: tosca/resources/metronetservice.py