starlingx
/
integ
Code Issues Proposed changes

Open vSwitch integration with host and configuration framework 

Integrates the latest Open vSwitch with DPDK into the host management
and configuration framework and configures the default system
vswitch type to be ovs-dpdk.

Change-Id: I104aedeb10cbaf3ab431bc283870e9d6f5e02021
Signed-off-by: Matt Peters <matt.peters@windriver.com>
This commit is contained in:
Matt Peters 2018-06-07 19:29:06 -05:00
parent ba41abad20
commit 5d34966c9b
26 changed files with 495 additions and 1032 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0004-restore-ovs-service-parameters.patch Normal file
View File

@ -0,0 +1,32 @@
From edf5db0a419f65350f6628cc74f144f8fd26e45d Mon Sep 17 00:00:00 2001
From: Matt Peters <matt.peters@windriver.com>
Date: Fri, 18 May 2018 13:35:03 -0500
Subject: [PATCH] restore ovs service parameters
---
SPECS/puppet-neutron.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/puppet-neutron.spec b/SPECS/puppet-neutron.spec
index 58bbd24..831d61b 100644
--- a/SPECS/puppet-neutron.spec
+++ b/SPECS/puppet-neutron.spec
@@ -17,6 +17,7 @@ Patch0006: 0006-Add-parameters-to-classes.patch
Patch0007: 0007-update-neutron-bgp-to-use-class-variables.patch
Patch0008: 0008-dvr-allow-base-mac-address-to-be-configured.patch
Patch0009: 0009-add-support-for-networking-sfc.patch
+Patch0010: 0010-restore-ovs-service-parameters.patch
BuildArch: noarch
@@ -44,6 +45,7 @@ Puppet module for OpenStack Neutron
%patch0007 -p1
%patch0008 -p1
%patch0009 -p1
+%patch0010 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
1.8.3.1

32
devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0005-unset-tunnel_types-when-tunnelling-disabled.patch Normal file
View File

@ -0,0 +1,32 @@
From c4b5fbe5505de3e673eb2e0b04ce65f9efc9b146 Mon Sep 17 00:00:00 2001
From: Matt Peters <matt.peters@windriver.com>
Date: Sat, 26 May 2018 09:05:10 -0500
Subject: [PATCH] unset tunnel_types when tunnelling disabled
---
SPECS/puppet-neutron.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/puppet-neutron.spec b/SPECS/puppet-neutron.spec
index 831d61b..0db2869 100644
--- a/SPECS/puppet-neutron.spec
+++ b/SPECS/puppet-neutron.spec
@@ -18,6 +18,7 @@ Patch0007: 0007-update-neutron-bgp-to-use-class-variables.patch
Patch0008: 0008-dvr-allow-base-mac-address-to-be-configured.patch
Patch0009: 0009-add-support-for-networking-sfc.patch
Patch0010: 0010-restore-ovs-service-parameters.patch
+Patch0011: 0011-unset-tunnel_types-when-tunneling-disabled.patch
BuildArch: noarch
@@ -46,6 +47,7 @@ Puppet module for OpenStack Neutron
%patch0008 -p1
%patch0009 -p1
%patch0010 -p1
+%patch0011 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
1.8.3.1

2
devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/PATCH_ORDER
View File

@ -1,3 +1,5 @@
0001-Update-package-versioning-for-TIS-format.patch
0002-Add-TiS-patches.patch
0003-add-support-for-networking-sfc.patch
0004-restore-ovs-service-parameters.patch
0005-unset-tunnel_types-when-tunnelling-disabled.patch

46
devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0010-restore-ovs-service-parameters.patch Normal file
View File

