starlingx
/
nfv
Code Issues Proposed changes

Fix yamllint and bashate tox warnings 

yamllint warnings are fixed.
bashate failure was due to not finding any shell scripts.
Added a generic shell script under the test folder.

Change-Id: If4b8a416422356be318f875a28ae2b1785ef818b
Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
This commit is contained in:
Al Bailey 2018-06-29 08:59:19 -05:00
parent 2b6413891c
commit 01f3717f86
10 changed files with 137 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
nfv/nfv-common/nfv_common/forensic/config/nfv-vim.yaml
View File

@ -3,6 +3,7 @@
#
# SPDX-License-Identifier: Apache-2.0
#
---
logs:
- name: Host State Change
type: nfv_vim_host_nfvi_state_change
@ -606,7 +607,8 @@ logs:
'name': u'(.*)', 'tenant_id': '(.*)', 'avail_status': \\[(.*)], 'nfvi_data':
{'vm_state': u'(.*)', 'task_state': u?'(.*)', 'power_state': '(.*)'},
'live_migration_support': (.*), 'oper_state': '(.*)', 'host_name': u'(.*)',
'admin_state': '(.*)', 'action': '(.*)', 'image_uuid': (.*), 'uuid': u'(.*)'}."
'admin_state': '(.*)', 'action': '(.*)', 'image_uuid': (.*),
'uuid': u'(.*)'}."
fields:
- instance_type
- instance_name
@ -706,7 +708,8 @@ logs:
- name: Instance Live-Migrate Callback
type: nfv_vim_instance_live_migrate_callback
file: _instance_task_work.py
regex: "Live-Migrate-Instance callback for (.*), response={'completed': (.*),
regex: "Live-Migrate-Instance callback for (.*),
response={'completed': (.*),
'reason': (.*)}."
fields:
- instance_name
@ -716,7 +719,8 @@ logs:
- name: Instance Cold-Migrate Callback
type: nfv_vim_instance_cold_migrate_callback
file: _instance_task_work.py
regex: "Cold-Migrate-Instance callback for (.*), response={'completed': (.*),
regex: "Cold-Migrate-Instance callback for (.*),
response={'completed': (.*),
'reason': (.*)}."
fields:
- instance_name
@ -766,7 +770,8 @@ logs:
- name: Instance Resize Revert Callback
type: nfv_vim_instance_resize_revert_callback
file: _instance_task_work.py
regex: "Resize-Revert-Instance callback for (.*), response={'completed': (.*),
regex: "Resize-Revert-Instance callback for (.*),
response={'completed': (.*),
'reason': (.*)}."
fields:
- instance_name
@ -790,7 +795,8 @@ logs:
- name: Instance Guest Services Enable
type: nfv_vim_instance_guest_services_enable
file: _instance_task_work.py
regex: "Guest-Services-Enable for (.*), nfvi_guest_services=\\[{'admin_state':
regex: "Guest-Services-Enable for (.*),
nfvi_guest_services=\\[{'admin_state':
'(.*)', 'service': '(.*)'}]."
fields:
- instance_name
@ -800,7 +806,8 @@ logs:
- name: Instance Guest Services Enable Callback
type: nfv_vim_instance_guest_services_enable_callback
file: _instance_task_work.py
regex: "Guest-Services-Enable callback for (.*), response={'completed': (.*),
regex: "Guest-Services-Enable callback for (.*),
response={'completed': (.*),
'reason': (.*), 'result-data': {'instance_uuid': u'(.*)', 'services':
\\[{'admin_state': '(.*)', 'restart_timeout': (.*), 'oper_state': '(.*)',
'name': '(.*)'}], 'host_name': u'(.*)'}}."
@ -818,7 +825,8 @@ logs:
- name: Instance Guest Services Disable
type: nfv_vim_instance_guest_services_disable
file: _instance_task_work.py
regex: "Guest-Services-Disable for (.*), nfvi_guest_services=\\[{'admin_state':
regex: "Guest-Services-Disable for (.*),
nfvi_guest_services=\\[{'admin_state':
'(.*)', 'service': '(.*)'}]."
fields:
- instance_name
@ -828,7 +836,8 @@ logs:
- name: Instance Guest Services Disable Callback
type: nfv_vim_instance_guest_services_disable_callback
file: _instance_task_work.py
regex: "Guest-Services-Disable callback for (.*), response={'completed': (.*),
regex: "Guest-Services-Disable callback for (.*),
response={'completed': (.*),
'reason': (.*), 'result-data': {'instance_uuid': u'(.*)', 'services':
\\[{'admin_state': '(.*)', 'restart_timeout': (.*), 'oper_state': '(.*)',
'name': '(.*)'}], 'host_name': u'(.*)'}}."
@ -862,7 +871,8 @@ logs:
- name: Instance Guest Services Vote Callback
type: nfv_vim_instance_guest_services_vote_callback
file: _instance_task_work.py
regex: "Guest-Services-Vote callback for (.*), response={'action-type': u'(.*)',
regex: "Guest-Services-Vote callback for (.*),
response={'action-type': u'(.*)',
'uuid': u'(.*)', 'completed': (.*), 'reason': (.*), 'host-name': u'(.*)',
'timeout': (.*)}."
fields:

