Merge pull request #33 from cfrademan/development

Netrino Southbound Netconf API #12
TachyonicProject · Jul 17, 2018 · 607e34f · 607e34f
2 parents dc053b0 + fed0cac
commit 607e34f
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 62 deletions.
diff --git a/netrino/__init__.py b/netrino/__init__.py
@@ -28,4 +28,3 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGE.
 
-from netrino.core.register import Register
diff --git a/netrino/core/register.py b/netrino/core/register.py
diff --git a/netrino/interfaces/__init__.py b/netrino/interfaces/__init__.py
@@ -1 +0,0 @@
-from netrino.interfaces import netconf

diff --git a/netrino/interfaces/netconf/discover.py b/netrino/interfaces/netconf/discover.py
@@ -28,10 +28,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGE.
 
-from netrino import register
-
-
-@register.discover('netconf')
 def discover(ip):
     pass
 
diff --git a/netrino/interfaces/netconf/element.py b/netrino/interfaces/netconf/element.py
@@ -32,10 +32,7 @@
 from luxon import Model
 from luxon.utils.timezone import now 
 
-from netrino import register
 
-
-@register.element('netconf')
 class Element(Model):
     id = Model.Uuid(default=uuid4, internal=True)
     ip = Model.String(null=False)

diff --git a/netrino/interfaces/netconf/interface.py b/netrino/interfaces/netconf/interface.py
@@ -28,13 +28,10 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGE.
 
-from netrino import register
-
-
-@register.interface('netconf')
 class Interface(object):
     def edit_config(self, uuid, payload):
         # step 1 use function to get creds etc from uuid
         # step 2 pass to ncclient
         # return response
+        pass
 
diff --git a/setup.py b/setup.py
@@ -281,7 +281,17 @@ def run(self):
     cmdclass=cmdclass,
     ext_modules=ext_modules,
     zip_safe=False,  # don't use eggs
-    # entry_points={
+    entry_points={
+        'netrino_discover': [
+            'netconf = netrino.interfaces.netconf.discover:discover'
+        ],
+        'netrino_interfaces': [
+            'netconf = netrino.interfaces.netconf.interface:Interface'
+        ],
+        'netrino_elements': [
+            'netconf = netrino.interfaces.netconf.element:Element'
+        ],
+    }
     #    'console_scripts': [
     #        'netrino = netrino.main:entry_point'
     #    ],