@ -0,0 +1,46 @@
From dc4b592359fd30045797c26f3d9a99e191a932cc Mon Sep 17 00:00:00 2001
From: Matt Peters <matt.peters@windriver.com>
Date: Fri, 1 Jun 2018 20:26:20 -0500
Subject: [PATCH] 0010-restore-ovs-service-parameters.patch
---
manifests/params.pp | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/manifests/params.pp b/manifests/params.pp
index 858e3fa..22320e5 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -7,7 +7,7 @@ class neutron::params {
$client_package = 'python-neutronclient'
$server_service = 'neutron-server'
- #$ovs_agent_service = 'neutron-openvswitch-agent'
+ $ovs_agent_service = 'neutron-openvswitch-agent'
#$linuxbridge_agent_service = 'neutron-linuxbridge-agent'
#$cisco_config_file = '/etc/neutron/plugins/cisco/cisco_plugins.ini'
$opencontrail_plugin_package = 'neutron-plugin-contrail'
@@ -37,7 +37,6 @@ class neutron::params {
$l2gw_agent_service = 'neutron-l2gw-agent'
$nsx_plugin_package = 'vmware-nsx'
$nsx_config_file = '/etc/neutron/plugins/vmware/nsx.ini'
- $vswitch_agent_service = ''
$router_scheduler_driver = 'neutron.scheduler.l3_agent_scheduler.HostBasedScheduler'
$network_scheduler_driver = 'neutron.scheduler.dhcp_agent_scheduler.HostBasedScheduler'
$router_status_managed = true
@@ -50,9 +49,9 @@ class neutron::params {
$server_package = false
#$ml2_server_package = 'openstack-neutron-ml2'
$ml2_server_package = false
- #$ovs_agent_package = false
- #$ovs_server_package = 'openstack-neutron-openvswitch'
- #$ovs_cleanup_service = 'neutron-ovs-cleanup'
+ $ovs_agent_package = false
+ $ovs_server_package = 'openstack-neutron-openvswitch'
+ $ovs_cleanup_service = 'neutron-ovs-cleanup'
#$libnl_package = 'libnl'
#$package_provider = 'rpm'
#$linuxbridge_agent_package = false
--
1.8.3.1

24
devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0011-unset-tunnel_types-when-tunneling-disabled.patch Normal file
View File

@ -0,0 +1,24 @@
From efc8886902108994a799ab4bf7c5a8ddec0c0a8b Mon Sep 17 00:00:00 2001
From: Matt Peters <matt.peters@windriver.com>
Date: Sat, 26 May 2018 09:02:35 -0500
Subject: [PATCH] unset tunnel_types when tunneling disabled
---
manifests/agents/ml2/ovs.pp | 1 +
1 file changed, 1 insertion(+)
diff --git a/manifests/agents/ml2/ovs.pp b/manifests/agents/ml2/ovs.pp
index a10c7b5..f7c19c2 100644
--- a/manifests/agents/ml2/ovs.pp
+++ b/manifests/agents/ml2/ovs.pp
@@ -310,6 +310,7 @@ class neutron::agents::ml2::ovs (
'ovs/local_ip': ensure => absent;
'ovs/int_peer_patch_port': ensure => absent;
'ovs/tun_peer_patch_port': ensure => absent;
+ 'agent/tunnel_types': ensure => absent;
}
}
--
1.8.3.1

7
networking/openvswitch/centos/build_srpm.data
View File

@ -1,4 +1,3 @@
COPY_LIST="$CGCS_BASE/downloads/openvswitch-2.8.1.tar.gz \
$CGCS_BASE/downloads/dpdk-17.05.2.tar.gz \
patches/*"
TIS_PATCH_VER=1
COPY_LIST="files/*"
TIS_PATCH_VER=0
BUILD_IS_SLOW=12

25
networking/openvswitch/centos/meta_patches/0001-update-package-versioning-for-TIS-format.patch Normal file
View File

@ -0,0 +1,25 @@
From cfa7930a4bf0b0e798f1492cd75e37f66c1f5319 Mon Sep 17 00:00:00 2001
From: Matt Peters <matt.peters@windriver.com>
Date: Mon, 28 May 2018 08:14:24 -0500
Subject: [PATCH] update package versioning for TIS format
---
SPECS/openvswitch.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/openvswitch.spec b/SPECS/openvswitch.spec
index e007992..71b4634 100644
--- a/SPECS/openvswitch.spec
+++ b/SPECS/openvswitch.spec
@@ -46,7 +46,7 @@ URL: http://www.openvswitch.org/
# Carried over from 2.6.1 CBS builds, introduced to win over 2.6.90
Epoch: 1
Version: 2.9.0
-Release: 3%{?commit0:.%{date}git%{shortcommit0}}%{?dist}
+Release: 3.el7%{?_tis_dist}.%{tis_patch_ver}
# Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the
# lib/sflow*.[ch] files are SISSL
--
1.8.3.1

48
networking/openvswitch/centos/meta_patches/0002-dpdk-usertools.patch Normal file
View File

@ -0,0 +1,48 @@
From f1173c242506fb5d1b311efe2f7d657b04ae6b24 Mon Sep 17 00:00:00 2001
From: Matt Peters <matt.peters@windriver.com>
Date: Fri, 15 Jun 2018 13:37:14 -0500
Subject: [PATCH] dpdk usertools
---
SPECS/openvswitch.spec | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/SPECS/openvswitch.spec b/SPECS/openvswitch.spec
index 71b4634..22bdec9 100644
--- a/SPECS/openvswitch.spec
+++ b/SPECS/openvswitch.spec
@@ -150,6 +150,7 @@ BuildRequires: libcap-ng libcap-ng-devel
%ifarch %{dpdkarches}
# DPDK driver dependencies
BuildRequires: zlib-devel libpcap-devel numactl-devel
+Requires: python-pyelftools
# Virtual provide for depending on DPDK-enabled OVS
Provides: openvswitch-dpdk = %{version}-%{release}
@@ -421,6 +422,13 @@ install -p -D -m 0755 \
touch $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch/conf.db
touch $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch/system-id.conf
+%if %{with dpdk}
+%ifarch %{dpdkarches}
+ install -m 0755 %{dpdkdir}-%{dpdkver}/usertools/dpdk-pmdinfo.py $RPM_BUILD_ROOT%{_datadir}/openvswitch/scripts/dpdk-pmdinfo.py
+ install -m 0755 %{dpdkdir}-%{dpdkver}/usertools/dpdk-devbind.py $RPM_BUILD_ROOT%{_datadir}/openvswitch/scripts/dpdk-devbind.py
+%endif
+%endif
+
# remove unpackaged files
rm -f $RPM_BUILD_ROOT/%{_bindir}/ovs-benchmark \
$RPM_BUILD_ROOT/%{_bindir}/ovs-docker \
@@ -656,6 +664,9 @@ fi
%{_datadir}/openvswitch/scripts/ovs-vtep
%{_datadir}/openvswitch/scripts/ovs-ctl
%{_datadir}/openvswitch/scripts/ovs-systemd-reload
+%{_datadir}/openvswitch/scripts/dpdk-pmdinfo.py
+%{_datadir}/openvswitch/scripts/dpdk-devbind.py
+%exclude %{_datadir}/openvswitch/scripts/*.py[oc]
%config %{_datadir}/openvswitch/vswitch.ovsschema
%config %{_datadir}/openvswitch/vtep.ovsschema
%{_bindir}/ovs-appctl
--
1.8.3.1

49
networking/openvswitch/centos/meta_patches/0003-run-services-as-root-user.patch Normal file
View File

@ -0,0 +1,49 @@
From 45378c59ffd64d2cf17aa2944489075e6940ab39 Mon Sep 17 00:00:00 2001
From: Matt Peters <matt.peters@windriver.com>
Date: Tue, 29 May 2018 11:58:36 -0500
Subject: [PATCH] 0003-run-services-as-root-user.patch
---
SPECS/openvswitch.spec | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/SPECS/openvswitch.spec b/SPECS/openvswitch.spec
index 6950479..6fc2b67 100644
--- a/SPECS/openvswitch.spec
+++ b/SPECS/openvswitch.spec
@@ -103,6 +103,7 @@ ExclusiveArch: x86_64 aarch64 ppc64le s390x
%define dpdktarget %{dpdk_mach_arch}-%{dpdk_mach_tmpl}-linuxapp-gcc
# ovs-patches
+Patch01: run-services-as-root-user.patch
# OVS (including OVN) backports (0 - 300)
@@ -507,24 +508,6 @@ rm -rf $RPM_BUILD_ROOT
fi
%endif
-%post
-if [ $1 -eq 1 ]; then
- getent passwd openvswitch >/dev/null || \
- useradd -r -d / -s /sbin/nologin -c "Open vSwitch Daemons" openvswitch
-
- sed -i 's:^#OVS_USER_ID=:OVS_USER_ID=:' /etc/sysconfig/openvswitch
-
- getent group hugetlbfs >/dev/null || \
- groupadd hugetlbfs
- usermod -a -G hugetlbfs openvswitch
- sed -i \
- 's@OVS_USER_ID="openvswitch:openvswitch"@OVS_USER_ID="openvswitch:hugetlbfs"@'\
- /etc/sysconfig/openvswitch
-
- # In the case of upgrade, this is not needed.
- chown -R openvswitch:openvswitch /etc/openvswitch
-fi
-
%if 0%{?systemd_post:1}
%systemd_post %{name}.service
%else
--
1.8.3.1

42
networking/openvswitch/centos/meta_patches/0004-add-pmon-conf-files.patch Normal file
View File

@ -0,0 +1,42 @@
From 4f7df3882496e1df40de57824d2c4811750d2405 Mon Sep 17 00:00:00 2001
From: Matt Peters <matt.peters@windriver.com>
Date: Fri, 1 Jun 2018 19:49:33 -0500
Subject: [PATCH] add pmon conf files
---
SPECS/openvswitch.spec | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/SPECS/openvswitch.spec b/SPECS/openvswitch.spec
index 6fc2b67..57a3055 100644
--- a/SPECS/openvswitch.spec
+++ b/SPECS/openvswitch.spec
@@ -76,6 +76,9 @@ Source504: arm64-armv8a-linuxapp-gcc-config
Source505: ppc_64-power8-linuxapp-gcc-config
Source506: x86_64-native-linuxapp-gcc-config
+Source600: ovsdb-server.pmon.conf
+
+
# The DPDK is designed to optimize througput of network traffic using, among
# other techniques, carefully crafted assembly instructions. As such it
# needs extensive work to port it to other architectures.
@@ -429,6 +432,8 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch/system-id.conf
%endif
%endif
+install -m 0644 %{SOURCE600} $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch/ovsdb-server.pmon.conf
+
# remove unpackaged files
rm -f $RPM_BUILD_ROOT/%{_bindir}/ovs-benchmark \
$RPM_BUILD_ROOT/%{_bindir}/ovs-docker \
@@ -631,6 +636,7 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch
+%{_sysconfdir}/openvswitch/ovsdb-server.pmon.conf
%{_unitdir}/openvswitch.service
%{_unitdir}/ovsdb-server.service
%{_unitdir}/ovs-vswitchd.service
1.8.3.1

24
networking/openvswitch/centos/meta_patches/0005-log-rotation-config.patch Normal file
View File

@ -0,0 +1,24 @@
From babffcf0f064379438fabcd00329bd431413e28a Mon Sep 17 00:00:00 2001
From: Matt Peters <matt.peters@windriver.com>
Date: Fri, 1 Jun 2018 20:13:57 -0500
Subject: [PATCH] log rotation config
---
SPECS/openvswitch.spec | 1 +
1 file changed, 1 insertion(+)
diff --git a/SPECS/openvswitch.spec b/SPECS/openvswitch.spec
index ff5694a..c51d53f 100644
--- a/SPECS/openvswitch.spec
+++ b/SPECS/openvswitch.spec
@@ -107,6 +107,7 @@ ExclusiveArch: x86_64 aarch64 ppc64le s390x
# ovs-patches
Patch01: run-services-as-root-user.patch
+Patch02: log-rotation-config.patch
# OVS (including OVN) backports (0 - 300)
--
1.8.3.1

25
networking/openvswitch/centos/meta_patches/0006-rpm-check-with-condition.patch Normal file
View File

@ -0,0 +1,25 @@
From 39471b1f12131cfa74e272e73c38eb830d89f1bd Mon Sep 17 00:00:00 2001
From: Matt Peters <matt.peters@windriver.com>
Date: Tue, 12 Jun 2018 14:41:25 -0500
Subject: [PATCH] rpm check with condition
---
SPECS/openvswitch.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/openvswitch.spec b/SPECS/openvswitch.spec
index c51d53f..432c9ed 100644
--- a/SPECS/openvswitch.spec
+++ b/SPECS/openvswitch.spec
@@ -25,7 +25,7 @@
# https://bugzilla.redhat.com/show_bug.cgi?id=1105458#c10
# "ofproto-dpif - select group with dp_hash selection method" test is broken on armv7lh
%ifarch x86_64 aarch64 ppc64le
-%bcond_without check
+%bcond_with check
%else
%bcond_with check
%endif
--
1.8.3.1

6
networking/openvswitch/centos/meta_patches/PATCH_ORDER Normal file
View File

@ -0,0 +1,6 @@
0001-update-package-versioning-for-TIS-format.patch
0002-dpdk-usertools.patch
0003-run-services-as-root-user.patch
0004-add-pmon-conf-files.patch
0005-log-rotation-config.patch
0006-rpm-check-with-condition.patch

1009
networking/openvswitch/centos/openvswitch.spec
View File

File diff suppressed because it is too large Load Diff

29
networking/openvswitch/centos/patches/log-rotation-config.patch Normal file
View File

@ -0,0 +1,29 @@
From 97cd48cae1ac9b431747211dbaf59c304bf93293 Mon Sep 17 00:00:00 2001
From: Matt Peters <matt.peters@windriver.com>
Date: Fri, 1 Jun 2018 20:17:47 -0500
Subject: [PATCH] log rotation config
---
rhel/etc_logrotate.d_openvswitch | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/rhel/etc_logrotate.d_openvswitch b/rhel/etc_logrotate.d_openvswitch
index ed7d733..f9ae766 100644
--- a/rhel/etc_logrotate.d_openvswitch
+++ b/rhel/etc_logrotate.d_openvswitch
@@ -6,7 +6,11 @@
# without warranty of any kind.
/var/log/openvswitch/*.log {
- daily
+ nodateext
+ size 10M
+ start 1
+ rotate 20
+ notifempty
compress
sharedscripts
missingok
--
1.8.3.1

38
networking/openvswitch/centos/patches/run-services-as-root-user.patch Normal file
View File

@ -0,0 +1,38 @@
From 76ba5dcc92ad317d2b19cac916d710465e43e3a8 Mon Sep 17 00:00:00 2001
From: Matt Peters <matt.peters@windriver.com>
Date: Tue, 29 May 2018 12:20:27 -0500
Subject: [PATCH] run services as root user
---
rhel/etc_openvswitch_default.conf | 2 +-
rhel/usr_lib_systemd_system_ovs-vswitchd.service.in | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/rhel/etc_openvswitch_default.conf b/rhel/etc_openvswitch_default.conf
index c74417d..56d79eb 100644
--- a/rhel/etc_openvswitch_default.conf
+++ b/rhel/etc_openvswitch_default.conf
@@ -2,4 +2,4 @@
# The following is the *default* configuration for the openvswitch user ID.
# This is for backward compatibility.
-OVS_USER_ID="root:root"
+OVS_USER_ID=""
diff --git a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in
index c6d9aa1..63eb68e 100644
--- a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in
+++ b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in
@@ -13,10 +13,6 @@ Restart=on-failure
Environment=HOME=/var/run/openvswitch
EnvironmentFile=/etc/openvswitch/default.conf
EnvironmentFile=-/etc/sysconfig/openvswitch
-@begin_dpdk@
-ExecStartPre=-/usr/bin/chown :hugetlbfs /dev/hugepages
-ExecStartPre=-/usr/bin/chmod 0775 /dev/hugepages
-@end_dpdk@
ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \
--no-ovsdb-server --no-monitor --system-id=random \
--ovs-user=${OVS_USER_ID} \
--
1.8.3.1

1
networking/openvswitch/centos/srpm_path Normal file
View File

@ -0,0 +1 @@
mirror:/Source/openvswitch-2.9.0-3.el7.src.rpm

25
networking/openvswitch/files/ovsdb-server.pmon.conf Normal file
View File

@ -0,0 +1,25 @@
[process]
process = ovsdb-server
service = ovsdb-server ; The name of the process's systemd service file without the extension
pidfile = /var/run/openvswitch/ovsdb-server.pid
style = lsb ; ocf or lsb
severity = critical ; minor, major, critical
restarts = 3 ; restarts before error assertion
interval = 5 ; number of seconds to wait between restarts
debounce = 20 ; number of seconds that a process needs to remain
; running before degrade is removed and retry count
; is cleared.
startuptime = 5 ; Seconds to wait after process start before starting the debounce monitor
mode = passive ; Monitoring mode: passive (default) or active
; passive: process death monitoring (default: always)
; active : heartbeat monitoring, i.e. request / response messaging
; ignore : do not monitor or stop monitoring
subfunction = compute ; Optional label.
; Manage this process in the context of a combo host subfunction
; Choices: compute or storage.
; when specified pmond will wait for
; /var/run/.compute_config_complete or
; /var/run/.storage_config_complete
; ... before managing this process with the specified subfunction
; Excluding this label will cause this process to be managed by default on startup

14
networking/openvswitch/patches/ovs-vswitchd.system.service.patch
View File

@ -1,14 +0,0 @@
--- a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in 2017-09-29 13:41:03.569697066 +0800
+++ b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in 2018-02-05 18:42:08.183083617 +0800
@@ -15,7 +15,11 @@
EnvironmentFile=-/etc/sysconfig/openvswitch
@begin_dpdk@
ExecStartPre=-/usr/bin/chown :hugetlbfs /dev/hugepages
+ExecStartPre=-/usr/bin/chown -R :hugetlbfs /mnt/huge-2048kB
+ExecStartPre=-/usr/bin/chown -R :hugetlbfs /mnt/huge-1048576kB
ExecStartPre=-/usr/bin/chmod 0775 /dev/hugepages
+ExecStartPre=-/usr/bin/chmod 0775 /mnt/huge-2048kB
+ExecStartPre=-/usr/bin/chmod 0775 /mnt/huge-1048576kB
@end_dpdk@
ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \
--no-ovsdb-server --no-monitor --system-id=random \

4
restapi-doc/restapi-doc/api-ref/src/wadls/networking-api/v2/api_samples/networking-v2-cgcs-ext/host-list_admin_response.json
View File

@ -4,7 +4,7 @@
"agents": [
{
"id": "894d7327-ef14-468d-9037-82f7209a4165",
"type": "AVS agent"
"type": "Open vSwitch agent"
},
{
"id": "b3aa7556-0f13-4822-9707-d42b5bca114d",
@ -32,7 +32,7 @@
},
{
"id": "53b84157-5761-4480-8b14-10abc22e3c65",
"type": "AVS agent"
"type": "Open vSwitch agent"
},
{
"id": "3c28bc57-ae08-428f-8387-1e4b74376220",

2
restapi-doc/restapi-doc/api-ref/src/wadls/networking-api/v2/api_samples/networking-v2-cgcs-ext/host-show_admin_response.json
View File

@ -11,7 +11,7 @@
},
{
"id": "894d7327-ef14-468d-9037-82f7209a4165",
"type": "AVS agent"
"type": "Open vSwitch agent"
}
],
"availability": "up",

2
restapi-doc/restapi-doc/api-ref/src/wadls/networking-api/v2/api_samples/networking-v2-cgcs-ext/host-update_admin_response.json
View File

@ -3,7 +3,7 @@
"agents": [
{
"id": "894d7327-ef14-468d-9037-82f7209a4165",
"type": "AVS agent"
"type": "Open vSwitch agent"
},
{
"id": "b3aa7556-0f13-4822-9707-d42b5bca114d",

8
restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/memory_list-response.json
View File

@ -1,12 +1,14 @@
{
"imemorys" : [
{
"vswitch_hugepages_nr" : 1,
"hugepages_configured" : "True",
"vm_hugepages_nr_1G_pending" : null,
"memavail_mib" : 22448,
"uuid" : "34098f3a-6b95-4cad-aecb-986dc6312f4f",
"ihost_uuid" : "afecdcfb-2954-498d-88bf-d1385b00f34d",
"created_at" : "2015-04-06T20:27:50.171841+00:00",
"vswitch_hugepages_size_mib" : 1024,
"vm_hugepages_avail_1G" : 0,
"capabilities" : {},
"links" : [
@ -20,7 +22,9 @@
}
],
"vm_hugepages_nr_2M_pending" : null,
"vswitch_hugepages_reqd" : null,
"vm_hugepages_avail_2M" : 11224,
"vswitch_hugepages_avail" : 0,
"numa_node" : 0,
"vm_hugepages_nr_1G" : 0,
"updated_at" : "2015-04-08T11:32:25.205552+00:00",
@ -30,12 +34,14 @@
"inode_uuid" : "c65c852c-1707-40e1-abfc-334270ec0427"
},
{
"vswitch_hugepages_nr" : 1,
"hugepages_configured" : "True",
"vm_hugepages_nr_1G_pending" : null,
"memavail_mib" : 24082,
"uuid" : "85df5109-77d9-4335-9181-0efa82c98dcc",
"ihost_uuid" : "afecdcfb-2954-498d-88bf-d1385b00f34d",
"created_at" : "2015-04-06T20:27:50.182764+00:00",
"vswitch_hugepages_size_mib" : 1024,
"vm_hugepages_avail_1G" : 0,
"capabilities" : {},
"links" : [
@ -49,7 +55,9 @@
}
],
"vm_hugepages_nr_2M_pending" : null,
"vswitch_hugepages_reqd" : null,
"vm_hugepages_avail_2M" : 12041,
"vswitch_hugepages_avail" : 0,
"numa_node" : 1,
"vm_hugepages_nr_1G" : 0,
"updated_at" : "2015-04-08T11:32:25.220242+00:00",

4
restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/memory_modify-response.json
View File

@ -1,10 +1,12 @@
{
"vswitch_hugepages_nr" : 1,
"hugepages_configured" : "True",
"vm_hugepages_nr_1G_pending" : null,
"memavail_mib" : 24082,
"uuid" : "85df5109-77d9-4335-9181-0efa82c98dcc",
"ihost_uuid" : "afecdcfb-2954-498d-88bf-d1385b00f34d",
"created_at" : "2015-04-06T20:27:50.182764+00:00",
"vswitch_hugepages_size_mib" : 1024,
"vm_hugepages_avail_1G" : 0,
"capabilities" : {},
"links" : [
@ -18,7 +20,9 @@
}
],
"vm_hugepages_nr_2M_pending" : null,
"vswitch_hugepages_reqd" : null,
"vm_hugepages_avail_2M" : 12041,
"vswitch_hugepages_avail" : 0,
"numa_node" : 1,
"vm_hugepages_nr_1G" : 0,
"updated_at" : "2015-04-08T11:33:25.280674+00:00",

4
restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/api_samples/memory_show-response.json
View File

@ -1,10 +1,12 @@
{
"vswitch_hugepages_nr" : 1,
"hugepages_configured" : "True",
"vm_hugepages_nr_1G_pending" : null,
"memavail_mib" : 24082,
"uuid" : "85df5109-77d9-4335-9181-0efa82c98dcc",
"ihost_uuid" : "afecdcfb-2954-498d-88bf-d1385b00f34d",
"created_at" : "2015-04-06T20:27:50.182764+00:00",
"vswitch_hugepages_size_mib" : 1024,
"vm_hugepages_avail_1G" : 0,
"capabilities" : {},
"links" : [
@ -18,7 +20,9 @@
}
],
"vm_hugepages_nr_2M_pending" : null,
"vswitch_hugepages_reqd" : null,
"vm_hugepages_avail_2M" : 12041,
"vswitch_hugepages_avail" : 0,
"numa_node" : 1,
"vm_hugepages_nr_1G" : 0,
"updated_at" : "2015-04-08T11:33:25.280674+00:00",

25
restapi-doc/restapi-doc/api-ref/src/wadls/sysinv-api/v1/common.ent
View File

@ -915,7 +915,7 @@
Platform, Vswitch, Shared or VMs .</para>
<para><code>Platform</code> indicates the core is used for the host
kernel, Titanium Cloud and OpenStack Services,</para>
<para><code>Vswitch</code> indicates the core is used by AVS, the
<para><code>Vswitch</code> indicates the core is used by the
virtual switch,</para>
<para><code>Shared</code> indicates that the core is reserved for
sharing by VMs using the hw:wrs:shared_vcpu flavor extra spec,</para>
@ -1011,6 +1011,29 @@
or not.</para>
</wadl:doc>
</param>
<param xmlns="http://wadl.dev.java.net/2009/02"
name="vswitch_hugepages_size_mib" style="plain" type="xsd:integer" >
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
<para>The size of a Virtual Switch (vSwitch) huge page,
in MiBs.</para>
</wadl:doc>
</param>
<param xmlns="http://wadl.dev.java.net/2009/02"
name="vswitch_hugepages_nr" style="plain" type="xsd:integer" >
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
<para>The total number of Virtual Switch (vSwitch) huge
pages.</para>
</wadl:doc>
</param>
<param xmlns="http://wadl.dev.java.net/2009/02"
name="vswitch_hugepages_avail" style="plain" type="xsd:integer" >
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
<para>The free / available Virtual Switch (vSwitch) huge pages.</para>
</wadl:doc>
</param>
<param xmlns="http://wadl.dev.java.net/2009/02"
name="vm_hugepages_nr_1G" style="plain" type="xsd:integer" >
<wadl:doc xmlns="http://docbook.org/ns/docbook"