1
nfv/nfv-docs/documentation/document.yaml
View File

@ -3,6 +3,7 @@
#
# SPDX-License-Identifier: Apache-2.0
#
---
title: VIM Documentation
title_expanded: Virtual Infrastructure Manager Documentation

1
nfv/nfv-docs/documentation/software_image_management.yaml
View File

@ -3,6 +3,7 @@
#
# SPDX-License-Identifier: Apache-2.0
#
---
page_title: Software Image Management
page_description: >
These interfaces allows an authorized consumer functional block to manage

1
nfv/nfv-docs/documentation/virtualised_compute_resource.yaml
View File

@ -3,4 +3,5 @@
#
# SPDX-License-Identifier: Apache-2.0
#
---
page_title: Virtualised Compute Resource

126
nfv/nfv-docs/documentation/virtualised_network_resource.yaml
View File

@ -3,6 +3,7 @@
#
# SPDX-License-Identifier: Apache-2.0
#
---
page_title: Virtualised Network Resource
page_description: >
These interfaces allows an authorized consumer functional block to manage
@ -80,11 +81,18 @@ api_networks: &api_networks_grouping
This example demonstrates how to allocate a network with subnets.
request: >
cat > network_ipv4_subnets_request.txt
{"network_resource_id": "network-ipv4-subnets", "network_resource_type": "network",
{"network_resource_id": "network-ipv4-subnets",
"network_resource_type": "network",
"type_network_data": {
"type_of_network": "vlan", "type_of_segment": "351", "wrs_physical_network": "physnet-x", "is_shared": true,
"type_of_network": "vlan",
"type_of_segment": "351",
"wrs_physical_network": "physnet-x",
"is_shared": true,
"layer3_attributes": [
{"ip_version": "4", "is_dhcp_enabled": true, "gateway_ip": "192.168.12.1", "wrs_subnet_ip": "192.168.12.0",
{"ip_version": "4",
"is_dhcp_enabled": true,
"gateway_ip": "192.168.12.1",
"wrs_subnet_ip": "192.168.12.0",
"wrs_subnet_prefix": 24}
]}}
@ -96,12 +104,21 @@ api_networks: &api_networks_grouping
{"operation_result": null, "message": null,
"network_data": {
"network_attributes": {
"is_shared": true, "type_of_network": "vlan", "type_of_segment": "351",
"is_shared": true,
"type_of_network": "vlan",
"type_of_segment": "351",
"layer3_attributes": [
{"is_dhcp_enabled": true, "meta_data": null, "wrs_subnet_ip": "192.168.12.0", "gateway_ip": "192.168.12.1",
"ip_version": "4", "wrs_subnet_prefix": 24}
{"is_dhcp_enabled": true,
"meta_data": null,
"wrs_subnet_ip": "192.168.12.0",
"gateway_ip": "192.168.12.1",
"ip_version": "4",
"wrs_subnet_prefix": 24}
],
"sharing_criteria": null, "bandwidth": 0, "meta_data": null, "network_qos": []},
"sharing_criteria": null,
"bandwidth": 0,
"meta_data": null,
"network_qos": []},
"resource_id": "network-ipv4-subnets"}}
- id: update_network
@ -166,10 +183,19 @@ api_networks: &api_networks_grouping
{"network_resource_id": "network-ipv4-subnets",
"update_network_data": {
"layer3_attributes": [
{"ip_version": "4", "is_dhcp_enabled": true, "wrs_subnet_ip": "192.168.14.0", "wrs_subnet_prefix": "24"},
{"ip_version": "6", "is_dhcp_enabled": false, "gateway_ip": "3FFE::1", "wrs_subnet_ip": "3FFE::",
{"ip_version": "4",
"is_dhcp_enabled": true,
"wrs_subnet_ip": "192.168.14.0",
"wrs_subnet_prefix": "24"},
{"ip_version": "6",
"is_dhcp_enabled": false,
"gateway_ip": "3FFE::1",
"wrs_subnet_ip": "3FFE::",
"wrs_subnet_prefix": "16"},
{"ip_version": "4", "is_dhcp_enabled": false, "gateway_ip": "192.168.15.1", "wrs_subnet_ip": "192.168.15.0",
{"ip_version": "4",
"is_dhcp_enabled": false,
"gateway_ip": "192.168.15.1",
"wrs_subnet_ip": "192.168.15.0",
"wrs_subnet_prefix": "24"}
]}}
@ -178,21 +204,41 @@ api_networks: &api_networks_grouping
http://localhost:4545/v1/virtualised_resources/networks
-d @network_update_ipv4_ipv6_subnets_request.txt
response: >
{"operation_result": null, "message": null,
{"operation_result": null,
"message": null,
"network_data": {
"network_attributes": {
"is_shared": false, "type_of_network": "vlan", "type_of_segment": "351",
"network_attributes": %%{
"is_shared": false,
"type_of_network": "vlan",
"type_of_segment": "351",
"layer3_attributes": [
{"network_id": "143fab9e-b4d2-4239-867b-d52e254d6d86", "is_dhcp_enabled": false, "meta_data": null,
"wrs_subnet_ip": "192.168.15.0", "gateway_ip": "192.168.15.1",
"ip_version": "4", "wrs_subnet_prefix": 24},
{"network_id": "143fab9e-b4d2-4239-867b-d52e254d6d86", "is_dhcp_enabled": false, "meta_data": null,
"wrs_subnet_ip": "3ffe::", "gateway_ip": "3FFE::1", "ip_version": "6", "wrs_subnet_prefix": 16},
{"network_id": "143fab9e-b4d2-4239-867b-d52e254d6d86", "is_dhcp_enabled": true, "meta_data": null,
"wrs_subnet_ip": "192.168.14.0", "gateway_ip": "192.168.14.1", "ip_version": "4", "wrs_subnet_prefix": 24}
{"network_id": "143fab9e-b4d2-4239-867b-d52e254d6d86",
"is_dhcp_enabled": false,
"meta_data": null,
"wrs_subnet_ip": "192.168.15.0",
"gateway_ip": "192.168.15.1",
"ip_version": "4",
"wrs_subnet_prefix": 24},
{"network_id": "143fab9e-b4d2-4239-867b-d52e254d6d86",
"is_dhcp_enabled": false,
"meta_data": null,
"wrs_subnet_ip": "3ffe::",
"gateway_ip": "3FFE::1",
"ip_version": "6",
"wrs_subnet_prefix": 16},
{"network_id": "143fab9e-b4d2-4239-867b-d52e254d6d86",
"is_dhcp_enabled": true,
"meta_data": null,
"wrs_subnet_ip": "192.168.14.0",
"gateway_ip": "192.168.14.1",
"ip_version": "4",
"wrs_subnet_prefix": 24}
],
"sharing_criteria": null, "bandwidth": 0, "meta_data": null, "network_qos": []},
"resource_id": "network-ipv4-subnets"}}
"sharing_criteria": null,
"bandwidth": 0,
"meta_data": null,
"network_qos": []},
"resource_id": "network-ipv4-subnets"}}
- id: delete_network
name: Delete Network
@ -279,16 +325,36 @@ api_networks: &api_networks_grouping
{"operation_result": null, "message": null,
"query_result": [
{"network_attributes": {
"is_shared": false, "type_of_network": "vlan", "type_of_segment": "351",
"is_shared": false,
"type_of_network": "vlan",
"type_of_segment": "351",
"layer3_attributes": [
{"network_id": "143fab9e-b4d2-4239-867b-d52e254d6d86", "is_dhcp_enabled": false, "meta_data": null,
"wrs_subnet_ip": "192.168.15.0", "gateway_ip": "192.168.15.1", "ip_version": "4", "wrs_subnet_prefix": 24},
{"network_id": "143fab9e-b4d2-4239-867b-d52e254d6d86", "is_dhcp_enabled": false, "meta_data": null,
"wrs_subnet_ip": "3ffe::", "gateway_ip": "3FFE::1", "ip_version": "6", "wrs_subnet_prefix": 16},
{"network_id": "143fab9e-b4d2-4239-867b-d52e254d6d86", "is_dhcp_enabled": true, "meta_data": null,
"wrs_subnet_ip": "192.168.14.0", "gateway_ip": "192.168.14.1", "ip_version": "4", "wrs_subnet_prefix": 24}
{"network_id": "143fab9e-b4d2-4239-867b-d52e254d6d86",
"is_dhcp_enabled": false,
"meta_data": null,
"wrs_subnet_ip": "192.168.15.0",
"gateway_ip": "192.168.15.1",
"ip_version": "4",
"wrs_subnet_prefix": 24},
{"network_id": "143fab9e-b4d2-4239-867b-d52e254d6d86",
"is_dhcp_enabled": false,
"meta_data": null,
"wrs_subnet_ip": "3ffe::",
"gateway_ip": "3FFE::1",
"ip_version": "6",
"wrs_subnet_prefix": 16},
{"network_id": "143fab9e-b4d2-4239-867b-d52e254d6d86",
"is_dhcp_enabled": true,
"meta_data": null,
"wrs_subnet_ip": "192.168.14.0",
"gateway_ip": "192.168.14.1",
"ip_version": "4",
"wrs_subnet_prefix": 24}
],
"sharing_criteria": null, "bandwidth": 0, "meta_data": null, "network_qos": []},
"sharing_criteria": null,
"bandwidth": 0,
"meta_data": null,
"network_qos": []},
"resource_id": "network-ipv4-subnets"}]}
api_group_list:

3
nfv/nfv-docs/documentation/virtualised_storage_resource.yaml
View File

@ -3,4 +3,5 @@
#
# SPDX-License-Identifier: Apache-2.0
#
page_title: Virtualised Storage Resource
---
page_title: Virtualised Storage Resource

3
nfv/nfv-tests/lint_check.sh Normal file
View File

@ -0,0 +1,3 @@
#!/bin/sh
echo "Update this file to run lint activities outside of tox"

13
nfv/nfv-tests/nfv_scenario_tests/data/data/default-data-guest.yaml
View File

@ -3,8 +3,9 @@
#
# SPDX-License-Identifier: Apache-2.0
#
---
default:
guest_hb: yes
guest_hb: true
pause_instance: cirros-guest-1
unpause_instance: cirros-guest-1
@ -24,17 +25,17 @@ default:
cold_migrate_revert_instance: cirros-guest-1
resize_instance: cirros-guest-1
resize_flavors: [small-guest, medium-guest]
resize_flavors: [small-guest, medium-guest]
resize_confirm_instance: cirros-guest-1
resize_confirm_flavors: [small-guest, medium-guest]
resize_confirm_flavors: [small-guest, medium-guest]
resize_revert_instance: cirros-guest-1
resize_revert_flavors: [small-guest, medium-guest]
resize_revert_flavors: [small-guest, medium-guest]
rebuild_instance: cirros-guest-image-1
lock_host: compute-100
lock_host: compute-100
lock_instances: [cirros-guest-1]
unlock_host: compute-100
unlock_host: compute-100

11
nfv/nfv-tests/nfv_scenario_tests/data/data/default-data.yaml
View File

@ -3,6 +3,7 @@
#
# SPDX-License-Identifier: Apache-2.0
#
---
default:
pause_instance: cirros-1
unpause_instance: cirros-1
@ -22,17 +23,17 @@ default:
cold_migrate_revert_instance: cirros-1
resize_instance: cirros-1
resize_flavors: [small, medium]
resize_flavors: [small, medium]
resize_confirm_instance: cirros-1
resize_confirm_flavors: [small, medium]
resize_confirm_flavors: [small, medium]
resize_revert_instance: cirros-1
resize_revert_flavors: [small, medium]
resize_revert_flavors: [small, medium]
rebuild_instance: cirros-image-1
lock_host: compute-100
lock_host: compute-100
lock_instances: [cirros-1]
unlock_host: compute-100
unlock_host: compute-100

2
tox.ini
View File

@ -1,5 +1,5 @@
[tox]
envlist = linters
envlist = linters,pep8
minversion = 2.3
skipsdist = True