Merge pull request #162 from mpeuster/master

Improved Vagrant setup

diff --git a/.gitignore b/.gitignore
index 51aa756..e59451b 100755 (executable)
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,9 @@ __pycache__/
 #IDE
 .idea/
 
+# virtualenv
+venv
+
 # vagrant
 .vagrant/
 

diff --git a/Vagrantfile b/Vagrantfile
index 30fd519..3ed9a3f 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -58,7 +58,10 @@ Vagrant.configure(2) do |config|
   # Create a forwarded port mapping which allows access to a specific port
   # within the machine from a port on the host machine. In the example below,
   # accessing "localhost:8080" will access port 80 on the guest machine.
-  config.vm.network "forwarded_port", guest: 5000, host: 5000
+  config.vm.network "forwarded_port", guest: 5000, host: 5000 # dummy gatekeeper
+  config.vm.network "forwarded_port", guest: 5001, host: 5001 # REST API
+  config.vm.network "forwarded_port", guest: 8080, host: 8080 # cAdvisor
+  config.vm.network "forwarded_port", guest: 9091, host: 9091 # push gateway
 
   # Create a private network, which allows host-only access to the machine
   # using a specific IP.

diff --git a/setup-cli.py b/setup-cli.py
new file mode 100644 (file)
index 0000000..78a212c
--- /dev/null
+++ b/setup-cli.py
@@ -0,0 +1,57 @@
+"""
+Copyright (c) 2015 SONATA-NFV
+ALL RIGHTS RESERVED.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Neither the name of the SONATA-NFV [, ANY ADDITIONAL AFFILIATION]
+nor the names of its contributors may be used to endorse or promote
+products derived from this software without specific prior written
+permission.
+
+This work has been performed in the framework of the SONATA project,
+funded by the European Commission under Grant number 671517 through
+the Horizon 2020 and 5G-PPP programmes. The authors would like to
+acknowledge the contributions of their colleagues of the SONATA
+partner consortium (www.sonata-nfv.eu).
+"""
+"""
+Additional setup that installs 'son-emu-cli' in standalone mode.
+"""
+from setuptools import setup, find_packages
+
+setup(name='sonemucli',
+      version='0.9',
+      license='Apache 2.0',
+      description='CLI client for son-emu',
+      url='http://github.com/sonata-emu',
+      author_email='sonata-dev@sonata-nfv.eu',
+      package_dir={'': 'src'},
+      packages=find_packages('src'),
+      install_requires=[
+          'tabulate',
+          'argparse',
+          'pytest',
+          'requests',
+          'prometheus_client',
+          'urllib3'
+      ],
+      zip_safe=False,
+      entry_points={
+          'console_scripts': [
+              'son-emu-cli=emuvim.cli.son_emu_cli:main',
+          ],
+      },
+      setup_requires=['pytest-runner'],
+      tests_require=['pytest'],
+)

diff --git a/setup.py b/setup.py
index d23ea68..8770532 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -44,7 +44,7 @@ setup(name='emuvim',
           'networkx',
           'six>=1.9',
           'ryu',
-          'ryu',
+          'oslo.config',
           'pytest',
           'Flask',
           'flask_restful',