diff options
| author |   Feng Pan <fpan@redhat.com> | 2016-04-22 18:49:07 -0400 |
|---|---|---|
| committer | Feng Pan <fpan@redhat.com> | 2016-05-04 23:48:00 -0400 |
| commit | 568656d2bd0341aacc74a936e28315b06f1881ca (patch) | |
| tree | 5e9b45102935b03f2676be7fe5396828bc05729b /build | |
| parent | d93d2992ff5de7f60c47fd3c31e429e5c06f6bce (diff) | |
Add python parsing library for network settings file.
Changes:
- Implements network_settings.yaml file parsing in python.
- Adds support for both IPv4 and IPv6 in network_settings.yaml
- Adds support for api_network in network_settings.yaml
- Removes bash library functions for network related functions.
- Adds dependency to python34-yaml for apex-common package.
Note that support for ipv6 and api_network is not complete yet.
Proper configuriration of network environment and nic template
files will be added later.
Change-Id: I087f725dabedfef109c9de1f58ce2611da647e87
Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'build')
| -rw-r--r-- | build/opnfv-apex-common.spec | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec index 89fb4030..56f0f305 100644 --- a/build/opnfv-apex-common.spec +++ b/build/opnfv-apex-common.spec @@ -11,7 +11,7 @@ Source0: opnfv-apex-common.tar.gz BuildArch: noarch BuildRequires: python-docutils python34-devel Requires: openstack-tripleo opnfv-apex-sdn opnfv-apex-undercloud openvswitch qemu-kvm bridge-utils libguestfs-tools -Requires: initscripts net-tools iputils iproute iptables python34 +Requires: initscripts net-tools iputils iproute iptables python34 python34-yaml %description Scripts for OPNFV deployment using RDO Manager @@ -39,12 +39,14 @@ install config/deploy/os-onos-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv install config/deploy/os-opencontrail-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-opencontrail-nofeature-ha.yaml install config/network/network_settings.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/network_settings.yaml -mkdir -p %{buildroot}%{_var}/opt/opnfv/lib/ +mkdir -p %{buildroot}%{_var}/opt/opnfv/lib/python/apex install lib/common-functions.sh %{buildroot}%{_var}/opt/opnfv/lib/ install lib/utility-functions.sh %{buildroot}%{_var}/opt/opnfv/lib/ +install lib/python/apex-python-utils.py %{buildroot}%{_var}/opt/opnfv/lib/python/ mkdir -p %{buildroot}%{python3_sitelib}/apex/ install lib/python/apex/__init__.py %{buildroot}%{python3_sitelib}/apex/ install lib/python/apex/ip_utils.py %{buildroot}%{python3_sitelib}/apex/ +install lib/python/apex/net_env.py %{buildroot}%{python3_sitelib}/apex/ mkdir -p %{buildroot}%{_var}/opt/opnfv/lib/installer/onos/ install lib/installer/onos/onos_gw_mac_update.sh %{buildroot}%{_var}/opt/opnfv/lib/installer/onos/ @@ -64,7 +66,11 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %attr(755,root,root) %{_bindir}/opnfv-util %{_var}/opt/opnfv/lib/common-functions.sh %{_var}/opt/opnfv/lib/utility-functions.sh +%{_var}/opt/opnfv/lib/python/apex-python-utils.py +%{_var}/opt/opnfv/lib/python/apex-python-utils.pyo +%{_var}/opt/opnfv/lib/python/apex-python-utils.pyc %{python3_sitelib}/apex/ip_utils.py +%{python3_sitelib}/apex/net_env.py %{python3_sitelib}/apex/__init__.py %{python3_sitelib}/apex/__pycache__/* %{_var}/opt/opnfv/lib/installer/onos/onos_gw_mac_update.sh @@ -84,6 +90,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %doc %{_docdir}/opnfv/inventory.yaml.example %changelog +* Fri Apr 22 2016 Feng Pan <fpan@redhat.com> - 3.0-3 +- Adds python network setting parsing lib. * Fri Apr 15 2016 Feng Pan <fpan@redhat.com> - 3.0-2 - Adds python ip utility lib. * Mon Apr 11 2016 Tim Rozet <trozet@redhat.com> - 3.0-1 |